shiyang / regional-platform

Download as
Browse Code »

Commit 08641b1662555c548e8c8970e208fea551ef5e71

Authored by landong2015
1 parent 5336faefe8
Exists in master and in 1 other branch nobuildprocess

update

Showing 1 changed file with 19 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 08641b1
... ... @@ -55,11 +55,12 @@
55 55 public BaseObjectResponse getPremaritalCheckup(PremaritalCheckupQueryRequest requestParam,Integer id) {
56 56  
57 57 PremaritalCheckup result = null;
58   - Map<String, Object> resultMap = new HashMap<>();
59   - Map<String, Object> archiveMap = new HashMap<>();
60   -
  58 + PremaritalCheckupHistoryResult historyResult = null;
61 59 ResidentsArchiveModel archiveModel = null;
  60 + Map<String, Object> archiveMap = null;
62 61  
  62 + Map<String, Object> resultMap = new HashMap<>();
  63 +
63 64 //婚检ID不为空
64 65 if (StringUtils.isNotEmpty(requestParam.getId())) {
65 66 //婚检数据
... ... @@ -101,7 +102,7 @@
101 102 result = checkupList.get(0);
102 103 //历史婚检记录
103 104 for (PremaritalCheckup data : checkupList){
104   - PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult();
  105 + historyResult = new PremaritalCheckupHistoryResult();
105 106 historyResult.setId(data.getId());
106 107 historyResult.setPremaritalUpTime(data.getPremaritalUpTime());
107 108 Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId()));
108 109  
109 110  
... ... @@ -109,25 +110,28 @@
109 110 historyResult.setPremaritalUpHospital(org.getName());
110 111 historyResult.setHospitalId(data.getHospitalId());
111 112 }
112   - resultMap.put("premaritalCheckupHistory",historyResult);
113 113 }
114 114 }
115 115 }
116 116 }
117 117  
118   - archiveMap.put("certificateNum", archiveModel.getCertificateNum());
119   - archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId());
120   - archiveMap.put("username", archiveModel.getUsername());
121   - archiveMap.put("age", archiveModel.getAge());
122   - archiveMap.put("sex", archiveModel.getSex());
123   - archiveMap.put("birthday", getBirthday(archiveModel.getBirthday()));
124   - archiveMap.put("phone", archiveModel.getPhone());
125   - archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceId(), archiveModel.getCityId(),
126   - archiveModel.getAreaId(), archiveModel.getStreetId(), archiveModel.getAddress(), basicConfigService));
127   - archiveMap.put("workUnit", archiveModel.getWorkUnit());
  118 + if (archiveModel!=null){
  119 + archiveMap = new HashMap<>();
  120 + archiveMap.put("certificateNum", archiveModel.getCertificateNum());
  121 + archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId());
  122 + archiveMap.put("username", archiveModel.getUsername());
  123 + archiveMap.put("age", archiveModel.getAge());
  124 + archiveMap.put("sex", archiveModel.getSex());
  125 + archiveMap.put("birthday", getBirthday(archiveModel.getBirthday()));
  126 + archiveMap.put("phone", archiveModel.getPhone());
  127 + archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceId(), archiveModel.getCityId(),
  128 + archiveModel.getAreaId(), archiveModel.getStreetId(), archiveModel.getAddress(), basicConfigService));
  129 + archiveMap.put("workUnit", archiveModel.getWorkUnit());
  130 + }
128 131  
129 132 resultMap.put("archiveResult", archiveMap);
130 133 resultMap.put("checkupResult", result);
  134 + resultMap.put("premaritalCheckupHistory",historyResult);
131 135  
132 136 BaseObjectResponse response = new BaseObjectResponse();
133 137 response.setData(resultMap);