Commit 39bdc2fe2c5b06363344e5e1bb9459966e715d45
1 parent
0bccfdf558
Exists in
master
and in
6 other branches
修改产后复查bug
Showing 1 changed file with 3 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java
View file @
39bdc2f
| ... | ... | @@ -314,15 +314,14 @@ |
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | /**2019-07 需求搜索条件添加*/ |
| 317 | - if (downQueryRequest.getFmType() != null) {//分泌方式 | |
| 317 | + if (StringUtils.isNotEmpty(downQueryRequest.getFmType())) {//分泌方式 | |
| 318 | 318 | patientsQuery.setFmMode(downQueryRequest.getFmType()); |
| 319 | 319 | isPatient = true; |
| 320 | 320 | } |
| 321 | - | |
| 322 | 321 | if (null != downQueryRequest.getPostpartumDays()) {//产后天数 |
| 323 | 322 | Calendar instance = Calendar.getInstance(); |
| 324 | 323 | instance.setTime(new Date()); |
| 325 | - instance.add(Calendar.DATE, -downQueryRequest.getBeOverdueDays()); | |
| 324 | + instance.add(Calendar.DATE, -downQueryRequest.getPostpartumDays()); | |
| 326 | 325 | instance.set(Calendar.HOUR_OF_DAY, 23); |
| 327 | 326 | instance.set(Calendar.MINUTE, 59); |
| 328 | 327 | instance.set(Calendar.SECOND, 59); |
| ... | ... | @@ -331,7 +330,7 @@ |
| 331 | 330 | patientsQuery.setFmDateEnd(end); |
| 332 | 331 | |
| 333 | 332 | instance.setTime(new Date()); |
| 334 | - instance.add(Calendar.DATE, -downQueryRequest.getBeOverdueDays()); | |
| 333 | + instance.add(Calendar.DATE, -downQueryRequest.getPostpartumDays()); | |
| 335 | 334 | instance.set(Calendar.HOUR_OF_DAY, 00); |
| 336 | 335 | instance.set(Calendar.MINUTE, 00); |
| 337 | 336 | instance.set(Calendar.SECOND, 00); |