优化代码

src/main/java/thyyxxk/webserver/controller/zhuyuanyizheng/JianYanJianChaController.java

@@ -85,7 +85,7 @@ public class JianYanJianChaController {
     }
 
     @GetMapping("/huoQuLingChuangZhenDuan")
-    public ResultVo<List<SelectValueObject>> huoQuLingChuangZhenDuan(@RequestParam("name") String name,
+    public ResultVo<List<GetDropdownBox>> huoQuLingChuangZhenDuan(@RequestParam("name") String name,
                                                                      @RequestParam("laiYuan") Boolean laiYuan) {
         return server.huoQuLinChuangZhenDuan(name, laiYuan);
     }

src/main/java/thyyxxk/webserver/dao/his/zhuyuanyisheng/JianYanJianChaDao.java

@@ -263,19 +263,19 @@ public interface JianYanJianChaDao {
     void xinZengShouMingMuBan(YshZdYjTemplate param);
 
 
-    @Select("select rtrim(yb_code) as value, rtrim(yb_name) as label " +
+    @Select("select rtrim(yb_code) as code, rtrim(yb_name) as name " +
             "from zd_icd_code_new with (NOLOCK) " +
             "where (yb_code like #{name} or yb_name like #{name} or yb_py_code like #{name})")
-    List<SelectValueObject> yiBaoZhenDuan(String name);
+    List<GetDropdownBox> yiBaoZhenDuan(String name);
 
-    @Select("SELECT rtrim(a.code) as value, " +
-            "       rtrim(a.name) as label " +
+    @Select("SELECT rtrim(a.code) as code, " +
+            "       rtrim(a.name) as name " +
             "FROM zd_icd_code a with (NOLOCK) " +
             "where (a.py_code like #{name} " +
             "    or a.code like #{name} " +
             "    or a.name like #{name}) " +
             "  and isnull(a.del_flag, '') <> '1'")
-    List<SelectValueObject> benYuanLinChuangZhenDuan(String name);
+    List<GetDropdownBox> benYuanLinChuangZhenDuan(String name);
 
     @Select("select tc_no " +
             "from zy_tc_yj with (NOLOCK) " +

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

@@ -105,7 +105,7 @@ public class MenZhengXiangMuServer {
                 }
                 template.setChargeFee(template.getChargeFee().add(item.getUnitPrice().multiply(item.getQuantity()).multiply(item.getDrugWin())));
                 template.getList().add(item);
-            } else {
+            } else if (!treeMap.containsKey(item.getPatientId() + item.getTimes() + item.getReceiptNo() + item.getOrderNo() + item.getChargeItemCode())) {
                 resultList.add(item);
             }
         }

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

@@ -308,7 +308,7 @@ public class JianYanJianChaShenQingServer {
      * @return 返回搜索的数据
      */
     @DS("his")
-    public ResultVo<List<SelectValueObject>> huoQuLinChuangZhenDuan(String name, Boolean laiYuan) {
+    public ResultVo<List<GetDropdownBox>> huoQuLinChuangZhenDuan(String name, Boolean laiYuan) {
         return laiYuan ? ResultVoUtil.success(dao.yiBaoZhenDuan(StringUtil.isContainChinese(name))) :
                 ResultVoUtil.success(dao.benYuanLinChuangZhenDuan(StringUtil.isContainChinese(name)));
     }

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

@@ -678,7 +678,7 @@ public class YiZhuLuRuServer {
                     yzActOrder.setChildren(new ArrayList<>());
                 }
                 yzActOrder.getChildren().add(item);
-            } else {
+            } else if (!map.containsKey(item.getId())) {
                 item.setParentNo(null);
                 tree.add(item);
             }