From 1e58611fe9852e1c751d2fa447c5c35f48e40f03 Mon Sep 17 00:00:00 2001
From: wzqgit <568275241@qq.com>
Date: Thu, 14 Jan 2021 15:12:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=9C=80=E6=B1=82=EF=BC=9A?=
 =?UTF-8?q?=20=E7=97=85=E6=A1=88=E5=AE=A4=E7=BB=88=E5=AE=A1=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E7=97=85=E5=8E=86=E6=B8=85=E5=8D=95=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9F=A5=E7=9C=8B=E6=89=AB=E6=8F=8Fpdf?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=EF=BC=8C=E5=8F=AF=E6=9F=A5=E7=9C=8B=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E6=9D=A5=E6=BA=90=E4=B8=BA=E5=98=89=E6=97=B6=E6=89=AB?=
 =?UTF-8?q?=E6=8F=8F=E7=B3=BB=E7=BB=9F=E7=9A=84=E5=88=86=E6=AE=B5=20?=
 =?UTF-8?q?=E2=80=94=E2=80=94=E2=80=94=E2=80=942021.01.14=20=E7=8E=8B?=
 =?UTF-8?q?=E6=B3=BD=E9=92=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/Archive_DetailMapper.xml    |  3 +++
 .../views/lastVerifyDir/lastVerifyList.jsp       | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml
index c96b8f8..c52765e 100644
--- a/src/main/resources/mapper/Archive_DetailMapper.xml
+++ b/src/main/resources/mapper/Archive_DetailMapper.xml
@@ -88,6 +88,9 @@
     <if test="assortId != null and assortId != ''">
       and t.AssortID=#{assortId,jdbcType=VARCHAR}
     </if>
+    <if test="source != null and source != ''">
+      and t.Source=#{source,jdbcType=VARCHAR}
+    </if>
     <if test="flag != null">
       and t.flag = #{flag,jdbcType=NVARCHAR}
     </if>
diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
index dc21c64..def94f0 100644
--- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
+++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
@@ -1,4 +1,4 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %>
+<%@ page contentType="text/html;charset=UTF-8" language="java" import="java.util.*" %>
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <c:set value="${pageContext.request.contextPath}" var="path" scope="page"/>
@@ -303,6 +303,9 @@
                             <div class="col-sm-5" hidden>
                                 病案号：<label id="idLab" class="labCss"></label><label id="assortId" hidden></label>
                             </div>
+                            <div class="col-sm-5" hidden>
+                                来源：<label id="idsource" class="labCss"></label><label id="source" hidden></label>
+                            </div>
                             <div class="col-sm-4">
                                 住院号：<label id="inLab" class="labCss"></label>
                             </div>
@@ -378,6 +381,7 @@
                                 <button type="button" class="btn btn-default btn-sm" id="uploadBtn">上传文件</button>
                                 <button type="button" class="btn btn-info btn-sm" id="pdfBtn">查看分段PDF</button>
                                 <button type="button" class="btn btn-success btn-sm" id="pdfBtn2">查看PDF</button>
+                                <button type="button" class="btn btn-info btn-sm" id="pdfBtn3">查看扫描PDF</button>
                                 <%--<button type="button" class="btn btn-primary btn-sm" id="addBtn">添加清单</button>--%>
                                 <button type="button" class="btn btn-warning btn-sm" id="updateStateBtn">选中作废</button>
                                 <button type="button" class="btn btn-primary btn-sm" id="updateStateBtn2">选中使用</button>
@@ -2307,6 +2311,7 @@
                 var limit = null;
                 var offset = params.offset;
                 var patientId = $("#idLab").html();
+                var source = $("#source").html();
                 var assortId = $("#assortId").html();
                 if (assortId == 0) assortId = null;
                 //判断是否导出全部all
@@ -2325,6 +2330,7 @@
                     order: params.order,      //排位命令（desc，asc）
                     patientId: patientId,
                     assortId: assortId,
+                    source: source,
                     flag:flag
                 };
                 return temp;
@@ -2573,6 +2579,14 @@
 
     initTable2();
 
+    //点击扫描全选分段列表，查询来源为嘉时扫描系统
+    $("#pdfBtn3").click(function () {
+        $("#assortId").html("");
+        $("#source").html("嘉时扫描系统");
+        $("#table2").bootstrapTable("refreshOptions", {pageNumber: 1});
+        $("#source").html("");
+    });
+
     $("#flag").click(function () {
         if ($("#flag").is(":checked") == true) {
             //选中触发事件