Commit 9e063089dc29277e02b66609b126f10aaf600331
1 parent
acc6e2f5e1
Exists in
dev
#fix:优化分娩统计导出展示逻辑
Showing 2 changed files with 4 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java
View file @
9e06308
| ... | ... | @@ -242,7 +242,7 @@ |
| 242 | 242 | result.put("分娩方式", dtFm.getDelivery_MODE()); |
| 243 | 243 | result.put("分娩时间", dtFm.getBaby_DELIVERY_TIME()); |
| 244 | 244 | result.put("分娩医生",dtFm.getDeliver_DOCTOR()); |
| 245 | - result.put("是否建档",dtFm.getIsBuild()==1?"已建档":"为建档"); | |
| 245 | + result.put("是否建档",dtFm.getIsBuild()==1?"已建档":"未建档"); | |
| 246 | 246 | results.add(result); |
| 247 | 247 | } |
| 248 | 248 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java
View file @
9e06308
| ... | ... | @@ -526,6 +526,9 @@ |
| 526 | 526 | Date date=new Date(); |
| 527 | 527 | if (CollectionUtils.isNotEmpty(modelList)){ |
| 528 | 528 | boolean b=true; |
| 529 | + if (expire!=null || isBuild!=null){ | |
| 530 | + b=false; | |
| 531 | + } | |
| 529 | 532 | List<AppointmentModel> checkList=new ArrayList<>(); |
| 530 | 533 | |
| 531 | 534 | PatientsQuery patientsQuery =new PatientsQuery(); |
| ... | ... | @@ -592,7 +595,6 @@ |
| 592 | 595 | } |
| 593 | 596 | } |
| 594 | 597 | if (isBuild!=null){ |
| 595 | - b=false; | |
| 596 | 598 | if (expire!=null){ |
| 597 | 599 | if (appointmentModel.getIsBuild()==isBuild&&appointmentModel.getExpire()==expire){ |
| 598 | 600 | checkList.add(appointmentModel); |
| ... | ... | @@ -604,7 +606,6 @@ |
| 604 | 606 | } |
| 605 | 607 | }else { |
| 606 | 608 | if (expire!=null){ |
| 607 | - b=false; | |
| 608 | 609 | if (appointmentModel.getExpire()==expire){ |
| 609 | 610 | checkList.add(appointmentModel); |
| 610 | 611 | } |