封存列表(排除is_valid为1),封存日志(排除作废和is_valid为1,修改归档状态和格式),其它微调等

master
hujl 4 years ago
parent 8dbb7b7bb0
commit 6cb88490bb

@ -142,7 +142,7 @@ public class storageController {
archiveMasterFollowing.setHandleName(handleName);
archiveMasterFollowing.setRemark(emrFaultDetail.getRecallReason());
bol = archiveMasterFollowingService.insertSelective(archiveMasterFollowing);
}else if (archiveMaster.getArchivestate().equals("已归档")){
}else{// if (archiveMaster.getArchivestate().equals("已归档"))
archiveMasterFollowing.setMasterId(emrFaultDetail.getArchiveDetailId());
archiveMasterFollowing.setFollowingContent("病案取消封存");
archiveMasterFollowing.setFollowingType("12");

@ -1591,7 +1591,8 @@
</select>
<!--封存日志-->
<select id="selectByFollowinglog" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
select m.INP_NO,m.VISIT_ID,m.name,m.sex,f.handle_name,f.handle_time, m.archiveState ,f.following_content from Archive_Master m
select m.INP_NO,m.VISIT_ID,m.name,m.sex,f.handle_name,CONVERT(VARCHAR(20),f.handle_time,120) handle_time, m.archiveState ,f.following_content
from (select * from Archive_Master where ArchiveState!='作废' and Is_Valid!=1) m
INNER JOIN Archive_Master_Following f on m.ID=f.master_id
where 1=1 AND f.following_type in('11','12')
<if test="inpNo != null and inpNo != ''">
@ -1603,8 +1604,11 @@
<if test="name != null and name != ''">
and m.name like '%'+#{name,jdbcType=NCHAR}+'%'
</if>
<if test="archivestate != null and archivestate != ''">
and m.ArchiveState=#{archivestate,jdbcType=NVARCHAR}
<if test="archivestate!= null and archivestate!= ''">
and m.ArchiveState in
<foreach item="item" collection="archivestate.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<if test="handleName != null and handleName != ''">
and f.handle_name=#{handleName,jdbcType=NVARCHAR}
@ -1692,15 +1696,15 @@
</select>
<!--封存查询-->
<select id="selectStorageByCol" parameterType="com.emr.entity.Archive_Master_Vo" resultMap="BaseResultMap2">
select m.id ,m.inp_no,m.visit_id,m.name,ISNULL(f.name, m.dept_name) dept_name,m.discharge_date_time,m.ArchiveState,m.sex,m.ID_NO,
select m.id ,m.inp_no,m.visit_id,m.name,ISNULL(f.name, m.dept_name) dept_name,CONVERT(VARCHAR(20),m.discharge_date_time,120) discharge_date_time,m.ArchiveState,m.sex,m.ID_NO,
ISNULL(c.name, m.dept_admission_to) dept_admission_to
,m.admission_date_time,m.DISCHARGE_DISPOSITION,d.handle_time,d.handle_name,d.following_type
from(select * from Archive_Master where ArchiveState!='作废') m
,CONVERT(VARCHAR(20),m.admission_date_time,120) admission_date_time,m.DISCHARGE_DISPOSITION,d.handle_time,d.handle_name,d.following_type
from(select * from Archive_Master where ArchiveState!='作废' and Is_Valid!=1) m
LEFT JOIN(
select master_id ,handle_time ,handle_name,following_type from (
select ROW_NUMBER() over(partition by master_id order by handle_time desc) RowNum
,Archive_Master_Following.*
from Archive_Master_Following where 1=1 ) as t1 where 1=1 and RowNum = 1 and following_type='11'
select master_id ,handle_time ,handle_name,following_type from (
select ROW_NUMBER() over(partition by master_id order by handle_time desc) RowNum
,Archive_Master_Following.*
from Archive_Master_Following where 1=1 ) as t1 where 1=1 and RowNum = 1 and following_type='11'
) d
on m.id=d.master_id
LEFT JOIN (select code,name from emr_dictionary where parent_id=(select id from emr_dictionary where
@ -1737,8 +1741,11 @@
#{item}
</foreach>
</if>
<if test="archivestate != null and archivestate != ''">
and m.ArchiveState=#{archivestate,jdbcType=NCHAR}
<if test="archivestate!= null and archivestate!= ''">
and m.ArchiveState in
<foreach item="item" collection="archivestate.split(',')" open="(" separator="," close=")">
#{item}
</foreach>
</if>
<choose>
<when test="startDate != null and startDate != '' and endDate != null and endDate != ''">

@ -574,10 +574,8 @@
<div class="columns columns-right btn-group pull-right" style="margin-top:0px;">
<div class="btn-group btn-info">
<select id="sel_exportoption" class="form-control">                
<option value="">导出当前页面数据</option>
               
<option value="all">导出全部数据</option>
               
<option value="">导出当前页面数据</option>                
<option value="all">导出全部数据</option>                
<option value="selected">导出选中数据</option>
</select>
</div>

@ -494,10 +494,8 @@
<div class="columns columns-right btn-group pull-right" style="margin-top:0px;">
<div class="btn-group btn-info">
<select id="sel_exportoption" class="form-control">                
<option value="">导出当前页面数据</option>
               
<option value="all">导出全部数据</option>
               
<option value="">导出当前页面数据</option>                
<option value="all">导出全部数据</option>                
<option value="selected">导出选中数据</option>
</select>
</div>

@ -152,7 +152,7 @@
<label for="archivestate">归档状态 :</label>
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="doctorInCharge" id="archivestate" title="请输入归档状态"
data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" data-none-results-text="没找到相应记录{0}">
<option value="">全部</option>
<%--<option value="">全部</option>--%>
<option value="在院">在院</option>
<option value="未归档">未归档</option>
<option value="归档中">归档中</option>
@ -166,29 +166,25 @@
<button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
</div>
</form>
</div>
<!--数据表格-->
<table id="table" class="table text-nowrap table-striped"></table>
<%--</div>--%>
<div id="toolbar" class="btn-group pull-right toolbarCss" >
<div class="columns columns-right btn-group pull-right" style="margin-top:0px;">
<div class="btn-group btn-info">
<select id="sel_exportoption" class="form-control">                
<option value="">导出当前页面数据</option>                
<option value="all">导出全部数据</option>                
<option value="selected">导出选中数据</option>
</select>
</div>
<button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh" aria-label="Refresh"
title="Refresh">
<i class="glyphicon glyphicon-refresh icon-refresh"></i>
</button>
<!--数据表格-->
<table id="table" class="table text-nowrap table-striped"></table>
<div id="toolbar" class="btn-group pull-right toolbarCss" >
<div class="columns columns-right btn-group pull-right" style="margin-top:0px;">
<div class="btn-group btn-info">
<select id="sel_exportoption" class="form-control">                
<option value="">导出当前页面数据</option>                
<option value="all">导出全部数据</option>                
<option value="selected">导出选中数据</option>
</select>
</div>
<button class=" btn btn-success" style="height: 34px" type="button" id="refreshBtn" name="refresh" aria-label="Refresh"
title="Refresh">
<i class="glyphicon glyphicon-refresh icon-refresh"></i>
</button>
</div>
</div>
</div>
</div>

@ -542,10 +542,8 @@
<div class="columns columns-right btn-group pull-right" style="margin-top:0px;">
<div class="btn-group btn-info">
<select id="sel_exportoption" class="form-control">                
<option value="">导出当前页面数据</option>
               
<option value="all">导出全部数据</option>
               
<option value="">导出当前页面数据</option>                
<option value="all">导出全部数据</option>                
<option value="selected">导出选中数据</option>
</select>
</div>
@ -619,10 +617,8 @@
<div class="columns columns-right btn-group pull-right" style="margin-top:0px;">
<div class="btn-group btn-info">
<select id="sel_exportoptionLg" class="form-control">                
<option value="">导出当前页面数据</option>
               
<option value="all">导出全部数据</option>
               
<option value="">导出当前页面数据</option>                
<option value="all">导出全部数据</option>                
<option value="selected">导出选中数据</option>
</select>
</div>

@ -489,7 +489,7 @@
完整性审核:
</div>
<div class="col-sm-10" style="margin-left: -70px" id="wzContent">
地三生三世所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所所
</div>
</div>
<%--<div class="row divCss2">--%>
@ -2198,7 +2198,17 @@
{
title: '处理状态',
field: 'followingContent',
align: 'center',
align: 'left',
formatter: function (value, row, index) {
var a = '';
if(value.indexOf("病案室审核")!=-1){
a = '<span style="color:#030378"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
}else if(value.indexOf("病案室退回")!=-1){
a = '<span style="color:#db0ead"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
}
return a;
}
},
{
title: '处理人',

@ -121,8 +121,16 @@
</div>
<div class="form-group divCss8">
<label for="archivestate">归档状态 :</label>
<select class="input-sm form-control" id="archivestate">
<option value="">全部</option>
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="doctorInCharge" id="archivestate" title="请输入归档状态"
data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" data-none-results-text="没找到相应记录{0}">
<%-- <option value="">全部</option>--%>
<option value="取消入院">取消入院</option>
<option value="在院">在院</option>
<option value="归档中">归档中</option>
<option value="提交">提交</option>
<option value="主任退回">主任退回</option>
<option value="初审">初审</option>
<option value="复审退回">复审退回</option>
<option value="已归档">已归档</option>
<option value="已封存">已封存</option>
</select>
@ -154,10 +162,8 @@
<div class="columns columns-right btn-group pull-right" style="margin-top:0px;">
<div class="btn-group btn-info">
<select id="sel_exportoption" class="form-control">                
<option value="">导出当前页面数据</option>
               
<option value="all">导出全部数据</option>
             
<option value="">导出当前页面数据</option>                
<option value="all">导出全部数据</option>              
<option value="selected">导出选中数据</option>
</select>
</div>
@ -476,12 +482,9 @@
field: 'dischargeDateTime',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
/* formatter: function (value, row, index) {
return value.substring(0, 10);
}
// formatter: function (value, row, index) {
// return value
// }
}*/
},
/*{
title: '上次封存状态',

@ -68,20 +68,27 @@
</div>
<div class="form-group divCss8">
<label for="handleName">撤回人:</label>
<input type="text" class="input-sm form-control" id="handleName" placeholder="请输入撤回人">
<label for="handleName">封存人:</label>
<input type="text" class="input-sm form-control" id="handleName" placeholder="请输入封存人">
</div>
<div class="form-group divCss8">
<label for="archivestate">归档状态 :</label>
<select class="input-sm form-control" id="archivestate">
<option value="">全部</option>
<label>归档状态 :</label>
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="doctorInCharge" id="archivestate" title="请输入归档状态"
data-actions-box="true" data-deselect-all-text="取消全选" data-select-all-text="全选" data-none-results-text="没找到相应记录{0}">
<%-- <option value="">全部</option>--%>
<option value="取消入院">取消入院</option>
<option value="在院">在院</option>
<option value="归档中">归档中</option>
<option value="提交">提交</option>
<option value="主任退回">主任退回</option>
<option value="初审">初审</option>
<option value="复审退回">复审退回</option>
<option value="已归档">已归档</option>
<option value="已封存">已封存</option>
</select>
</div>
<div class="form-group divCss8">
<label for="followingContent">状态 :</label>
<label for="followingContent">封存状态 :</label>
<select class="input-sm form-control" id="followingContent">
<option value="">全部</option>
<option value="病案封存">病案封存</option>
@ -107,10 +114,8 @@
<div class="columns columns-right btn-group pull-right" style="margin-top:0px;">
<div class="btn-group btn-info">
<select id="sel_exportoption" class="form-control">                
<option value="">导出当前页面数据</option>
               
<option value="">导出当前页面数据</option>                
<option value="all">导出全部数据</option>
               --%>
<option value="selected">导出选中数据</option>
</select>
</div>
@ -131,7 +136,6 @@
$(function () {
var url = window.location.href;
var index = url.substring(url.lastIndexOf('?') + 1).replace("num=", "");
if (index != null && index != "" && index.indexOf("excel") != -1) {
@ -315,14 +319,14 @@
valign: 'middle',
},
{
title: '撤回人',
title: '封存人',
field: 'handleName',
align: 'center',
valign: 'middle',
},
{
title: '撤回时间',
title: '封存时间',
field: 'handleTime',
align: 'center',
valign: 'middle',
@ -335,19 +339,42 @@
formatter: function (value, row, index) {
//在院 未归档 归档中 初审 已归档 已认证
var a = '';
if (value == "已归档") {
a = '<span ><i class="fa fa-check-circle-o" aria-hidden="true"></i>未封存</span>';
} else if(value == "已封存"){
a = '<span style="color:#003eff;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>已封存</span>';
if (value == "未归档") {
a = '<span style="color:#c12e2a;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "已归档") {
a = '<span style="color:#030378"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "在院") {
a = '<span style="color:#bfa200"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "归档中") {
a = '<span style="color:#698B69"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "初审") {
a = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "已封存") {
a = '<span style="color:#FF7F24"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "复审退回") {
a = '<span style="color:#db0ead"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "提交") {
a = '<span style="color:blue"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
} else if (value == "主任退回") {
a = '<span style="color:#0000FF"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
}
return a;
}
},
{
title: '签收状态',
title: '封存状态',
field: 'followingContent',
align: 'center',
valign: 'middle',
formatter: function (value, row, index) {
var a = '';
if (value == "病案取消封存") {
a = '<span style="color: #c0c0c0;"><i class="fa fa-check-circle-o" aria-hidden="true"></i>'+value+'</span>';
} else if(value == "病案封存"){
a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>'+value+'</span>';
}
return a;
}
}
],
@ -376,7 +403,7 @@
} else {
toastr.warning("正在查询,请稍等...");
}
$(".selectpicker").selectpicker( 'deselectAll' );
// $(".selectpicker").selectpicker( 'deselectAll' );
// $('#table').bootstrapTable('destroy');
//$('#table').bootstrapTable('refreshOptions', {limit: 1, offset: 10});
//刷新

Loading…
Cancel
Save