|
@@ -36,11 +36,12 @@ public class EvaluationFacade extends EvaluationServiceImpl {
|
|
List<EvaluationDTO> evaluationList = this.getEvaluationModule(evaluationdiseaseNameVO);
|
|
List<EvaluationDTO> evaluationList = this.getEvaluationModule(evaluationdiseaseNameVO);
|
|
|
|
|
|
Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(searchVO);
|
|
Map<String, JSONObject> jsonobject = pushFacade.getManagementEvaluationContent(searchVO);
|
|
- for (String key : jsonobject.keySet()) {
|
|
|
|
- for (EvaluationDTO evaluadata : evaluationList) {
|
|
|
|
- if (key.equals(evaluadata.getRegionName())) {
|
|
|
|
- evaluadata.setData(jsonobject.get(key));
|
|
|
|
- }
|
|
|
|
|
|
+ if (jsonobject == null) {
|
|
|
|
+ return evaluationList;
|
|
|
|
+ }
|
|
|
|
+ for (EvaluationDTO evaluadata : evaluationList) {
|
|
|
|
+ if (jsonobject.containsKey(evaluadata.getRegionName())) {
|
|
|
|
+ evaluadata.setData(jsonobject.get(evaluadata.getRegionName()));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return evaluationList;
|
|
return evaluationList;
|