Commit 185926f1a43f85df4b014dc484d2e705bff33aa9
1 parent
2a50cc496d
Exists in
master
and in
6 other branches
区域妇幼-孕产妇管理-全部孕妇-原筛选后导出bug修复
Showing 1 changed file with 11 additions and 8 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
View file @
185926f
| ... | ... | @@ -363,8 +363,16 @@ |
| 363 | 363 | |
| 364 | 364 | |
| 365 | 365 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
| 366 | - patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId()); | |
| 367 | - patientsQueryRequest.sethId(null); | |
| 366 | + //产妇列表 | |
| 367 | + if(null != patientsQueryRequest.getQueryType()&& 2==patientsQueryRequest.getQueryType()){ | |
| 368 | + patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId()); | |
| 369 | + patientsQueryRequest.sethId(null); | |
| 370 | + patientsQueryRequest.setFmStartAge(patientsQueryRequest.getStartAge()); | |
| 371 | + patientsQueryRequest.setFmEndAge(patientsQueryRequest.getEndAge()); | |
| 372 | + patientsQueryRequest.setStartAge(null); | |
| 373 | + patientsQueryRequest.setEndAge(null); | |
| 374 | + } | |
| 375 | + | |
| 368 | 376 | patientsQueryRequest.setPage(1); |
| 369 | 377 | patientsQueryRequest.setLimit(99999); |
| 370 | 378 | |
| 371 | 379 | |
| ... | ... | @@ -373,13 +381,8 @@ |
| 373 | 381 | // patientsQueryRequest.setStartDueWeek(null); |
| 374 | 382 | // patientsQueryRequest.setEndDueWeek(null); |
| 375 | 383 | |
| 376 | - patientsQueryRequest.setFmTime(patientsQueryRequest.getFmTime()); | |
| 377 | - patientsQueryRequest.setBuildTime(patientsQueryRequest.getBuildTime()); | |
| 378 | 384 | |
| 379 | - patientsQueryRequest.setFmStartAge(patientsQueryRequest.getStartAge()); | |
| 380 | - patientsQueryRequest.setFmEndAge(patientsQueryRequest.getEndAge()); | |
| 381 | - patientsQueryRequest.setStartAge(null); | |
| 382 | - patientsQueryRequest.setEndAge(null); | |
| 385 | + | |
| 383 | 386 | |
| 384 | 387 | |
| 385 | 388 | patientFacade.exportAreaData(patientsQueryRequest, loginState.getId(), response); |