From 66ca8400396ea0bf57ed288d6079dff2726befe4 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Wed, 7 Oct 2020 22:21:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/emr_record.bak                            | Bin 98683392 -> 131578368 bytes
 .../controller/beHospitaledController.java    |   9 +-
 .../views/beHospitaledDir/beHospList.jsp      | 320 +++++++++---------
 .../static/js/hospitalLoadPdf/loadPdf.js      |   4 +
 4 files changed, 167 insertions(+), 166 deletions(-)

diff --git a/doc/emr_record.bak b/doc/emr_record.bak
index 7466c235b0dfaa73e1aa935456ea01b613922159..58c30d8a1539cdb2871c08f246b6f7148475beb3 100644
GIT binary patch
delta 30339
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

delta 4265
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
W-Qd08aBw6z8oVDIi^U(r?*9QpJ0w~F

diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java
index 5279ca2..e5a313b 100644
--- a/src/main/java/com/emr/controller/beHospitaledController.java
+++ b/src/main/java/com/emr/controller/beHospitaledController.java
@@ -233,8 +233,8 @@ public class beHospitaledController {
             /*for (int i = 1; i <= 11; i++) {
                 HisCollectInfo obj1 = new HisCollectInfo();
                 obj1.setFrecName("标题" + i);
-                obj1.setFentryNo((808+i)+"");
-                obj1.setFentryName("分类"+(808+i));
+                obj1.setFentryNo((800+i)+"");
+                obj1.setFentryName("分类"+(800+i));
                 if(i>=2){
                     obj1.setPdfflag("1");
                     obj1.setFfileId((4234+i)+"");
@@ -248,10 +248,10 @@ public class beHospitaledController {
                 //查询oracle
                 list = OracleConnect.select1(sql);
             }catch (Exception e){
-                e.printStackTrace();
                 ExceptionPrintUtil.printException(e);
                 log.error("优先采集查询oracle出错,请查看error.log文件");
             }
+            log.info("list数量:"+list.size()+"个->list:"+list);
             //赋值两时间：最近上传时间与最新手动提交时间
             if(!CollectionUtils.isEmpty(list)) {
                 setTwoTimeForList(list);
@@ -259,7 +259,6 @@ public class beHospitaledController {
             }
             return JSON.toJSONString(list);
         } catch (Exception e) {
-            e.printStackTrace();
             ExceptionPrintUtil.printException(e);
         }
         return null;
@@ -364,7 +363,6 @@ public class beHospitaledController {
                     OracleConnect.insert(sql);
                     log.info("优先采集插入oracle成功");
                 }catch (Exception e){
-                    e.printStackTrace();
                     log.info("优先采集插入oracle失败,请查看error.log文件");
                     ExceptionPrintUtil.printException(e);
                 }
@@ -398,7 +396,6 @@ public class beHospitaledController {
             }
             log.info("优先采集插入本地数据库成功");
         }catch (Exception e){
-            e.printStackTrace();
             ExceptionPrintUtil.printException(e);
             log.error("优先采集插入本地数据库失败,请查看error.log文件");
             return true;
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 1db05c2..942bb8f 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -338,7 +338,7 @@
                             <div class="col-sm-4">
                                 完整性审核：
                                 <a id="showDefectTable" style="cursor: pointer">
-                                    <span id="wzContent"></span>
+                                    <span id="wzContent">测试完整性</span>
                                 </a>
                             </div>
                         </div>
@@ -1707,10 +1707,8 @@
                         events: {
                             'click .verifyInfo': function (e, value, row, index) {
                                 //查询his判断医生护士是否全部提交
-                                var result = 1;
-                                //result = selectHis(row);
+                                var result = selectHis(row);
                                 if (result == 1) {
-                                    // console.log("====审核====");
                                     $('#verifyModal').modal({
                                         backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
                                         keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
@@ -1718,18 +1716,13 @@
                                     });
                                     $("#verifyText").val("");
                                     $("#archiveId").val(row.id);
-                                } else if (result == -1) {
-                                    toastr.warning("系统出错了请联系系统管理员");
-                                } else {
-                                    toastr.warning("his系统医生或护士未完成提交");
                                 }
                             },
                             'click .selInfo': function (e, value, row, index) {
                                 //赋值记帐号
                                 $("#fpatno").val(row.patientId);
                                 //查询是否医生或护士是否提交
-                                var result = 1;
-                                result = selectHis(row);
+                                var result = selectHis(row);
                                 $('#selModal').modal({
                                     backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
                                     keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
@@ -2188,7 +2181,7 @@
                         html += '<option value="'+key+'">'+value+'</option>';
                     })
                     //加载文件生成情况表格
-                    initTable3();
+                    initTable3(data,1)
                     $("#modal-default").modal({
                         show: true
                     });
@@ -2200,162 +2193,166 @@
             }
         });
     }
-    //加载文件生成情况表格
-    function initTable3() {
+    //加载文件生成情况表格 flag是否是初始化
+    function initTable3(data,flag) {
         $('#myModal').modal('show');
         //查询数据
-        $.ajax({
-            type:'post',
-            url:path+'/beHosp/getPdfCollectInfoFromHis',
-            data:{
-                fpatno: $("#fpatno").val(),
-                frecName:$("#frecName").val(),
-                fentryNo:$("#fentryNo").val(),
-                pdfflag:$("#pdfflag").val()
+        if(flag != 1) {
+            $.ajax({
+                type: 'post',
+                url: path + '/beHosp/getPdfCollectInfoFromHis',
+                data: {
+                    fpatno: $("#fpatno").val(),
+                    frecName: $("#frecName").val(),
+                    fentryNo: $("#fentryNo").val(),
+                    pdfflag: $("#pdfflag").val()
+                },
+                async:false,
+                dataType: 'json',
+                success: function (result) {
+                    data = result;
+                }
+            })
+        }
+        initTab(data);
+    }
+    function initTab(data){
+        //加载成功数量
+        loadCollectNum(data);
+        $('#table3').bootstrapTable('destroy');
+        //加载表格
+        $("#table3").bootstrapTable({ // 对应table标签的id
+            data: data,
+            cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
+            striped: true,  //表格显示条纹，默认为false
+            pagination: true, // 在表格底部显示分页组件，默认false
+            paginationShowPageGo: true,
+            pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
+            pageSize: 10, // 页面数据条数
+            pageNumber: 1, // 初始化加载第一页，默认第一页
+            sidePagination: 'client', // 设置为服务器端分页     客户端：client
+            searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
+            undefinedText: '---', //当数据为 undefined 时显示的字符
+            clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
+            height: 560,     //定义表格的高度。
+            searchTimeOut: 500,// 默认500  设置搜索超时时间。
+            paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
+            showHeader: true,//是否显示列头。
+            trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
+            columns: [{
+                title: '全选',
+                field: 'select',   //复选框
+                checkbox: true,
+                width: 25,
+                align: 'center',
+                hidden: true,
+            }, {
+                title: '序',
+                field: 'id',
+                align: 'left',
+                visible: false
             },
-            dataType:'json',
-            success:function(data){
-                if(data.length > 0) {
-                    //加载成功数量
-                    loadCollectNum(data);
-                    $('#table3').bootstrapTable('destroy');
-                    //加载表格
-                    $("#table3").bootstrapTable({ // 对应table标签的id
-                        data: data,
-                        cache: false, // 设置为 false 禁用 AJAX 数据缓存， 默认为true
-                        striped: true,  //表格显示条纹，默认为false
-                        pagination: true, // 在表格底部显示分页组件，默认false
-                        paginationShowPageGo: true,
-                        pageList: [10, 20, 50, 100], // 如果设置了分页，设置可供选择的页面数据条数。设置为All 则显示所有记录。
-                        pageSize: 10, // 页面数据条数
-                        pageNumber: 1, // 初始化加载第一页，默认第一页
-                        sidePagination: 'client', // 设置为服务器端分页     客户端：client
-                        searchOnEnterKey: true, //设置为 true时，按回车触发搜索方法，否则自动触发搜索方法
-                        undefinedText: '---', //当数据为 undefined 时显示的字符
-                        clickToSelect: true,//设置true 将在点击行时，自动选择rediobox 和 checkbox
-                        height: 560,     //定义表格的高度。
-                        searchTimeOut: 500,// 默认500  设置搜索超时时间。
-                        paginationDetailHAlign: 'left',//指定 分页详细信息 在水平方向的位置。'left' 或 'right'。
-                        showHeader: true,//是否显示列头。
-                        trimOnSearch: true,//设置为 true 将自动去掉搜索字符的前后空格。
-                        columns: [{
-                            title: '全选',
-                            field: 'select',   //复选框
-                            checkbox: true,
-                            width: 25,
-                            align: 'center',
-                            hidden: true,
-                        }, {
-                            title: '序',
-                            field: 'id',
-                            align: 'left',
-                            visible: false
-                        },
-                            {
-                                title: "操作",
-                                align: 'left',
-                                valign: 'middle',
-                                width: 100, // 定义列的宽度，单位为像素px
-                                formatter: function (value, row, index) {
-                                    var html = '<button type="button" class="btn btn-primary btn-sm firstCollect">优先采集</button>';
-                                    return html;
-                                }, events: {
-                                    'click .firstCollect': function (e, value, row, index) {
-                                        $(this).attr("disabled",true);
-                                        //分类编号
-                                        var fentryNos = row.fentryNo;
-                                        //文件id
-                                        var ffileIds = row.ffileId;
-                                        if(ffileIds == null || ffileIds == ''){
-                                            ffileIds = 'undefined';
-                                        }
-                                        //提交请求
-                                        sumbitFirstCollect(fentryNos,ffileIds);
-                                        $(this).removeAttr("disabled");
-                                    }
-                                },
-                                cellStyle: function (value, row, index) {
-                                    return {classes: 'success'}
+                {
+                    title: "操作",
+                    align: 'left',
+                    valign: 'middle',
+                    width: 100, // 定义列的宽度，单位为像素px
+                    formatter: function (value, row, index) {
+                        var html = '<button type="button" class="btn btn-primary btn-sm firstCollect">优先采集</button>';
+                        return html;
+                    }, events: {
+                        'click .firstCollect': function (e, value, row, index) {
+                            $(this).attr("disabled",true);
+                            //分类编号
+                            var fentryNos = row.fentryNo;
+                            //文件id
+                            var ffileIds = row.ffileId;
+                            if(ffileIds == null || ffileIds == ''){
+                                ffileIds = 'undefined';
+                            }
+                            //提交请求
+                            sumbitFirstCollect(fentryNos,ffileIds);
+                            $(this).removeAttr("disabled");
+                        }
+                    },
+                    cellStyle: function (value, row, index) {
+                        return {classes: 'success'}
 
-                                }
-                            },
-                            {
-                                title: '标题',
-                                field: 'frecName',
-                                align: 'left',
-                                valign: 'middle',
-                                //格式化列
-                                formatter: function (value, row, index) {
-                                    return paramsMatterColumn(value);
-                                }
-                            },
-                            {
-                                title: '状态',
-                                field: 'pdfflag',
-                                align: 'center',
-                                valign: 'middle',
-                                formatter: function (value, row, index) {
-                                    //在院  未归档  归档中  初审 已归档 已认证
-                                    var a = '';
-                                    if (value == '0') {
-                                        a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>未完成</span>';
-                                    } else if (value == '1') {
-                                        a = '<span style="color:green"><i class="fa fa-check-circle-o" aria-hidden="true"></i>完成</span>';
-                                    }
-                                    return a;
-                                }
-                            },
-                            {
-                                title: '来源',
-                                field: 'source',
-                                align: 'center',
-                                valign: 'middle',
-                                formatter: function (value, row, index) {
-                                    return 'his';
-                                }
-                            },
-                            {
-                                title: '分段',
-                                field: 'fentryName',
-                                align: 'center',
-                                valign: 'middle'
-                            },
-                            {
-                                title: '最新采集时间',
-                                field: 'updateLoadTime',
-                                align: 'left',
-                                valign: 'middle',
-                                width: 150 // 定义列的宽度，单位为像素px
-                            },
-                            {
-                                title: '最近手动提交时间',
-                                field: 'sumbitTime',
-                                align: 'left',
-                                valign: 'middle',
-                                width: 150, // 定义列的宽度，单位为像素px
-                                formatter: function (value, row, index) {
-                                    if(value != '' && value != null){
-                                        var color = '';
-                                        color = 'red';
-                                        if(row.updateLoadTime != ''){
-                                            if(value < row.updateLoadTime){
-                                                color = 'green';
-                                            }
-                                        }
-                                        return '<span style="color:'+color+';">'+value+'</span>';
-                                    }else{
-                                        return value;
-                                    }
+                    }
+                },
+                {
+                    title: '标题',
+                    field: 'frecName',
+                    align: 'left',
+                    valign: 'middle',
+                    //格式化列
+                    formatter: function (value, row, index) {
+                        return paramsMatterColumn(value);
+                    }
+                },
+                {
+                    title: '状态',
+                    field: 'pdfflag',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function (value, row, index) {
+                        //在院  未归档  归档中  初审 已归档 已认证
+                        var a = '';
+                        if (value == '0') {
+                            a = '<span style="color:red;"><i class="fa fa-times-circle-o" aria-hidden="true"></i>未完成</span>';
+                        } else if (value == '1') {
+                            a = '<span style="color:green"><i class="fa fa-check-circle-o" aria-hidden="true"></i>完成</span>';
+                        }
+                        return a;
+                    }
+                },
+                {
+                    title: '来源',
+                    field: 'source',
+                    align: 'center',
+                    valign: 'middle',
+                    formatter: function (value, row, index) {
+                        return 'his';
+                    }
+                },
+                {
+                    title: '分段',
+                    field: 'fentryName',
+                    align: 'center',
+                    valign: 'middle'
+                },
+                {
+                    title: '最新采集时间',
+                    field: 'updateLoadTime',
+                    align: 'left',
+                    valign: 'middle',
+                    width: 150 // 定义列的宽度，单位为像素px
+                },
+                {
+                    title: '最近手动提交时间',
+                    field: 'sumbitTime',
+                    align: 'left',
+                    valign: 'middle',
+                    width: 150, // 定义列的宽度，单位为像素px
+                    formatter: function (value, row, index) {
+                        if(value != '' && value != null){
+                            var color = '';
+                            color = 'red';
+                            if(row.updateLoadTime != ''){
+                                if(value < row.updateLoadTime){
+                                    color = 'green';
                                 }
                             }
-                        ],
-                    });
+                            return '<span style="color:'+color+';">'+value+'</span>';
+                        }else{
+                            return value;
+                        }
+                    }
                 }
-                $('#myModal').modal('hide');
-            }
-        })
+            ],
+        });
+        $('#myModal').modal('hide');
     }
-
     //加载采集数量
     function loadCollectNum(data) {
         //总数量
@@ -2378,12 +2375,15 @@
             if (percent >= 80) {
                 color = 'green';
             }
+        }else{
+            $("#collectFinishPercent").text(0);
         }
         $("#collectFinishPercentId").css("color",color);
     }
     //pdf生成情况查询按钮
     $("#collectPdfInfosearchBtn").click(function(){
-        initTable3();
+        var data = [];
+        initTable3(data,2)
     })
     $("#loading").css("background","url(${path}/static/img/load.gif) no-repeat 10px 50%");
     //批量采集
diff --git a/src/main/webapp/static/js/hospitalLoadPdf/loadPdf.js b/src/main/webapp/static/js/hospitalLoadPdf/loadPdf.js
index 3ee3aee..8f2e90b 100644
--- a/src/main/webapp/static/js/hospitalLoadPdf/loadPdf.js
+++ b/src/main/webapp/static/js/hospitalLoadPdf/loadPdf.js
@@ -103,20 +103,24 @@ $("#pdfBtn2").click(function () {
 
 //封装请求查询his系统医生护士是否全部提交
 function selectHis(row){
+    var data = 1;
     $.ajax({
         type:'get',
         url:path+"/beHosp/getInfoFromHis",
         data:{patientId:row.patientId},
         async:false,
         success:function(result) {
+            data = result;
             if (result == 1) {
             } else if(result == -1){
                 toastr.warning("系统出错了请联系系统管理员");
             }else {
                 toastr.warning('医生或护士未提交数据，请稍后再试');
             }
+
         }
     })
+    return data;
 }
 function initTable2() {
     $("#table2").bootstrapTable({ // 对应table标签的id