From 78f7853bc6950686ce8c1b5ba1d3f6447fbbd2a5 Mon Sep 17 00:00:00 2001
From: zengwh <zengwh>
Date: Mon, 16 May 2022 00:47:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=9B=86=E5=90=88=E5=AF=B9=E5=A4=96=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=94=B9=E5=85=A8=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/emr/controller/FontController.java        | 4 ++--
 .../com/emr/service/ipml/Archive_MasterServiceImpl.java     | 4 ++--
 src/main/resources/mapper/Archive_MasterMapper.xml          | 6 +++++-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java
index 6c56c9d..818970d 100644
--- a/src/main/java/com/emr/controller/FontController.java
+++ b/src/main/java/com/emr/controller/FontController.java
@@ -750,14 +750,14 @@ public class FontController {
      */
     @RequestMapping(value = "getMaster")
     @ResponseBody
-    public OffsetLimitPage getMaster(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit, HttpServletRequest request) throws Exception {
+    public OffsetLimitPage getMaster(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) throws Exception {
         //如果前端主管医生字段有选全部选项，则查全部数据
         String[] doctorInCharge = archiveMasterVo.getDoctorInCharge().split(",");
         int i = doctorInCharge.length;
         if (doctorInCharge.length > 1 && StringUtils.isBlank(doctorInCharge[0]) && StringUtils.isNotBlank(doctorInCharge[1])) {
             archiveMasterVo.setDoctorInCharge("");
         }
-        return archiveMasterService.selectMasterByColumn(archiveMasterVo, offset, limit, request);
+        return archiveMasterService.selectByCol(archiveMasterVo, offset, limit);
     }
 
     /**
diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
index 9ac8811..0a86b45 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -95,13 +95,13 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         //设置查询条件审核角色
         //setInfoId(archiveMasterVo);
         //设置登录用户
-        Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER");
+        /*Power_User user = (Power_User)request.getSession().getAttribute("CURRENT_USER");
         //查该登录工号绑定的科室下面的患者，且只能查在院患者
         String requestUrl =POWER_URLHEAD + "/ssoLogin/getUser?userName="+user.getUserName();
         JSONObject obj = HttpClientUtils.httpGet(requestUrl);
         if(obj!=null) {
             archiveMasterVo.setDeptName(obj.getString("deptCode"));
-        }
+        }*/
         //查询
         List<Archive_Master_Vo> list = selectByColumn(offset, limit,archiveMasterVo,request);
         return new OffsetLimitPage((Page) list);
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index 6e6e902..524a0d1 100644
--- a/src/main/resources/mapper/Archive_MasterMapper.xml
+++ b/src/main/resources/mapper/Archive_MasterMapper.xml
@@ -167,7 +167,11 @@
             and m.LockInfo = #{lockinfo,jdbcType=NVARCHAR}
         </if>
         <if test="doctorInCharge != null and doctorInCharge != ''">
-            and m.DOCTOR_IN_CHARGE in (${doctorInCharge})
+            and m.DOCTOR_IN_CHARGE in (
+            <foreach collection="doctorInCharge.split(',')" item="item" separator=",">
+                #{item}
+            </foreach>
+            )
         </if>
         <if test="dischargeDisposition != null">
             and m.DISCHARGE_DISPOSITION = #{dischargeDisposition,jdbcType=NVARCHAR}