优化门诊项目确认与取消

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyiji/MenZhengXiangMuDao.java

@@ -73,7 +73,7 @@ public interface MenZhengXiangMuDao {
     @Select("<script>" +
             "select confirm_flag,rtrim(patient_id) patient_id ,times,item_no,receipt_no,order_no,req_no, " +
             "       rtrim(charge_item_code) charge_item_code,rtrim(isnull(tc_no,'')) tc_no,rtrim(tc_name) tc_name," +
-            "       rtrim(bill_item_code) bill_item_code,rtrim(exec_dept) exec_dept," +
+            "       rtrim(bill_item_code) bill_item_code, (select rtrim(code) from zd_unit_code where code = exec_dept)  exec_dept," +
             "       charge_name = (select rtrim(name) from zd_charge_item where charge_item_code = code)," +
             "       quantity,drug_win,unit_price, " +
             "       exec_dept_name= (select rtrim(name) from zd_unit_code where code = exec_dept), " +

src/main/java/thyyxxk/webserver/entity/datamodify/MzChargeDetail.java

@@ -19,6 +19,7 @@ public class MzChargeDetail implements Serializable {
 
     private String chargeCode;
     private BigDecimal chargeFee;
+    private BigDecimal chargeFeeNew;
     private Double chargeAmount;
     private String chargeCodeMx;
     private Integer detailSn;

src/main/java/thyyxxk/webserver/service/zhuyuanyiji/MenZhengXiangMuServer.java

@@ -82,7 +82,7 @@ public class MenZhengXiangMuServer {
             String key = item.getPatientId() + item.getTimes() + item.getReceiptNo() + item.getOrderNo() + item.getChargeItemCode();
             treeMap.put(key, item);
             if (BigUtils.bigDaYu(item.getUnitPrice(), BigDecimal.ZERO)) {
-                item.setChargeFee(item.getUnitPrice().multiply(item.getQuantity()).multiply(item.getDrugWin()));
+                item.setChargeFeeNew(item.getUnitPrice().multiply(item.getQuantity()).multiply(item.getDrugWin()));
             }
             if ("TC".equals(item.getBillItemCode())) {
                 item.setChargeName(item.getTcName() + "（套餐）");
@@ -97,10 +97,10 @@ public class MenZhengXiangMuServer {
                 if (template.getList() == null) {
                     template.setList(new ArrayList<>());
                 }
-                if (template.getChargeFee() == null) {
-                    template.setChargeFee(new BigDecimal(BigInteger.ZERO));
+                if (template.getChargeFeeNew() == null) {
+                    template.setChargeFeeNew(BigDecimal.ZERO);
                 }
-                template.setChargeFee(template.getChargeFee().add(item.getUnitPrice().multiply(item.getQuantity()).multiply(item.getDrugWin())));
+                template.setChargeFeeNew(template.getChargeFeeNew().add(item.getUnitPrice().multiply(item.getQuantity()).multiply(item.getDrugWin())));
                 template.getList().add(item);
             } else if (!resultList.contains(item)) {
                 resultList.add(item);