Browse Source

fix 修改接口

DYH2020 2 years ago
parent
commit
0b712288c7

+ 10 - 10
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvRegisterServiceImpl.java

@@ -375,21 +375,21 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
         log.info("IsvRegisterServiceImpl#orderConfirm--OrderConfirmRequest:{}", JsonSerializer.toJson(request));
         int userId = ContextHelper.getCurrentUserIdWrapped();
         int hospitalId = BizUtil.getCurrentHospitalId();
-        String deptCode = request.getDeptCode();
-        String deptName = request.getDeptName();
-        String doctorCode = request.getDoctorCode();
-        String doctorName = request.getDoctorName();
+        String deptCode = Checker.getStringValue(request.getDeptCode());
+        String deptName = Checker.getStringValue(request.getDeptName());
+        String doctorCode = Checker.getStringValue(request.getDoctorCode());
+        String doctorName = Checker.getStringValue(request.getDoctorName());
         double registeredFee = request.getRegisteredFee();
         double medicalFee = request.getMedicalFee();
-        String registeredDate = request.getRegisteredDate();
+        String registeredDate = Checker.getStringValue(request.getRegisteredDate());
         int period = request.getPeriod();
-        String startTime = request.getStartTime();
-        String endTime = request.getEndTime();
+        String startTime = Checker.getStringValue(request.getStartTime());
+        String endTime = Checker.getStringValue(request.getEndTime());
         int medicalCardId = request.getMedicalCardId();
-        String scheduleItemCode = request.getScheduleItemCode();
+        String scheduleItemCode = Checker.getStringValue(request.getScheduleItemCode());
         int deptId = request.getDeptId();
-        String lockQueueNo = request.getLockQueueNo();
-        String availableNumStr = request.getAvailableNumStr();
+        String lockQueueNo = Checker.getStringValue(request.getLockQueueNo());
+        String availableNumStr = Checker.getStringValue(request.getAvailableNumStr());
 
         if (hospitalId < 1) {
             throw new AppMessageException("医院不存在");

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

@@ -115,11 +115,12 @@ public class RegisterController {
                             deptName = schedule.getDeptName();
                             doctorName = schedule.getDoctorName();
                             fee = schedule.getFee() / 100d;
+                            treatFee = schedule.getCheckupFee() / 100d;
                         }
                     }
                 }
                 String feeStr = String.format("%.2f", fee);
-                String treatFeeStr = String.format("%.2f", treatFee / 100d);
+                String treatFeeStr = String.format("%.2f", treatFee);
                 for (QueryDoctorScheduleListResponseData info : dataList) {
                     info.setDeptCode(deptCode);
                     info.setDeptName(deptName);

+ 1 - 1
onemini-hospital-sdk/src/main/java/com/ywt/request/register/OrderConfirmRequest.java

@@ -35,7 +35,7 @@ public class OrderConfirmRequest implements IsvRequest<OrderConfirmResponseData>
     private int medicalCardId;  // 就诊人Id
     private String scheduleItemCode;    // 门诊排班项记录标识
     private int deptId;         // 科室ID
-    private String lockQueueNo; // 锁住的挂号编号
+    private String lockQueueNo; // 锁住的挂号编号,和 availableNumStr 参数二选一就行
     private String availableNumStr; // 可用的编号