|
@@ -70,19 +70,19 @@ public class TreatmentFacade {
|
|
|
retMap.put("surgeryTreatment", surgeryTreatmentDetailList.size() > 0 ? surgeryTreatmentDetailList.get(0).getContent() : "");
|
|
|
|
|
|
//获取知识图谱治疗方案
|
|
|
- JSONObject diseaseJson = treatmentMap.get(disease.getTagName());
|
|
|
- if (diseaseJson == null || diseaseJson.isEmpty()) {
|
|
|
+ JSONObject treatmentJson = treatmentMap.get(disease.getTagName());
|
|
|
+ if (treatmentJson == null || treatmentJson.isEmpty()) {
|
|
|
return retMap;
|
|
|
}
|
|
|
|
|
|
- JSONObject treatmentJson = diseaseJson.getJSONObject(disease.getTagName());
|
|
|
+ /*JSONObject treatmentJson = diseaseJson.getJSONObject(disease.getTagName());
|
|
|
if (treatmentJson == null || treatmentJson.isEmpty()) {
|
|
|
return retMap;
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
List<MedicitionClass> drugsList = FastJsonUtils.getJsonToListByKey(treatmentJson.toString(), "treatment", MedicitionClass.class);
|
|
|
|
|
|
- List<String> classNameList = drugsList.stream().map(drugs -> drugs.getDrugsName()).collect(Collectors.toList());
|
|
|
+ List<String> classNameList = drugsList.stream().map(drugs -> drugs.getBigdrugsName()).collect(Collectors.toList());
|
|
|
List<QuestionInfo> drugClassList = getTopQuestionList(classNameList, QuestionTypeEnum.DrugClass.getKey());
|
|
|
Map<String, QuestionInfo> drugClassMap = EntityUtil.makeEntityMap(drugClassList, "tagName");
|
|
|
List<Long> drugClassIds = drugClassList.stream().map(drugClass -> drugClass.getId()).collect(Collectors.toList());
|
|
@@ -90,7 +90,7 @@ public class TreatmentFacade {
|
|
|
Map<Long, IntroduceMap> introduceMapMap = EntityUtil.makeEntityMap(introduceMapList, "questionId");
|
|
|
|
|
|
for (MedicitionClass medicitionClass : drugsList) {
|
|
|
- QuestionInfo drugClass = drugClassMap.get(medicitionClass.getDrugsName());
|
|
|
+ QuestionInfo drugClass = drugClassMap.get(medicitionClass.getBigdrugsName());
|
|
|
if (drugClass != null) {
|
|
|
medicitionClass.setId(drugClass.getId());
|
|
|
if (introduceMapMap.get(drugClass.getId()) != null) {
|