From 9e063089dc29277e02b66609b126f10aaf600331 Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Fri, 20 Sep 2024 11:00:01 +0800
Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=88=86=E5=A8=A9?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AF=BC=E5=87=BA=E5=B1=95=E7=A4=BA=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/hospitalapi/dtdyrm/DtdyrmFmService.java   | 2 +-
 .../lyms/platform/operate/web/controller/PatientDtController.java    | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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<AppointmentModel> 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);
                        }
-- 
1.8.3.1