|
@@ -92,13 +92,23 @@ public class TreatmentFacade {
|
|
|
return retMap;
|
|
|
}
|
|
|
|
|
|
- List<MedicitionClass> drugsList = FastJsonUtils.getJsonToListByKey(treatmentJson.toString(), "treatment", MedicitionClass.class);
|
|
|
- List<String> cateBigNameList = drugsList.stream().map(drugs -> drugs.getBigdrugsName()).collect(Collectors.toList());
|
|
|
- List<Concept> cateBigConceptList = conceptFacade.getListByNamesAndType(cateBigNameList, LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey());
|
|
|
- Map<String, Concept> cateBigConceptMap = EntityUtil.makeEntityMap(cateBigConceptList, "libName");
|
|
|
- List<String> cateSmallNameList = drugsList.stream().map(drugs -> drugs.getSubdrugsName()).collect(Collectors.toList());
|
|
|
- List<Concept> cateSmallConceptList = conceptFacade.getListByNamesAndType(cateSmallNameList, LexiconTypeEnum.DRUG_CATEGORY_SMALL.getKey());
|
|
|
- Map<String, Concept> cateSmallConceptMap = EntityUtil.makeEntityMap(cateSmallConceptList, "libName");
|
|
|
+ List<MedicitionClass> drugsList
|
|
|
+ = FastJsonUtils.getJsonToListByKey(treatmentJson.toString(),
|
|
|
+ "treatment", MedicitionClass.class);
|
|
|
+ List<String> cateBigNameList
|
|
|
+ = drugsList.stream().map(drugs -> drugs.getBigdrugsName()).collect(Collectors.toList());
|
|
|
+ List<Concept> cateBigConceptList
|
|
|
+ = conceptFacade.getListByNamesAndType(cateBigNameList,
|
|
|
+ LexiconTypeEnum.DRUG_CATEGORY_BIG.getKey());
|
|
|
+ Map<String, Concept> cateBigConceptMap
|
|
|
+ = EntityUtil.makeEntityMap(cateBigConceptList, "libName");
|
|
|
+ List<String> cateSmallNameList
|
|
|
+ = drugsList.stream().map(drugs -> drugs.getSubdrugsName()).collect(Collectors.toList());
|
|
|
+ List<Concept> cateSmallConceptList
|
|
|
+ = conceptFacade.getListByNamesAndType(cateSmallNameList,
|
|
|
+ LexiconTypeEnum.DRUG_CATEGORY_SMALL.getKey());
|
|
|
+ Map<String, Concept> cateSmallConceptMap
|
|
|
+ = EntityUtil.makeEntityMap(cateSmallConceptList, "libName");
|
|
|
|
|
|
for (MedicitionClass medicitionClass : drugsList) {
|
|
|
Concept cateBigConcept = cateBigConceptMap.get(medicitionClass.getBigdrugsName());
|
|
@@ -124,10 +134,13 @@ public class TreatmentFacade {
|
|
|
}
|
|
|
}
|
|
|
LinkedList<Medicition> medicitionList = medicitionClass.getMedicitionsList();
|
|
|
- List<String> drugNameList = medicitionList.stream().map(medicition -> medicition.getMedicitionName()).collect(Collectors.toList());
|
|
|
- List<Concept> drugList = conceptFacade.getListByNamesAndType(drugNameList, LexiconTypeEnum.DRUGS.getKey());
|
|
|
+ List<String> drugNameList
|
|
|
+ = medicitionList.stream().map(m -> m.getMedicitionName()).collect(Collectors.toList());
|
|
|
+ List<Concept> drugList
|
|
|
+ = conceptFacade.getListByNamesAndType(drugNameList, LexiconTypeEnum.DRUGS.getKey());
|
|
|
Map<String, Concept> drugMap = EntityUtil.makeEntityMap(drugList, "libName");
|
|
|
- Map<String, Concept> drugDetailMap = conceptDetailFacade.existList(drugNameList, LexiconTypeEnum.DRUGS.getKey());
|
|
|
+ Map<String, Concept> drugDetailMap
|
|
|
+ = conceptDetailFacade.existList(drugNameList, LexiconTypeEnum.DRUGS.getKey());
|
|
|
for (Medicition medicition : medicitionList) {
|
|
|
Concept drugConcept = drugMap.get(medicition.getMedicitionName());
|
|
|
if (drugConcept != null) {
|
|
@@ -167,11 +180,17 @@ public class TreatmentFacade {
|
|
|
//上次用药-icss层处理
|
|
|
retMap.put("drugHistory", null);
|
|
|
//不良反应
|
|
|
- List<AdverseReaction> adverseReactionList = FastJsonUtils.getJsonToListByKey(treatmentJson.toString(), "adverseEvent", AdverseReaction.class);
|
|
|
- List<String> adNameList = adverseReactionList.stream().map(adverseReaction -> adverseReaction.getName()).collect(Collectors.toList());
|
|
|
- List<Concept> adConceptList = conceptFacade.getListByNamesAndType(adNameList, LexiconTypeEnum.SIDE_EFFECTS.getKey());
|
|
|
- Map<String, Concept> adConceptMap = EntityUtil.makeEntityMap(adConceptList, "libName");
|
|
|
- Map<String, Concept> adConceptDetailMap = conceptDetailFacade.existList(adNameList, LexiconTypeEnum.SIDE_EFFECTS.getKey());
|
|
|
+ List<AdverseReaction> adverseReactionList
|
|
|
+ = FastJsonUtils.getJsonToListByKey(treatmentJson.toString(),
|
|
|
+ "adverseEvent", AdverseReaction.class);
|
|
|
+ List<String> adNameList
|
|
|
+ = adverseReactionList.stream().map(a -> a.getName()).collect(Collectors.toList());
|
|
|
+ List<Concept> adConceptList
|
|
|
+ = conceptFacade.getListByNamesAndType(adNameList, LexiconTypeEnum.SIDE_EFFECTS.getKey());
|
|
|
+ Map<String, Concept> adConceptMap
|
|
|
+ = EntityUtil.makeEntityMap(adConceptList, "libName");
|
|
|
+ Map<String, Concept> adConceptDetailMap
|
|
|
+ = conceptDetailFacade.existList(adNameList, LexiconTypeEnum.SIDE_EFFECTS.getKey());
|
|
|
for (AdverseReaction adverseReaction : adverseReactionList) {
|
|
|
Concept adConcept = adConceptMap.get(adverseReaction.getName());
|
|
|
if (adConcept != null) {
|