From e2ec13e786826d8daaf347e68b89e00d07eb03bb Mon Sep 17 00:00:00 2001
From: zengwh <zengwh>
Date: Mon, 16 May 2022 00:23:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E6=9F=A5?=
 =?UTF-8?q?=E6=88=BF=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/emr/controller/FontController.java   | 10 ++--------
 .../resources/mapper/Archive_MasterMapper.xml     |  6 +++++-
 src/main/webapp/static/js/record/recordPage.js    | 15 ++++++++++-----
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/emr/controller/FontController.java b/src/main/java/com/emr/controller/FontController.java
index 18c07f9..f0d30a8 100644
--- a/src/main/java/com/emr/controller/FontController.java
+++ b/src/main/java/com/emr/controller/FontController.java
@@ -750,14 +750,8 @@ public class FontController {
      */
     @RequestMapping(value = "getMaster")
     @ResponseBody
-    public OffsetLimitPage getMaster(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit, HttpServletRequest request) 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);
+    public OffsetLimitPage getMaster(Archive_Master_Vo archiveMasterVo, Integer offset, Integer limit) throws Exception {
+        return archiveMasterService.selectByCol(archiveMasterVo, offset, limit);
     }
 
     /**
diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml
index a052abb..6faf1dd 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}
diff --git a/src/main/webapp/static/js/record/recordPage.js b/src/main/webapp/static/js/record/recordPage.js
index e0627a9..deb5de0 100644
--- a/src/main/webapp/static/js/record/recordPage.js
+++ b/src/main/webapp/static/js/record/recordPage.js
@@ -62,11 +62,10 @@ function initTable() {
                     offset: offset,   //页码
                     inpNo: "" + $("#inpNo").val(),
                     visitId: "" + $("#visitId").val(),
-                    userName: "" + $("#name").val(),
-                    startDateTo: $("#startDateTo").val(),
-                    endDateTo: $("#endDateTo").val(),
-                    startDate: $("#startDate").val(),
-                    endDate: $("#endDate").val(),
+                    name: "" + $("#name").val(),
+                    deptAdmissionTo: getDeptNameForQuery(),
+                    startDateTo: $("#startDate").val(),
+                    endDateTo: $("#endDate").val(),
                     doctorInCharge: doctorInCharge,
                 };
                 return temp;
@@ -110,6 +109,12 @@ function initTable() {
                     field: 'doctorInCharge',
                     align: 'left'
                 },
+                {
+                    title: '当前科室',
+                    field: 'deptName',
+                    align: 'left',
+                    valign: 'middle',
+                },
                 {
                     title: '入院时间',
                     field: 'admissionDateTime',