From df343174ae4502772d5949cdb3e3f9fd27ce9730 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Tue, 29 Sep 2020 23:47:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2hisPdf?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=94=9F=E6=88=90=E6=98=8E=E7=BB=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/emr_record.bak                            | Bin 65789440 -> 98683392 bytes
 .../controller/beHospitaledController.java    |  24 ++++----
 src/main/java/com/emr/util/OracleConnect.java |  21 +++----
 .../views/beHospitaledDir/beHospList.jsp      |  54 ++++++++----------
 4 files changed, 47 insertions(+), 52 deletions(-)

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

delta 2761
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

diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java
index d261220..f793e7d 100644
--- a/src/main/java/com/emr/controller/beHospitaledController.java
+++ b/src/main/java/com/emr/controller/beHospitaledController.java
@@ -282,19 +282,21 @@ public class beHospitaledController {
         if(!CollectionUtils.isEmpty(archiveDetails) || !CollectionUtils.isEmpty(archiveSumbitdateInfoList)){
             for (HisCollectInfo hisCollectInfo : list) {
                 String ffileId = hisCollectInfo.getFfileId();
-                if(!CollectionUtils.isEmpty(archiveDetails)){
-                    for (Archive_Detail archiveDetail : archiveDetails) {
-                        if (ffileId.equals(archiveDetail.getSubassort())) {
-                            hisCollectInfo.setUpdateLoadTime(archiveDetail.getUploaddatetime());
-                            break;
+                if(StringUtils.isNotBlank(ffileId)) {
+                    if (!CollectionUtils.isEmpty(archiveDetails)) {
+                        for (Archive_Detail archiveDetail : archiveDetails) {
+                            if (ffileId.equals(archiveDetail.getSubassort())) {
+                                hisCollectInfo.setUpdateLoadTime(archiveDetail.getUploaddatetime());
+                                break;
+                            }
                         }
                     }
-                }
-                if(!CollectionUtils.isEmpty(archiveSumbitdateInfoList)){
-                    for (ArchiveSumbitdateInfo info : archiveSumbitdateInfoList) {
-                        if (ffileId.equals(info.getFileId())) {
-                            hisCollectInfo.setSumbitTime(info.getCreateTime());
-                            break;
+                    if (!CollectionUtils.isEmpty(archiveSumbitdateInfoList)) {
+                        for (ArchiveSumbitdateInfo info : archiveSumbitdateInfoList) {
+                            if (ffileId.equals(info.getFileId())) {
+                                hisCollectInfo.setSumbitTime(info.getCreateTime());
+                                break;
+                            }
                         }
                     }
                 }
diff --git a/src/main/java/com/emr/util/OracleConnect.java b/src/main/java/com/emr/util/OracleConnect.java
index 14e6315..9b34769 100644
--- a/src/main/java/com/emr/util/OracleConnect.java
+++ b/src/main/java/com/emr/util/OracleConnect.java
@@ -107,18 +107,15 @@ public class OracleConnect {
         pst = conn.prepareStatement(arg0);
         rs = pst.executeQuery();
         List<HisCollectInfo> list = new ArrayList<>();
-        if (rs != null) {
-            System.out.println("查询oracle");
-            if(!rs.next()) {
-                while (rs.next()) {
-                    HisCollectInfo info = new HisCollectInfo();
-                    info.setFentryNo(rs.getString(1));
-                    info.setFentryName(rs.getString(2));
-                    info.setFrecName(rs.getString(3));
-                    info.setFfileId(rs.getString(4));
-                    info.setPdfflag(rs.getString(5));
-                    list.add(info);
-                }
+        if(rs.next()) {
+            while (rs.next()) {
+                HisCollectInfo info = new HisCollectInfo();
+                info.setFentryNo(rs.getString(1));
+                info.setFentryName(rs.getString(2));
+                info.setFrecName(rs.getString(3));
+                info.setFfileId(rs.getString(4));
+                info.setPdfflag(rs.getString(5));
+                list.add(info);
             }
         }
         OracleConnect.CloseConn(rs, pst, conn);
diff --git a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
index 98d4f60..f8e8883 100644
--- a/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
+++ b/src/main/webapp/WEB-INF/views/beHospitaledDir/beHospList.jsp
@@ -1730,12 +1730,6 @@
                                 //查询是否医生或护士是否提交
                                 var result = 1;
                                 result = selectHis(row);
-                                if (result == 1) {
-                                } else if(result == -1){
-                                    toastr.warning("系统出错了请联系系统管理员");
-                                }else {
-                                    toastr.warning('医生或护士未提交数据，请稍后再试');
-                                }
                                 $('#selModal').modal({
                                     backdrop: 'static',//backdrop 为 static 时，点击模态对话框的外部区域不会将其关闭。
                                     keyboard: false,//keyboard 为 false 时，按下 Esc 键不会关闭 Modal。
@@ -2167,16 +2161,12 @@
     });
     //查看缺失详情
     $("#showDefectTable").click(function () {
-        $("#modal-default").modal({
-            show: true
-        });
         //加载分类
         loadAssort();
-        //加载文件生成情况表格
-        initTable3();
     })
     //加载分类
     function loadAssort(){
+        $('#myModal').modal('show');
         $("#fentryNo").empty();
         $.ajax({
             type: 'post',
@@ -2186,8 +2176,8 @@
             },
             dataType: 'json',
             success: function (data) {
-                var html = '<option value="">全部</option>';
-                if(data != null){
+                if(data.length > 0){
+                    var html = '<option value="">全部</option>';
                     //获取分段集合
                     var map = new Map();
                     for(var i = 0;i < data.length;i++){
@@ -2197,8 +2187,16 @@
                     map.forEach(function(value,key){
                         html += '<option value="'+key+'">'+value+'</option>';
                     })
+                    //加载文件生成情况表格
+                    initTable3();
+                    $("#modal-default").modal({
+                        show: true
+                    });
+                    $("#fentryNo").append(html);
+                }else{
+                    toastr.warning("未查询到his病历生成任务,请耐心等待!")
                 }
-                $("#fentryNo").append(html);
+                $('#myModal').modal('hide');
             }
         });
     }
@@ -2217,7 +2215,7 @@
             },
             dataType:'json',
             success:function(data){
-                if(data != null) {
+                if(data.length > 0) {
                     //加载成功数量
                     loadCollectNum(data);
                     $('#table3').bootstrapTable('destroy');
@@ -2348,36 +2346,35 @@
                                 }
                             }
                         ],
-                        onLoadError: function () {  //加载失败时执行
-                            console.info("加载数据失败");
-                        }
                     });
-                    $('#myModal').modal('hide');
                 }
+                $('#myModal').modal('hide');
             }
         })
     }
 
     //加载采集数量
-    function loadCollectNum(data){
+    function loadCollectNum(data) {
         //总数量
         $("#collectTotle").text(data.length);
         //完成数
         var finishNum = 0;
-        for(var i = 0;i < data.length;i++){
-            if(data[i].pdfflag == '1'){
+        for (var i = 0; i < data.length; i++) {
+            if (data[i].pdfflag == '1') {
                 finishNum++;
             }
         }
         $("#collectFinish").text(finishNum);
         //为完成数
-        $("#collectUnFinish").text(data.length-finishNum);
-        //完成百分比
-        var percent = Math.round(finishNum*100/data.length);
-        $("#collectFinishPercent").text(percent);
+        $("#collectUnFinish").text(data.length - finishNum);
         var color = 'red';
-        if(percent >= 80){
-            color = 'green';
+        //完成百分比
+        if (data.length > 0) {
+            var percent = Math.round(finishNum * 100 / data.length);
+            $("#collectFinishPercent").text(percent);
+            if (percent >= 80) {
+                color = 'green';
+            }
         }
         $("#collectFinishPercentId").css("color",color);
     }
@@ -2427,7 +2424,6 @@
                     toastr.error(data.msg);
                 }
                 $('#myModal').modal('hide');
-
             }
         })
     }