1.修正终审页面终审前判断是否扫描纸质病历

2.终审页面列表显示新增原来的状态列
4.病案终审退回页面增加终审工号查询
5.复印扫描报表增加住院号查询
master
zengwh 5 years ago
parent 1bdb48de0d
commit 729d72dc62

@ -68,8 +68,8 @@ public class MedicalRecallController {
@ResponseBody
@RequestMapping(value = "/exportExcel")
public void exportExcel(HttpServletResponse response, Archive_Master_Vo master){
String tableThNames = "住院号,住院次数,名字,性别,入院科室,入院日期,出院科室,出院日期,上次召回状态,归档状态";
String fieldCns = "inpNo,visitId,name,sex,deptAdmissionTo,admissionDateTime,deptName,dischargeDateTime,status,archivestate";
String tableThNames = "住院号,住院次数,名字,性别,入院科室,入院日期,出院科室,出院日期,上次召回状态,归档状态,终审工号";
String fieldCns = "inpNo,visitId,name,sex,deptAdmissionTo,admissionDateTime,deptName,dischargeDateTime,status,archivestate,checkedDoctor";
try {
List<Archive_Master_Vo> list = archiveMasterMapper.selectFiled(master);
//文件名

@ -211,8 +211,8 @@ public class Archive_DetailServiceImpl implements Archive_DetailService {
StringBuilder idsStr = new StringBuilder();
//组织已经扫描上传的MasterId
List<Archive_Detail> list = archiveDetailMapper.selectIsScan(ids);
ids = "";
if(!CollectionUtils.isEmpty(list)){
ids = "";
for (Archive_Detail obj: list ) {
String masterid = obj.getMasterid();
if(StringUtils.isBlank(idsStr)){

@ -204,12 +204,12 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
StringBuilder patientIdStr = new StringBuilder();
for (Archive_Master_Vo masterVo : list) {
//状态均为护士长已质控,取出一个对象,转换中文状态
/*Integer status = Integer.valueOf(masterVo.getArchivestate());
Integer status = Integer.valueOf(masterVo.getArchivestate());
if(status.equals(EnumVerify.DocState.HeadNurseCheck.getCode())){
masterVo.setStatus(EnumVerify.DocState.HeadNurseCheck.getName());
}else if(status.equals(EnumVerify.DocState.CallBacked.getCode())){
masterVo.setStatus(EnumVerify.DocState.CallBacked.getName());
}*/
}
//组织记帐号集合
if(StringUtils.isNotBlank(masterVo.getPatientId())) {
if (StringUtils.isNotBlank(patientIdStr)) {
@ -227,14 +227,14 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
//执行查询
List<String> selectList = OracleConnect.selectList(sql);
for (Archive_Master_Vo masterVo : list) {
masterVo.setStatus("未签收");
masterVo.setRemark("未签收");
//赋值
if(!CollectionUtils.isEmpty(selectList)){
String patientId = masterVo.getPatientId();
if(StringUtils.isNotBlank(patientId)) {
for (String str : selectList) {
if(str.equals(patientId)){
masterVo.setStatus("已签收");
masterVo.setRemark("已签收");
break;
}
}

@ -23,5 +23,7 @@ public class TUuPrintSearch {
private String name;
private String sql;
private String inpNo;
}

@ -1,9 +1,9 @@
#power\u6743\u9650\u7CFB\u7EDFIP\u548C\u7AEF\u53E3
POWER_IP = localhost
POWER_PORT = 8080
#POWER_IP = localhost
#POWER_PORT = 8080
#POWER_IP = 200.100.104.40
#POWER_PORT = 8081
POWER_IP = 200.100.104.40
POWER_PORT = 8081
#power\u6743\u9650\u7CFB\u7EDF\u7684\u670D\u52A1\u5668\u5730\u5740\u5934
POWER_URLHEAD = http://${POWER_IP}:${POWER_PORT}/power
@ -20,8 +20,8 @@ powerUrl=${POWER_URLHEAD}/font/getMenusByUserIdAndSysFlag
#CHECKSUCCESS_IP = 200.100.104.40
CHECKSUCCESS_IP = ${POWER_IP}
#\u6821\u9A8C\u5B8C\u6574\u6027\u7AEF\u53E3
CHECKSUCCESS_PORT = 8081
#CHECKSUCCESS_PORT = ${POWER_PORT}
#CHECKSUCCESS_PORT = 8081
CHECKSUCCESS_PORT = ${POWER_PORT}
HomepageDictionary=http://${CHECKSUCCESS_IP}:${CHECKSUCCESS_PORT}/WholeCheckInterface/services/HomepageDictionary?wsdl
HomepageMethod=CheckData
@ -40,7 +40,7 @@ recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863
pdfWater = \u4F5B\u5C71\u5E02\u9AD8\u660E\u4EBA\u6C11\u533B\u9662
#\u672C\u5730\u56FE\u7247\u5730\u5740
pictureUrl=D:\\JiaShiPic\\
pictureUrl=C:\\JiaShiPic\\
#\u6620\u5C04\u672C\u5730\u56FE\u7247\u5730\u5740\u6839\u76EE\u5F55
picSrc=upload\\

@ -1,17 +1,14 @@
jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=gm_record
#jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=gm_record
#jdbc.username=sa
#jdbc.password=docus702
jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=emr_record
jdbc.username=sa
jdbc.password=docus702
jdbc.password=AbcXyz123
filters=stat
maxWait=60000
#jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
#jdbc.url=jdbc\:sqlserver\://localhost:1433;databaseName=emr_record
#jdbc.username=sa
#jdbc.password=AbcXyz123
#filters=stat
#maxWait=60000

@ -527,6 +527,7 @@
f. NAME dept_name,
archive_master.discharge_date_time,
archive_master.checked_datetime,
archive_master.checked_doctor,
CASE
WHEN archive_callback_info.count = NULL
OR archive_callback_info.count = 0 THEN
@ -597,6 +598,9 @@
</otherwise>
</choose>
</if>
<if test="checkedDoctor != null and checkedDoctor != ''">
and archive_master.checked_doctor like '%'+#{checkedDoctor,jdbcType=NVARCHAR}+'%'
</if>
ORDER BY archive_master.checked_datetime DESC
</select>

@ -192,6 +192,9 @@
<if test="name != null and name != ''">
AND uuName LIKE '%${name}%'
</if>
<if test="inpNo != null and inpNo != ''">
AND inp_no LIKE '%${inpNo}%'
</if>
<if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
AND UpLoadDateTime between '${startDate} 00:00:00' and '${endDate} 23:59:59'
</if>

@ -134,6 +134,9 @@
<if test="name != null and name != ''">
AND cpyUser LIKE '%${name}%'
</if>
<if test="inpNo != null and inpNo != ''">
AND inp_no LIKE '%${inpNo}%'
</if>
<if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
AND cpytime between '${startDate} 00:00:00' and '${endDate} 23:59:59'
</if>
@ -183,6 +186,9 @@
<if test="name != null and name != ''">
AND cpyUser LIKE '%${name}%'
</if>
<if test="inpNo != null and inpNo != ''">
AND inp_no LIKE '%${inpNo}%'
</if>
<if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
AND cpytime between '${startDate} 00:00:00' and '${endDate} 23:59:59'
</if>

@ -585,6 +585,30 @@
</div>
</div>
</div>
<%--单个审核弹窗未扫描纸质病历弹窗提示--%>
<div class="modal fade" id="WZModal" tabindex="-5" role="dialog" aria-labelledby="exampleModalLabel">
<div class="modal-dialog" role="document">
<div class="modal-content modal-contentLow">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">×</span>
</button>
<h4 class="modal-title">终审信息</h4>
</div>
<div class="modal-body">
<form>
<div class="form-group ">
<label class="control-label" id="resultLabel">纸质病历未扫描上传是否强制提交?</label>
</div>
</form>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default btn-sm" data-dismiss="modal">返回</button>
<button type="button" class="btn btn-primary btn-sm" id="wzSaveBtn">通过</button>
</div>
</div>
</div>
</div>
<%--审核确认弹窗--%>
<div class="modal fade verifyModal" id="sureModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel">
<div class="modal-dialog" role="document">
@ -622,7 +646,7 @@
</div>
</div>
</body>
<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-09-11"></script>
<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2020-09-11_1"></script>
<script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-09-11"></script>
<script src="${path}/static/js/statistics/getDeptCommom.js"></script>
<script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-08-21"></script>

@ -86,7 +86,7 @@
</select>
</div>--%>
<div class="form-group divCss8" id="deptDiv" style="height: 18px;margin-top: -7px;">
<label>院科室:</label>
<label>院科室:</label>
<select class="selectpicker bla bla bli" multiple data-live-search="true" name="deptName"
id="deptName" title="请输入科室">
<option value="">全部</option>
@ -100,6 +100,10 @@
<option value="0">未召回</option>
</select>
</div>
<div class="form-group divCss8">
<label for="name">终审工号:</label>
<input type="text" class="input-sm form-control" id="checkedDoctor" placeholder="请输入终审工号" maxlength="16">
</div>
<button type="button" class="btn btn-primary btn-sm divCss" id="searchBtn">查询</button>
<button type="button" class="btn btn-info btn-sm divCss" id="excelBtn">条件导出</button>
</div>
@ -234,5 +238,5 @@
</div>
</div>
</body>
<script src="${path}/static/js/medicalRecallList/medicalRecallList.js?time=2020-09-11"></script>
<script src="${path}/static/js/medicalRecallList/medicalRecallList.js?time=2020-09-11_1"></script>
</html>

@ -62,6 +62,10 @@
onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
</select>
</div>
<div class="form-group divCss8">
<label>住院号:</label>
<input type="text" class="form-control input-sm" id="inpNo" maxlength="16">
</div>
<div class="form-group divCss8">
<label>操作人:</label>
<input type="text" class="form-control input-sm" id="name" maxlength="8">
@ -93,7 +97,7 @@
</div>
</div>
</div>
<script src="${path}/static/js/statistics/printCount.js?time=2020-08-18"></script>
<script src="${path}/static/js/statistics/printCount.js?time=2020-09-11"></script>
<script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-07-24"></script>
</body>
</html>

@ -62,6 +62,10 @@
onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
</select>
</div>
<div class="form-group divCss8">
<label>住院号:</label>
<input type="text" class="form-control input-sm" id="inpNo" maxlength="16">
</div>
<div class="form-group divCss8">
<label>操作人:</label>
<input type="text" class="form-control input-sm" id="name" maxlength="8">
@ -93,7 +97,7 @@
</div>
</div>
</div>
<script src="${path}/static/js/statistics/printInfo.js?time=2020-08-18"></script>
<script src="${path}/static/js/statistics/printInfo.js?time=2020-09-11"></script>
<script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-07-24"></script>
</body>
</html>

@ -62,6 +62,10 @@
onchange="loadTableByTime(this.options[this.options.selectedIndex].value,'startTime1','endTime1','table')">
</select>
</div>
<div class="form-group divCss8">
<label>住院号:</label>
<input type="text" class="form-control input-sm" id="inpNo" maxlength="16">
</div>
<div class="form-group divCss8">
<label>扫描人:</label>
<input type="text" class="form-control input-sm" id="name" maxlength="8">
@ -93,7 +97,7 @@
</div>
</div>
</div>
<script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-08-18"></script>
<script src="${path}/static/js/statistics/statisticsCommom.js?time=2020-09-11"></script>
<script src="${path}/static/js/statistics/scanInfo.js"></script>
</body>
</html>

@ -131,16 +131,25 @@ function initTable() {
align: 'left'
},
{
title: '纸质状态',
title: '状态',
field: 'status',
align: 'center',
valign: 'middle',
formatter: function (value, row) {
var overTimeStr = '';
//超期
if (row.days > 0) {
overTimeStr = '<span style="color:red">(超期)</span>';
}
var str = '<span style="color:#8FBC8F"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
return overTimeStr+str;
}
},
{
title: '纸质状态',
field: 'remark',
align: 'center',
valign: 'middle',
formatter: function (value, row) {
var colorStr = ''
if(value == '已签收'){
colorStr = '#8FBC8F';
@ -150,7 +159,7 @@ function initTable() {
value = '';
}
var str = '<span style="color:'+colorStr+'"><i class="fa fa-check-circle-o" aria-hidden="true"></i>' + value + '</span>';
return overTimeStr+str;
return str;
}
},
{
@ -368,10 +377,39 @@ $("#verifyBtn").on('click', function () {
});
}else{
//只有一个直接提交
approveMethod();
var ids = $("#archiveId").val();
//判断是否有扫描纸质
$.ajax({
type:'get',
url:path+'/lastVerify/selectIsScan',
data:{ids:ids},
dataType:'json',
success:function(data){
if(data.code == 100){
var str = data.extend.ids;
if(str != ''){
//允许提交
approveMethod();
}else{
//弹窗确认
$("#WZModal").modal({show:"true"});
}
//隐藏该窗口
$("#verifyModal").modal('hide');
}else{
toastr.error(data.msg);
}
}
})
}
});
//单个终审判断纸质未扫描仍强制提交
$("#wzSaveBtn").click(function(){
approveMethod();
$("#WZModal").modal('hide');
})
//终审方法
function approveMethod(){
setFormToken();
@ -420,45 +458,15 @@ $("#sureBtn").on('click',function(){
//调用审批diag
function callApproveDiag(ids,count) {
//判断是否有扫描纸质
$.ajax({
type:'get',
url:path+'/lastVerify/selectIsScan',
data:{ids:ids},
dataType:'json',
success:function(data){
if(data.code == 100){
var ids = data.extend.ids;
if(ids != ''){
$('#verifyModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
$("#archiveId").val(ids);
$("#status1").val("64");
$("#verifyText").val("");
//审批个数
//组织selects
debugger
var idsList = ids.split(",");
for (var i = 0; i < selects.length; i++) {
for (var j = 0; j < idsList.length; j++) {
if(selects[i].id == idsList[j]){
return ;
}
}
selects.splice(i,1);
}
$("#approveCount").val(idsList.length);
}else{
toastr.warning("纸质病历未扫描上传,请先扫描上传")
}
}else{
toastr.error(data.msg);
}
}
})
$('#verifyModal').modal({
backdrop: 'static',//backdrop 为 static 时,点击模态对话框的外部区域不会将其关闭。
keyboard: false,//keyboard 为 false 时,按下 Esc 键不会关闭 Modal。
show: true//弹出对话框
});
$("#archiveId").val(ids);
$("#status1").val("64");
$("#verifyText").val("");
$("#approveCount").val(count);
}
//查看初审信息

@ -88,7 +88,8 @@ function initTable() {
name:""+$("#name").val(),
//archivestate: "" + $("#archivestate").val(),
status:"" + $("#state").val(),
deptName: deptName.toString()
deptName: deptName.toString(),
checkedDoctor:$("#checkedDoctor").val()
};
return temp;
},
@ -199,6 +200,12 @@ function initTable() {
return '<span style="color:#030378"><i class="fa fa-check-circle-o" aria-hidden="true"></i>已归档</span>';
}
},
{
title: '终审工号',
field: 'checkedDoctor',
align: 'center',
valign: 'middle'
},
{
title: "操作",
align: 'left',
@ -336,6 +343,7 @@ $("#excelBtn").click(function () {
var name = $("#name").val();
var idNo = $("#idNo").val();
var status = $("#state").val();
var checkedDoctor = $("#checkedDoctor").val();
//var archivestate=""+ $("#archivestate").val();
var url = window.location.href;
@ -348,7 +356,7 @@ $("#excelBtn").click(function () {
}
}
var url = path+"/medicalRecall/exportExcel";
post(url,{"inpNo":inpNo,"visitId":visitId,"name":name,"idNo":idNo,"deptName":deptName,"status":status});
post(url,{"inpNo":inpNo,"visitId":visitId,"name":name,"idNo":idNo,"deptName":deptName,"status":status,"checkedDoctor":checkedDoctor});
});
//召回提交

@ -56,7 +56,8 @@ function initTable() {
startDate: $("#startTime1").val(),
endDate: $("#endTime1").val(),
name:$("#name").val(),
isSearch:$("#isSearch").val()
isSearch:$("#isSearch").val(),
inpNo:$("#inpNo").val()
};
return temp;
},
@ -149,6 +150,7 @@ $("#excelBtn").click(function () {
"endDate": $("#endTime1").val(),
"name":$("#name").val(),
"isSearch":$("#isSearch").val(),
"sql":sql
"sql":sql,
"inpNo":$("#inpNo").val()
});
});

@ -56,7 +56,8 @@ function initTable() {
startDate: $("#startTime1").val(),
endDate: $("#endTime1").val(),
name:$("#name").val(),
isSearch:$("#isSearch").val()
isSearch:$("#isSearch").val(),
inpNo:$("#inpNo").val()
};
return temp;
},
@ -185,6 +186,7 @@ $("#excelBtn").click(function () {
"endDate": $("#endTime1").val(),
"name":$("#name").val(),
"isSearch":$("#isSearch").val(),
"sql":sql
"sql":sql,
"inpNo":$("#inpNo").val()
});
});

@ -57,6 +57,7 @@ function initTable() {
endDate: $("#endTime1").val(),
name:$("#name").val(),
isSearch:$("#isSearch").val(),
inpNo:$("#inpNo").val()
};
return temp;
},
@ -173,6 +174,7 @@ $("#excelBtn").click(function () {
"endDate": $("#endTime1").val(),
"name":$("#name").val(),
"isSearch":$("#isSearch").val(),
"sql":sql
"sql":sql,
"inpNo":$("#inpNo").val()
});
});
Loading…
Cancel
Save