From 5f42a8f9a628a82d9359bf04832067bd1d996b27 Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Mon, 19 Aug 2024 11:07:10 +0800
Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=BB=BA=E6=A1=A3?=
 =?UTF-8?q?=E4=BA=A7=E6=A3=80=E5=8C=BB=E7=94=9F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/biz/service/PatientsService.java |  2 +-
 .../lyms/hospitalapi/dtdyrm/DtdyrmFmService.java   |  2 ++
 .../operate/web/result/AntexListResult.java        | 26 ++++++++++++++++++++++
 .../platform/operate/web/utils/HiskCountTask.java  |  4 ++--
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
index 0ad91b3..dbc9e39 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
@@ -132,7 +132,7 @@ public class PatientsService {
             patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query));
             query.start(patientsQuery.getOffset()).end(patientsQuery.getLimit());
         }
-        //System.out.println(query.convertToMongoQuery());
+        System.out.println(query.convertToMongoQuery());
         return iPatientDao.queryPatient(query.addOrder(Sort.Direction.fromString(sort), field));
     }
 
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 c59013f..058555a 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
@@ -274,6 +274,8 @@ public class DtdyrmFmService implements IdtdyrmFmService {
                                         ||"剖宫产".equals(allFm.getDelivery_MODE().trim()))
                                         ) {
                                     fmfs = FmTypeEnums.O1.getId();
+                                }else if ("顺产".equals(allFm.getDelivery_MODE().trim())){
+                                    fmfs = FmTypeEnums.O.getId();
                                 }
                             }else {
                                 fmfs = FmTypeEnums.O.getId();
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
index 6ddc51c..67756aa 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
@@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.result;
 
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.StringUtils;
+import com.lyms.platform.operate.web.utils.CollectionUtils;
 import com.lyms.platform.pojo.AntExChuModel;
 import com.lyms.platform.pojo.AntenatalExaminationModel;
 import com.lyms.platform.pojo.Patients;
@@ -113,6 +114,25 @@ public class AntexListResult {
     private String HIVJ;//人类免疫缺陷病毒抗体
     private String tp;//梅毒螺旋体抗体
 
+    private String prodDoctor;//初检医生
+    private String checkDoctor;//复检医生
+
+    public String getProdDoctor() {
+        return prodDoctor;
+    }
+
+    public void setProdDoctor(String prodDoctor) {
+        this.prodDoctor = prodDoctor;
+    }
+
+    public String getCheckDoctor() {
+        return checkDoctor;
+    }
+
+    public void setCheckDoctor(String checkDoctor) {
+        this.checkDoctor = checkDoctor;
+    }
+
     public String getPnationStr() {
         return pnationStr;
     }
@@ -543,6 +563,12 @@ public class AntexListResult {
             setHBsAgJ(patients.getHBsAgJ());
             setHIVJ(patients.getHIVJ());
             setTp(patients.getTp());
+            if (CollectionUtils.isNotEmpty(destModel)&&CollectionUtils.isNotEmpty(antExChuModel)){
+                setCheckDoctor(patients.getLastCheckEmployeeId());
+            }
+            if (CollectionUtils.isEmpty(antExChuModel)){
+                setProdDoctor(patients.getLastCheckEmployeeId());
+            }
         }
         return this;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java
index a021f4b..136bf68 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java
@@ -79,8 +79,8 @@ public class HiskCountTask implements Callable {
                             query.setBuildTypeList(patientsQuery.getBuildTypeList());
                             query.setHospitalId(patientsQuery.getHospitalId());
                             query.setDueStatus(patientsQuery.getDueStatus());
-                            //高危等级
-                            query.setrLevel(patientsQuery.getrLevel());
+                          /*  //高危等级
+                            query.setrLevel(patientsQuery.getrLevel());*/
                             //产检医生
                             query.setLastCheckEmployeeId(patientsQuery.getLastCheckEmployeeId());
                             query.setDueDateStart(patientsQuery.getDueDateStart());
-- 
1.8.3.1