Zhaops 6 lat temu
rodzic
commit
2be9084597

+ 5 - 5
icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -115,13 +115,13 @@ public class PushFacade {
         Map<String, Object> labMap = list2Map(labs);
         Map<String, Object> pacsMap = list2Map(pacs);
 
-        if (featureTypeSet.contains(QuestionTypeEnum.Lis.getKey())) {
+        if (featureTypeSet.contains(String.valueOf(QuestionTypeEnum.Lis.getKey()))) {
             pushDTO.setLabMap(labMap);
-        } else if (featureTypeSet.contains(QuestionTypeEnum.Pacs.getKey())) {
+        } else if (featureTypeSet.contains(String.valueOf(QuestionTypeEnum.Pacs.getKey()))) {
             pushDTO.setPacsMap(pacsMap);
         }
         //诊断 返回tagName+id
-        else if (featureTypeSet.contains(QuestionTypeEnum.Disease.getKey())) {
+        else if (featureTypeSet.contains(String.valueOf(QuestionTypeEnum.Disease.getKey()))) {
             QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper();
             questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                     in("tag_name", disMap.keySet()).
@@ -131,7 +131,7 @@ public class PushFacade {
             pushDTO.setDisMap(disMap);
         }
         //症状(主诉 type=1;现病史 type=2) 返回 tagName+填写单
-        else if (featureTypeSet.contains(QuestionTypeEnum.Symptom.getKey())) {
+        else if (featureTypeSet.contains(String.valueOf(QuestionTypeEnum.Symptom.getKey()))) {
             QueryWrapper<QuestionInfo> questionInfoQueryWrapper = new QueryWrapper();
             questionInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                     in("tag_name", symptomMap.keySet()).
@@ -141,7 +141,7 @@ public class PushFacade {
             pushDTO.setSymptomMap(symptomMap);
         }
         //查体 返回模板
-        else if (featureTypeSet.contains(QuestionTypeEnum.Vital.getKey())) {
+        else if (featureTypeSet.contains(String.valueOf(QuestionTypeEnum.Vital.getKey()))) {
             //没有推送信息时,默认取全科模板
             String deptName = "全科";
             if (dis != null && dis.size() > 0) {