From 60db7272661289af504a8b05625669c2cdb943f6 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 12 Dec 2017 15:47:44 +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 | 86 ++++++++++------------ .../web/controller/VirtualCallController.java | 15 +++- .../platform/operate/web/facade/ViewFacade.java | 3 +- 3 files changed, 55 insertions(+), 49 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 b42d502..5acc018 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 @@ -48,7 +48,7 @@ public class VirtualCallService { String code = departments.getShortCode(); String deptName = departments.getName(); - String doctorAccount = user.getAccount(); + String doctorAccount = user.getRemarks(); String doctorName = user.getName(); //打印头信息 @@ -74,10 +74,10 @@ public class VirtualCallService { cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?,?,?,?)}"); cs.setString(1, "1"); cs.setString(2, "200.200.3.53"); - cs.setString(3, "050301"); + cs.setString(3, "0501"); cs.setString(4, "产二门诊"); - cs.setString(5, "0258"); - cs.setString(6, "宋晓辉"); + cs.setString(5, "10120"); + cs.setString(6, "李文学"); // // cs.setString(2, ip); // cs.setString(3, code); @@ -146,7 +146,7 @@ public class VirtualCallService { if (value != null && "T".equals(String.valueOf(value))) { result.setErrorcode(ErrorCodeConstants.SUCCESS); - result.setErrormsg("登陆成功"); + result.setErrormsg("登出成功"); return result; } @@ -228,10 +228,9 @@ public class VirtualCallService { cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?,?)}"); cs.setString(1, "7"); cs.setString(2, "200.200.3.53"); - cs.setString(3, "@ghxh=" + patientId); + cs.setString(3, "@ghxh=18441"); cs.execute(); ResultSet rs = cs.getResultSet(); - int count = rs.getMetaData().getColumnCount(); while (rs.next()) { for (int i = 1; i <= count; i++) @@ -239,7 +238,7 @@ public class VirtualCallService { String columnName = rs.getMetaData().getColumnName(i); Object value = rs.getObject(columnName); System.out.println(ip+";rebackCall columName=" + columnName+ ";value="+value); - if (value != null && "T".equals(String.valueOf(value))) + if (columnName != null && "GHXH".equals(String.valueOf(columnName))) { result.setErrorcode(ErrorCodeConstants.SUCCESS); result.setErrormsg("登陆成功"); @@ -287,43 +286,35 @@ public class VirtualCallService { cs = conn.prepareCall("{call usp_mzhs_hsfzinterface_km(?,?,?,?)}"); cs.setString(1, "6"); cs.setString(2, "200.200.3.53"); - cs.setString(3, "@ksdm=050301"); - cs.setString(4, "@ysdm=0258"); + cs.setString(3, "@ksdm=0501"); + cs.setString(4, "@ysdm=10120"); cs.execute(); ResultSet rs = cs.getResultSet(); int count = rs.getMetaData().getColumnCount(); - boolean isSuccess = true; while (rs.next()) { for (int i = 1; i <= count; i++) { - isSuccess = false; String columnName = rs.getMetaData().getColumnName(i); Object value = rs.getObject(columnName); System.out.println(ip+"waitPatientList columName=" + columnName+ ";value="+value); - if (value != null && "T".equals(String.valueOf(value))) - { - isSuccess = true; - } + } if (isExistColumn(rs,"GHXH")) { Map map = new HashMap<>(); map.put("patientId",rs.getString("GHXH")); - map.put("vcCardNo",rs.getString("CARDNO")); + map.put("vcCardNo",rs.getString("GHHX")); map.put("name", rs.getString("HZXM")); - map.put("time", rs.getString("JLRQ")); + map.put("time", rs.getString("ZJDLXH")); datas.add(map); } } - if (isSuccess) - { - result.setErrorcode(ErrorCodeConstants.SUCCESS); - result.setErrormsg("获取候诊队列成功"); - result.setData(datas); - return result; - } + result.setErrorcode(ErrorCodeConstants.SUCCESS); + result.setErrormsg("获取候诊队列成功"); + result.setData(datas); + return result; } catch (Exception e) { @@ -355,14 +346,17 @@ public class VirtualCallService { return false; } - public BaseResponse callPatients(HttpServletRequest request, Integer userId, String patientId) { + public BaseResponse callPatients(HttpServletRequest request,boolean isCall) { BaseObjectResponse result = new BaseObjectResponse(); String ip = getIp(request); - System.out.println("time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";ip="+ip); + System.out.println("time=" + DateUtil.getyyyy_MM_dd_hms(new Date()) + ";ip=" + ip); - nextPatient(ip); + if (isCall) + { + nextPatient(ip); + } List> datas = new ArrayList<>(); @@ -379,39 +373,26 @@ public class VirtualCallService { ResultSet rs = cs.getResultSet(); int count = rs.getMetaData().getColumnCount(); - boolean isSuccess = true; while (rs.next()) { for (int i = 1; i <= count; i++) { - isSuccess = false; String columnName = rs.getMetaData().getColumnName(i); Object value = rs.getObject(columnName); System.out.println("callPatients columName=" + columnName+ ";value="+value); - - if (value != null && "T".equals(String.valueOf(value))) - { - isSuccess = true; - } - } if (isExistColumn(rs,"GHXH")) { Map map = new HashMap<>(); map.put("patientId", rs.getString("GHXH")); - map.put("vcCardNo", rs.getString("CARDNO")); + map.put("vcCardNo", rs.getString("GHHX")); map.put("name", rs.getString("HZXM")); - map.put("time", rs.getString("JLRQ")); + map.put("time", rs.getString("ZJDLXH")); datas.add(map); } } - - if (isSuccess) - { - result.setErrorcode(ErrorCodeConstants.SUCCESS); - result.setErrormsg("呼叫成功"); - result.setData(datas); - return result; - } - + result.setErrorcode(ErrorCodeConstants.SUCCESS); + result.setErrormsg("呼叫成功"); + result.setData(datas); + return result; } catch (Exception e) { @@ -441,6 +422,16 @@ public class VirtualCallService { cs.setString(1, "2"); cs.setString(2, "200.200.3.53"); cs.execute(); + ResultSet rs = cs.getResultSet(); + int count = rs.getMetaData().getColumnCount(); + while (rs.next()) { + for (int i = 1; i <= count; i++) { + String columnName = rs.getMetaData().getColumnName(i); + Object value = rs.getObject(columnName); + System.out.println("nextPatient columName=" + columnName + ";value=" + value); + } + } + return true; } catch (Exception e) @@ -504,6 +495,7 @@ public class VirtualCallService { return macAddress; } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VirtualCallController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VirtualCallController.java index d29fad2..e40c2f6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VirtualCallController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/VirtualCallController.java @@ -91,6 +91,19 @@ public class VirtualCallController extends BaseController { } + /** + * 已呼号队列 + * @param httpServletRequest + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/calledPatientList") + @ResponseBody + @TokenRequired + public BaseResponse calledPatientList(HttpServletRequest httpServletRequest) { + return virtualCallService.callPatients(httpServletRequest, false); + } + + /** * 叫号 @@ -103,7 +116,7 @@ public class VirtualCallController extends BaseController { @ResponseBody @TokenRequired public BaseResponse callPatients(@RequestParam("patientId") String patientId,HttpServletRequest httpServletRequest) { - return virtualCallService.callPatients(httpServletRequest, getUserId(httpServletRequest),patientId); + return virtualCallService.callPatients(httpServletRequest, true); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index 4f93d04..5359b8e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -3923,7 +3923,8 @@ public class ViewFacade { map.put("fatherNation", getBasicConfig(patients.getHnationId())); String fage = ""; - if (StringUtils.isNotEmpty(patients.getHcertificateTypeId()) && patients.getHcertificateNum().length() == 18 && + if (StringUtils.isNotEmpty(patients.getHcertificateTypeId()) && StringUtils.isNotEmpty(patients.getHcertificateNum()) && + patients.getHcertificateNum().length() == 18 && "70ae1d93-2964-46bc-83fa-bec9ff605b1c".equals(patients.getHcertificateTypeId())) { String cardNo = patients.getHcertificateNum().substring(6, 14); -- 1.8.3.1