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

无纸化归档功能修改

Browse Source
master
xuhaoxiang 4 years ago
parent ed5250ccda
commit a2f127217d
8 changed files with 55 additions and 53 deletions
Show Stats Download Patch File Download Diff File

1
src/main/java/com/emr/controller/beHospitaledController.java
Unescape Escape View File

@ -535,7 +535,6 @@ public class beHospitaledController {
Session session = currentUser.getSession();
signList.setC1((String) session.getAttribute("userSession"));
signList.setC5("1");
List<Sign_List> returnList = signListService.selectSignListWith(signList);
signList.setId(IDHelper.NewID());
/*signList.setC2(master.get(0).getSigner());

2
src/main/java/com/emr/controller/signListController.java
Unescape Escape View File

@ -127,7 +127,6 @@ public class signListController {
Session session = currentUser.getSession();
signList.setC1((String) session.getAttribute("userSession"));
signList.setC5("1");
List<Sign_List> returnList = signListService.selectSignListWith(signList);
signList.setId(IDHelper.NewID());
/*signList.setC2(master.get(0).getSigner());
@ -177,7 +176,6 @@ public class signListController {
Session session = currentUser.getSession();
signList.setC1((String) session.getAttribute("userSession"));
signList.setC5("1");
List<Sign_List> returnList = signListService.selectSignListWith(signList);
signList.setId(IDHelper.NewID());
signList.setCreatedtime(sdf.format(new Date()));
signList.setdTime(sdf.format(new Date()));

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

@ -396,7 +396,7 @@
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.first_instance,
m.is_scanning,m.bed_number,amf.following_type,ISNULL(s.numb, 0) numb,ao.C5 is_sign,ao.C1 signer
,ISNULL(printTable.num, 0) printNum
,ISNULL(sDoctor.numb, 0) faultDoctorNum,ISNULL(sNurse.numb, 0) faultNurseNum,ISNULL(printTable.num, 0) printNum
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
@ -404,6 +404,10 @@
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) f
on m.dept_name=f.code
LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag in ('1','5') GROUP BY archive_detail_id) sDoctor
on m.id=sDoctor.archive_detail_id
LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag in ('2','6') GROUP BY archive_detail_id) sNurse
on m.id=sNurse.archive_detail_id
left join Archive_Master_Following amf
on m.id=amf.master_id and amf.following_type=9
LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag is not null GROUP BY archive_detail_id) s
@ -656,10 +660,14 @@
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.is_scanning,
m.bed_number,ISNULL(s.numb, 0) numb,ISNULL(amf.num, 0) checkFlag
,ISNULL(printTable.num, 0) printNum
,ISNULL(sDoctor.numb, 0) faultDoctorNum,ISNULL(sNurse.numb, 0) faultNurseNum,ISNULL(printTable.num, 0) printNum
from archive_master m
LEFT JOIN(select master_id,count(*) num from Archive_Master_Following where following_type=5 GROUP BY master_id ) amf
on m.id=amf.master_id
LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag in ('1','5') GROUP BY archive_detail_id) sDoctor
on m.id=sDoctor.archive_detail_id
LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag in ('2','6') GROUP BY archive_detail_id) sNurse
on m.id=sNurse.archive_detail_id
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
on m.dept_admission_to=d.code
@ -784,11 +792,15 @@
dept_name,CONVERT(varchar(10),m.discharge_date_time, 120) discharge_date_time,m.ArchiveState,CONVERT(varchar(10),m.admission_date_time, 120) admission_date_time,d.name dept_admission_to
,m.check_doctor,m.checked_datetime,m.checked_doctor,m.LockInfo,m.DOCTOR_IN_CHARGE,m.ID_NO,m.DISCHARGE_DISPOSITION,m.dept_code_lend,m.isscaned,m.is_scanning,
m.cmt_doctor,m.cmt_nurse,m.doctor_name,m.nurse_name,m.cmt_doctor_date,m.cmt_nurse_date,m.emr_doctor_cmt,m.emr_nure_cmt,m.death_flag,m.bed_number,ISNULL(s.numb, 0) numb
,ISNULL(printTable.num, 0) printNum
,ISNULL(sDoctor.numb, 0) faultDoctorNum,ISNULL(sNurse.numb, 0) faultNurseNum,ISNULL(printTable.num, 0) printNum
from archive_master m
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) d
on m.dept_admission_to=d.code
LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag in ('1','5') GROUP BY archive_detail_id) sDoctor
on m.id=sDoctor.archive_detail_id
LEFT JOIN(select archive_detail_id,count(*) numb from emr_fault_detail where 1=1 and back_flag in ('2','6') GROUP BY archive_detail_id) sNurse
on m.id=sNurse.archive_detail_id
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
typeCode='dept_code' )) f
on m.dept_name=f.code

2
src/main/resources/mapper/Sign_ListMapper.xml
Unescape Escape View File

@ -96,7 +96,6 @@
<if test="masterID != null and masterID != ''"> and s.masterID = #{masterID}</if>
<if test="detailID != null and detailID != ''"> and s.detailID = #{detailID}</if>
<if test="dTime != null and dTime != ''"> and s.dTime = #{dTime}</if>
<if test="sysFlag != null and sysFlag != ''"> and s.sysFlag = #{sysFlag}</if>
<if test="c1 != null and c1 != ''"> and s.C1 = #{c1}</if>
<if test="c2 != null and c2 != ''"> and s.C2 = #{c2}</if>
<if test="c3 != null and c3 != ''"> and s.C3 = #{c3}</if>
@ -112,6 +111,7 @@
<if test="inpNo != null and inpNo != ''"> and m.inp_no = #{inpNo}</if>
<if test="visitId != null and visitId != ''"> and m.visit_id = #{visitId}</if>
<if test="name != null and name != ''"> and m.name like '%'+#{name}+'%'</if>
and s.sysFlag ='1'
ORDER BY s.dTime desc
</select>

26
src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
Unescape Escape View File

@ -1295,7 +1295,7 @@
</div>
<div class="row divCss2">
<%--归档病历是否已全部无纸化无扫描件--%>
是否有纸质病历送病案室
<b><span style="color:red;">是否有纸质补充资料送病案室 </span></b>
<input type="checkbox" name="isScanedChk" class="isScanedChk1"
onclick="checkedThis(this,this);">有
<input type="checkbox" name="isScanedChk" class="isScanedChk2"
@ -1344,7 +1344,7 @@
</div>
<div class="row divCss2">
<%--归档病历是否已全部无纸化无扫描件--%>
是否有纸质病历送病案室
<b><span style="color:red;">是否有纸质补充资料送病案室 </span></b>
<input type="checkbox" name="isScanedChk2" class="isScanedChk3"
onclick="checkedThis(this,this);">有
<input type="checkbox" name="isScanedChk2" class="isScanedChk4"
@ -2968,7 +2968,7 @@
success: function (result) {
if (result != null) {
for (var i = 0; i < result.length; i++) {
if (result[i].doctorInCharge != null) {
if (result[i]!=null&&result[i].doctorInCharge != null) {
$("#doctorInCharge").append("<option value=" + result[i].doctorInCharge + ">" + result[i].doctorInCharge + "</option>");
}
}
@ -4404,22 +4404,16 @@
if (value == '提交') {
a = '<span style="color:#269abc;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已提交</span>';
} else {
if (doctorNum == 0) {
a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
} else {
a = '<span style="color:#269abc;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已提交</span>';
}
}
} else {
if (value == '提交') {
//有缺陷显示红色 #269abc;
a = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true" style="color:#269abc;"></i><span style="color:red;">已提交</span>';
} else {
if (doctorNum == 0) {
a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
} else {
a = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true" style="color:#269abc;"></i><span style="color:red;">已提交</span>';
}
}
}
return a;
@ -4437,11 +4431,8 @@
if (value == '提交') {
a = '<span style="color:#269abc;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已提交</span>';
} else {
if (nurseNum == 0) {
a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
} else {
a = '<span style="color:#269abc;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已提交</span>';
}
}
} else {
//有缺陷显示红色
@ -4449,11 +4440,8 @@
//有缺陷显示红色
a = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true" style="color:#269abc;"></i><span style="color:red;">已提交</span>';
} else {
if (nurseNum == 0) {
a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
} else {
a = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true" style="color:#269abc;"></i><span style="color:red;">已提交</span>';
}
}
}
return a;

14
src/main/webapp/WEB-INF/views/commitDir/commitList.jsp
Unescape Escape View File

@ -1018,7 +1018,7 @@
</div>
<div class="row ">
<%--<input type="checkbox" id="isScanedChk1" />归档病历已全部无纸化无扫描件--%>
<input type="checkbox" id="isScanedChk1" />是否有纸质病历送病案室
<input type="checkbox" id="isScanedChk1" ><span style="color:red;">是否有纸质补充资料送病案室</span>
</div>
</div>
@ -1061,7 +1061,7 @@
</div>
<div class="row divCss2">
<%--<input type="checkbox" id="isScanedChk" disabled />归档病历已全部无纸化无扫描件--%>
<input type="checkbox" id="isScanedChk" disabled />是否有纸质病历送病案室
<input type="checkbox" id="isScanedChk" disabled /><span style="color:red;">是否有纸质补充资料送病案室</span>
</div>
</div>
</form>
@ -1423,6 +1423,7 @@
//创建数组保存图片
var files = new Array();
var id = 0;
var docNorFlag = 1;
$(function () {
@ -2843,6 +2844,7 @@
}
var scollPostion = null;
var docNorFlag=1;
function initTableQX() {
$("#QXDealCancelBtn").hide();
$("#QXDealBtn").show();
@ -3541,11 +3543,11 @@
var redFlag = row.numb;
if (redFlag != 0) {
//有退回给医生的缺陷
if(redFlagDoc!= 0){
if(row.faultDoctorNum!= 0){
html = html + '<button type="button" class="btn btn-sm btn-info getQXDoctorInfo">医生查看缺陷</button>';
}
//有退回给护士的缺陷
if(redFlagNur!= 0){
if(row.faultNurseNum!= 0){
html = html + '<button type="button" class="btn btn-sm btn-info getQXNurseInfo">护士查看缺陷</button>';
}
}
@ -3733,7 +3735,7 @@
'click .getQXDoctorInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
var docNorFlag= 3;
docNorFlag= 3;
$("#archIdQX").val(row.id);
$('#tableQX').bootstrapTable('refresh');
$('#QXInfoModal').modal({
@ -3745,7 +3747,7 @@
'click .getQXNurseInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
var docNorFlag= 4;
docNorFlag= 4;
$("#archIdQX").val(row.id);
$('#tableQX').bootstrapTable('refresh');
$('#QXInfoModal').modal({

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

@ -2766,6 +2766,7 @@
}
var scollPostion = null;
var docNorFlag=1;
function initTableQX() {
$("#QXDealCancelBtn").hide();
$("#QXDealBtn").show();
@ -3429,7 +3430,7 @@
},
{
// title: '科室是否提交纸质病历',
title: '是否有纸质病历送病案室',
title: '是否有纸质补充资料送病案室',
field: 'isscaned',
align: 'center',
valign: 'middle',
@ -3590,11 +3591,11 @@
var redFlag = row.numb;
if (redFlag != 0) {
//有退回给医生的缺陷
if(redFlagDoc!= 0){
if(row.faultDoctorNum!= 0){
html = html + '<button type="button" class="btn btn-sm btn-info getQXDoctorInfo">医生查看缺陷</button>';
}
//有退回给护士的缺陷
if(redFlagNur!= 0){
if(row.faultNurseNum!= 0){
html = html + '<button type="button" class="btn btn-sm btn-info getQXNurseInfo">护士查看缺陷</button>';
}
}
@ -3770,7 +3771,7 @@
'click .getQXDoctorInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
var docNorFlag= 3;
docNorFlag= 3;
$("#archIdQX").val(row.id);
$('#tableQX').bootstrapTable('refresh');
$('#QXInfoModal').modal({
@ -3782,7 +3783,7 @@
'click .getQXNurseInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
var docNorFlag= 4;
docNorFlag= 4;
$("#archIdQX").val(row.id);
$('#tableQX').bootstrapTable('refresh');
$('#QXInfoModal').modal({

34
src/main/webapp/WEB-INF/views/unfileMedicalDir/unfileMedicalList.jsp
Unescape Escape View File

@ -1389,6 +1389,7 @@
var files = new Array();
var id = 0;
var backFlagVal;
var docNorFlag = 1;
function getFaultType() {
//获取科室列表
@ -2606,6 +2607,7 @@
}
var scollPostion = null;
var docNorFlag = 1;
function initTableQX() {
$("#QXDealCancelBtn").hide();
$("#QXDealBtn").show();
@ -3412,11 +3414,11 @@
var redFlag = row.numb;
if (redFlag != 0) {
//有退回给医生的缺陷
if(redFlagDoc!= 0){
if(row.faultDoctorNum!= 0){
html = html + '<button type="button" class="btn btn-sm btn-info getQXDoctorInfo">医生查看缺陷</button>';
}
//有退回给护士的缺陷
if(redFlagNur!= 0){
if(row.faultNurseNum!= 0){
html = html + '<button type="button" class="btn btn-sm btn-info getQXNurseInfo">护士查看缺陷</button>';
}
}
@ -3483,30 +3485,30 @@
initTree(row.id);
getSourceFun();
},
'click .getQXNurseInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
$("#archIdQX").val(row.id);
docNorFlag= 4;
$('#tableQX').bootstrapTable('refresh');
$('#QXInfoModal').modal({
backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
keyboard: true,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
},
'click .getQXDoctorInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
$("#archIdQX").val(row.id);
docNorFlag= 3;
$('#tableQX').bootstrapTable('refresh');
var docNorFlag= 3;
$('#QXInfoModal').modal({
backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
keyboard: true,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
}
},
'click .getQXNurseInfo': function (e, value, row, index) {
//查看缺陷列表
//initTableQX(row.id);
var docNorFlag= 4;
$("#archIdQX").val(row.id);
$('#tableQX').bootstrapTable('refresh');
$('#QXInfoModal').modal({
backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
keyboard: true,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
}
},
cellStyle: function (value, row, index) {
return {classes: 'success'}

Write Preview
Loading…
Cancel
Save