diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java index 87cfd6c..8bbfc47 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java @@ -242,7 +242,7 @@ public class DtdyrmFmService implements IdtdyrmFmService { result.put("分娩方式", dtFm.getDelivery_MODE()); result.put("分娩时间", dtFm.getBaby_DELIVERY_TIME()); result.put("分娩医生",dtFm.getDeliver_DOCTOR()); - result.put("是否建档",dtFm.getIsBuild()==1?"已建档":"为建档"); + result.put("是否建档",dtFm.getIsBuild()==1?"已建档":"未建档"); results.add(result); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java index 878f329..5045e2a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientDtController.java @@ -526,6 +526,9 @@ public class PatientDtController { Date date=new Date(); if (CollectionUtils.isNotEmpty(modelList)){ boolean b=true; + if (expire!=null || isBuild!=null){ + b=false; + } List checkList=new ArrayList<>(); PatientsQuery patientsQuery =new PatientsQuery(); @@ -592,7 +595,6 @@ public class PatientDtController { } } if (isBuild!=null){ - b=false; if (expire!=null){ if (appointmentModel.getIsBuild()==isBuild&&appointmentModel.getExpire()==expire){ checkList.add(appointmentModel); @@ -604,7 +606,6 @@ public class PatientDtController { } }else { if (expire!=null){ - b=false; if (appointmentModel.getExpire()==expire){ checkList.add(appointmentModel); }