优化

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;//是否超期
 }
  
 

src/main/java/com/emr/service/ipml/ArchiveCallbackInfoService.java

@@ -80,8 +80,6 @@ public class ArchiveCallbackInfoService {
         List<ArchiveFlowRole> archiveFlowRoles = flowRoleMapper.selectAll();
         List<ArchiveFlowRole> 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{

src/main/resources/mapper/Archive_MasterMapper.xml

@@ -622,7 +622,7 @@
           <include refid="selectColumms"></include>,
             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,

src/main/webapp/WEB-INF/jspf/comm.jspf

@@ -58,6 +58,6 @@
 
 <script src="${path}/static/bootstrap-3.3.7/bower_components/bootstrap/dist/js/fileinput.min.js"></script>
 <script type="text/javascript" src="${path}/static/js/hospitalCommom/pinying.js"></script>
-<script type="text/javascript" src="${path}/static/js/comm.js?t=2021-07-30"></script>
+<script type="text/javascript" src="${path}/static/js/comm.js?t=2021-10-27"></script>
 <script type="text/javascript" src="${path}/static/js/md5.js"></script>
 <input type="hidden" id="userId" value="${CURRENT_USER.userId}">

src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp

@@ -855,7 +855,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/beHospList/beHospList.js?time=2021-08-04"></script>
+<script src="${path}/static/js/beHospList/beHospList.js?time=2021-10-27"></script>
 <script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2021-08-01"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>
 </html>

src/main/webapp/WEB-INF/views/lastVerifyDir/lastVerifyList.jsp

@@ -687,7 +687,7 @@
     </div>
 </div>
 </body>
-<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2021-08-04"></script>
+<script src="${path}/static/js/lastVerifyList/lastVerifyList.js?time=2021-10-27"></script>
 <script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2021-08-01"></script>
 <script src="${path}/static/js/statistics/getDeptCommom.js"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>

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 '<span style="color:green">是</span>';
+                        if(value == '召回中'){
+                            return '<span style="color:green">召回中</span>';
                         }else{
                             return '<span style="color:red">否</span>';
                         }
@@ -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()
     });
 });
 

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});
 }
 

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 '<span style="color:green">是</span>';
+                        if(value != '召回中'){
+                            return '<span style="color:green">召回中</span>';
                         }else{
                             return '<span style="color:red">否</span>';
                         }
@@ -650,6 +650,8 @@ $("#getRecallBtn").on('click', function () {
 });
 
 $(function () {
+    $("#startDateTo").val(getHisDay(15));
+    $("#endDateTo").val(getHisDay(8));
     //加载科室
     getDept();
     $(".modal-dialog").draggable();//为模态对话框添加拖拽

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;