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 abb20406bf
commit 67bfe65408
7 changed files with 123 additions and 18 deletions
Show Stats Download Patch File Download Diff File

10
src/main/java/com/emr/entity/Archive_Master.java
Unescape Escape View File

@ -83,6 +83,16 @@ public class Archive_Master {
private String signer;
private String signTime;
//2021-8-03 ,字段值不为0，页面显示“已打印”标志
private String printNum;
public String getPrintNum() {
return printNum;
}
public void setPrintNum(String printNum) {
this.printNum = printNum;
}
public BigDecimal getScore() {
return score;

32
src/main/java/com/emr/entity/Archive_Master_Vo.java
Unescape Escape View File

@ -140,6 +140,38 @@ public class Archive_Master_Vo {
//科主任是否审核标志
private String checkFlag;
//2021-8-03 ,字段值不为0，页面显示“已打印”标志
private String printNum;
//2021-8-04 ,出院浏览页面电子病历医生提交字段
private String doctorNum;
//2021-8-04 ,出院浏览页面电子病历护士提交字段
private String nurseNum;
public String getDoctorNum() {
return doctorNum;
}
public void setDoctorNum(String doctorNum) {
this.doctorNum = doctorNum;
}
public String getNurseNum() {
return nurseNum;
}
public void setNurseNum(String nurseNum) {
this.nurseNum = nurseNum;
}
public String getPrintNum() {
return printNum;
}
public void setPrintNum(String printNum) {
this.printNum = printNum;
}
public String getCheckFlag() {
return checkFlag;

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

@ -43,6 +43,7 @@
<result column="is_sign" jdbcType="INTEGER" property="isSign" />
<result column="signer" jdbcType="NVARCHAR" property="signer"/>
<result column="sign_time" jdbcType="NVARCHAR" property="signTime"/>
<result column="print_num" jdbcType="NVARCHAR" property="printNum"/>
</resultMap>
<resultMap id="BaseResultMap2" type="com.emr.entity.Archive_Master_Vo">
@ -94,6 +95,9 @@
<result column="signer" jdbcType="NVARCHAR" property="signer"/>
<result column="sign_time" jdbcType="NVARCHAR" property="signTime"/>
<result column="check_flag" jdbcType="NVARCHAR" property="checkFlag"/>
<result column="print_num" jdbcType="NVARCHAR" property="printNum"/>
<result column="doctor_num" jdbcType="NVARCHAR" property="doctorNum"/>
<result column="nurse_num" jdbcType="NVARCHAR" property="nurseNum"/>
</resultMap>
<sql id="Base_Column_List">
id, patient_id, inp_no, visit_id, name, sex, dept_name, discharge_date_time, ArchiveState,
@ -152,6 +156,7 @@
select distinct m.id,m.patient_id,m.inp_no,m.cmt_doctor,m.cmt_nurse,m.visit_id,m.name,m.sex,f.name
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.doctor_name,m.nurse_name,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,bed_number
,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
@ -159,6 +164,8 @@
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 MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable
on m.id=printTable.MasterID
where 1=1
and patindex('%B%',m.inp_no) = 0
<if test="deptAdmissionTo!= null and deptAdmissionTo!= ''">
@ -260,6 +267,7 @@
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(extDoctor.num, 0) doctorNum,ISNULL(extNurse.num, 0) nurseNum
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
@ -269,6 +277,16 @@
on m.dept_name=f.code
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
on m.id=s.archive_detail_id
LEFT JOIN (select MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable
on m.id=printTable.MasterID
LEFT JOIN (select zyh,jzh,T1,COUNT(*) num from archive_other_ext group by zyh,jzh,T1) extDoctor
on m.inp_no=extDoctor.zyh
and m.visit_id=extDoctor.jzh
and extDoctor.T1!='1801-02-03 00:00:00.000'
LEFT JOIN (select zyh,jzh,T2,COUNT(*) num from archive_other_ext group by zyh,jzh,T2) extNurse
on m.inp_no=extNurse.zyh
and m.visit_id=extNurse.jzh
and extNurse.T2!='1801-02-03 00:00:00.000'
where 1=1 and ArchiveState in('归档中','提交','主任退回')
and patindex('%B%',m.inp_no) = 0
<if test="emrCmit!=null and emrCmit!=''">
@ -372,6 +390,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
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
@ -385,6 +404,8 @@
on m.id=s.archive_detail_id
LEFT JOIN archive_other ao
on m.id=ao.masterID
LEFT JOIN (select MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable
on m.id=printTable.MasterID
where 1=1 and ArchiveState in('初审')
and patindex('%B%',m.inp_no) = 0
<if test="id != null and id != ''">
@ -629,6 +650,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.is_scanning,
m.bed_number,ISNULL(s.numb, 0) numb,ISNULL(amf.num, 0) checkFlag
,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
@ -640,6 +662,8 @@
on m.dept_name=f.code
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
on m.id=s.archive_detail_id
LEFT JOIN (select MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable
on m.id=printTable.MasterID
where 1=1
and patindex('%B%',m.inp_no) = 0
and m.ArchiveState not in('作废')
@ -754,6 +778,7 @@
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
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
@ -763,6 +788,8 @@
on m.dept_name=f.code
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
on m.id=s.archive_detail_id
LEFT JOIN (select MasterID,COUNT(*) num from archive_printInfo group by MasterID) printTable
on m.id=printTable.MasterID
where 1=1 and ArchiveState in('提交','主任退回','归档中','复审退回')
and patindex('%B%',m.inp_no) = 0
<if test="id != null and id != ''">

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

@ -33,7 +33,23 @@
.modal-footer {
padding: 5px;
}
.seal-result{
width: 60px;
height: 60px;
transform: rotate(30deg);
border: solid 2px red;
border-radius: 100%;
text-align: center;
color: red;
font-size: 16px;
font-weight: bold;
line-height: 60px;
left: 17.5%;
top: 6%;
position: absolute;
background-color: rgba(255,255,255,0.8);
z-index: 1000;
}
.divCss {
margin-top: 5px;
}
@ -637,6 +653,7 @@
<div class="row">
<div class="row divCss3">病历信息</div>
<div class="row divCss2">
<div class="seal-result" style="display:none;" id="printTableFlag">已打印</div>
<div class="col-sm-5" hidden>
病案号：<label id="idLab" class="labCss"></label><label id="assortId" hidden></label>
</div>
@ -665,11 +682,11 @@
退回管理:
<button type="button" class="btn btn-danger btn-sm" id="getRecallBtn">退回查看</button>
</div>
<div class="col-sm-4"><input type="text" id="outDeptLab" hidden/>
出院科室：<label id="outDeptToLab" class="labCss"></label>
</div>
</div>
<div class="row divCss2">
<div class="col-sm-4"><input type="text" id="outDeptLab" hidden/>
出院科室：<label id="outDeptToLab" class="labCss"></label>
</div>
<div class="col-sm-4">
出院日期：<label id="outDeptDateLab" class="labCss"></label>
</div>
@ -3963,6 +3980,10 @@
},
'click .selInfo': function (e, value, row, index) {
$("#printTableFlag").hide();
if(row.printNum!=0){
$("#printTableFlag").show();
}
getStaffRemarkFun(row.id, 0);
$('#selModal').modal({
backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
@ -4326,23 +4347,23 @@
},
{
title: '电子病历医生提交',
field: 'emrDoctorCmt',
field: 'doctorNum',
align: 'center',
formatter: function (value, row, index) {
var redFlag = row.numb;
var a = "";
if (redFlag == 0) {
if (value == '提交') {
a = '<span style="color:#269abc;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已提交</span>';
} else {
if (value ==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 == '提交') {
if (value ==0) {
a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
} else {
//有缺陷显示红色 #269abc;
a = '<i class="glyphicon glyphicon-ok-circle" aria-hidden="true" style="color:#269abc;"></i><span style="color:red;">已提交</span>';
} else {
a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
}
}
return a;
@ -4350,24 +4371,24 @@
},
{
title: '电子病历护士提交',
field: 'emrNureCmt',
field: 'nurseNum',
align: 'center',
formatter: function (value, row, index) {
var redFlag = row.numb;
var a = "";
if (redFlag == 0) {
if (value == '提交') {
a = '<span style="color:#269abc;"><i class="glyphicon glyphicon-ok-circle" aria-hidden="true"></i>已提交</span>';
} else {
if (value ==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 == '提交') {
if (value ==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>';
} else {
a = '<span style="color:red;"><i class="glyphicon glyphicon-ban-circle" aria-hidden="true"></i>未提交</span>';
}
}
return a;

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

@ -627,6 +627,7 @@
<div class="row">
<div class="row divCss3">病历信息</div>
<div class="row divCss2">
<div class="seal-result" style="display:none;" id="printTableFlag">已打印</div>
<div class="col-sm-5" hidden>
病案号：<label id="idLab" class="labCss"></label><label id="assortId" hidden></label>
</div>
@ -3653,6 +3654,10 @@
},
'click .selInfo': function (e, value, row, index) {
$("#printTableFlag").hide();
if(row.printNum!=0){
$("#printTableFlag").show();
}
//实时获取完整性
getWzxFun(row.id);
$('#selModal').modal({

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

@ -551,6 +551,7 @@
<div class="row">
<div class="row divCss3">病历信息</div>
<div class="row divCss2">
<div class="seal-result" style="display:none;" id="printTableFlag">已打印</div>
<div class="col-sm-5" hidden>
病案号：<label id="idLab" class="labCss"></label><label id="assortId" hidden></label>
</div>
@ -3700,6 +3701,10 @@
},
'click .selInfo': function (e, value, row, index) {
$("#printTableFlag").hide();
if(row.printNum!=0){
$("#printTableFlag").show();
}
//实时获取完整性
getWzxFun(row.id);
$('#selModal').modal({

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

@ -643,6 +643,7 @@
<div class="row">
<div class="row divCss3">病历信息</div>
<div class="row divCss2">
<div class="seal-result" style="display:none;" id="printTableFlag">已打印</div>
<div class="col-sm-5" hidden>
病案号：<label id="idLab" class="labCss"></label><label id="assortId" hidden></label>
</div>
@ -3412,6 +3413,10 @@
return html;
}, events: {
'click .selInfo': function (e, value, row, index) {
$("#printTableFlag").hide();
if(row.printNum!=0){
$("#printTableFlag").show();
}
//实时获取完整性
getWzxFun(row.id);
$('#selModal').modal({

Write Preview
Loading…
Cancel
Save