Commit 061e478edf1ac4cd788bffb1b9f6f2107827ff6b
1 parent
7c39cb1a38
Exists in
master
and in
6 other branches
追访查询条件修改
Showing 1 changed file with 18 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
View file @
061e478
| ... | ... | @@ -354,16 +354,16 @@ |
| 354 | 354 | isPatient = true; |
| 355 | 355 | } |
| 356 | 356 | |
| 357 | - if (downQueryRequest.getStartNextCheckTime() != null) {//下次产检开始日期 | |
| 358 | - patientsQuery.setNextCheckTimeStart(downQueryRequest.getStartNextCheckTime()); | |
| 359 | - isPatient = true; | |
| 360 | - } | |
| 357 | +// if (downQueryRequest.getStartNextCheckTime() != null) {//下次产检开始日期 | |
| 358 | +// patientsQuery.setNextCheckTimeStart(downQueryRequest.getStartNextCheckTime()); | |
| 359 | +// isPatient = true; | |
| 360 | +// } | |
| 361 | +// | |
| 362 | +// if (downQueryRequest.getEndNextCheckTime() != null) {//下次产检结束日期 | |
| 363 | +// patientsQuery.setNextCheckTimeEnd(downQueryRequest.getEndNextCheckTime()); | |
| 364 | +// isPatient = true; | |
| 365 | +// } | |
| 361 | 366 | |
| 362 | - if (downQueryRequest.getEndNextCheckTime() != null) {//下次产检结束日期 | |
| 363 | - patientsQuery.setNextCheckTimeEnd(downQueryRequest.getEndNextCheckTime()); | |
| 364 | - isPatient = true; | |
| 365 | - } | |
| 366 | - | |
| 367 | 367 | /**2019-07 需求搜索条件添加*/ |
| 368 | 368 | if (StringUtils.isNotEmpty(downQueryRequest.getFmType())) {//分泌方式 |
| 369 | 369 | patientsQuery.setFmMode(downQueryRequest.getFmType()); |
| ... | ... | @@ -651,6 +651,15 @@ |
| 651 | 651 | } |
| 652 | 652 | |
| 653 | 653 | downRecordQuery.setHospitalId(hospitalId); |
| 654 | + | |
| 655 | + | |
| 656 | + if (downQueryRequest.getStartNextCheckTime() != null) {//下次产检开始日期 | |
| 657 | + downRecordQuery.setNextCheckTimeStart(downQueryRequest.getStartNextCheckTime()); | |
| 658 | + } | |
| 659 | + | |
| 660 | + if (downQueryRequest.getEndNextCheckTime() != null) {//下次产检结束日期 | |
| 661 | + downRecordQuery.setNextCheckTimeEnd(downQueryRequest.getEndNextCheckTime()); | |
| 662 | + } | |
| 654 | 663 | |
| 655 | 664 | return downRecordQuery; |
| 656 | 665 | } |