Browse Source

化验明细项从词库检索

zhoutg 6 years ago
parent
commit
18ceb097f1

+ 2 - 1
icssman-service/src/main/java/com/diagbot/enums/QuestionTypeEnum.java

@@ -18,7 +18,8 @@ public enum QuestionTypeEnum implements KeyedNamed {
     Drug(8, "药品"),
     DrugClass(9, "药品分类"),
     Scale(21, "量表"),
-    Index(22, "核心指标");
+    Index(22, "核心指标"),
+    LisDetail(51, "化验明细");
 
     @Setter
     private Integer key;

+ 6 - 1
icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -444,13 +444,18 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             Map<String, List<Integer>> map = resMap.data;
             for (QuestionPageDTO bean : res.getRecords()) {
                 List<Integer> list = new ArrayList<>();
+                Boolean isLisDetail = false;
                 if (QuestionTypeEnum.Lis.getKey() == bean.getType() && TagTypeEnum.T7.getKey() != bean.getTagType().intValue()) {
+                    isLisDetail = true;
+                }
+                if (isLisDetail) {
                     list = map.get(bean.getName());
                 } else {
                     list = map.get(bean.getTagName());
                 }
+                // 化验明细需要特殊处理,类型转换为明细
                 if (ListUtil.isNotEmpty(list)) {
-                    if (list.contains(bean.getType())) {
+                    if (list.contains(bean.getType()) || (isLisDetail && list.contains(QuestionTypeEnum.LisDetail.getKey())) ) {
                         bean.setExist(true);
                     }
                 }