From 9269409970334d09d0a9163bc8b33abcb31f43ca Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 15 Mar 2022 14:56:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=80=E7=B3=96=E5=88=97=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=9D=83=E9=99=90=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/BloodSugarController.java      |  4 ++--
 .../platform/operate/web/service/IBloodSugarService.java  |  2 +-
 .../operate/web/service/impl/BloodSugarServiceImpl.java   | 15 ++++++++++++---
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java
index 8f254ef..0cd8b9f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java
@@ -87,8 +87,8 @@ public class BloodSugarController extends BaseController {
     @ResponseBody
     @RequestMapping(method = RequestMethod.GET)
     @TokenRequired
-    public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
-        return bloodSugarService.list(key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request));
+    public BaseResponse list(String isAll,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
+        return bloodSugarService.list(isAll,key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request));
     }
 
     @ResponseBody
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java
index 32ca05f..cc77115 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java
@@ -12,7 +12,7 @@ public interface IBloodSugarService extends IBaseService  {
 
     BaseResponse add(Integer userId, BloodSugar bloodSugar);
 
-    BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId);
+    BaseResponse list(String isAll,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId);
 
     BaseResponse info(String parentId, Integer type, Date time);
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
index d5689d2..d0e4e74 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java
@@ -129,15 +129,24 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga
     }
 
     @Override
-    public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) {
+    public BaseResponse list(String isAll,String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, Integer userId) {
         boolean flag = false;
         if (StringUtils.isNotEmpty(key) || StringUtils.isNotEmpty(vcCardNo) || weekEnd != null || weekStart != null || age != null) {
             flag = true;
         }
-//        List<String> hospitalIds = accessPermissionFacade.getCurrentUserHospPermissions(userId);
         List<String> hospitalIds = groupsFacade.findGroupHospital(userId, false);
+        List<String> hids = new ArrayList<>();
+        if (!StringUtils.isNotEmpty(isAll) || "1".equals(isAll))
+        {
+            String hospitalId = autoMatchFacade.getHospitalId(userId);
+            hids.add(hospitalId);
+        }
+        else
+        {
+            hids.addAll(hospitalIds);
+        }
         Criteria criteria = Criteria.where("yn").is(1);
-        criteria.and("hospitalId").in(hospitalIds);
+        criteria.and("hospitalId").in(hids);
         if (flag) {
             List<String> pids = mongoUtil.getPidsByCondition2(hospitalIds, key, vcCardNo, weekStart, weekEnd, age);
             criteria.and("pid").in(pids);
-- 
1.8.3.1