feature: 门诊缴费详情增加项目名称

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

@@ -141,6 +141,9 @@ public class IsvPayServiceImpl implements IsvPayService {
             da.setAmount(Checker.getStringValue(request.getAmount()));
             da.setCreateTime(Checker.getStringValue(request.getPrescribeDate()));
             da.setHisPatientId(request.getHisPatientId());
+            if (!Checker.isNone(request.getOrderItems())) {
+                da.setOrderItems((request.getOrderItems()));
+            }
             return da;
         }
         if (Checker.isNone(request.getInvoiceNo()) && Checker.isNone(request.getOutTradeNo())) {
@@ -295,6 +298,19 @@ public class IsvPayServiceImpl implements IsvPayService {
                         data.setDoctorName(payItem.getDoctorName());
                         data.setDoctorCode(payItem.getDoctorCode());
                         data.setHisClinicCode(payItem.getClinicCode());
+                        List<PayDetailItem> detailItems = payItem.getItemListList();
+                        List<OrderItem> ls = new ArrayList<>();
+//                        String detailName = "";
+                        for (PayDetailItem detailItem : detailItems) {
+                            OrderItem it = new OrderItem();
+                            it.setAmount(String.valueOf(detailItem.getItemTotalFee()));
+                            it.setItemName(detailItem.getItemName());
+                            it.setItemNum(detailItem.getItemNumber());
+                            ls.add(it);
+                        }
+////                        detailName.substring(1);
+//                        data.setDetailName(detailName);
+                        data.setOrderItems(ls);
                         data.setType(0);
                         list.add(data);
 //                        map.put("hisClinicCode", payItem.getClinicCode());
@@ -304,19 +320,7 @@ public class IsvPayServiceImpl implements IsvPayService {
 //                        map.put("patientAge", pAge);
 //                        map.put("patientSex", pGender);
 //                        map.put("doctorCode", payItem.getDoctorCode());
-                        List<PayDetailItem> detailItems = payItem.getItemListList();
-                        List<Map<String, Object>> items = new LinkedList<>();
-                        for (PayDetailItem detailItem : detailItems) {
-                            Map<String, Object> d = new HashMap<>();
-                            d.put("name", detailItem.getItemName());
-                            d.put("price", detailItem.getItemPrice());
-                            d.put("code", detailItem.getItemCode());
-                            d.put("number", detailItem.getItemNumber());
-                            d.put("spec", detailItem.getItemSpec());
-                            d.put("unit", detailItem.getItemUnit());
-                            d.put("totalFee", detailItem.getItemTotalFee());
-                            items.add(d);
-                        }
+
 //                        map.put("detailItems", items);
 //                        lst.add(map);
                         // 保存门诊缴费明细到数据库

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

@@ -3,9 +3,12 @@ package com.ywt.request.pay;
 import com.ywt.model.IsvRequest;
 import com.ywt.request.IAppIdRequest;
 import com.ywt.request.IUserIdRequest;
+import com.ywt.response.pay.OrderItem;
 import com.ywt.response.pay.PayDetailResponseData;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 订单详情查询的请求参数
  **/
@@ -32,6 +35,8 @@ public class PayDetailRequest implements IsvRequest<PayDetailResponseData>, IApp
     private int total;
     private String hisClinicCode;
     private String payTime;
+    private String detailName;
+    private List<OrderItem> orderItems;//订单项目（可为空）
 
     @Override
     public String serviceName() {

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

@@ -3,6 +3,8 @@ package com.ywt.response.pay;
 import com.ywt.model.IsvResponseData;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * 订单列表单个数据
  **/
@@ -34,5 +36,7 @@ public class PayHistoryResponseData implements IsvResponseData {
     private String doctorCode;
     private int total;
     private String hisClinicCode;
+    private List<OrderItem> orderItems;//订单项目（可为空）
+
 
 }