소스 검색

aipt管理评估加密解密测试

zhaops 5 년 전
부모
커밋
e19e6f4f01
1개의 변경된 파일6개의 추가작업 그리고 5개의 파일을 삭제
  1. 6 5
      aipt-service/src/main/java/com/diagbot/facade/EvaluationFacade.java

+ 6 - 5
aipt-service/src/main/java/com/diagbot/facade/EvaluationFacade.java

@@ -36,11 +36,12 @@ public class EvaluationFacade extends EvaluationServiceImpl {
         List<EvaluationDTO> evaluationList = this.getEvaluationModule(evaluationdiseaseNameVO);
 
         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;