Merge branch 'master' into caoyao

src/main/java/thyyxxk/webserver/service/settings/MenuSettingsService.java

@@ -34,11 +34,6 @@ public class MenuSettingsService {
         this.redisLikeService = redisLikeService;
     }
 
-    @PostConstruct
-    @DS("his")
-    public void menuPushRedis() {
-        redisServer.setData("IntergrationPlatformMenu", dao.getAll());
-    }
 
     public List<IntergrationMenu> getMenuSettings() {
         return menuListByTree(dao.getAll());

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

@@ -645,12 +645,14 @@ public class YiZhuLuRuServer {
             return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "请先选择数据");
         }
         Map<BigDecimal, String> map = new HashMap<>();
+
         param.getList().forEach(item -> {
+            BigDecimal id = item.getActOrderNo();
             if (item.getEndTime() == null) {
-                map.put(item.getActOrderNo(), "停止时间不能为空。");
+                map.put(id, "停止时间不能为空，或该医嘱已经停止了。");
             } else {
                 if (DateUtil.shiJianDaXiao(item.getEndTime(), item.getStartTime(), "<")) {
-                    map.put(item.getActOrderNo(), "停止时间不能小于医嘱的开始时间。");
+                    map.put(id, "停止时间不能小于医嘱的开始时间。");
                 }
             }
         });
@@ -659,10 +661,9 @@ public class YiZhuLuRuServer {
             dao.setStopTime(param.getList(), TokenUtil.getInstance().getTokenUserId(), param.getInpatientNo(), param.getAdmissTimes());
             return ResultVoUtil.success(ExceptionEnum.SUCCESS_AND_EL_MESSAGE);
         }
-        return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "存在医嘱时间为空的医嘱请检查。", map);
-    }
 
-    private Integer a = 0;
+        return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "请修改错误", map);
+    }
 
     /**
      * 获取某一个费用的详细信息