From 3e508e09b25a1e94f34677138e0eb73626ee7937 Mon Sep 17 00:00:00 2001 From: zengwh <81383286@qq.com> Date: Thu, 28 Oct 2021 08:37:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/emr/entity/Archive_Master_Vo.java | 2 ++ .../emr/service/ipml/ArchiveCallbackInfoService.java | 2 -- src/main/resources/mapper/Archive_MasterMapper.xml | 4 ++-- src/main/webapp/WEB-INF/jspf/comm.jspf | 2 +- .../WEB-INF/views/beHospitaledDir/beHospList.jsp | 2 +- .../WEB-INF/views/lastVerifyDir/lastVerifyList.jsp | 2 +- src/main/webapp/static/js/beHospList/beHospList.js | 12 ++++++++---- src/main/webapp/static/js/comm.js | 8 +++----- .../static/js/lastVerifyList/lastVerifyList.js | 6 ++++-- src/main/webapp/static/pdfjs/web/viewer.js | 2 +- 10 files changed, 23 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/emr/entity/Archive_Master_Vo.java b/src/main/java/com/emr/entity/Archive_Master_Vo.java index 23290d3..3f61846 100644 --- a/src/main/java/com/emr/entity/Archive_Master_Vo.java +++ b/src/main/java/com/emr/entity/Archive_Master_Vo.java @@ -87,6 +87,8 @@ public class Archive_Master_Vo extends Archive_Master{ private String callBackStatus;//退回召回状态 private String printStatus;//打印状态 + + private Integer isOverTime;//是否超期 } diff --git a/src/main/java/com/emr/service/ipml/ArchiveCallbackInfoService.java b/src/main/java/com/emr/service/ipml/ArchiveCallbackInfoService.java index 4fe20ac..71a9a35 100644 --- a/src/main/java/com/emr/service/ipml/ArchiveCallbackInfoService.java +++ b/src/main/java/com/emr/service/ipml/ArchiveCallbackInfoService.java @@ -80,8 +80,6 @@ public class ArchiveCallbackInfoService { List archiveFlowRoles = flowRoleMapper.selectAll(); List currentRoleAndNextRole = archiveFlowInfoService.getCurrentRoleAndNextRole(currentCode,targetCode,archiveFlowRoles); archiveFlowInfoService.insertFlowInfo(masterId,remark,currentRoleAndNextRole.get(0),currentRoleAndNextRole.get(1),new Date()); - //TODO 删除病案资料 - callbackInfoMapper.deleteRecordByRecall(masterId); } private String getAddressIp() throws Exception{ diff --git a/src/main/resources/mapper/Archive_MasterMapper.xml b/src/main/resources/mapper/Archive_MasterMapper.xml index 8047e8b..117cd28 100644 --- a/src/main/resources/mapper/Archive_MasterMapper.xml +++ b/src/main/resources/mapper/Archive_MasterMapper.xml @@ -622,7 +622,7 @@ , CASE WHEN jzh IS NOT NULL THEN - '是' + '召回中' ELSE '否' END callBackStatus, @@ -711,7 +711,7 @@ END remark, CASE WHEN jzh IS NOT NULL THEN - '是' + '召回中' ELSE '否' END callBackStatus, diff --git a/src/main/webapp/WEB-INF/jspf/comm.jspf b/src/main/webapp/WEB-INF/jspf/comm.jspf index c8bca64..c529e28 100644 --- a/src/main/webapp/WEB-INF/jspf/comm.jspf +++ b/src/main/webapp/WEB-INF/jspf/comm.jspf @@ -58,6 +58,6 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp index e21a353..c740511 100644 --- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp +++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp @@ -855,7 +855,7 @@ - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp index 0bd9f57..763d556 100644 --- a/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp +++ b/src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp @@ -687,7 +687,7 @@ - + diff --git a/src/main/webapp/static/js/beHospList/beHospList.js b/src/main/webapp/static/js/beHospList/beHospList.js index ead942c..856f2d5 100644 --- a/src/main/webapp/static/js/beHospList/beHospList.js +++ b/src/main/webapp/static/js/beHospList/beHospList.js @@ -73,7 +73,8 @@ function initTable() { infoId:$("#infoId").val(), operRole:$("#checker").val(), callBackStatus:$("#callBackStatus").val(), - printStatus:$("#printStatus").val() + printStatus:$("#printStatus").val(), + isOverTime:$("#isOverTime").val() }; return temp; }, @@ -156,8 +157,8 @@ function initTable() { align: 'center', valign: 'middle', formatter:function(value, row){ - if(value == '是'){ - return '是'; + if(value == '召回中'){ + return '召回中'; }else{ return '否'; } @@ -822,6 +823,8 @@ $(function () { } else { $('#deptDiv').hide(); } + $("#startDateTo").val(getHisDay(15)); + $("#endDateTo").val(getHisDay(8)); }); //导出excel功能 @@ -852,7 +855,8 @@ $("#excelBtn").click(function () { "roles":$("#searchOperRole").val(), "isSuccess":$("#isSuccessSearch").val(), "infoId":$("#infoId").val(), - "operRole":$("#checker").val() + "operRole":$("#checker").val(), + "isOverTime":$("#isOverTime").val() }); }); diff --git a/src/main/webapp/static/js/comm.js b/src/main/webapp/static/js/comm.js index 83cc9fa..9e1f1ee 100644 --- a/src/main/webapp/static/js/comm.js +++ b/src/main/webapp/static/js/comm.js @@ -162,16 +162,14 @@ function getHeight(height) { } //重设表格高度 function reloadTableHeight(tableId) { - //获取表格内容高度 - var height = $(".fixed-table-body #"+tableId).height(); //刷新 $('#'+tableId).bootstrapTable('resetView', { height: "auto" }); + //获取表格内容高度 + var height = $(".fixed-table-body #"+tableId).height(); //计算body所需高度 var tableBodyHeight = height-6; //赋值body高度，且定义最高高度 - if(maxHeight == 0){ - maxHeight = tableBodyHeight; - } + maxHeight = tableBodyHeight; $(".fixed-table-body").css({height:tableBodyHeight,"max-height":maxHeight}); } diff --git a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js index c609946..c2e0170 100644 --- a/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js +++ b/src/main/webapp/static/js/lastVerifyList/lastVerifyList.js @@ -194,8 +194,8 @@ function initTable() { align: 'center', valign: 'middle', formatter:function(value, row){ - if(value == '是'){ - return '是'; + if(value != '召回中'){ + return '召回中'; }else{ return '否'; } @@ -650,6 +650,8 @@ $("#getRecallBtn").on('click', function () { }); $(function () { + $("#startDateTo").val(getHisDay(15)); + $("#endDateTo").val(getHisDay(8)); //加载科室 getDept(); $(".modal-dialog").draggable();//为模态对话框添加拖拽 diff --git a/src/main/webapp/static/pdfjs/web/viewer.js b/src/main/webapp/static/pdfjs/web/viewer.js index cb46f89..58e3d5c 100644 --- a/src/main/webapp/static/pdfjs/web/viewer.js +++ b/src/main/webapp/static/pdfjs/web/viewer.js @@ -46,7 +46,7 @@ var mozL10n = document.mozL10n || document.webL10n; var CSS_UNITS = 96.0 / 72.0; -var DEFAULT_SCALE = '1'; +var DEFAULT_SCALE = '1.25'; var UNKNOWN_SCALE = 0; var MAX_AUTO_SCALE = 1.25; var SCROLLBAR_PADDING = 40;