Kaynağa Gözat

fix 修改分时排班接口,新增医生信息返回

DYH2020 2 yıl önce
ebeveyn
işleme
ce67a09e2c

+ 38 - 0
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/web/controller/RegisterController.java

@@ -94,6 +94,44 @@ public class RegisterController {
                     }
                 }
             }
+            // 获取医生相关信息
+            String doctorName = "", deptName = "";
+            double fee = 0, treatFee = 0;;     //单位:元
+            if (dataList.size() > 0) {
+                String strDate = dataList.get(0).getServiceDate();
+                GetScheduleListRequest getScheduleListRequest = GetScheduleListRequest.newBuilder()
+                        .setDeptCode(deptCode)
+                        .setDoctorCode(doctorCode)
+                        .setServiceDate(strDate)
+                        .setHospitalId(hospitalId)
+                        .build();
+                GetScheduleListResponse getScheduleListResponse = taiheServiceBlockingStub.getScheduleList(getScheduleListRequest);
+
+                if (getScheduleListResponse.getCode() == ResultCode.SUCCEED_VALUE) {
+                    List<Schedule> scheduleList = getScheduleListResponse.getSchedulesList();
+                    if (scheduleList.size() > 0) {
+                        Schedule schedule = scheduleList.stream().filter(s -> s.getDatePeriod() == Checker.getIntegerValue(period)).findFirst().orElse(null);
+                        if (schedule != null) {
+                            deptName = schedule.getDeptName();
+                            doctorName = schedule.getDoctorName();
+                            fee = schedule.getFee() / 100d;
+                            treatFee = schedule.getCheckupFee();
+                        }
+                    }
+                }
+                String feeStr = String.format("%.2f", fee);
+                String treatFeeStr = String.format("%.2f", treatFee / 100d);
+                for (QueryDoctorScheduleListResponseData info : dataList) {
+                    info.setDeptCode(deptCode);
+                    info.setDeptName(deptName);
+                    info.setDoctorCode(doctorCode);
+                    info.setDoctorName(doctorName);
+                    info.setFee(fee);
+                    info.setFeeStr(feeStr);
+                    info.setTreatFee(treatFee);
+                    info.setTreatFeeStr(treatFeeStr);
+                }
+            }
             return ResponseVO.success(dataList);
         } catch (AppMessageException e) {
             return ResponseVO.fail(Code.RESP_CODE_PARAM_ERROR, e.getMessage());

+ 8 - 0
onemini-hospital-sdk/src/main/java/com/ywt/response/register/QueryDoctorScheduleListResponseData.java

@@ -18,4 +18,12 @@ public class QueryDoctorScheduleListResponseData implements IsvResponseData {
     private String serviceDate; //日期
     private String datePeriod;  //时间段
     private List<ScheduleInfo> schedule;    //分时排班信息list
+    private String deptCode;  //科室code
+    private String deptName;  //科室名称
+    private String doctorCode;  //医生code
+    private String doctorName;  //医生姓名
+    private Double fee;         // 挂号费,单位:元
+    private String feeStr;         // 挂号费,单位:元
+    private Double treatFee;  // 治疗费,前端用于诊疗卡费 ,单位:元
+    private String treatFeeStr;  // 治疗费,前端用于诊疗卡费 ,单位:元
 }