From 5e008403dad7469c09dfcc54ed690a53542370c8 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 8 Dec 2017 10:48:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E5=8F=AB=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/hospitalapi/whfy/VirtualCallService.java  | 65 +++++++++++++---------
 .../operate/web/facade/RiskReportFacade.java       |  2 +-
 2 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/VirtualCallService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/VirtualCallService.java
index 0b0b4e9..18d17d7 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/VirtualCallService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/VirtualCallService.java
@@ -58,32 +58,43 @@ public class VirtualCallService {
         System.out.println("time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";code="+code+";deptName="+deptName+";doctorAccount="+doctorAccount+";doctorName="+doctorName
         +";ip="+ip+";mac="+mac);
 
-//        Connection conn = null;
-//        CallableStatement cs = null;
-//        try {
-//            conn = makeHisConnection();
-//            //1.1 普通登录
-//            //exec usp_mzhs_hsfzinterface '1','192.168.1.219','2052','儿科门诊','00','supervisor','D8-9E-F3-13-A5-86','0',@sex='男'
-//            cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?,?,?,?,?)}");
-//            cs.setString(1, "1");
-//            cs.setString(2, ip);
-//            cs.setString(3, code);
-//            cs.setString(4, deptName);
-//            cs.setString(5, doctorAccount);
-//            cs.setString(6, doctorName);
-//            cs.setString(7, mac);
-//            ResultSet rs = cs.executeQuery();
-//        }
-//        catch (SQLException e)
-//        {
-//            ExceptionUtils.catchException(e, "callLogin exception");
-//            result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
-//            result.setErrormsg("登陆异常");
-//            return  result;
-//        }
-//        finally {
-//            ConnTools.close(conn,cs);
-//        }
+        Connection conn = null;
+        CallableStatement cs = null;
+        try {
+            conn = makeHisConnection();
+            //1.1 普通登录
+            //exec usp_mzhs_hsfzinterface '1','192.168.1.219','2052','儿科门诊','00','supervisor','D8-9E-F3-13-A5-86','0',@sex='男'
+            cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?,?,?,?,?)}");
+            cs.setString(1, "1");
+            cs.setString(2, ip);
+            cs.setString(3, code);
+            cs.setString(4, deptName);
+            cs.setString(5, doctorAccount);
+            cs.setString(6, doctorName);
+            cs.setString(7, mac);
+            ResultSet rs = cs.executeQuery();
+
+            int count = rs.getMetaData().getColumnCount();
+            while (rs.next()) {
+                for (int i = 1; i <= count; i++)
+                {
+                    String columnName = rs.getMetaData().getColumnName(i);
+                    Object obj = rs.getObject(columnName);
+                    System.out.println("columName=" + columnName+ ";value="+obj);
+                }
+            }
+
+        }
+        catch (SQLException e)
+        {
+            ExceptionUtils.catchException(e, "callLogin exception");
+            result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
+            result.setErrormsg("登陆异常");
+            return  result;
+        }
+        finally {
+            ConnTools.close(conn,cs);
+        }
 
         result.setErrorcode(ErrorCodeConstants.SUCCESS);
         result.setErrormsg("登陆成功");
@@ -382,7 +393,7 @@ public class VirtualCallService {
             }
 
             //获取非本地IP的MAC地址
-            Process p = Runtime.getRuntime().exec("nbtstat -A " + ip);
+            Process p = Runtime.getRuntime().exec("arp -A " + ip);
             InputStreamReader isr = new InputStreamReader(p.getInputStream());
             BufferedReader br = new BufferedReader(isr);
             while ((line = br.readLine()) != null) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
index a1e8d69..6b36394 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
@@ -494,7 +494,7 @@ public class RiskReportFacade {
                     int total = 0;
                     for (List<String> items : result)
                     {
-                        if (items.contains(level.getName()))
+                        if (items.contains(HighLevelMap.get(level.getName())))
                         {
                            total+=Integer.valueOf(items.get(i));
                         }
-- 
1.8.3.1