Commit ea8ee93551a7c08c873f07c5378b7c72ab69d9de
1 parent
02a4ff4715
Exists in
master
and in
2 other branches
两癌导出
Showing 2 changed files with 30 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
View file @
ea8ee93
| ... | ... | @@ -223,6 +223,11 @@ |
| 223 | 223 | cnames.put("levelType", "文化程度"); |
| 224 | 224 | cnames.put("liveAddress", "家庭地址"); |
| 225 | 225 | cnames.put("country", "乡镇"); |
| 226 | + cnames.put("yc", "孕次"); | |
| 227 | + cnames.put("cc", "产次"); | |
| 228 | + cnames.put("juejing", "是否绝经"); | |
| 229 | + cnames.put("juejingAge", "绝经年龄"); | |
| 230 | + cnames.put("lastMenstrual", "末次月经"); | |
| 226 | 231 | ResponseUtil.responseExcel(cnames, datas, response); |
| 227 | 232 | } |
| 228 | 233 | |
| ... | ... | @@ -262,6 +267,16 @@ |
| 262 | 267 | model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));//住址 |
| 263 | 268 | map.put("country", CommonsHelper.getResidence(null, null, |
| 264 | 269 | null, model.getStreetId(), null, basicConfigService));//住址 |
| 270 | + | |
| 271 | + map.put("yc", model.getYcYc()); | |
| 272 | + map.put("cc", model.getYcCc()); | |
| 273 | + String juejing = ""; | |
| 274 | + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(model.getBsJj())){ | |
| 275 | + juejing = "1".equals(model.getBsJj()) ? "否" : "是"; | |
| 276 | + } | |
| 277 | + map.put("juejing", juejing); | |
| 278 | + map.put("juejingAge", model.getBsJjage()); | |
| 279 | + map.put("lastMenstrual", model.getBsZjyj()); | |
| 265 | 280 | lascList.add(map); |
| 266 | 281 | } |
| 267 | 282 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java
View file @
ea8ee93
| ... | ... | @@ -424,7 +424,11 @@ |
| 424 | 424 | cnames.put("contactPhone", "联系人电话"); |
| 425 | 425 | cnames.put("levelType", "文化程度"); |
| 426 | 426 | cnames.put("liveAddress", "家庭地址"); |
| 427 | - cnames.put("country", "乡镇"); | |
| 427 | + cnames.put("yc", "孕次"); | |
| 428 | + cnames.put("cc", "产次"); | |
| 429 | + cnames.put("juejing", "是否绝经"); | |
| 430 | + cnames.put("juejingAge", "绝经年龄"); | |
| 431 | + cnames.put("lastMenstrual", "末次月经"); | |
| 428 | 432 | ResponseUtil.responseExcel(cnames, datas, response); |
| 429 | 433 | } |
| 430 | 434 | |
| ... | ... | @@ -465,6 +469,16 @@ |
| 465 | 469 | model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));//住址 |
| 466 | 470 | map.put("country", CommonsHelper.getResidence(null, null, |
| 467 | 471 | null, model.getStreetId(), null, basicConfigService));//住址 |
| 472 | + map.put("yc", model.getYc()); | |
| 473 | + map.put("cc", model.getFmc()); | |
| 474 | + String juejing = ""; | |
| 475 | + if (StringUtils.isNotEmpty(model.getJuejing())){ | |
| 476 | + juejing = "1".equals(model.getJuejing()) ? "否" : "是"; | |
| 477 | + } | |
| 478 | + map.put("juejing", juejing); | |
| 479 | + map.put("juejingAge", model.getJuejingAge()); | |
| 480 | + map.put("lastMenstrual", DateUtil.getyyyy_MM_dd(model.getLastMenstrual())); | |
| 481 | + | |
| 468 | 482 | gjaList.add(map); |
| 469 | 483 | } |
| 470 | 484 | return gjaList; |