Merge branch 'temp' into debug

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

@@ -273,20 +273,14 @@ public class BehospitalInfoFacade extends BehospitalInfoServiceImpl {
         queryVo.setInputCatalogueMap(getInputCatalogueMap(qcCasesEntryDTOList)); // 设置质控条目编码
         List<MedrecVo> medrecVoList = new ArrayList<>(); // 设置内容
 
-
         // 添加住院病历信息
-        List<BehospitalInfo> behospitalInfoList = this.list(new QueryWrapper<BehospitalInfo>()
+        BehospitalInfo behospitalInfo = this.getOne(new QueryWrapper<BehospitalInfo>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("hospital_id", hospitalId)
-                .eq("behospital_code", analyzeVO.getBehospitalCode())
+                .eq("behospital_code", analyzeVO.getBehospitalCode()), false
         );
-        if (ListUtil.isNotEmpty(behospitalInfoList)) {
-            MedrecVo medrecVo = new MedrecVo();
-            medrecVo.setTitle("住院病历信息");
-            Map<String, Object> content = new HashMap<>();
-            content.put("content", behospitalInfoList);
-            medrecVo.setContent(content);
-            medrecVoList.add(medrecVo);
+        if (behospitalInfo != null) {
+            queryVo.setBehospitalInfo(behospitalInfo);
         }
 
         // 会诊记录

src/main/java/com/diagbot/vo/QueryVo.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.entity.BehospitalInfo;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -26,4 +27,6 @@ public class QueryVo extends TokenVO {
     private String hospitalId;
     // 是否使用CRF缓存(false: 不使用缓存，true：使用缓存)
     private boolean useCrfCache;
+    // 添加基本病历信息
+    private BehospitalInfo behospitalInfo;
 }

src/main/resources/application-pre.yml

@@ -165,7 +165,7 @@ qc.address: http://192.168.2.186:6009
 
 # 加解密开关
 encrypt:
-  enable: true
+  enable: false
 
 swagger:
   enable: true

src/main/resources/application-pro.yml

@@ -165,7 +165,7 @@ qc.address: http://192.168.2.123:6009
 
 # 加解密开关
 encrypt:
-  enable: true
+  enable: false
 
 swagger:
   enable: true

src/main/resources/application-test.yml

@@ -165,7 +165,7 @@ qc.address: http://192.168.2.241:6009
 
 # 加解密开关
 encrypt:
-  enable: true
+  enable: false
 
 swagger:
   enable: true