From 81c7887e81d16f6c8b45720604e25d7ce9bcc339 Mon Sep 17 00:00:00 2001
From: mengfanqiang <402653474@qq.com>
Date: Wed, 7 Jun 2023 09:59:41 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=B0=E7=94=9F=E5=84=BF=E8=AE=BF?=
 =?UTF-8?q?=E8=A7=86-=E8=AE=BF=E8=A7=86=E7=AE=A1=E7=90=86-=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E2=80=9C=E5=A8=A9=E5=8C=BB=E9=99=A2=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/controller/NewbornVisitControoler.java | 4 ++--
 .../com/lyms/platform/operate/web/service/INewbornVisitService.java  | 2 +-
 .../lyms/platform/operate/web/service/impl/NewbornServiceImpl.java   | 5 ++++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java
index 3601b9a..f853d08 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/NewbornVisitControoler.java
@@ -43,8 +43,8 @@ public class NewbornVisitControoler extends BaseController {
     @RequestMapping(method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
-    public BaseObjectResponse list(HttpServletRequest request, Date startDate, Date endDate, String doctor, String key, Integer page, Integer limit) {
-        return visitService.list(startDate, endDate, doctor, getUserId(request), key, page, limit);
+    public BaseObjectResponse list(HttpServletRequest request, Date startDate, Date endDate, String doctor, String key, Integer page, Integer limit,String dueOrg) {
+        return visitService.list(startDate, endDate, doctor, getUserId(request), key, page, limit,dueOrg);
     }
 
     /**
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java
index e20c37d..9fd01a0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/INewbornVisitService.java
@@ -13,7 +13,7 @@ public interface INewbornVisitService extends IBaseService {
 
     BaseObjectResponse addOrUpdate(Integer userId, NewbornVisit newbornVisit);
 
-    BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit);
+    BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit,String dueOrg);
 
     void export(Date startDate, Date endDate, String doctor, Integer userId, HttpServletResponse response, String key);
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
index 44183e5..450aaf3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
@@ -181,12 +181,15 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit
     }
 
     @Override
-    public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit) {
+    public BaseObjectResponse list(Date startDate, Date endDate, String doctor, Integer userId, String key, Integer page, Integer limit,String dueOrg) {
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         Criteria criteria = Criteria.where("hospitalId").is(hospitalId).and("yn").ne("0");
         if(startDate != null && endDate != null) {
            criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1));
         }
+        if(StringUtils.isNotBlank(dueOrg)) {
+            criteria.and("dueOrg").is(dueOrg);
+        }
         if(StringUtils.isNotBlank(doctor)) {
             criteria.and("doctor").is(doctor);
         }
-- 
1.8.3.1