diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 340f8966..1f001e5b 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -530,6 +530,9 @@ and m.isscaned = #{isscaned,jdbcType=NVARCHAR} + + and m.death_flag = #{deathFlag,jdbcType=NVARCHAR} + and m.is_scanning = #{isScanning,jdbcType=NVARCHAR} diff --git a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml index 8e323d24..0271bebc 100644 --- a/src/main/resources/mapper/Emr_Fault_DetailMapper.xml +++ b/src/main/resources/mapper/Emr_Fault_DetailMapper.xml @@ -382,6 +382,12 @@ #{item} + + and m.dept_admission_to in + + #{item} + + and CONVERT(VARCHAR(100),m.discharge_date_time,23) between CONVERT(VARCHAR(100),#{startDate,jdbcType=NCHAR},23) and diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 6d6e995c..559fead7 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -527,6 +527,14 @@ +
+ + +
<%--
--%> <%----%> <%----%>
+ +
+ + +
+
@@ -337,9 +346,11 @@ if (result != null) { for (var i = 0; i < result.length; i++) { $("#deptName").append(""); + $("#deptAdmissionTo").append(""); } } $('#deptName').selectpicker('refresh'); + $('#deptAdmissionTo').selectpicker('refresh'); // for (var i = 0; i < result.length; i++) { // if (deptArr.length != 1 && deptArr[0] != "") { // var bol = deptArr.indexOf(result[i].code); @@ -477,7 +488,8 @@ state:"" + $("#state").val(), startDate: $("#startDate").val(), endDate: $("#endDate").val(), - deptName: $("#deptName").val().toString() + deptName: $("#deptName").val().toString(), + deptAdmissionTo: $("#deptAdmissionTo").val().toString() }; return temp; }, @@ -746,6 +758,9 @@ if ($("#deptName").val().length > 0){ value = $("#deptName").val(); } + if ($("#deptAdmissionTo").val().length > 0){ + value = $("#deptAdmissionTo").val(); + } if (tipLoad == 0) { $("#table").bootstrapTable("refreshOptions", {pageNumber: 1}); } else { @@ -780,7 +795,8 @@ var name = "" + $("#name").val(); var idNo = "" + $("#idNo").val(); var state = "" + $("#state").val(); - var deptName= $("#deptName").val(); + var deptName = $("#deptName").val(); + var deptAdmissionTo = $("#deptAdmissionTo").val(); var archivestate=""; if($("#archivestate").val()!=null && $("#archivestate").val()!=""){ archivestate="" + $("#archivestate").val(); @@ -798,7 +814,7 @@ // } // } window.location.href = "${path}/medicalRecall/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId + - "&name=" + name + "&state=" + state + "&idNo=" + idNo + "&archivestate=" + archivestate+ "&deptName=" + deptName; + "&name=" + name + "&state=" + state + "&idNo=" + idNo + "&archivestate=" + archivestate + "&deptName=" + deptName + "&deptAdmissionTo=" + deptAdmissionTo; });