feature: 门诊缴费详情

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

@@ -124,10 +124,20 @@ public class IsvPayServiceImpl implements IsvPayService {
         }
         if (request.getStatus() == TYPE_UNPAID_ZFB) {
             PayDetailResponseData da = new PayDetailResponseData();
-            da.setDepName(Checker.getStringValue(request.getDepName()));
-            da.setAge(request.getAge().toString());
-            da.setSex(request.getSex());
+            da.setDepName(Checker.getStringValue(request.getDeptName()));
+            String age = "";
+            if(!Checker.isNone(request.getAge())){
+                age = (request.getAge()).toString();
+            }
+            da.setAge(age);
+            da.setSex(Checker.getStringValue(request.getSex()));
             da.setStatus(request.getStatus());
+            da.setDoctorName(Checker.getStringValue(request.getDoctorName()));
+            da.setDoctorCode(Checker.getStringValue(request.getDoctorCode()));
+            da.setHisClinicCode(request.getHisClinicCode());
+            da.setPrescribeDate(request.getPrescribeDate());
+            da.setTotal(request.getTotal());
+            da.setUserName(request.getName());
             return da;
         }
         if (Checker.isNone(request.getInvoiceNo()) && Checker.isNone(request.getOutTradeNo())) {
@@ -355,7 +365,7 @@ public class IsvPayServiceImpl implements IsvPayService {
                             data.setTitle("");
                             data.setDepName(payItem.getDeptName());
                             data.setPrescribeDate(payItem.getPrescriptionDate());
-                            data.setName(payItem.getPatientName());
+                            data.setName(resp.getPatientName());
                             data.setAmount(String.format("%.2f", payItem.getTotalFee() / 100d));
                             data.setTradeNo(""); //Todo
                             data.setOutTradeNo("");//Todo

onemini-hospital-sdk/src/main/java/com/ywt/request/pay/PayDetailRequest.java

@@ -20,11 +20,17 @@ public class PayDetailRequest implements IsvRequest<PayDetailResponseData>, IApp
     private String hisPatientId;
     private String date;
     private Integer status;//订单状态;0-待支付 1-已支付 9-已取消
-    private String depName;//科室名称
+    private String deptName;//科室名称
     private String amount;//支付金额
     private String name;//就诊人姓名
     private Integer age;
     private String sex;
+    private String prescribeDate;//开方时间
+    private String hisOrderNo;
+    private String doctorName;
+    private String doctorCode;
+    private int total;
+    private String hisClinicCode;
 
     @Override
     public String serviceName() {

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

@@ -36,4 +36,9 @@ public class PayDetailResponseData implements IsvResponseData {
     private String receiptRemind;//开发票提示（可为空）
     private List<OrderItem> orderItems;//订单项目（可为空）
     private String orderId;//预约订单号
+    private String prescribeDate;//开方时间
+    private String hisOrderNo;
+    private String doctorCode;
+    private int total;
+    private String hisClinicCode;
 }