diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfHisService.java index 2f8d2ab..905a226 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcdcf/LcdcfHisService.java @@ -50,12 +50,12 @@ public class LcdcfHisService { * @param vcCardNo * @return */ - public List getPatientCheckLisItems(String vcCardNo,String time) + public List getPatientCheckLisItems(String vcCardNo) { - - String sql = "select ID as id,就诊卡号 as vcCardNo,医嘱内容 as content,开嘱时间 as time,诊疗项目ID as itemId from v_check_items where 就诊卡号='"+vcCardNo+"' and 开嘱时间 like '"+time+"%'"; + String time = DateUtil.getyyyy_MM_dd(new Date()); Connection connection = null; try { + String sql = "select ID as id,就诊卡号 as vcCardNo,医嘱内容 as content,开嘱时间 as time,诊疗项目ID as itemId from v_check_items where 就诊卡号='"+vcCardNo+"' and 开嘱时间 like '"+time+"%'"; connection = ConnTools.makeHisConnection(); QueryRunner queryRunner = new QueryRunner(true); List hisCheckItems = queryRunner.query(connection,sql,new BeanListHandler(HisCheckItems.class)); 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 db1ae73..30ef33f 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 @@ -20,11 +20,9 @@ import java.io.InputStreamReader; import java.io.LineNumberReader; import java.net.InetAddress; import java.net.NetworkInterface; -import java.sql.CallableStatement; -import java.sql.Connection; -import java.sql.ResultSet; -import java.sql.SQLException; +import java.sql.*; import java.util.*; +import java.util.Date; import static com.lyms.hospitalapi.whfy.ConnTools.makeHisConnection; @@ -71,7 +69,7 @@ public class VirtualCallService { CallableStatement cs = null; try { conn = makeHisConnection(); - //1.1 普通登录 + //1.1 普通登录 '1','200.200.3.164','05030101','产二门诊','10018','滕振娟' //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"); @@ -80,23 +78,24 @@ public class VirtualCallService { cs.setString(4, deptName); cs.setString(5, doctorAccount); cs.setString(6, doctorName); - ResultSet rs = cs.executeQuery(); + 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 obj = rs.getObject(columnName); - System.out.println("callLogin columName=" + columnName+ ";value="+obj); - } - String isSuccess = rs.getString("STATUS"); - if (StringUtils.isNotEmpty(isSuccess) && "T".equals(isSuccess)) - { - result.setErrorcode(ErrorCodeConstants.SUCCESS); - result.setErrormsg("登陆成功"); - return result; + Object value = rs.getObject(columnName); + System.out.println(ip+";callLogin columName=" + columnName+ ";value="+value); + if (value != null && "T".equals(String.valueOf(value))) + { + result.setErrorcode(ErrorCodeConstants.SUCCESS); + result.setErrormsg("登陆成功"); + return result; + } } + } } catch (Exception e) @@ -127,25 +126,26 @@ public class VirtualCallService { cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}"); cs.setString(1, "5"); cs.setString(2, ip); - ResultSet rs = cs.executeQuery(); + 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 obj = rs.getObject(columnName); - System.out.println("callLoginOut columName=" + columnName+ ";value="+obj); - } - String isSuccess = rs.getString("STATUS"); - if (StringUtils.isNotEmpty(isSuccess) && "T".equals(isSuccess)) - { - result.setErrorcode(ErrorCodeConstants.SUCCESS); - result.setErrormsg("登出成功"); - return result; + Object value = rs.getObject(columnName); + System.out.println(ip+" ;callLoginOut columName=" + columnName+ ";value="+value); + + if (value != null && "T".equals(String.valueOf(value))) + { + result.setErrorcode(ErrorCodeConstants.SUCCESS); + result.setErrormsg("登陆成功"); + return result; + } + } } - } catch (Exception e) { @@ -183,15 +183,14 @@ public class VirtualCallService { for (int i = 1; i <= count; i++) { String columnName = rs.getMetaData().getColumnName(i); - Object obj = rs.getObject(columnName); - System.out.println("doWorkStatusChange columName=" + columnName+ ";value="+obj); - } - String isSuccess = rs.getString("STATUS"); - if (StringUtils.isNotEmpty(isSuccess) && "T".equals(isSuccess)) - { - result.setErrorcode(ErrorCodeConstants.SUCCESS); - result.setErrormsg("工作状态修改成功"); - return result; + Object value = rs.getObject(columnName); + System.out.println(ip+";doWorkStatusChange columName=" + columnName+ ";value="+value); + if (value != null && "T".equals(String.valueOf(value))) + { + result.setErrorcode(ErrorCodeConstants.SUCCESS); + result.setErrormsg("登陆成功"); + return result; + } } } } @@ -223,22 +222,23 @@ public class VirtualCallService { cs.setString(1, "7"); cs.setString(2, ip); cs.setString(3, "@ghxh=" + patientId); - ResultSet rs = cs.executeQuery(); + 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 obj = rs.getObject(columnName); - System.out.println("rebackCall columName=" + columnName+ ";value="+obj); - } - String isSuccess = rs.getString("STATUS"); - if (StringUtils.isNotEmpty(isSuccess) && "T".equals(isSuccess)) - { - result.setErrorcode(ErrorCodeConstants.SUCCESS); - result.setErrormsg("复呼成功"); - return result; + Object value = rs.getObject(columnName); + System.out.println(ip+";rebackCall columName=" + columnName+ ";value="+value); + if (value != null && "T".equals(String.valueOf(value))) + { + result.setErrorcode(ErrorCodeConstants.SUCCESS); + result.setErrormsg("登陆成功"); + return result; + } + } } } @@ -267,7 +267,7 @@ public class VirtualCallService { String doctorAccount = user.getAccount(); String ip = getIp(request); - System.out.println("waitPatientList time="+ DateUtil.getyyyy_MM_dd_hms(new Date())+";ip="+ip); + System.out.println("waitPatientList time=" + DateUtil.getyyyy_MM_dd_hms(new Date()) + ";ip=" + ip); List> datas = new ArrayList<>(); @@ -282,15 +282,22 @@ public class VirtualCallService { cs.setString(2, ip); cs.setString(3, "@ksdm="+code); cs.setString(4, "@ysdm=" + doctorAccount); - ResultSet rs = cs.executeQuery(); + cs.execute(); + ResultSet rs = cs.getResultSet(); int count = rs.getMetaData().getColumnCount(); + boolean isSuccess = false; while (rs.next()) { for (int i = 1; i <= count; i++) { String columnName = rs.getMetaData().getColumnName(i); - Object obj = rs.getObject(columnName); - System.out.println("waitPatientList columName=" + columnName+ ";value="+obj); + Object value = rs.getObject(columnName); + System.out.println(ip+"waitPatientList columName=" + columnName+ ";value="+value); + if (value != null && "T".equals(String.valueOf(value))) + { + isSuccess = true; + } + } Map map = new HashMap<>(); map.put("patientId",rs.getString("GHXH")); @@ -300,23 +307,29 @@ public class VirtualCallService { map.put("gender", ""); datas.add(map); } + + if (isSuccess) + { + result.setErrorcode(ErrorCodeConstants.SUCCESS); + result.setErrormsg("获取候诊队列成功"); + result.setData(datas); + return result; + } } catch (Exception e) { ExceptionUtils.catchException(e, "waitPatientList exception"); - result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); - result.setErrormsg("获取候诊队列失败"); - return result; + } finally { ConnTools.close(conn,cs); } - - result.setErrorcode(ErrorCodeConstants.SUCCESS); - result.setErrormsg("复呼成功"); - result.setData(datas); + result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + result.setErrormsg("获取候诊队列失败"); return result; + + } @@ -340,15 +353,23 @@ public class VirtualCallService { cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}"); cs.setString(1, "16"); cs.setString(2, ip); - ResultSet rs = cs.executeQuery(); + cs.execute(); + ResultSet rs = cs.getResultSet(); int count = rs.getMetaData().getColumnCount(); + boolean isSuccess = false; while (rs.next()) { for (int i = 1; i <= count; i++) { String columnName = rs.getMetaData().getColumnName(i); - Object obj = rs.getObject(columnName); - System.out.println("callPatients columName=" + columnName+ ";value="+obj); + Object value = rs.getObject(columnName); + System.out.println("callPatients columName=" + columnName+ ";value="+value); + + if (value != null && "T".equals(String.valueOf(value))) + { + isSuccess = true; + } + } Map map = new HashMap<>(); map.put("patientId",rs.getString("GHXH")); @@ -358,23 +379,29 @@ public class VirtualCallService { map.put("gender", ""); datas.add(map); } + + if (isSuccess) + { + result.setErrorcode(ErrorCodeConstants.SUCCESS); + result.setErrormsg("呼叫成功"); + result.setData(datas); + return result; + } + } catch (Exception e) { ExceptionUtils.catchException(e, "callPatients exception"); - result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); - result.setErrormsg("获取候诊队列失败"); - return result; + } finally { ConnTools.close(conn,cs); } - - result.setErrorcode(ErrorCodeConstants.SUCCESS); - result.setErrormsg("复呼成功"); - result.setData(datas); + result.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR); + result.setErrormsg("呼叫失败"); return result; + } @@ -389,7 +416,7 @@ public class VirtualCallService { cs = conn.prepareCall("{call usp_mzhs_hsfzinterface(?,?)}"); cs.setString(1, "2"); cs.setString(2, ip); - cs.executeQuery(); + cs.execute(); return true; } catch (Exception e) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java index 4649458..7ab9126 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.hospitalapi.lcdcf.LcdcfHisService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; @@ -44,6 +45,9 @@ public class LisController extends BaseController { @Autowired private LisFacade lisFacade; + @Autowired + private LcdcfHisService lcdcfHisService; + /** * 保存各个医院上传上来的lis数据,该数据保存在mysql数据库 * 每条lis数据中保存了属于那个医院的id @@ -238,6 +242,21 @@ public class LisController extends BaseController { @RequestParam(required = true) String checkTime, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return lisFacade.getBabyLisAssistCheckInfo(vcCardNo, phone,checkTime,loginState.getId()); + return lisFacade.getBabyLisAssistCheckInfo(vcCardNo, phone, checkTime, loginState.getId()); + } + + + /** + * 聊城东昌妇幼保健院 获取孕妇当天检查了那些项 + * @param vcCardNo + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/getDcfyLisCheck") + @ResponseBody + @TokenRequired + public BaseResponse getDcfyLisCheck(@RequestParam(required = true) String vcCardNo, + HttpServletRequest request) { + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS). + setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(lcdcfHisService.getPatientCheckLisItems(vcCardNo)); } }