shiyang / regional-platform

Download as
Browse Code »

Commit c963c5f7bbeb962f28d1012deeb98d46a85129f8

Authored by landong2015
1 parent 05eeed91bf
Exists in master and in 1 other branch nobuildprocess

update

Showing 1 changed file with 4 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ c963c5f
... ... @@ -54,11 +54,10 @@
54 54 public BaseObjectResponse getPremaritalCheckup(PremaritalCheckupQueryRequest requestParam) {
55 55  
56 56 PremaritalCheckup result = null;
57   - PremaritalCheckupHistoryResult historyResult = null;
58 57 ResidentsArchiveModel archiveModel = null;
59 58 Map<String, Object> archiveMap = null;
60   -
61 59 Map<String, Object> resultMap = new HashMap<>();
  60 + List<PremaritalCheckupHistoryResult> historyList = null;
62 61  
63 62 //婚检ID不为空
64 63 if (StringUtils.isNotEmpty(requestParam.getId())) {
... ... @@ -101,7 +100,7 @@
101 100 result = checkupList.get(0);
102 101 //历史婚检记录
103 102 for (PremaritalCheckup data : checkupList){
104   - historyResult = new PremaritalCheckupHistoryResult();
  103 + PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult();
105 104 historyResult.setId(data.getId());
106 105 historyResult.setPremaritalUpTime(data.getPremaritalUpTime());
107 106 Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId()));
... ... @@ -109,6 +108,7 @@
109 108 historyResult.setPremaritalUpHospital(org.getName());
110 109 historyResult.setHospitalId(data.getHospitalId());
111 110 }
  111 + historyList.add(historyResult);
112 112 }
113 113 }
114 114 }
... ... @@ -130,7 +130,7 @@
130 130  
131 131 resultMap.put("archiveResult", archiveMap);
132 132 resultMap.put("checkupResult", result);
133   - resultMap.put("premaritalCheckupHistory",historyResult);
  133 + resultMap.put("premaritalCheckupHistory",historyList);
134 134  
135 135 BaseObjectResponse response = new BaseObjectResponse();
136 136 response.setData(resultMap);