|
@@ -66,7 +66,7 @@ public class GraphCalculate {
|
|
|
responseData.setTreat(mulDiseaseTreat);
|
|
|
}
|
|
|
//管理评估(慢病才有)
|
|
|
- if(featureTypeList.contains("11") && diseaseType == 1){
|
|
|
+ if(featureTypeList.contains("11") && diseaseType == 1 && diseaseType !=null){
|
|
|
logger.info("featureTypeList 包含11,走管理评估!!!");
|
|
|
MangementEvaluation mangementEvaluation = this.getMangementEvaluation();
|
|
|
Map<String, JSONObject> mangementEvaluation1 = mangementEvaluation.getMangementEvaluation();
|
|
@@ -290,6 +290,7 @@ public class GraphCalculate {
|
|
|
MedicalIndicationDetail medicalIndicationDetail3 = new MedicalIndicationDetail();
|
|
|
medicalIndicationDetail3.setType(3);
|
|
|
JSONObject shiFouJson = new JSONObject();
|
|
|
+ shiFouJson.put("name","是否");
|
|
|
shiFouJson.put("controlType",0);
|
|
|
List<JSONObject> shiFouList = new ArrayList<>();
|
|
|
JSONObject shiJsonObject = new JSONObject();
|