From d262f095e2b8cd28d0eb7e16440d0c2d07c2cefe Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Mon, 28 Sep 2020 23:31:58 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=BC=80=E6=B3=A8=E9=87=8A=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0oracle=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/beHospitaledController.java    | 60 +++++++++----------
 src/main/java/com/emr/util/OracleConnect.java | 22 +++----
 2 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/main/java/com/emr/controller/beHospitaledController.java b/src/main/java/com/emr/controller/beHospitaledController.java
index 52bfed8..d261220 100644
--- a/src/main/java/com/emr/controller/beHospitaledController.java
+++ b/src/main/java/com/emr/controller/beHospitaledController.java
@@ -253,8 +253,10 @@ public class beHospitaledController {
                 log.error("优先采集查询oracle出错,请查看error.log文件");
             }
             //赋值两时间：最近上传时间与最新手动提交时间
-            setTwoTimeForList(list);
-            log.info("优先采集查询成功!");
+            if(!CollectionUtils.isEmpty(list)) {
+                setTwoTimeForList(list);
+                log.info("优先采集查询成功!");
+            }
             return JSON.toJSONString(list);
         } catch (Exception e) {
             e.printStackTrace();
@@ -265,36 +267,34 @@ public class beHospitaledController {
 
     //赋值两时间：最近上传时间与最新手动提交时间
     private void setTwoTimeForList(List<HisCollectInfo> list) {
-        if(!CollectionUtils.isEmpty(list)){
-            StringBuilder fileIdsStr = new StringBuilder();
-            for (int i = 0; i < list.size(); i++) {
-                String ffileId = list.get(i).getFfileId();
-                if(i != 0){
-                    fileIdsStr.append(",");
-                }
-                fileIdsStr.append("'").append(ffileId).append("'");
+        StringBuilder fileIdsStr = new StringBuilder();
+        for (int i = 0; i < list.size(); i++) {
+            String ffileId = list.get(i).getFfileId();
+            if(i != 0){
+                fileIdsStr.append(",");
             }
-            //查询detail表的上传时间
-            List<Archive_Detail> archiveDetails = detailMapper.selectUpdateTimeBySubAssort(fileIdsStr.toString());
-            //查询archive_sumbitDate_info的提交时间
-            List<ArchiveSumbitdateInfo> archiveSumbitdateInfoList = sumbitdateInfoMapper.selectOneByFileId(fileIdsStr.toString());
-            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;
-                            }
+            fileIdsStr.append("'").append(ffileId).append("'");
+        }
+        //查询detail表的上传时间
+        List<Archive_Detail> archiveDetails = detailMapper.selectUpdateTimeBySubAssort(fileIdsStr.toString());
+        //查询archive_sumbitDate_info的提交时间
+        List<ArchiveSumbitdateInfo> archiveSumbitdateInfoList = sumbitdateInfoMapper.selectOneByFileId(fileIdsStr.toString());
+        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(!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;
                         }
                     }
                 }
@@ -350,7 +350,7 @@ public class beHospitaledController {
                 String sql = "insert into pacs.p_pdf_print(FENTRYNO,FPATNO,FAPPLYTIME,FFILE_ID) values('"+fentryNoList[i]+"','"+fpatno+"','"+fapplytime+"','"+ffileIdList[i]+"')";
                 log.info("优先采集插入语句:"+sql);
                 try {
-                    //OracleConnect.insert(sql);
+                    OracleConnect.insert(sql);
                     log.info("优先采集插入oracle成功");
                 }catch (Exception e){
                     e.printStackTrace();
diff --git a/src/main/java/com/emr/util/OracleConnect.java b/src/main/java/com/emr/util/OracleConnect.java
index b1d5c94..14e6315 100644
--- a/src/main/java/com/emr/util/OracleConnect.java
+++ b/src/main/java/com/emr/util/OracleConnect.java
@@ -108,17 +108,17 @@ public class OracleConnect {
         rs = pst.executeQuery();
         List<HisCollectInfo> list = new ArrayList<>();
         if (rs != null) {
-            ResultSetMetaData md = rs.getMetaData();
-            int columnCount = md.getColumnCount();
-            Map rowData = new HashMap();
-            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);
+            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);
+                }
             }
         }
         OracleConnect.CloseConn(rs, pst, conn);