杭州七院三大量表数据查询

src/main/java/com/diagbot/enums/QualityContent.java

@@ -166,6 +166,12 @@ public class QualityContent {
             "塞来昔布胶囊", "氨酚曲马多片", "盐酸羟考酮缓释片","硫酸吗啡缓释片", "盐酸吗啡片","复方甲氧那明胶囊","醋酸甲地孕酮分散","枸橼酸托瑞米芬片","标准桃金娘油肠溶",
             "甲氧氯普胺片","多潘立酮片"
     );
+
+    /**
+     * 用于添加量表数据
+     */
+    public static List<String> LB = Arrays.asList(
+            "猝死危险因素评估表", "自杀危险因素评估表", "攻击风险性评估表");
 }
 
 

src/main/java/com/diagbot/facade/BehospitalInfoFacade.java

@@ -12,6 +12,7 @@ import com.diagbot.entity.*;
 import com.diagbot.enums.CheckStatusEnum;
 import com.diagbot.enums.CheckerRoleEnum;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.QualityContent;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.BehospitalInfoServiceImpl;
@@ -1049,6 +1050,8 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 
         addData("日常病程录", recMap, medrecVoList);
 
+        lbAddDataHZQY("量表", recMap, medrecVoList,"65", analyzeVO);
+
         //DataWithKey("知情同意书", medicalRecordDTOList, medrecVoList);
         addDataWithInnerKey("知情同意书", recMap, medrecVoList);
         addDataWithInnerKey("谈话告知书", recMap, medrecVoList);
@@ -1221,6 +1224,45 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         }
     }
 
+    /**
+     * 量表拼接数据（杭州七院时效性规则统计）
+     *
+     * @param key
+     * @param medrecVoList
+     */
+    public void lbAddDataHZQY(String key, Map<String, List<RecordContentDTO>> recMap, List<MedrecVo> medrecVoList, String modeId, AnalyzeVO analyzeVO) {
+        List<RecordContentDTO> list = recMap.get(key);
+        List<RecordContentDTO> listCopy = new ArrayList<>();
+        for (String lb:QualityContent.LB) {
+            List<MedicalRecord> recordList = medicalRecordFacade.list(new QueryWrapper<MedicalRecord>()
+                    .eq("mode_id", modeId)
+                    .eq("rec_title", lb)
+                    .eq("hospital_id", analyzeVO.getHospitalId())
+                    .eq("behospital_code", analyzeVO.getBehospitalCode())
+                    .orderByAsc("rec_date")
+            );
+
+            if (ListUtil.isNotEmpty(list)) {
+                for (RecordContentDTO recordContentDTO : list) {
+                    if(lb.equals(recordContentDTO.getRecTitle())){
+                        recordContentDTO.setFirstCreateDate(recordList.get(0).getRecDate());
+                        recordContentDTO.setRecTitle(recordContentDTO.getRecTitle());
+                        listCopy.add(recordContentDTO);
+                    }
+                }
+            }
+        }
+        if (ListUtil.isNotEmpty(listCopy)) {
+            MedrecVo medrecVo = new MedrecVo();
+            Map<String, Object> content = new HashMap<>();
+            content.put("content", listCopy);
+            medrecVo.setTitle(key);
+            medrecVo.setContent(content);
+            medrecVoList.add(medrecVo);
+        }
+
+    }
+
 
     /**
      * 1.5.0拼接数据(手术、会诊)
@@ -1751,10 +1793,17 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
 //            taskVO.setEndLeaveDate(DateUtil.getLastTimeOfDay(DateUtil.addDay(DateUtil.now(), -1)));
 //        }
 //        List<BehospitalInfo> behospitalInfoList = getNoGrade(taskVO);
+        List<BehospitalInfo> behospitalInfoList = new ArrayList<>();
+        if(taskVO.getType() == 1){
+            behospitalInfoList = behospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
+                    .le("behospital_date", taskVO.getEndLeaveDate())
+                    .ge("behospital_date", taskVO.getStartLeaveDate()));
+        }else if(taskVO.getType() == 2){
+            behospitalInfoList = behospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
+                    .le("leave_hospital_date", taskVO.getEndLeaveDate())
+                    .ge("leave_hospital_date", taskVO.getStartLeaveDate()));
+        }
 
-        List<BehospitalInfo> behospitalInfoList = behospitalInfoFacade.list(new QueryWrapper<BehospitalInfo>()
-                .le("behospital_date", taskVO.getEndLeaveDate())
-                .ge("behospital_date", taskVO.getStartLeaveDate()));
         for (BehospitalInfo bean : behospitalInfoList) {
             AnalyzeVO analyzeVO = new AnalyzeVO();
             analyzeVO.setIsTask(true);

src/main/java/com/diagbot/facade/QcClientFacade.java

@@ -33,7 +33,7 @@ public class QcClientFacade {
         if (StringUtil.isBlank(url)) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "配置表内找不到评分接口地址数据！");
         }
-//        String url = "http://127.0.0.1:6010";
+//        url = "http://127.0.0.1:6011";
         try {
             uri = new URI(url);
         } catch (Exception e) {

src/main/java/com/diagbot/facade/data/AMedicalRecordFacade.java

@@ -550,6 +550,8 @@ public class AMedicalRecordFacade extends MedicalRecordServiceImpl {
                 modeId=Long.valueOf("54");
             }else if (medicalRecord.getRecTitle().contains("通知书")){
                 modeId=Long.valueOf("25");
+            }else if (medicalRecord.getRecTitle().contains("评估表")){
+                modeId=Long.valueOf("65");
             }
         }
         return modeId;

src/main/java/com/diagbot/web/BehospitalInfoController.java

@@ -212,7 +212,7 @@ public class BehospitalInfoController {
                     "【个性化需求】——默认即可<br>" +
                     "filterFlag： 筛选病历数据：0：未评分的病历【推荐使用】；1：全部病历【谨慎使用】<br>" +
                     "individuation：【1：近3天不含当天的病历强制评分更新】<br>" +
-                    "type：【1：出院时间比当前时间早3天前的病历（例如：长兴病历）】)<br>" +
+                    "type：【1：按照入院时间评分、2.按照出院时间评分】)<br>" +
                     "behospitalCodeList：指定病历号<br>")
     @PostMapping("/execule")
     @SysLogger("execule")

src/main/resources/application-local.yml

@@ -59,9 +59,9 @@ spring:
     druid:
       driver-class-name: com.mysql.cj.jdbc.Driver
       platform: mysql
-      url: jdbc:mysql://173.18.12.194:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
+      url: jdbc:mysql://192.16.1.104:3306/qc?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&useSSL=false&allowMultiQueries=true
       username: root
-      password: dsYun8!@#
+      password: lt@great
       # 连接池的配置信息
       # 初始化大小，最小，最大
       initialSize: 5
@@ -111,9 +111,9 @@ spring:
     database:
       cache: 8 # cache索引
       token: 8 # Token索引
-    host: 173.18.12.194  #Redis服务器地址
+    host: 192.16.1.104  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
-    password:  # Redis服务器连接密码（默认为空）
+    password: lantone # Redis服务器连接密码（默认为空）
     lettuce:
       pool:
         max-active: 8 # 连接池最大连接数（使用负值表示没有限制）