From dcad9e69ac3b7697727a0a1a06d521bfb0993106 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Tue, 8 Mar 2022 21:48:44 +0800
Subject: [PATCH] =?UTF-8?q?oracle=E5=85=B3=E9=97=AD=E6=B5=81=E5=92=8Cin?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ipml/Archive_MasterServiceImpl.java       |  2 +-
 src/main/java/com/emr/util/OracleConnect.java | 49 ++++++++++++-------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
index 30f9507..9722356 100644
--- a/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/Archive_MasterServiceImpl.java
@@ -1402,7 +1402,7 @@ public class Archive_MasterServiceImpl implements Archive_MasterService {
         }
         //判断电子病历是否完成sysFlag = 2
         //查询电子病历采集任务
-        String sql2 = "SELECT FPAT_NO,FREC_ID,FENTRY_NAME,FLOGLUDATE FROM VIEW_DOCTOR_DATA_2 WHERE FISAVAILABLE = 'Y' AND FENTRY_NAME NOT IN ('手术同意书'、'手术安全审核单'、'手术风险评估单') AND FPAT_NO = '"+jzh+"'";
+        String sql2 = "SELECT FPAT_NO,FREC_ID,FENTRY_NAME,FLOGLUDATE FROM VIEW_DOCTOR_DATA_2 WHERE FISAVAILABLE = 'Y' AND FENTRY_NAME NOT IN ('手术同意书','手术安全审核单','手术风险评估单') AND FPAT_NO = '"+jzh+"'";
         try {
             List<Map> selectList2 = OracleConnect.selectListConvertMap(sql2);
             if(!CollectionUtils.isEmpty(selectList2)) {
diff --git a/src/main/java/com/emr/util/OracleConnect.java b/src/main/java/com/emr/util/OracleConnect.java
index 98ef717..72cae36 100644
--- a/src/main/java/com/emr/util/OracleConnect.java
+++ b/src/main/java/com/emr/util/OracleConnect.java
@@ -102,12 +102,17 @@ public class OracleConnect {
         Connection conn = new OracleConnect().getConnect();
         pst = conn.prepareStatement(arg0);
         rs = pst.executeQuery();
-        if (rs != null) {
-            while (rs.next()) {
-                str = rs.getString(1);
+        try {
+            if (rs != null) {
+                while (rs.next()) {
+                    str = rs.getString(1);
+                }
             }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } finally {
+            OracleConnect.CloseConn(rs, pst, conn);
         }
-        OracleConnect.CloseConn(rs, pst, conn);
         return str;
     }
     public static List<String> selectList(String arg0) throws Exception {
@@ -115,12 +120,17 @@ public class OracleConnect {
         Connection conn = new OracleConnect().getConnect();
         pst = conn.prepareStatement(arg0);
         rs = pst.executeQuery();
-        if (rs != null) {
-            while (rs.next()) {
-                str.add(rs.getString(1));
+        try {
+            if (rs != null) {
+                while (rs.next()) {
+                    str.add(rs.getString(1));
+                }
             }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } finally {
+            OracleConnect.CloseConn(rs, pst, conn);
         }
-        OracleConnect.CloseConn(rs, pst, conn);
         return str;
     }
     public static List<Map> selectListConvertMap(String sql) throws Exception{
@@ -128,18 +138,23 @@ public class OracleConnect {
         Connection conn = new OracleConnect().getConnect();
         pst = conn.prepareStatement(sql);
         rs = pst.executeQuery();
-        if (rs != null) {
-            ResultSetMetaData md = rs.getMetaData();//获取键名
-            int columnCount = md.getColumnCount();//获取列的数量
-            while (rs.next()) {
-                Map<String, Object> rowData = new HashMap<>();//声明Map
-                for (int i = 1; i <= columnCount; i++) {
-                    rowData.put(md.getColumnName(i), rs.getObject(i));//获取键名及值
+        try {
+            if (rs != null) {
+                ResultSetMetaData md = rs.getMetaData();//获取键名
+                int columnCount = md.getColumnCount();//获取列的数量
+                while (rs.next()) {
+                    Map<String, Object> rowData = new HashMap<>();//声明Map
+                    for (int i = 1; i <= columnCount; i++) {
+                        rowData.put(md.getColumnName(i), rs.getObject(i));//获取键名及值
+                    }
+                    list.add(rowData);
                 }
-                list.add(rowData);
             }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } finally {
+            OracleConnect.CloseConn(rs, pst, conn);
         }
-        OracleConnect.CloseConn(rs, pst, conn);
         return list;
     }