|
@@ -52,22 +52,23 @@ public class GraphCalculate {
|
|
|
}
|
|
|
String webDiag = searchData.getDiag();
|
|
|
Set<String> diseaseSet = condition.keySet();
|
|
|
- String featureType = searchData.getFeatureType();
|
|
|
+ String[] featureTypes = searchData.getFeatureTypes();
|
|
|
+ List<String> featureTypeList = Arrays.asList(featureTypes);
|
|
|
Integer diseaseType = searchData.getDisType();
|
|
|
//走治疗
|
|
|
- if(webDiag.trim()!=null && webDiag.trim()!="" && "8".equals(featureType)){
|
|
|
+ if(webDiag.trim()!=null && webDiag.trim()!="" && featureTypeList.contains("8")){
|
|
|
//走平常诊断治疗
|
|
|
Map<String, Filnlly> mulDiseaseTreat = neo4jAPI.getMulDiseaseTreat_2(webDiag,diseaseType,diseaseSet,String.join(",", inputList));
|
|
|
responseData.setTreat(mulDiseaseTreat);
|
|
|
}
|
|
|
- //管理评估
|
|
|
- if("11".equals(featureType) && diseaseType == 1){
|
|
|
+ //管理评估(慢病才有)
|
|
|
+ if(featureTypeList.contains("11") && diseaseType == 1){
|
|
|
MangementEvaluation mangementEvaluation = this.getMangementEvaluation();
|
|
|
Map<String, JSONObject> mangementEvaluation1 = mangementEvaluation.getMangementEvaluation();
|
|
|
responseData.setManagementEvaluation(mangementEvaluation1);
|
|
|
}
|
|
|
//指标推送
|
|
|
- if("22".equals(featureType) && diseaseSet != null && diseaseSet.size()>0){
|
|
|
+ if(featureTypeList.contains("22") && diseaseSet != null && diseaseSet.size()>0){
|
|
|
List<MedicalIndication> medicalIndicationList = new ArrayList<>();
|
|
|
MedicalIndication medicalIndication = this.getMedicalIndication(diseaseSet);
|
|
|
medicalIndicationList.add(medicalIndication);
|
|
@@ -301,6 +302,11 @@ public class GraphCalculate {
|
|
|
}
|
|
|
return medicalIndication;
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 管理评估
|
|
|
+ * @return
|
|
|
+ */
|
|
|
public MangementEvaluation getMangementEvaluation(){
|
|
|
MangementEvaluation mangementEvaluation = new MangementEvaluation();
|
|
|
Map<String,JSONObject> mangementMap = new HashMap<>();
|