修改字段名，以及中药退费会携带原医嘱号

src/main/java/thyyxxk/webserver/service/hospitalizationCosts/HospitalizationCostsService.java

@@ -2,7 +2,6 @@ package thyyxxk.webserver.service.hospitalizationCosts;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.sun.org.apache.bcel.internal.generic.NEW;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -161,7 +160,7 @@ public class HospitalizationCostsService {
                     sb.append("请对应的执行科室进行退费。");
                 }
                 // 只退费设置
-                refundOnly.add(设置默认值以及自增(item, maxDetailSn, -1));
+                refundOnly.add(setDefaultValuesAndAutoincrements(item, maxDetailSn, -1));
             } else {
                 // 药品判断
                 // 医技科室录入的费用
@@ -169,15 +168,15 @@ public class HospitalizationCostsService {
                     if (!deptList.contains(item.getExecUnit())) {
                         sb.append("此药品为医技科室录入，请对应的医技科室退费。");
                     }
-                    refundOnly.add(设置默认值以及自增(item, maxDetailSn, -1));
-                    medicalTechnologyDrugReturnForm.add(设置默认值以及自增(item, maxDetailSn, -1));
+                    refundOnly.add(setDefaultValuesAndAutoincrements(item, maxDetailSn, -1));
+                    medicalTechnologyDrugReturnForm.add(setDefaultValuesAndAutoincrements(item, maxDetailSn, -1));
                 } else {
                     // 仅退费不退药品
                     if ("refundOnly".equals(param.getRefundFlag())) {
-                        refundOnly.add(设置默认值以及自增(item, maxDetailSn, -1));
+                        refundOnly.add(setDefaultValuesAndAutoincrements(item, maxDetailSn, -1));
                     } else {
                         // 退费又退药.不需要向refundOnly中添加数据，且oriDetailSn 要设置为 -2 代表申请退费
-                        generateAReturnOrder.add(设置默认值以及自增(item, maxDetailSn, -2));
+                        generateAReturnOrder.add(setDefaultValuesAndAutoincrements(item, maxDetailSn, -2));
                     }
 
                     OrderInfo order = orderCacheOnce.get(orderNo, (key) -> dao.selectDrugClassByOrderNo(new BigDecimal(orderNo)));
@@ -275,7 +274,15 @@ public class HospitalizationCostsService {
 
     }
 
-    public ZyDetailChargeTable 设置默认值以及自增(ZyDetailChargeTable item, int maxDetailSn, int oriDetailSn) {
+    /**
+     * 设置默认值
+     *
+     * @param item
+     * @param maxDetailSn
+     * @param oriDetailSn
+     * @return
+     */
+    public ZyDetailChargeTable setDefaultValuesAndAutoincrements(ZyDetailChargeTable item, int maxDetailSn, int oriDetailSn) {
         String userCode = TokenUtil.getTokenUserId();
         // 克隆一下 item 的数据
         ZyDetailChargeTable clone = EntityCopy.Copy(item, ZyDetailChargeTable.class);
@@ -317,7 +324,7 @@ public class HospitalizationCostsService {
 
         for (ZyDetailChargeTable item : list) {
             maxDetailSn += 1;
-            refundOnly.add(设置默认值以及自增(item, maxDetailSn, -1));
+            refundOnly.add(setDefaultValuesAndAutoincrements(item, maxDetailSn, -1));
         }
 
         // 直接退费

src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/CaoYaoYiZhuService.java

@@ -298,8 +298,8 @@ public class CaoYaoYiZhuService {
                 item.setOriDetailSn(item.getDetailSn());
                 // 设置 流水号
                 item.setDetailSn(maxDetailSn += 1);
-                item.setOrderNo(new BigDecimal(0));
-                item.setNewOrderNo(new BigDecimal(0));
+                item.setOrderNo(item.getOrderNo());
+                item.setNewOrderNo(item.getOrderNo());
                 refundArray.add(item);
             }
             List<List<ZyDetailCharge>> fenGe = ListUtils.partition(refundArray, 20);