1、静态知识增加治疗方案类型

src/main/java/com/diagbot/dto/ConceptDetailDTO.java

@@ -37,7 +37,7 @@ public class ConceptDetailDTO {
     private Integer orderNo;
 
     /**
-     * 内容类型（多选）：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径
+     * 内容类型（多选）：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径，4-治疗方案
      */
     private String contentType;
 }

src/main/java/com/diagbot/dto/StaticKnowledgeDetailDTO.java

@@ -37,7 +37,7 @@ public class StaticKnowledgeDetailDTO {
     private Integer orderNo;
 
     /**
-     * 内容类型（多选）：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径
+     * 内容类型（多选）：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径，4-治疗方案
      */
     private String contentType;
 }

src/main/java/com/diagbot/dto/StaticKnowledgeIndexDTO.java

@@ -34,7 +34,11 @@ public class StaticKnowledgeIndexDTO {
     /**
      * 是否有静态知识
      */
-    private Integer hasInfomation = 0;
+    private Integer hasInfo = 0;
+    /**
+     * 是否有基本静态知识
+     */
+    private Integer hasStaticKnowledge = 0;
     /**
      * 是否有临床路径
      */
@@ -43,4 +47,8 @@ public class StaticKnowledgeIndexDTO {
      * 是否有注意事项
      */
     private Integer hasNotice = 0;
-}
+    /**
+     * 是否有治疗方案静态知识
+     */
+    private Integer hasTreatInfo = 0;
+}

src/main/java/com/diagbot/entity/ConceptDetail.java

@@ -77,7 +77,7 @@ public class ConceptDetail implements Serializable {
     private Integer orderNo;
 
     /**
-     * 内容类型（多选）：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径
+     * 内容类型（多选）：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径，4-治疗方案
      */
     private String contentType;
 

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

@@ -85,9 +85,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
         //过滤没有静态知识的检索结果
         staticKnowledgeIndexDTOList = staticKnowledgeIndexDTOList
                 .stream()
-                .filter(i -> i.getHasInfomation().equals(1)
-                        || i.getHasNotice().equals(1)
-                        || i.getHasClinicalPathway().equals(1))
+                .filter(i -> i.getHasInfo().equals(1))
                 .collect(Collectors.toList());
         return staticKnowledgeIndexDTOList;
     }
@@ -103,9 +101,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
         //过滤没有静态知识的检索结果
         staticKnowledgeIndexDTOList = staticKnowledgeIndexDTOList
                 .stream()
-                .filter(i -> i.getHasInfomation().equals(0)
-                        && i.getHasNotice().equals(0)
-                        && i.getHasClinicalPathway().equals(0))
+                .filter(i -> i.getHasInfo().equals(0))
                 .collect(Collectors.toList());
         return staticKnowledgeIndexDTOList;
     }
@@ -166,15 +162,18 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
                     for (StaticKnowledgeIndexDTO item : staticKnowledgeIndexDTOList) {
                         if (item.getId() == null
                                 || !detailMap.containsKey(item.getId())) {
-                            item.setHasInfomation(0);
+                            item.setHasInfo(0);
+                            item.setHasStaticKnowledge(0);
                             item.setHasClinicalPathway(0);
                             item.setHasNotice((0));
+                            item.setHasTreatInfo(0);
                             continue;
                         }
                         for (ConceptDetail detail : detailMap.get(item.getId())) {
+                            item.setHasInfo(1);
                             List<String> contentTypeList = Arrays.asList(detail.getContentType().split(","));
                             if (contentTypeList.contains("1")) {
-                                item.setHasInfomation(1);
+                                item.setHasStaticKnowledge(1);
                             }
                             if (contentTypeList.contains("2")) {
                                 item.setHasNotice(1);
@@ -182,6 +181,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
                             if (contentTypeList.contains("3")) {
                                 item.setHasClinicalPathway(1);
                             }
+                            if (contentTypeList.contains("4")) {
+                                item.setHasTreatInfo(1);
+                            }
                         }
                     }
                 }
@@ -267,6 +269,10 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
                 .stream()
                 .filter(i -> Arrays.asList(i.getContentType().split(",")).contains("3"))
                 .collect(Collectors.toList());
