From 419b22f30d272ced7d797016e3f3b0acf108a22b Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 14 Sep 2022 14:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=86=E5=8C=96=E5=A9=9A=E6=A3=80=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E5=92=8C=E8=82=8C=E8=90=8E=E7=BC=A9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/operate/web/facade/SmnFacade.java  | 11 ++++++++---
 .../lyms/platform/operate/web/request/SmnQueryRequest.java    | 11 ++++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
index 7fa0149..faf15ff 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
@@ -120,11 +120,12 @@ public class SmnFacade {
                             .orOperator(Criteria.where("username").is(param.getQueryNo()))));
         }
 
+
         if(param.getQueryType() == 1)
         {
             query.addCriteria(Criteria.where("hospitalId").is(hospitalId));
         }
-        else if (param.getQueryType() == 1)
+        else if (param.getQueryType() == 2)
         {
             query.addCriteria(Criteria.where("sendHospitalId").is(hospitalId));
             if (StringUtils.isNotEmpty(param.getHospitalId()))
@@ -135,8 +136,12 @@ public class SmnFacade {
         String pid = param.getPid();
         if (StringUtils.isNotEmpty(pid)) {
             query.addCriteria(Criteria.where("pid").is(pid));
-        }   String patientId = param.getPatientId();
-
+        }
+        String id = param.getId();
+        if (StringUtils.isNotEmpty(id)) {
+            query.addCriteria(Criteria.where("id").is(id));
+        }
+        String patientId = param.getPatientId();
         if (StringUtils.isNotEmpty(patientId)) {
             query.addCriteria(Criteria.where("patientId").is(patientId));
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java
index c6c1279..ce81672 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SmnQueryRequest.java
@@ -4,7 +4,8 @@ import com.lyms.platform.common.dao.BaseQuery;
 
 
 public class SmnQueryRequest extends BaseQuery {
-    private Integer queryType; //1 本机构查询 2 妇幼查询 3 检验机构查询
+    private String id;
+    private Integer queryType = 3; //1 本机构查询 2 妇幼查询 3 检验机构查询
     private String patientId;
     private String pid;
     private String queryNo;//查询号  身份证号码，手机号码，姓名
@@ -23,6 +24,14 @@ public class SmnQueryRequest extends BaseQuery {
 
     private String checkDate;//检查日期
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
     public String getPatientId() {
         return patientId;
     }
-- 
1.8.3.1