Просмотр исходного кода

杭州七院已发送按钮更新

“wangdsYun 10 месяцев назад
Родитель
Сommit
7b1e533733

+ 2 - 0
src/main/java/com/diagbot/dto/MsgDTO.java

@@ -62,4 +62,6 @@ public class MsgDTO {
     private String explainInfo;
     // 条目id对应页面数据的key值
     private List<Long> pageKeyList = new ArrayList<>();
+    // 是否发送(1:未发送,2:已发送)
+    private Integer IsSend = 1;
 }

+ 14 - 0
src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -400,6 +400,20 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
                     }
                 }
             }
+
+            List<QcRuleWarn> qcRuleWarns = qcRuleWarnServiceImpl.list(new QueryWrapper<QcRuleWarn>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_id", analyzeVO.getHospitalId())
+                    .eq("behospital_code", analyzeVO.getBehospitalCode()));
+            if (qcRuleWarns != null && ListUtil.isNotEmpty(msgDTOList)) {
+                for (MsgDTO msgDTO : msgDTOList) {
+                    for (QcRuleWarn qcRuleWarn:qcRuleWarns) {
+                        if (msgDTO.getCasesEntryId().equals(qcRuleWarn.getCasesEntryId())) {
+                            msgDTO.setIsSend(2);
+                        }
+                    }
+                }
+            }
             // 根据模块分组
             Map<String, List<MsgDTO>> msgMap = EntityUtil.makeEntityListMap(msgDTOList, "modelName");
             res.put("msg", msgMap);

+ 1 - 1
src/main/resources/logback-spring.xml

@@ -151,7 +151,7 @@
             <fileNamePattern>${LOG_PATH}/${APPDIR}/debug/${APPDIR}-debug-%d{yyyy-MM-dd}.%i.log
             </fileNamePattern>
             <!--  保留日志天数 -->
-            <maxHistory>15</maxHistory>
+            <maxHistory>2</maxHistory>
             <!-- 除按日志记录之外,还配置了日志文件不能超过10MB,若超过10MB,日志文件会以索引0开始,
             命名日志文件,例如log-debug-1992-11-06.0.log -->
             <timeBasedFileNamingAndTriggeringPolicy