Commit f713ae1f3443759801b8e614b4fd21781baa0339
1 parent
6ae12ce259
Exists in
master
and in
6 other branches
婚检
Showing 2 changed files with 22 additions and 7 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
f713ae1
| ... | ... | @@ -1218,13 +1218,18 @@ |
| 1218 | 1218 | } |
| 1219 | 1219 | out = response.getOutputStream(); |
| 1220 | 1220 | Map<String, String> cnames = new LinkedHashMap<>(); |
| 1221 | + cnames.put("premaritalUpTime", "婚检时间"); | |
| 1221 | 1222 | cnames.put("username", "姓名"); |
| 1223 | + cnames.put("certificateNum", "证件号"); | |
| 1222 | 1224 | cnames.put("phone", "联系方式"); |
| 1223 | - cnames.put("age", "年龄"); | |
| 1225 | + cnames.put("jianChaJieGuo", "结果"); | |
| 1226 | + cnames.put("yiXueYiJian", "医学意见"); | |
| 1227 | + cnames.put("address","居住地址"); | |
| 1228 | + cnames.put("hunJianDoctor", "婚检医生"); | |
| 1229 | + | |
| 1230 | + /*cnames.put("age", "年龄"); | |
| 1224 | 1231 | cnames.put("hospital", "婚检机构"); |
| 1225 | - cnames.put("premaritalUpTime", "婚检时间"); | |
| 1226 | 1232 | cnames.put("certificateTypeId", "证件类型"); |
| 1227 | - cnames.put("certificateNum", "证件号"); | |
| 1228 | 1233 | cnames.put("vcCardNo", "就诊卡号"); |
| 1229 | 1234 | cnames.put("sexType", "性别"); |
| 1230 | 1235 | |
| 1231 | 1236 | |
| 1232 | 1237 | |
| ... | ... | @@ -1358,14 +1363,13 @@ |
| 1358 | 1363 | cnames.put("linBing", "淋病"); |
| 1359 | 1364 | cnames.put("xiongTou", "胸透"); |
| 1360 | 1365 | |
| 1361 | - cnames.put("jianChaJieGuo", "检查结果"); | |
| 1366 | + | |
| 1362 | 1367 | cnames.put("jianChaDetails", "检查异常详情"); |
| 1363 | 1368 | cnames.put("jiBingZhenDuan", "疾病诊断"); |
| 1364 | 1369 | |
| 1365 | - cnames.put("yiXueYiJian", "医学意见"); | |
| 1370 | + | |
| 1366 | 1371 | cnames.put("yiJianQiTaDetails", "医学意见其他详情"); |
| 1367 | - cnames.put("zhiDaoYiJian", "指导意见"); | |
| 1368 | - cnames.put("hunJianDoctor", "婚检医生"); | |
| 1372 | + cnames.put("zhiDaoYiJian", "指导意见");*/ | |
| 1369 | 1373 | |
| 1370 | 1374 | response.setContentType("application/octet-stream"); |
| 1371 | 1375 | response.setHeader("Content-Disposition", "attachment;fileName=" + "huanjian.xls"); |
| ... | ... | @@ -2480,6 +2484,7 @@ |
| 2480 | 2484 | checkupResult.setVolumeRight(result.getVolumeRight());//体积右 |
| 2481 | 2485 | checkupResult.setGaoWanZuo(result.getGaoWanZuo());//睾丸左 |
| 2482 | 2486 | checkupResult.setGaoWanYou(result.getGaoWanYou());//睾丸右 |
| 2487 | + checkupResult.setSpouseCertificateTypeId(result.getSpouseCertificateTypeId());//证件类型 | |
| 2483 | 2488 | |
| 2484 | 2489 | return checkupResult; |
| 2485 | 2490 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
View file @
f713ae1
| ... | ... | @@ -370,6 +370,16 @@ |
| 370 | 370 | private String gaoWanZuo; |
| 371 | 371 | //睾丸(右) |
| 372 | 372 | private String gaoWanYou; |
| 373 | + //证件类型 | |
| 374 | + private String spouseCertificateTypeId; | |
| 375 | + | |
| 376 | + public String getSpouseCertificateTypeId() { | |
| 377 | + return spouseCertificateTypeId; | |
| 378 | + } | |
| 379 | + | |
| 380 | + public void setSpouseCertificateTypeId(String spouseCertificateTypeId) { | |
| 381 | + this.spouseCertificateTypeId = spouseCertificateTypeId; | |
| 382 | + } | |
| 373 | 383 | |
| 374 | 384 | public String getGaoWanZuo() { |
| 375 | 385 | return gaoWanZuo; |