Parcourir la source

接受会诊的 bug

DESKTOP-0GD05B0\Administrator il y a 2 ans
Parent
commit
6e7d064710

+ 0 - 2
src/main/java/thyyxxk/webserver/service/casefrontsheet/JieShouHuiZhenService.java

@@ -102,8 +102,6 @@ public class JieShouHuiZhenService {
             param.setHzDoctor2(TokenUtil.getTokenUserId());
             UserInfo userInfo = redisLikeService.getUserInfoByToken();
 
-            userInfo.setEmpTitCode("002");
-
             param.setHzType(getHzTypeByTitCode(userInfo.getEmpTitCode()));
             JieShouHuiZhenPojo reqData = dao.getHuanZheXinXi(param.getAdmissTimes(), param.getReqTimes(), param.getInpatientNo());
 

+ 3 - 2
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/YiZhuLuRuServer.java

@@ -271,14 +271,15 @@ public class YiZhuLuRuServer {
      * @param param 数据
      * @return 返回提示
      */
-    public ResultVo<Map<String, Object>> confirmOrders(XinZhenYiZhu param) {
+    public ResultVo<Map<String, Object>> confirmOrders(@NotNull XinZhenYiZhu param) {
         QueryWrapper<?> qw = new QueryWrapper<>();
         qw.eq("a.inpatient_no", param.getInpatientNo())
                 .eq("a.admiss_times", param.getAdmissTimes())
                 .eq("a.status_flag", "1")
                 .eq("a.enter_oper", TokenUtil.getTokenUserId())
                 // 排除出院带药的医嘱
-                .ne("isnull(a.self_buy,'0')", "4");
+                .ne("isnull(a.self_buy,'0')", "4")
+                .orderByAsc("a.act_order_no");
         param.setList(dao.huoQuYiZhuShuJu(qw));
         List<XinZhenYzActOrder> yiZhuList = param.getList();
         if (ListUtil.isBlank(yiZhuList)) {