emr_medicalrecord_record2.0
/
EMR_Medical_Record
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

终审页面增加是否死亡查询、召回页面增加出院科室查询

Browse Source
master
51976 3 years ago
parent c2fbfd7ba6
commit 13b7f1e662
4 changed files with 41 additions and 6 deletions
Show Stats Download Patch File Download Diff File

3
src/main/resources/mapper/Archive_MasterMapper.xml
Unescape Escape View File

@ -529,6 +529,9 @@
<if test="isscaned != null and isscaned != ''">
and m.isscaned = #{isscaned,jdbcType=NVARCHAR}
</if>
<if test="deathFlag != null and deathFlag != ''">
and m.death_flag = #{deathFlag,jdbcType=NVARCHAR}
</if>
<if test="isScanning != null and isScanning != ''">
and m.is_scanning = #{isScanning,jdbcType=NVARCHAR}
</if>

6
src/main/resources/mapper/Emr_Fault_DetailMapper.xml
Unescape Escape View File

@ -382,6 +382,12 @@
#{item}
</foreach>
</if>
<if test="deptAdmissionTo!= null and deptAdmissionTo!= ''">
and m.dept_admission_to in
<foreach item="item" collection="deptAdmissionTo.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">
and CONVERT(VARCHAR(100),m.discharge_date_time,23) between CONVERT(VARCHAR(100),#{startDate,jdbcType=NCHAR},23) and

14
src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp
Unescape Escape View File

@ -527,6 +527,14 @@
<option value="0">否</option>
</select>
</div>
<div class="form-group divCss8" >
<label>是否死亡:</label>
<select class="selectpicker bla bla bli" data-live-search="true" name="deathFlag2" id="deathFlag2" title="是否死亡">
<option value="">全部</option>
<option value="1">是</option>
<option value="0">否</option>
</select>
</div>
<%--<div class="form-group divCss2">--%>
<%--<label for="archivestate">归档状态:</label>--%>
<%--<select class="input-sm form-control" id="archivestate">--%>
@ -3296,7 +3304,8 @@
//endSignDate: $("#endSignDate").val(),
isSign: $("#isSign").val(),
printNum:$("#printNum").val(),
isFault:$("#isFault").val()
isFault:$("#isFault").val(),
deathFlag:$("#deathFlag2").val(),
};
return temp;
},
@ -4882,9 +4891,10 @@
var isSign=$("#isSign").val();
var printNum=$("#printNum").val();
var isFault = $("#isFault").val();
var deathFlag = $("#deathFlag2").val();
window.location.href = "${path}/lastVerify/exportExcel?inpNo=" + inpNo + "&visitId=" + visitId +
"&name=" + name + "&deptName=" + deptName + "&startDateTo=" + startDateTo + "&endDateTo=" + endDateTo
+ "&isscaned=" + isscaned + "&isSign=" + isSign + "&isScanning=" + isScanning + "&printNum=" + printNum + "&isFault="+isFault;
+ "&isscaned=" + isscaned + "&isSign=" + isSign + "&isScanning=" + isScanning + "&printNum=" + printNum + "&isFault="+isFault + "&deathFlag="+deathFlag2;
});
var zNodes = [];

24
src/main/webapp/WEB-INF/views/medicalRecallDir/medicalRecallList.jsp
Unescape Escape View File

@ -118,10 +118,19 @@
<%--&lt;%&ndash;<option value="已归档">已归档</option>&ndash;%&gt;--%>
<%--</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="deptName" id="deptName" title="请输入科室">
data-none-results-text="没找到相应记录{0}" name="deptAdmissionTo" id="deptAdmissionTo" title="请输入科室">
<%-- <option value="">全部</option>--%>
</select>
</div>
<div class="form-group divCss8" id="deptDiv2" style="height: 18px;margin-top: -7px;">
<label>出院科室 :</label>
<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="deptName" id="deptName" title="请输入科室">
<%-- <option value="">全部</option>--%>
</select>
</div>
<div class="form-group divCss8">
<label>出院日期:</label>
<div class="input-daterange input-group" id="datepicker">
@ -337,9 +346,11 @@
if (result != null) {
for (var i = 0; i < result.length; i++) {
$("#deptName").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
$("#deptAdmissionTo").append("<option value=" + result[i].code + ">" + result[i].name + "</option>");
}
}
$('#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;
});

Write Preview
Loading…
Cancel
Save