修改门诊中没有父级的bug

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

@@ -72,7 +72,7 @@ public interface MenZhengXiangMuDao {
     //   子节点 根据  patient_id times receipt_no order_no tc_no
     @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(tc_no) tc_no,rtrim(tc_name) tc_name," +
+            "       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,exec_dept," +
             "       charge_name = (select rtrim(name) from zd_charge_item where charge_item_code = code)," +
             "       quantity,drug_win,unit_price, " +

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

@@ -79,16 +79,20 @@ public class MenZhengXiangMuServer {
     public List<MzChargeDetail> tcTree(List<MzChargeDetail> tempList) {
         List<MzChargeDetail> resultList = new ArrayList<>();
         Map<String, MzChargeDetail> treeMap = new HashMap<>(tempList.size());
+        Map<String, MzChargeDetail> 无父级节点 = tempList.stream().collect(
+                Collectors.toMap(item -> item.getPatientId() + item.getTimes() + item.getReceiptNo() + item.getOrderNo() + item.getChargeItemCode(),
+                        a -> a, (k1, k2) -> k1)
+        );
         for (MzChargeDetail item : tempList) {
             String key = item.getPatientId() + item.getTimes() + item.getReceiptNo() + item.getOrderNo() + item.getChargeItemCode();
             treeMap.put(key, item);
-            if (item.getBillItemCode().equals("TC")) {
+            if ("TC".equals(item.getBillItemCode())) {
                 if (BigUtils.bigDaYu(item.getUnitPrice(), BigDecimal.ZERO)) {
                     item.setChargeFee(item.getUnitPrice().multiply(item.getQuantity()).multiply(item.getDrugWin()));
-                } else {
-                    item.setChargeName(item.getTcName() + "（套餐）");
                 }
+                item.setChargeName(item.getTcName() + "（套餐）");
                 resultList.add(item);
+                无父级节点.remove(key);
             }
         }
 
@@ -104,8 +108,12 @@ public class MenZhengXiangMuServer {
                 }
                 template.setChargeFee(template.getChargeFee().add(item.getUnitPrice().multiply(item.getQuantity()).multiply(item.getDrugWin())));
                 template.getList().add(item);
+                无父级节点.remove(key);
             }
         }
+        if (!无父级节点.isEmpty()) {
+            resultList.addAll(无父级节点.values());
+        }
         return resultList;
     }