From e00eee44525a14c76fff4403ff0f92136987b553 Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Thu, 4 Jul 2024 18:12:27 +0800
Subject: [PATCH] =?UTF-8?q?#fix:=E6=96=B0=E5=A2=9E=E5=B0=8F=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E8=8E=B7=E5=8F=96=E4=BA=A7=E5=A6=87=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/PuerperaManageController.java       | 10 ++++++++++
 .../com/lyms/platform/operate/web/facade/PatientFacade.java    | 10 ++++++++--
 .../lyms/platform/operate/web/request/PatientQueryRequest.java |  9 +++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
index 9f2780c..da4aafb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
@@ -585,6 +585,16 @@ public class PuerperaManageController extends BaseController {
     }
 
     /**
+     * 获取产妇基本信息
+     * 上面的有bug
+     */
+    @RequestMapping(value = "/wx/findp2", method = RequestMethod.GET)
+    @ResponseBody
+    public BaseResponse getWxPatent2(PatientQueryRequest request) {
+        return patientFacade.findPatient2(request, null);
+    }
+
+    /**
      * @author dongqin
      * @description 根据身份证号，获取孕妇基本信息，此接口是对第三方提供服务的
      * @date 10:09 2019/11/18
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 66d1662..4626ed7 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -3724,11 +3724,17 @@ public class PatientFacade extends BaseServiceImpl {
     }
 
     public BaseResponse findPatient2(PatientQueryRequest patientQueryRequest, Integer userId) {
-        String hospitalId= autoMatchFacade.getHospitalId(userId);
+        String hospitalId;
+        if (userId==null){
+            hospitalId=patientQueryRequest.getHospitalId();
+        }else {
+             hospitalId= autoMatchFacade.getHospitalId(userId);
+        }
+
         Integer type = patientQueryRequest.getType() != null ? patientQueryRequest.getType() : -1;
 
         Patients patients = antenatalExaminationFacade.findOnePatient(patientQueryRequest.getCardNo(),
-                patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), groupsFacade.findGroupHospital(userId, false), type, false, patientQueryRequest.getPid(), false);
+                patientQueryRequest.getVcCardNo(), patientQueryRequest.getId(), userId!=null?groupsFacade.findGroupHospital(userId, false):null, type, false, patientQueryRequest.getPid(), false);
         PatientBaseResult patientBaseResult = new PatientBaseResult();
         if (null != patients) {
             if (type==3){
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java
index a4bfae6..105bb29 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java
@@ -10,6 +10,15 @@ public class PatientQueryRequest {
     private String pid;
     private String vcCardNo;
     private Integer type;
+    private String hospitalId;
+
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
 
     public Integer getType() {
         return type;
-- 
1.8.3.1