Merge branch 'feat_yibao2.0' into test

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

@@ -373,6 +373,11 @@ public class IsvPayServiceImpl implements IsvPayService {
 //                        data.setDetailName(detailName);
                         data.setOrderItems(ls);
                         data.setType(0);
+                        data.setTotalFee(total);
+                        data.setMedInsFee(payItem.getMedInsFee());
+                        data.setSelfFee(payItem.getSelfFee());
+                        data.setPayName(payItem.getPayName());
+                        data.setPatName(pName);
                         list.add(data);
 //                        map.put("hisClinicCode", payItem.getClinicCode());
 //                        map.put("hisOrderNo", payItem.getHisOrdNum());

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

@@ -38,4 +38,10 @@ public class PayHistoryResponseData implements IsvResponseData {
     private String hisClinicCode;
     private List<OrderItem> orderItems;//订单项目（可为空）
     private String orderInsType;
+    private int totalFee;
+    private int medInsFee;
+    private int selfFee;
+    private String payName;
+    private String patName;
+
 }