feature: 门诊缴费详情, 核酸确认

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvPayServiceImpl.java

@@ -125,11 +125,9 @@ public class IsvPayServiceImpl implements IsvPayService {
         if (request.getStatus() == TYPE_UNPAID_ZFB) {
             PayDetailResponseData da = new PayDetailResponseData();
             da.setDepName(Checker.getStringValue(request.getDeptName()));
-            String age = "";
-            if(!Checker.isNone(request.getAge())){
-                age = (request.getAge()).toString();
+            if(!Checker.isNone(request.getAge()) && request.getAge() > 0){
+                da.setAge(request.getAge());
             }
-            da.setAge(age);
             da.setSex(Checker.getStringValue(request.getSex()));
             da.setStatus(request.getStatus());
             da.setDoctorName(Checker.getStringValue(request.getDoctorName()));
@@ -139,6 +137,7 @@ public class IsvPayServiceImpl implements IsvPayService {
             da.setTotal(request.getTotal());
             da.setUserName(Checker.getStringValue(request.getName()));
             da.setHisOrderNo(Checker.getStringValue(request.getHisOrderNo()));
+            da.setAmount(Checker.getStringValue(request.getAmount()));
             return da;
         }
         if (Checker.isNone(request.getInvoiceNo()) && Checker.isNone(request.getOutTradeNo())) {
@@ -191,7 +190,7 @@ public class IsvPayServiceImpl implements IsvPayService {
                             })
                             .collect(Collectors.toList());
                 }
-                da.setAge(pAge.toString());
+                da.setAge(pAge);
                 da.setUserName(pName);
                 da.setSex(pGender);
                 da.setPayDate(request.getDate());

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/NucleicServiceImpl.java

@@ -126,8 +126,8 @@ public class NucleicServiceImpl implements NucleicService {
                 .setDeptName(deptName)
                 .setDoctorCode(doctorCode)
                 .setDoctorName(doctorName)
-                .setTotal(0)
-                .setRegisteredFee(0)
+                .setTotal(Checker.getIntegerValue(request.getFee()))
+                .setRegisteredFee(Checker.getIntegerValue(request.getFee()))
                 .setMedicalFee(0)
                 .setRegisteredDate(date.getTime())
                 .setStartTime(startTime)
@@ -308,6 +308,7 @@ public class NucleicServiceImpl implements NucleicService {
             Map<String, Object> scheduleMap = new HashMap<>();
             data.setNucleicItemId(s.getScheduleItemCode());
             Integer fee = s.getFee();
+            data.setFee(Checker.getIntegerValue(fee));
             String feeStr = fee.toString();
             data.setNucleicItemFee(feeStr);
             data.setNucleicItemDesc(s.getServiceDate() + "  " + s.getDatePeriodName());

onemini-hospital-sdk/src/main/java/com/ywt/request/nucleic/NucleicOrderConfirmRequest.java

@@ -42,6 +42,8 @@ public class NucleicOrderConfirmRequest implements IsvRequest<NucleicOrderConfir
 
     private int medicalId;
 
+    private Integer fee;
+
 
 
     @Override

onemini-hospital-sdk/src/main/java/com/ywt/response/nucleic/NucleicItemResponseData.java

@@ -37,4 +37,6 @@ public class NucleicItemResponseData implements IsvResponseData {
 
     private String doctorCode;
 
+    private int fee;
+
 }

onemini-hospital-sdk/src/main/java/com/ywt/response/pay/PayDetailResponseData.java

@@ -25,7 +25,7 @@ public class PayDetailResponseData implements IsvResponseData {
     private boolean medicareBinded; //用户是否绑定了医保, 当订单是待支付状态, 会返回此字段, 前端根据此字段判断是否展示医保结算按钮
     private String customInfo; //自定义展示的内容, 是个json结构的string;具体展示的内容, isv可以根据自己的业务来展示 | "{'医生':'华佗', '科室':'德国骨科'}"
     private String sex;//就诊人性别（可为空）
-    private String age;//就诊人年龄（可为空）
+    private Integer age;//就诊人年龄（可为空）
     private String payDetails;//支付金额构成（可为空）
     private String payDate;//费用日期（可为空）
     private String doctorName;//医生姓名（可为空）