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 @@