From 5e7a073b38cfef640fd581e70d396e6cf35dc685 Mon Sep 17 00:00:00 2001
From: hujl <hujl@126.com>
Date: Mon, 10 Jan 2022 15:44:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AC=E5=9B=9E=E6=97=A5=E5=BF=97=EF=BC=9A?=
 =?UTF-8?q?=E4=B8=8D=E5=8F=AF=E6=9F=A5=E5=87=BA=E5=B7=B2=E5=B0=81=E5=AD=98?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=94=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/mapper/Emr_LogMapper.xml   | 18 +++++--
 .../medicalRecallDateDir/recallDateList.jsp   | 52 +++++++++++++------
 2 files changed, 50 insertions(+), 20 deletions(-)

diff --git a/src/main/resources/mapper/Emr_LogMapper.xml b/src/main/resources/mapper/Emr_LogMapper.xml
index d848e9e9..c9a2f326 100644
--- a/src/main/resources/mapper/Emr_LogMapper.xml
+++ b/src/main/resources/mapper/Emr_LogMapper.xml
@@ -181,12 +181,20 @@
         <if test="name != null and name != ''">
           and m.name like '%'+#{name,jdbcType=NCHAR}+'%'
         </if>
-        <if test="archivestate != null and archivestate != ''">
-          and m.ArchiveState=#{archivestate,jdbcType=NCHAR}
-        </if>
-        <if test="state != null and state != ''">
-          and f.state=#{state,jdbcType=NCHAR}
+        <if test="archivestate!= null and archivestate!= ''">
+          and m.ArchiveState in
+          <foreach item="item" collection="archivestate.split(',')" open="(" separator="," close=")">
+            #{item}
+          </foreach>
         </if>
+        <choose>
+          <when test="state=='已召回'">
+            and f.state=#{state,jdbcType=NCHAR}
+          </when>
+          <when test="state=='未召回'">
+            AND (f.state='未召回' or f.state is null)
+          </when>
+        </choose>
         <if test="idNo != null and idNo != ''">
           and m.ID_NO like '%'+#{idNo,jdbcType=NCHAR}+'%'
         </if>
diff --git a/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp b/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp
index 6ea949a5..c8050767 100644
--- a/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp
+++ b/src/main/webapp/WEB-INF/views/medicalRecallDateDir/recallDateList.jsp
@@ -82,10 +82,23 @@
                 <input type="text" class="input-sm form-control" id="idNo" placeholder="请输入身份证号">
             </div>
             <div class="form-group divCss8">
-                <label for="archivestate">归档状态 :</label>
-                <select class="input-sm form-control" id="archivestate">
+                <label >归档状态 :</label>
+                <%--<select class="input-sm form-control" id="archivestate">
                     <option value="">全部</option>
                     <option value="在院">在院</option>
+                    &lt;%&ndash;<option value="未归档">未归档</option>&ndash;%&gt;
+                    <option value="归档中">归档中</option>
+                    <option value="初审">初审</option>
+                    <option value="已认证">已认证</option>
+                    <option value="已归档">已归档</option>
+                    <option value=" 复审退回">复审退回</option>
+                    <option value="提交">提交</option>
+                    <option value=" 主任退回">主任退回</option>
+                </select>--%>
+                <select class="selectpicker bla bla bli" multiple data-live-search="true"   data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选"
+                        data-none-results-text="没找到相应记录{0}" name="archivestate" id="archivestate" title="请输入归档状态">
+                    <%-- <option value="">全部</option>--%>
+                    <option value="在院">在院</option>
                     <%--<option value="未归档">未归档</option>--%>
                     <option value="归档中">归档中</option>
                     <option value="初审">初审</option>
@@ -96,15 +109,6 @@
                     <option value=" 主任退回">主任退回</option>
                 </select>
             </div>
-
-            <div class="form-group divCss8">
-                <label>召回日期:</label>
-                <div class="input-daterange input-group" id="datepicker">
-                    <input type="text" class="input-sm form-control" name="start" id="startDate"/>
-                    <span class="input-group-addon">-</span>
-                    <input type="text" class="input-sm form-control" name="end" id="endDate"/>
-                </div>
-            </div>
             <div class="form-group divCss8">
                 <label>召回人:</label>
                 <select class="selectpicker bla bla bli" multiple data-live-search="true" name="creater" id="creater" title="请输入召回人"
@@ -115,14 +119,24 @@
                 </select>
                 <%--<input type="text" class="input-sm form-control" id="creater" placeholder="请输入召回人">--%>
             </div>
-            <div class="form-group divCss">
+            <div class="form-group divCss8">
                 <label for="state">召回状态 :</label>
-                <select class="input-sm form-control" id="state">
-                    <option value="">全部</option>
+                <select class="selectpicker bla bla bli" multiple data-live-search="true"   data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选"
+                        data-none-results-text="没找到相应记录{0}" name="state" id="state" title="请输入召回状态">
+                    <%-- <option value="">全部</option>--%>
                     <option value="已召回">已召回</option>
                     <option value="未召回">未召回</option>
                 </select>
             </div>
+            <div class="form-group divCss">
+                <label>召回日期:</label>
+                <div class="input-daterange input-group" id="datepicker">
+                    <input type="text" class="input-sm form-control" name="start" id="startDate"/>
+                    <span class="input-group-addon">-</span>
+                    <input type="text" class="input-sm form-control" name="end" id="endDate"/>
+                </div>
+            </div>
+
 
             <button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn" >查询</button>
             <button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
@@ -278,6 +292,14 @@
                         this.pageSize = currPageSize;
                     }
 
+                    var archivestate="";
+                    if($("#archivestate").val()!=null && $("#archivestate").val()!=""){
+                        archivestate="" + $("#archivestate").val();
+                    }
+                    /*else{
+                        archivestate="已归档,已认证,初审";
+                    }*/
+
                     var temp = {
                         limit: limit,     //页面大小
                         offset: offset,   //页码
@@ -287,7 +309,7 @@
                         visitId: "" + $("#visitId").val(),
                         name: "" + $("#name").val(),
                         creater:"" + $("#creater").val(),
-                        archivestate: "" + $("#archivestate").val(),
+                        archivestate: archivestate,
                         state: "" + $("#state").val(),
                         startDate: $("#startDate").val(),
                         endDate: $("#endDate").val()