Commit 752fd2ee289b4b763ff508fb6929ab48e29fbae0
1 parent
0996e0c0c3
Exists in
master
and in
6 other branches
妇女建档打印
Showing 4 changed files with 81 additions and 73 deletions
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
752fd2e
... | ... | @@ -17,6 +17,7 @@ |
17 | 17 | import com.lyms.platform.operate.web.service.ITrackDownService; |
18 | 18 | import com.lyms.platform.operate.web.utils.CommonsHelper; |
19 | 19 | import com.lyms.platform.operate.web.utils.FunvCommonUtil; |
20 | +import com.lyms.platform.operate.web.utils.UnitConstants; | |
20 | 21 | import com.lyms.platform.permission.model.Organization; |
21 | 22 | import com.lyms.platform.permission.model.Users; |
22 | 23 | import com.lyms.platform.permission.service.OrganizationService; |
... | ... | @@ -491,6 +492,30 @@ |
491 | 492 | model = modelList.get(0); |
492 | 493 | //建档详情 |
493 | 494 | result = getResult(model); |
495 | + if (StringUtils.isNotEmpty(model.getSpouseCardNo())) | |
496 | + { | |
497 | + query.setId(null); | |
498 | + query.setCertificateNum(model.getSpouseCardNo()); | |
499 | + modelList.clear(); | |
500 | + modelList = residentsArchiveService.queryResident(query); | |
501 | + if (CollectionUtils.isNotEmpty(modelList)) | |
502 | + { | |
503 | + //是否显示打印指引单 | |
504 | + result.setIsPrint(true); | |
505 | + ResidentsArchiveModel model1 = modelList.get(0); | |
506 | + result.setSpouseName(model1.getUsername()); | |
507 | + result.setSpouseCardNo(model1.getCertificateNum()); | |
508 | + result.setSpouseSex(FunvCommonUtil.getBaseicConfigByid(model.getSex(), basicConfigService)); | |
509 | + if (model1.getBirthday() != null) { | |
510 | + result.setSpouseAge(com.lyms.platform.common.utils.StringUtils.unitHandle(DateUtil.getAge(model1.getBirthday(), new Date()).toString(), UnitConstants.SUI)); | |
511 | + } | |
512 | + //居住地 | |
513 | + String liveAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), | |
514 | + model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService); | |
515 | + result.setSpouseAddress(liveAddress); | |
516 | + result.setSpouseCreated(DateUtil.getyyyy_MM_dd(model.getBuildDay())); | |
517 | + } | |
518 | + } | |
494 | 519 | } |
495 | 520 | |
496 | 521 | List<ResidentsArchiveHistoryResult> historyResults = new ArrayList<>(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
View file @
752fd2e
... | ... | @@ -4951,31 +4951,7 @@ |
4951 | 4951 | ResidentsArchiveModel model = modelList.get(0); |
4952 | 4952 | //建档详情 |
4953 | 4953 | result = getResidentsPageResult(model); |
4954 | - if (StringUtils.isNotEmpty(model.getSpouseCardNo())) | |
4955 | - { | |
4956 | - query.setYn(YnEnums.YES.getId()); | |
4957 | - query.setId(null); | |
4958 | - query.setCertificateNum(model.getSpouseCardNo()); | |
4959 | - modelList.clear(); | |
4960 | - modelList = residentsArchiveService.queryResident(query); | |
4961 | - if (CollectionUtils.isNotEmpty(modelList)) | |
4962 | - { | |
4963 | - //是否显示打印指引单 | |
4964 | - result.setIsPrint(true); | |
4965 | - ResidentsArchiveModel model1 = modelList.get(0); | |
4966 | - result.setSpouseName(model1.getUsername()); | |
4967 | - result.setSpouseCardNo(model1.getCertificateNum()); | |
4968 | - result.setSpouseSex(getBasicConfig(model.getSex())); | |
4969 | - if (model1.getBirthday() != null) { | |
4970 | - result.setSpouseAge(com.lyms.platform.common.utils.StringUtils.unitHandle(DateUtil.getAge(model1.getBirthday(), new Date()).toString(), UnitConstants.SUI)); | |
4971 | - } | |
4972 | - //居住地 | |
4973 | - String liveAddress = CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), | |
4974 | - model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService); | |
4975 | - result.setSpouseAddress(liveAddress); | |
4976 | - result.setSpouseCreated(DateUtil.getyyyy_MM_dd(model.getBuildDay())); | |
4977 | - } | |
4978 | - } | |
4954 | + | |
4979 | 4955 | } |
4980 | 4956 | br.setData(result); |
4981 | 4957 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java
View file @
752fd2e
... | ... | @@ -66,13 +66,27 @@ |
66 | 66 | private String spouseName; |
67 | 67 | //配偶证件号 |
68 | 68 | private String spouseCardNo; |
69 | + | |
70 | + //配偶性别 | |
71 | + private String spouseSex; | |
72 | + //配偶年龄 | |
73 | + private String spouseAge; | |
74 | + //配偶家庭住址 | |
75 | + private String spouseAddress; | |
76 | + //配偶建档时间 | |
77 | + private String spouseCreated; | |
78 | + | |
79 | + | |
69 | 80 | //配偶手机 |
70 | 81 | private String spousePhone; |
71 | 82 | |
72 | 83 | //配偶证件类型Id |
73 | 84 | private String spouseCertTypeId; |
74 | 85 | |
86 | + //是否打印指引单 陵城区妇幼 | |
87 | + private boolean isPrint; | |
75 | 88 | |
89 | + | |
76 | 90 | /************配偶信息*************/ |
77 | 91 | |
78 | 92 | /************病史信息*************/ |
... | ... | @@ -145,6 +159,46 @@ |
145 | 159 | |
146 | 160 | //身份证照片 |
147 | 161 | private String photo; |
162 | + | |
163 | + public String getSpouseSex() { | |
164 | + return spouseSex; | |
165 | + } | |
166 | + | |
167 | + public void setSpouseSex(String spouseSex) { | |
168 | + this.spouseSex = spouseSex; | |
169 | + } | |
170 | + | |
171 | + public String getSpouseAge() { | |
172 | + return spouseAge; | |
173 | + } | |
174 | + | |
175 | + public void setSpouseAge(String spouseAge) { | |
176 | + this.spouseAge = spouseAge; | |
177 | + } | |
178 | + | |
179 | + public String getSpouseAddress() { | |
180 | + return spouseAddress; | |
181 | + } | |
182 | + | |
183 | + public void setSpouseAddress(String spouseAddress) { | |
184 | + this.spouseAddress = spouseAddress; | |
185 | + } | |
186 | + | |
187 | + public String getSpouseCreated() { | |
188 | + return spouseCreated; | |
189 | + } | |
190 | + | |
191 | + public void setSpouseCreated(String spouseCreated) { | |
192 | + this.spouseCreated = spouseCreated; | |
193 | + } | |
194 | + | |
195 | + public boolean isPrint() { | |
196 | + return isPrint; | |
197 | + } | |
198 | + | |
199 | + public void setIsPrint(boolean isPrint) { | |
200 | + this.isPrint = isPrint; | |
201 | + } | |
148 | 202 | |
149 | 203 | public String getPhoto() { |
150 | 204 | return photo; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsPageResult.java
View file @
752fd2e
... | ... | @@ -51,15 +51,8 @@ |
51 | 51 | private String spouseName; |
52 | 52 | //配偶证件号 |
53 | 53 | private String spouseCardNo; |
54 | - //配偶性别 | |
55 | - private String spouseSex; | |
56 | - //配偶年龄 | |
57 | - private String spouseAge; | |
58 | - //配偶家庭住址 | |
59 | - private String spouseAddress; | |
60 | - //配偶建档时间 | |
61 | - private String spouseCreated; | |
62 | 54 | |
55 | + | |
63 | 56 | //配偶手机 |
64 | 57 | private String spousePhone; |
65 | 58 | |
66 | 59 | |
67 | 60 | |
... | ... | @@ -132,49 +125,9 @@ |
132 | 125 | private String photo; |
133 | 126 | |
134 | 127 | |
135 | - //是否打印指引单 陵城区妇幼 | |
136 | - private boolean isPrint; | |
137 | 128 | |
138 | 129 | |
139 | - public String getSpouseSex() { | |
140 | - return spouseSex; | |
141 | - } | |
142 | 130 | |
143 | - public void setSpouseSex(String spouseSex) { | |
144 | - this.spouseSex = spouseSex; | |
145 | - } | |
146 | - | |
147 | - public String getSpouseAge() { | |
148 | - return spouseAge; | |
149 | - } | |
150 | - | |
151 | - public void setSpouseAge(String spouseAge) { | |
152 | - this.spouseAge = spouseAge; | |
153 | - } | |
154 | - | |
155 | - public String getSpouseAddress() { | |
156 | - return spouseAddress; | |
157 | - } | |
158 | - | |
159 | - public void setSpouseAddress(String spouseAddress) { | |
160 | - this.spouseAddress = spouseAddress; | |
161 | - } | |
162 | - | |
163 | - public String getSpouseCreated() { | |
164 | - return spouseCreated; | |
165 | - } | |
166 | - | |
167 | - public void setSpouseCreated(String spouseCreated) { | |
168 | - this.spouseCreated = spouseCreated; | |
169 | - } | |
170 | - | |
171 | - public boolean isPrint() { | |
172 | - return isPrint; | |
173 | - } | |
174 | - | |
175 | - public void setIsPrint(boolean isPrint) { | |
176 | - this.isPrint = isPrint; | |
177 | - } | |
178 | 131 | |
179 | 132 | public String getPhoto() { |
180 | 133 | return photo; |