+        List<StaticKnowledgeDetailDTO> treatInfoList = detailList
+                .stream()
+                .filter(i -> Arrays.asList(i.getContentType().split(",")).contains("4"))
+                .collect(Collectors.toList());
         Map<String, List<StaticKnowledgeDetailDTO>> detailMap = new HashMap<>();
         if (ListUtil.isEmpty(staticKnowledgeVO.getContentTypes()) || staticKnowledgeVO.getContentTypes().contains(0)) {
             if (ListUtil.isNotEmpty(introduceList)) {
@@ -278,6 +284,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             if (ListUtil.isNotEmpty(clinicalPathwayList)) {
                 detailMap.put("临床路径", clinicalPathwayList);
             }
+            if (ListUtil.isNotEmpty(treatInfoList)) {
+                detailMap.put("治疗方案", treatInfoList);
+            }
         } else {
             if (ListUtil.isNotEmpty(introduceList) && staticKnowledgeVO.getContentTypes().contains(1)) {
                 detailMap.put("静态知识", introduceList);
@@ -288,6 +297,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             if (ListUtil.isNotEmpty(clinicalPathwayList) && staticKnowledgeVO.getContentTypes().contains(3)) {
                 detailMap.put("临床路径", clinicalPathwayList);
             }
+            if (ListUtil.isNotEmpty(treatInfoList) && staticKnowledgeVO.getContentTypes().contains(4)) {
+                detailMap.put("治疗方案", treatInfoList);
+            }
         }
         staticKnowledgeDTO.setDetails(detailMap);
         return staticKnowledgeDTO;
@@ -365,6 +377,10 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
                         .stream()
                         .filter(i -> Arrays.asList(i.getContentType().split(",")).contains("3"))
                         .collect(Collectors.toList());
+                List<StaticKnowledgeDetailDTO> treatInfoList = subDetailList
+                        .stream()
+                        .filter(i -> Arrays.asList(i.getContentType().split(",")).contains("4"))
+                        .collect(Collectors.toList());
                 Map<String, List<StaticKnowledgeDetailDTO>> subDetailMap = new HashMap<>();
                 if (ListUtil.isEmpty(staticKnowledgeHISVO.getContentTypes()) || staticKnowledgeHISVO.getContentTypes().contains(0)) {
                     if (ListUtil.isNotEmpty(introduceList)) {
@@ -376,6 +392,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
                     if (ListUtil.isNotEmpty(clinicalPathwayList)) {
                         subDetailMap.put("临床路径", clinicalPathwayList);
                     }
+                    if (ListUtil.isNotEmpty(treatInfoList)) {
+                        subDetailMap.put("治疗方案", treatInfoList);
+                    }
                 } else {
                     if (ListUtil.isNotEmpty(introduceList) && staticKnowledgeHISVO.getContentTypes().contains(1)) {
                         subDetailMap.put("静态知识", introduceList);
@@ -386,6 +405,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
                     if (ListUtil.isNotEmpty(clinicalPathwayList) && staticKnowledgeHISVO.getContentTypes().contains(3)) {
                         subDetailMap.put("临床路径", clinicalPathwayList);
                     }
+                    if (ListUtil.isNotEmpty(treatInfoList) && staticKnowledgeHISVO.getContentTypes().contains(4)) {
+                        subDetailMap.put("治疗方案", treatInfoList);
+                    }
                 }
                 staticKnowledgeDTO.setDetails(subDetailMap);
             }

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

@@ -41,7 +41,7 @@ public class ConceptDetailVO {
     private Integer orderNo;
 
     /**
-     * 内容类型（多选）：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径
+     * 内容类型（多选）：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径，4-治疗方案
      */
     private String contentType;
 }

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

@@ -25,7 +25,7 @@ public class StaticKnowledgeVO {
     @NotNull(message = "请输入术语类型")
     private Integer type;
     /**
-     * 内容类型
+     * 内容类型：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径，4-治疗方案
      */
     private List<Integer> contentTypes;
 }

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

@@ -67,7 +67,7 @@ public class ConceptInfoController {
 
     @ApiOperation(value = "页面获取静态知识[zhaops]",
             notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作 <br>" +
-                    "contentTypes： 内容类型（多选）：1-静态信息、2-注意事项、3-临床路径 <br>" +
+                    "contentTypes： 内容类型（多选）：1-静态信息、2-注意事项、3-临床路径、4-治疗方案<br>" +
                     "name： 标准术语名称<br>")
     @PostMapping("/getStaticKnowledge")
     @SysLogger("getStaticKnowledge")
@@ -78,7 +78,7 @@ public class ConceptInfoController {
 
     @ApiOperation(value = "对接获取静态知识[zhaops]",
             notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作 <br>" +
-                    "contentTypes： 内容类型（多选）：1-静态信息、2-注意事项、3-临床路径 <br>" +
+                    "contentTypes： 内容类型（多选）：1-静态信息、2-注意事项、3-临床路径、4-治疗方案 <br>" +
                     "hisName： HIS大项名称<br>" +
                     "hisDetailName： HIS小项名称<br>")
     @PostMapping("/getStaticKnowledgeForHIS")