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

aipt-service/src/main/java/com/diagbot/facade/TreatmentFacade.java

@@ -107,8 +107,8 @@ public class TreatmentFacade {
         Map<String, Map<Long, List<ConceptDetail>>> hasConDetailMap = conceptDetailFacade.hasConDetail(conceptList);
 
         //一般治疗&&手术治疗
-        if (hasConDetailMap != null && hasConDetailMap.get(diseaseName) != null && ListUtil.isNotEmpty(hasConDetailMap.get(diseaseName).get(LexiconTypeEnum.DIAGNOSIS.getKey()))) {
-            List<ConceptDetail> diseaseConDetailList = hasConDetailMap.get(diseaseName).get(LexiconTypeEnum.DIAGNOSIS.getKey());
+        if (hasConDetailMap != null && hasConDetailMap.get(diseaseName) != null && ListUtil.isNotEmpty(hasConDetailMap.get(diseaseName).get(Long.valueOf(LexiconTypeEnum.DIAGNOSIS.getKey())))) {
+            List<ConceptDetail> diseaseConDetailList = hasConDetailMap.get(diseaseName).get(Long.valueOf(LexiconTypeEnum.DIAGNOSIS.getKey()));
             for (ConceptDetail conceptDetail : diseaseConDetailList) {
                 ConceptDetailDTO conceptDetailDTO = new ConceptDetailDTO();
                 List<String> positionList = Arrays.asList(conceptDetail.getPosition().split(",|，"));
@@ -128,11 +128,11 @@ public class TreatmentFacade {
 
         if (ListUtil.isNotEmpty(drugsList)) {
             for (MedicitionClass medicitionClass : drugsList) {
-                if (conceptMap != null && conceptMap.containsKey(medicitionClass.getBigdrugsName()) && conceptMap.get(medicitionClass.getBigdrugsName()) != null && conceptMap.get(medicitionClass.getBigdrugsName()).containsKey(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey())) {
-                    Concept cateBigConcept = conceptMap.get(medicitionClass.getBigdrugsName()).get(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey());
+                if (conceptMap != null  && conceptMap.get(medicitionClass.getBigdrugsName()) != null && conceptMap.get(medicitionClass.getBigdrugsName()).containsKey(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey()))) {
+                    Concept cateBigConcept = conceptMap.get(medicitionClass.getBigdrugsName()).get(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey()));
                     if (cateBigConcept != null) {
                         medicitionClass.setBigdrugsConceptId(cateBigConcept.getId());
-                        if (hasConDetailMap != null && hasConDetailMap.containsKey(cateBigConcept.getLibName()) && hasConDetailMap.get(cateBigConcept.getLibName()) != null && hasConDetailMap.get(cateBigConcept.getLibName()).containsKey(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey())) {
+                        if (hasConDetailMap != null && hasConDetailMap.get(cateBigConcept.getLibName()) != null && hasConDetailMap.get(cateBigConcept.getLibName()).containsKey(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey()))) {
                             medicitionClass.setShowInfo("1");
                         } else {
                             medicitionClass.setShowInfo("0");
@@ -141,8 +141,8 @@ public class TreatmentFacade {
                 }
                 medicitionClass.setBigdrgusLibType(LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey());
                 medicitionClass.setBigdrugsType(ConceptTypeEnum.Drug_Category_Big.getKey());
-                if (conceptMap != null && conceptMap.containsKey(medicitionClass.getSubdrugsName()) && conceptMap.get(medicitionClass.getSubdrugsName()) != null && conceptMap.get(medicitionClass.getSubdrugsName()).containsKey(LexiconTypeEnum.DRUG_CATEGORY_SMALL.getKey())) {
-                    Concept cateSmallConcept = conceptMap.get(medicitionClass.getSubdrugsName()).get(LexiconTypeEnum.DRUG_CATEGORY_SMALL.getKey());
+                if (conceptMap != null && conceptMap.get(medicitionClass.getSubdrugsName()) != null && conceptMap.get(medicitionClass.getSubdrugsName()).containsKey(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_SMALL.getKey()))) {
+                    Concept cateSmallConcept = conceptMap.get(medicitionClass.getSubdrugsName()).get(Long.valueOf(LexiconTypeEnum.DRUG_CATEGORY_SMALL.getKey()));
                     if (cateSmallConcept != null) {
                         medicitionClass.setSubdrugsConceptId(cateSmallConcept.getId());
                     }
@@ -152,15 +152,15 @@ public class TreatmentFacade {
 
                 LinkedList<Medicition> medicitionList = medicitionClass.getMedicitionsList();
                 for (Medicition medicition : medicitionList) {
-                    if (conceptMap != null && conceptMap.containsKey(medicition.getMedicitionName()) && conceptMap.get(medicition.getMedicitionName()) != null && conceptMap.get(medicition.getMedicitionName()).containsKey(LexiconTypeEnum.DRUGS.getKey())) {
-                        Concept drugConcept = conceptMap.get(medicition.getMedicitionName()).get(LexiconTypeEnum.DRUGS.getKey());
+                    if (conceptMap != null && conceptMap.get(medicition.getMedicitionName()) != null && conceptMap.get(medicition.getMedicitionName()).containsKey(Long.valueOf(LexiconTypeEnum.DRUGS.getKey()))) {
+                        Concept drugConcept = conceptMap.get(medicition.getMedicitionName()).get(Long.valueOf(LexiconTypeEnum.DRUGS.getKey()));
                         if (drugConcept != null) {
                             medicition.setConceptId(drugConcept.getId());
                         }
                     }
                     medicition.setLibType(LexiconTypeEnum.DRUGS.getKey());
                     medicition.setType(ConceptTypeEnum.Drug.getKey());
-                    if (hasConDetailMap != null && hasConDetailMap.containsKey(medicition.getMedicitionName()) && hasConDetailMap.get(medicition.getMedicitionName()) != null && hasConDetailMap.get(medicition.getMedicitionName()).containsKey(LexiconTypeEnum.DRUGS.getKey())) {
+                    if (hasConDetailMap != null &&hasConDetailMap.get(medicition.getMedicitionName()) != null && hasConDetailMap.get(medicition.getMedicitionName()).containsKey(Long.valueOf(LexiconTypeEnum.DRUGS.getKey()))) {
                         medicition.setShowInfo("1");
                     } else {
                         medicition.setShowInfo("0");
@@ -194,15 +194,15 @@ public class TreatmentFacade {
                 retMap.put("drugHistory", null);
                 //不良反应
                 for (AdverseReaction adverseReaction : adverseReactionList) {
-                    if (conceptMap != null && conceptMap.get(adverseReaction.getName()) != null && conceptMap.get(adverseReaction.getName()).containsKey(LexiconTypeEnum.SIDE_EFFECTS.getKey())) {
-                        Concept adConcept = conceptMap.get(adverseReaction.getName()).get(LexiconTypeEnum.SIDE_EFFECTS.getKey());
+                    if (conceptMap != null && conceptMap.get(adverseReaction.getName()) != null && conceptMap.get(adverseReaction.getName()).containsKey(Long.valueOf(LexiconTypeEnum.SIDE_EFFECTS.getKey()))) {
+                        Concept adConcept = conceptMap.get(adverseReaction.getName()).get(Long.valueOf(LexiconTypeEnum.SIDE_EFFECTS.getKey()));
                         if (adConcept != null) {
                             adverseReaction.setConceptId(adConcept.getId());
                         }
                     }
                     adverseReaction.setLibType(LexiconTypeEnum.SIDE_EFFECTS.getKey());
                     adverseReaction.setType(ConceptTypeEnum.SIDE_EFFECTS.getKey());
-                    if (hasConDetailMap != null && hasConDetailMap.get(adverseReaction.getName()) != null && hasConDetailMap.get(adverseReaction.getName()).containsKey(LexiconTypeEnum.SIDE_EFFECTS.getKey())) {
+                    if (hasConDetailMap != null && hasConDetailMap.get(adverseReaction.getName()) != null && hasConDetailMap.get(adverseReaction.getName()).containsKey(Long.valueOf(LexiconTypeEnum.SIDE_EFFECTS.getKey()))) {
                         adverseReaction.setShowInfo("1");
                     } else {
                         adverseReaction.setShowInfo("0");