DESKTOP-0GD05B0\Administrator 2 年 前
コミット
0ef15b3fd2

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

@@ -53,7 +53,7 @@ public class JieShouHuiZhenService {
      * @return 返回没有会诊的信息
      */
     public ResultVo<List<JieShouHuiZhenPojo>> getHuiZhenData(String startTime, String endTime, boolean history) {
-        log.info("数据:{}", history);
+
         UserInfo userInfo = redisLikeService.getUserInfoByToken();
         List<String> deptList = publicServer.getKeShiLieBiaoList(userInfo.getDeptCode());
         QueryWrapper<?> qw = new QueryWrapper<>();
@@ -64,12 +64,13 @@ public class JieShouHuiZhenService {
             qw.eq("status_flag", "1");
         }
         if (StringUtil.notBlank(startTime)) {
-            qw.ge("req_date", startTime)
+            qw.gt("req_date", startTime)
                     .le("req_date", endTime);
         }
         if (ListUtil.notBlank(deptList) && !history) {
             qw.and(q -> q.in("req_dept1", deptList).or().in("req_dept2", deptList));
         }
+
         return ResultVoUtil.success(dao.getHuiZhenData(qw));
     }
 

+ 1 - 4
src/main/java/thyyxxk/webserver/service/zhuyuanyisheng/EmrControlRuleSever.java

@@ -101,10 +101,7 @@ public class EmrControlRuleSever {
             String sql = rule.getSql();
             Map<String, Integer> count = new LinkedHashMap<>(Capacity.FOUR);
 
-            if (whetherToSendTheMessage) {
-                count.put("通过质控", 0);
-            }
-
+            count.put("通过质控", 0);
             count.put("超时未创建", 0);
             count.put("超时创建", 0);
             count.put("未超时未创建", 0);