优化代码

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

@@ -290,7 +290,7 @@ public interface YiZhuLuRuDao {
             "                order_code =a.code, " +
             "                order_name =a.name, " +
             "                drug_specification=a.specification, " +
-            "                    order_type =case a.infusion_flag " +
+            "                    drug_flag =case a.infusion_flag " +
             "                    when '1' then 'i' " +
             "                    else (case categories_flag " +
             "                              when '0' " +
@@ -310,7 +310,6 @@ public interface YiZhuLuRuDao {
             "                serial=a.serial, " +
             "                group_no=a.group_no, " +
             "                infusion_flag=a.infusion_flag, " +
-            "                drug_flag =a.drug_flag, " +
             "                group_name =a.group_name, " +
             "                pack_size=a.pack_size, " +
             "                order_class='Y', " +
@@ -574,14 +573,13 @@ public interface YiZhuLuRuDao {
             "       a.order_code , " +
             "       rtrim(a.order_name) order_name, " +
             "       drug_specification='诊疗项目', " +
-            "       order_type   = isnull(operation,'o') , " +
+            "       drug_flag   = isnull(operation,'o') , " +
             "       a.parent_code , " +
             "       a.exclu_group_type, " +
             "       discription=a.discription + '  ' + a.yb_comment, " +
             "       serial       ='00', " +
             "       group_no='00', " +
             "       infusion_flag='', " +
-            "       drug_flag    ='', " +
             "       group_name   ='', " +
             "       pack_size=1, " +
             "       order_class=a.order_class, " +

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

@@ -141,7 +141,7 @@ public class YiZhuLuRuServer {
         Map<BigDecimal, XinZhenYzActOrder> wuFuJiYiZhu = yiZhuList.stream().collect(Collectors.toMap(XinZhenYzActOrder::getActOrderNo, a -> a, (k1, k2) -> k1));
 
         if (ListUtil.isBlank(yiZhuList)) {
-            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST);
+            return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "该患者还没有开医嘱。");
         }
         // 做成树状图
         Map<BigDecimal, XinZhenYzActOrder> map = new HashMap<>();
@@ -201,6 +201,7 @@ public class YiZhuLuRuServer {
      * @param code 拼音首字母，中文，编码来进行搜索
      * @return 返回项目信息
      */
+    @DS("his")
     public ResultVo<List<YiZhuMingChen>> huoQuXiangMu(String code, String groupNo) {
         code = StringUtil.isContainChinese(code);
         // 药品