jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9bb66c50237219cdf78593e558a95cd3d135c36c

Authored by jiangjiazhi
2 parents a09679dee5 e3727ac878
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java View file @ 9bb66c5
... ... @@ -63,7 +63,6 @@
63 63 @RequestParam(value = "id",required = false)String id,
64 64 HttpServletRequest request) {
65 65 //获取当前登录用户ID
66   - LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
67 66 PremaritalCheckupQueryRequest param = new PremaritalCheckupQueryRequest();
68 67 param.setHospitalId(hospitalId);
69 68 if (StringUtils.isNotEmpty(id)){
... ... @@ -72,7 +71,7 @@
72 71 param.setVcCardNo(vcCardNo);
73 72 param.setCertificateNum(certificateNum);
74 73 }
75   - return premaritalCheckupFacade.getPremaritalCheckup(param, loginState.getId());
  74 + return premaritalCheckupFacade.getPremaritalCheckup(param);
76 75 }
77 76  
78 77 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 9bb66c5
... ... @@ -49,17 +49,17 @@
49 49 /**
50 50 * 查询单个(男/女)婚前检查
51 51 * @param requestParam
52   - * @param id
53 52 * @return
54 53 */
55   - public BaseObjectResponse getPremaritalCheckup(PremaritalCheckupQueryRequest requestParam,Integer id) {
  54 + public BaseObjectResponse getPremaritalCheckup(PremaritalCheckupQueryRequest requestParam) {
56 55  
57 56 PremaritalCheckup result = null;
58   - Map<String, Object> resultMap = new HashMap<>();
59   - Map<String, Object> archiveMap = new HashMap<>();
60   -
  57 + PremaritalCheckupHistoryResult historyResult = null;
61 58 ResidentsArchiveModel archiveModel = null;
  59 + Map<String, Object> archiveMap = null;
62 60  
  61 + Map<String, Object> resultMap = new HashMap<>();
  62 +
63 63 //婚检ID不为空
64 64 if (StringUtils.isNotEmpty(requestParam.getId())) {
65 65 //婚检数据
... ... @@ -101,7 +101,7 @@
101 101 result = checkupList.get(0);
102 102 //历史婚检记录
103 103 for (PremaritalCheckup data : checkupList){
104   - PremaritalCheckupHistoryResult historyResult = new PremaritalCheckupHistoryResult();
  104 + historyResult = new PremaritalCheckupHistoryResult();
105 105 historyResult.setId(data.getId());
106 106 historyResult.setPremaritalUpTime(data.getPremaritalUpTime());
107 107 Organization org = organizationService.getOrganization(Integer.valueOf(data.getHospitalId()));
108 108  
109 109  
... ... @@ -109,25 +109,28 @@
109 109 historyResult.setPremaritalUpHospital(org.getName());
110 110 historyResult.setHospitalId(data.getHospitalId());
111 111 }
112   - resultMap.put("premaritalCheckupHistory",historyResult);
113 112 }
114 113 }
115 114 }
116 115 }
117 116  
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());
  117 + if (archiveModel!=null){
  118 + archiveMap = new HashMap<>();
  119 + archiveMap.put("certificateNum", archiveModel.getCertificateNum());
  120 + archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId());
  121 + archiveMap.put("username", archiveModel.getUsername());
  122 + archiveMap.put("age", archiveModel.getAge());
  123 + archiveMap.put("sex", archiveModel.getSex());
  124 + archiveMap.put("birthday", getBirthday(archiveModel.getBirthday()));
  125 + archiveMap.put("phone", archiveModel.getPhone());
  126 + archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceId(), archiveModel.getCityId(),
  127 + archiveModel.getAreaId(), archiveModel.getStreetId(), archiveModel.getAddress(), basicConfigService));
  128 + archiveMap.put("workUnit", archiveModel.getWorkUnit());
  129 + }
128 130  
129 131 resultMap.put("archiveResult", archiveMap);
130 132 resultMap.put("checkupResult", result);
  133 + resultMap.put("premaritalCheckupHistory",historyResult);
131 134  
132 135 BaseObjectResponse response = new BaseObjectResponse();
133 136 response.setData(resultMap);