no message

src/main/java/thyyxxk/webserver/dao/his/LoginDao.java

@@ -9,6 +9,7 @@ import java.util.List;
 
 @Mapper
 public interface LoginDao {
+
     @Select("select a.code, rtrim(b.name) name, a.password, a.code_rs,user_config, " +
             "b.dept_code as dept_code," +
             "rtrim(b.yb_code) as yb_code," +
@@ -86,6 +87,4 @@ public interface LoginDao {
     @Update("update dj_user_base set password = #{pwd} ,verification_code = null , verification_time = null" +
             " where code_rs = #{codeRs}")
     int updatePasswordByCodeRsV2(String codeRs, String pwd);
-
-
 }

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

@@ -95,12 +95,7 @@ public class YiZhuLuRuServer {
      * @return 返回医嘱数据
      */
     public ResultVo<List<XinZhenYzActOrder>> huoQuYiZhuShuJu(YiZhuFeiYongChaXunTiaoJian param) {
-        List<XinZhenYzActOrder> yiZhuList = dao.selectOrderNo(param.buildQw());
-        if (ListUtil.isBlank(yiZhuList)) {
-            return ResultVoUtil.success(new ArrayList<>());
-        }
-        List<XinZhenYzActOrder> list = getOrderList(yiZhuList);
-        return ResultVoUtil.success(list);
+        return ResultVoUtil.success(getOrderList(dao.selectOrderNo(param.buildQw())));
     }
 
     /**
@@ -139,22 +134,22 @@ public class YiZhuLuRuServer {
         }
         for (XinZhenYzActOrder item : yiZhuList) {
             XinZhenYzActOrder actOrder = map.get(item.getParentNo());
-            if (actOrder != null) {
-                if (actOrder.getParentNo() != null) {
-                    item.setParentNo(null);
-                    item.setOrderName("注意此医嘱成组有误，请重新选择父医嘱，父医嘱不能是其他医嘱的子医嘱。");
-                    item.setStatusFlag("6");
-                    continue;
-                }
-                wuFuJiYiZhu.remove(item.getActOrderNo());
-                if (actOrder.getChildren() == null) {
-                    actOrder.setChildren(new ArrayList<>());
-                    actOrder.setOrderGroup("┌");
-                }
-
-                item.setOrderGroup("丨");
-                actOrder.getChildren().add(item);
+            if (actOrder == null) {
+                continue;
+            }
+            if (actOrder.getParentNo() != null) {
+                item.setParentNo(null);
+                item.setOrderName("注意此医嘱成组有误，请重新选择父医嘱，父医嘱不能是其他医嘱的子医嘱。");
+                item.setStatusFlag("6");
+                continue;
+            }
+            wuFuJiYiZhu.remove(item.getActOrderNo());
+            if (actOrder.getChildren() == null) {
+                actOrder.setChildren(new ArrayList<>());
+                actOrder.setOrderGroup("┌");
             }
+            item.setOrderGroup("└");
+            actOrder.getChildren().add(item);
         }
         if (!wuFuJiYiZhu.isEmpty()) {
             tree.addAll(wuFuJiYiZhu.values());
@@ -168,7 +163,6 @@ public class YiZhuLuRuServer {
                 zy.setChildren(null);
             }
         }
-
         return list;
     }