From c862c23fe042ab3e1ce5432659f1fa6793bafc6d Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Thu, 31 Dec 2020 17:17:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=92=8C=E6=89=AB=E6=8F=8F?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E9=A1=B5=E9=9D=A2=E5=90=84=E5=8A=A0=E4=BD=8F?= =?UTF-8?q?=E9=99=A2=E5=8F=B7=E5=92=8C=E6=82=A3=E8=80=85=E5=A7=93=E5=90=8D?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/emr/vo/TUuPrintSearch.java | 4 ++++ src/main/resources/mapper/TUuInfoMapper.xml | 6 ++++++ src/main/resources/mapper/TUuPrintMapper.xml | 6 ++++++ src/main/webapp/WEB-INF/views/index.jsp | 2 +- .../webapp/WEB-INF/views/statistics/printInfo.jsp | 12 ++++++++++-- .../webapp/WEB-INF/views/statistics/scanInfo.jsp | 12 ++++++++++-- src/main/webapp/static/js/statistics/printInfo.js | 6 +++++- src/main/webapp/static/js/statistics/scanInfo.js | 6 +++++- 8 files changed, 47 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/emr/vo/TUuPrintSearch.java b/src/main/java/com/emr/vo/TUuPrintSearch.java index a25be78..0fe5e72 100644 --- a/src/main/java/com/emr/vo/TUuPrintSearch.java +++ b/src/main/java/com/emr/vo/TUuPrintSearch.java @@ -23,5 +23,9 @@ public class TUuPrintSearch { private String name; private String sql; + + private String hzname; + + private String inpNo; } diff --git a/src/main/resources/mapper/TUuInfoMapper.xml b/src/main/resources/mapper/TUuInfoMapper.xml index 0da19b1..7369f6b 100644 --- a/src/main/resources/mapper/TUuInfoMapper.xml +++ b/src/main/resources/mapper/TUuInfoMapper.xml @@ -188,6 +188,12 @@ ${sql} + + AND hzName LIKE '%${hzname}%' + + + AND inp_no LIKE '%${inpNo}%' + AND uuName LIKE '%${name}%' diff --git a/src/main/resources/mapper/TUuPrintMapper.xml b/src/main/resources/mapper/TUuPrintMapper.xml index 6652344..ecf0512 100644 --- a/src/main/resources/mapper/TUuPrintMapper.xml +++ b/src/main/resources/mapper/TUuPrintMapper.xml @@ -180,6 +180,12 @@ ${sql} + + AND hzName LIKE '%${hzname}%' + + + AND inp_no LIKE '%${inpNo}%' + AND cpyUser LIKE '%${name}%' diff --git a/src/main/webapp/WEB-INF/views/index.jsp b/src/main/webapp/WEB-INF/views/index.jsp index b4892a1..97ceb48 100644 --- a/src/main/webapp/WEB-INF/views/index.jsp +++ b/src/main/webapp/WEB-INF/views/index.jsp @@ -329,7 +329,7 @@