Merge remote-tracking branch 'origin/dev/log_20211020' into dev/log_20211020

pom.xml

@@ -54,7 +54,7 @@
         <dependency>
             <groupId>com.diagbot</groupId>
             <artifactId>common</artifactId>
-            <version>0.0.2-SNAPSHOT</version>
+            <version>0.0.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>

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

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.util.CdssLogUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.LogTestVO;
 import org.springframework.stereotype.Component;
 
@@ -14,6 +15,16 @@ import org.springframework.stereotype.Component;
 @Component
 public class LogTestFacade {
     public Boolean logTest(LogTestVO logTestVO) {
+        CdssLogUtil.addBizHospitalId(logTestVO.getHospitalId());
+        if (StringUtil.isNotBlank(logTestVO.getPatientId())) {
+            CdssLogUtil.addBizPatientId(logTestVO.getPatientId());
+        }
+        if (StringUtil.isNotBlank(logTestVO.getSubHospitalName())) {
+            CdssLogUtil.addBizSubHospitalName(logTestVO.getSubHospitalName());
+        }
+        if (StringUtil.isNotBlank(logTestVO.getSubHospitalCode())) {
+            CdssLogUtil.addBizSubHospitalCode(logTestVO.getSubHospitalCode());
+        }
         if (logTestVO.getType().equals(1)) {
             //抛错
             throw new CommonException(CommonErrorCode.SERVER_IS_ERROR);

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

@@ -47,7 +47,8 @@ public class RetrievalFacade {
             retrievalDTO = respDTO.data;
         } else {
             //实际医院查询医院词
-            if (StringUtil.isBlank(retrievalVO.getInputStr())) {
+            if (retrievalVO.getDefaultList().equals(0)
+                    && StringUtil.isBlank(retrievalVO.getInputStr())) {
                 throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入检索内容！");
             }
             HospitalCheckVO hospitalCheckVO = new HospitalCheckVO();

src/main/java/com/diagbot/util/CdssLogUtil.java

@@ -29,6 +29,7 @@ public class CdssLogUtil {
     private final static String CDSS_HOSPITAL_ID = "Cdss_Hospital_Id";
     private final static String CDSS_SUB_HOSPITAL_NAME = "Cdss_Sub_Hospital_Name";
     private final static String CDSS_SUB_HOSPITAL_CODE = "Cdss_Sub_Hospital_Code";
+    private final static String CDSS_PATIENT_ID = "Cdss_Patient_Id";
     private final static String CDSS_LOG_SP = "→";
 
     /**
@@ -271,6 +272,15 @@ public class CdssLogUtil {
         handleRespHeaderMap(CDSS_SUB_HOSPITAL_CODE, o);
     }
 
+    /**
+     * 设置病人标识
+     *
+     * @param o
+     */
+    public static void addBizPatientId(Object o) {
+        handleRespHeaderMap(CDSS_PATIENT_ID, o);
+    }
+
 
     private static void handleRespHeaderMap(String key, Object o) {
         HttpServletResponse response = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getResponse();

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

@@ -17,4 +17,19 @@ public class LogTestVO {
     //0:正常，1:抛错，2:子方法放入参数
     @NotNull
     private Integer type = 0;
+    @NotNull(message = "请输入医院id")
+    private Long hospitalId;
+    /**
+     * 病人唯一标识（病人id、病历号等）
+     */
+    private String patientId;
+    /**
+     * 子医院编码
+     */
+    private String subHospitalCode;
+
+    /**
+     * 子医院名称
+     */
+    private String subHospitalName;
 }

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

@@ -31,4 +31,9 @@ public class RetrievalVO {
 //     * 年龄
 //     */
 //    private Integer age;
+
+    /**
+     * 默认展示 0:不展示，1：展示全部
+     */
+    private Integer defaultList = 0;
 }

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

@@ -30,6 +30,7 @@ public class RetrievalController {
     @ApiOperation(value = "术语检索[zhaops]",
             notes = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理、12-中医疾病、13-中医证候、14-麻醉、15-药品剂型、16-给药途径 <br>" +
                     "inputStr： 检索内容<br>" +
+                    "defaultList： 默认展示 0:不展示，1：展示全部<br>" +
                     "sex： 性别：1-男、2-女、3-通用 <br>" +
                     "age： 年龄<br>")
     @PostMapping("/index")