1、术语映射导入导出

2、静态知识检索

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

@@ -61,14 +61,14 @@ public class DeptConfig implements Serializable {
     /**
      * 医院科室名称
      */
-    @Excel(name = "医院科室名称", width = 40, orderNum = "1")
+    @Excel(name = "医院科室名称", width = 40, orderNum = "2")
     @NotBlank(message = "请输入医院科室名称")
     private String hisName;
 
     /**
      * 医院科室编码
      */
-    @Excel(name = "医院科室编码", width = 40, orderNum = "2")
+    @Excel(name = "医院科室编码", width = 40, orderNum = "1")
     private String hisCode;
 
     /**
@@ -81,7 +81,7 @@ public class DeptConfig implements Serializable {
     /**
      * 对应项编码
      */
-    @Excel(name = "对应项编码", width = 40, orderNum = "3")
+    //@Excel(name = "对应项编码", width = 40, orderNum = "3")
     private String uniqueCode;
 
     public Long getId() {

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

@@ -68,20 +68,20 @@ public class DrugConfig implements Serializable {
     /**
      * 标准药品名称
      */
-    @Excel(name = "标准药品名称", width = 40, orderNum = "4")
+    @Excel(name = "标准药品名称", width = 40, orderNum = "2")
     @NotBlank(message = "请输入标准药品名称")
     private String uniqueName;
 
     /**
      * 标准编码
      */
-    @Excel(name = "对应项编码", width = 40, orderNum = "3")
+    //@Excel(name = "对应项编码", width = 40, orderNum = "3")
     private String uniqueCode;
 
     /**
      * 剂型
      */
-    @Excel(name = "剂型", width = 20, orderNum = "2")
+    @Excel(name = "剂型", width = 20, orderNum = "3")
     private String form;
 
     public Long getId() {

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

@@ -83,7 +83,7 @@ public class LisConfig implements Serializable {
     /**
      * 对应项目编码
      */
-    @Excel(name = "对应项目编码", width = 40, orderNum = "3")
+    //@Excel(name = "对应项目编码", width = 40, orderNum = "3")
     private String uniqueCode;
 
     public Long getId() {

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

@@ -75,7 +75,7 @@ public class OperationConfig implements Serializable {
     /**
      * 对应项编码
      */
-    @Excel(name = "对应项编码", width = 40, orderNum = "2")
+    //@Excel(name = "对应项编码", width = 40, orderNum = "2")
     private String uniqueCode;
 
     public Long getId() {

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

@@ -75,7 +75,7 @@ public class PacsConfig implements Serializable {
     /**
      * 对应项编码
      */
-    @Excel(name = "对应项编码", width = 40, orderNum = "2")
+    //@Excel(name = "对应项编码", width = 40, orderNum = "2")
     private String uniqueCode;
 
     public Long getId() {

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

@@ -75,7 +75,7 @@ public class TransfusionConfig implements Serializable {
     /**
      * 对应项编码
      */
-    @Excel(name = "对应项编码", width = 40, orderNum = "2")
+    //@Excel(name = "对应项编码", width = 40, orderNum = "2")
     private String uniqueCode;
 
     public Long getId() {

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

@@ -82,7 +82,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
      * @return
      */
     public List<StaticKnowledgeIndexDTO> staticKnowledgeIndexWithInfo(StaticKnowledgeIndexVO staticKnowledgeIndexVO) {
-        List<StaticKnowledgeIndexDTO> staticKnowledgeIndexDTOList = staticKnowledgeIndex(staticKnowledgeIndexVO);
+        List<StaticKnowledgeIndexDTO> staticKnowledgeIndexDTOList = staticKnowledgeIndex(staticKnowledgeIndexVO,0);
         //过滤没有静态知识的检索结果
         staticKnowledgeIndexDTOList = staticKnowledgeIndexDTOList
                 .stream()
@@ -101,7 +101,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
      * @return
      */
     public List<StaticKnowledgeIndexDTO> staticKnowledgeIndexWithoutInfo(StaticKnowledgeIndexVO staticKnowledgeIndexVO) {
-        List<StaticKnowledgeIndexDTO> staticKnowledgeIndexDTOList = staticKnowledgeIndex(staticKnowledgeIndexVO);
+        List<StaticKnowledgeIndexDTO> staticKnowledgeIndexDTOList = staticKnowledgeIndex(staticKnowledgeIndexVO,1);
         //过滤没有静态知识的检索结果
         staticKnowledgeIndexDTOList = staticKnowledgeIndexDTOList
                 .stream()
@@ -117,9 +117,10 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
      * 医学知识（静态信息）检索
      *
      * @param staticKnowledgeIndexVO
+     * @param type 0：过滤逻辑删除数据，1：不过滤逻辑删除数据
      * @return
      */
-    public List<StaticKnowledgeIndexDTO> staticKnowledgeIndex(StaticKnowledgeIndexVO staticKnowledgeIndexVO) {
+    public List<StaticKnowledgeIndexDTO> staticKnowledgeIndex(StaticKnowledgeIndexVO staticKnowledgeIndexVO,Integer type) {
         List<StaticKnowledgeIndexDTO> retList = Lists.newLinkedList();
         //静态知识检索顺序
         List<DictionaryInfoDTO> dicStaticIndexList = dictionaryFacade.getListByGroupType(7);
@@ -144,24 +145,6 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             conceptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
             conceptInfoQueryWrapper.in("name", conNameList);
             List<ConceptInfo> conceptInfoList = this.list(conceptInfoQueryWrapper);
-            /*int n = 0;
-            do {
-                List<String> subConNameList = new ArrayList<>();
-                if (n + 1000 < conNameList.size()) {
-                    subConNameList = conNameList.subList(n, n + 1000);
-                } else {
-                    subConNameList = conNameList.subList(n, conNameList.size());
-                }
-                conceptInfoQueryWrapper = new QueryWrapper<>();
-                conceptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
-                conceptInfoQueryWrapper.in("name", subConNameList);
-                List<ConceptInfo> subConceptInfoList = this.list(conceptInfoQueryWrapper);
-                if (ListUtil.isNotEmpty(subConceptInfoList)) {
-                    conceptInfoList.addAll(subConceptInfoList);
-                }
-                n += 1000;
-            } while (conceptInfoList.size() < 100 && n < conNameList.size());*/
-
             if (ListUtil.isNotEmpty(conceptInfoList)) {
                 //typeName转换
                 conceptInfoList.forEach(item -> {
@@ -179,7 +162,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
                         .collect(Collectors.toList());
                 if (ListUtil.isNotEmpty(conceptIdList)) {
                     QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
-                    //conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+                    if (type.equals(0)) {
+                        conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
+                    }
                     conceptDetailQueryWrapper.in("concept_id", conceptIdList);
                     List<ConceptDetail> conceptDetailList = conceptDetailFacade.list(conceptDetailQueryWrapper);
                     Map<Long, List<ConceptDetail>> detailMap
@@ -195,11 +180,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
                             continue;
                         }
                         for (ConceptDetail detail : detailMap.get(item.getId())) {
-                            if (detail.getIsDeleted().equals(IsDeleteEnum.Y.getKey())) {
-                                continue;
-                            } else {
-                                item.setHasInfo(1);
-                            }
+                            item.setHasInfo(1);
                             List<String> contentTypeList = Arrays.asList(detail.getContentType().split(","));
                             if (contentTypeList.contains("1")) {
                                 item.setHasStaticKnowledge(1);