From 9071f1749777917484aceaac12998f7ec5342be5 Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Thu, 30 May 2024 17:16:28 +0800
Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=A4=A7=E5=90=8C?=
 =?UTF-8?q?=E9=AB=98=E5=8D=B1=E6=89=8B=E5=86=8C=E4=BF=AE=E6=94=B9=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AntExRecordFacade.java      |  4 +--
 .../operate/web/result/AntexChuResult.java         | 34 ++++++++++++++++++++++
 .../operate/web/result/MaternalDeliverResult.java  |  2 +-
 3 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
index 2a22f1c..faacdd2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
@@ -414,6 +414,7 @@ public class AntExRecordFacade {
 
             patientsQuery.setQueryNo(antExManagerQueryRequest.getQueryNo());
             patientsQuery.setHighRiskFileCode(antExManagerQueryRequest.getHighRiskFileCode());
+            System.out.println(patientsQuery.convertToQuery().convertToMongoQuery().toString());
             patientses = patientsService.queryPatient1(patientsQuery, "modpatientsQueryified");
 
             if (CollectionUtils.isEmpty(patientses)) {
@@ -443,10 +444,9 @@ public class AntExRecordFacade {
                 parentIds.add(pa.getId());
             }
             antExRecordQuery.setParentIds(parentIds);
-        } else if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())) {
+        } else if (StringUtils.isNotEmpty(antExManagerQueryRequest.getQueryNo())  || StringUtils.isNotEmpty(antExManagerQueryRequest.getHighRiskFileCode())) {
             return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(antExRecordQuery.getPageInfo());
         }
-
         String hospital = autoMatchFacade.getHospitalId(userId);
         List<AntExRecordModel> antExRecordModelList = recordService.queryAntExRecords(antExRecordQuery, Sort.Direction.DESC, "created");
         List<AntExManagerResult> data = getAntExRecords(antExRecordModelList, hospital, isRegion, antExManagerQueryRequest.getShowDetail());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
index 9f82047..0fdfaaa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java
@@ -370,6 +370,36 @@ public class AntexChuResult {
     //存活胎儿数
     private Integer survFetus;
 
+
+   //大同高危手册
+    private String other;//高危手册初诊其他
+    private String symptoms;//高危手册症状与体征
+    private String otherCheck;//高危手册其他检查项
+
+    public String getOther() {
+        return other;
+    }
+
+    public void setOther(String other) {
+        this.other = other;
+    }
+
+    public String getSymptoms() {
+        return symptoms;
+    }
+
+    public void setSymptoms(String symptoms) {
+        this.symptoms = symptoms;
+    }
+
+    public String getOtherCheck() {
+        return otherCheck;
+    }
+
+    public void setOtherCheck(String otherCheck) {
+        this.otherCheck = otherCheck;
+    }
+
     public String getZyzlState() {
         return zyzlState;
     }
@@ -2532,6 +2562,10 @@ public class AntexChuResult {
            setFollowupDoctorName(antExChuModel.getFollowupDoctorName());
            setFollowupDate(antExChuModel.getFollowupDate());
            setName(antExChuModel.getName());
+
+           setOther(antExChuModel.getOther());
+           setOtherCheck(antExChuModel.getOtherCheck());
+           setSymptoms(antExChuModel.getSymptoms());
         }
         return this;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
index 91fcdae..b1086cd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java
@@ -791,7 +791,7 @@ public class MaternalDeliverResult {
         setCfyc(destModel.getCfyc());
 
         setBabySize(destModel.getBabySize());
-        setPerinealCondition(destModel.getPerinealCondition());
+        setPelvicCondition(destModel.getPelvicCondition());
         setCurrentCondition(destModel.getCurrentCondition());
         setDtDiagnosis(destModel.getDtDiagnosis());
         setAdvice(destModel.getAdvice());
-- 
1.8.3.1