From c1e274d6e5b920b9917dab0bb49d83497a3da7c8 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 11 Sep 2017 14:35:29 +0800 Subject: [PATCH] update code --- .../com/lyms/hospitalapi/Cdfy/CdfyHisService.java | 50 +++++++++++----------- .../platform/operate/web/facade/LisFacade.java | 16 ++++++- .../platform/operate/web/utils/LisHandleTask.java | 11 ++++- 3 files changed, 49 insertions(+), 28 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdfyHisService.java index 7cc5d7b..fdb5032 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdfyHisService.java @@ -23,41 +23,39 @@ public class CdfyHisService { /** * 承德 * 查询病人ID + * 承德查询lis报告先通过就诊卡号查询到病人id + * 通过病人id到院内系统mysql中查询 vCcardNo字段 * @param vcCardNo 就诊卡号 * @return */ - public DzReplace findAllVcCarddNo(String vcCardNo){ + public String getPatientIdByVcCardNo(String vcCardNo){ List dzReplaceList = new ArrayList(); - if (StringUtils.isNotBlank(vcCardNo)){ + Connection conn = null; + try + { + if (StringUtils.isNotBlank(vcCardNo)){ + System.out.println("vcCardNo = " + vcCardNo); + conn = com.lyms.hospitalapi.Cdfy.ConnTools.makeHisConnection(); + QueryRunner queryRunner = new QueryRunner(true); + String sql = "select id as id from cdfyhis.v_patientinfo where cardno = '"+vcCardNo+"'"; - System.out.println("vcCardNo = " + vcCardNo); - Connection conn = com.lyms.hospitalapi.Cdfy.ConnTools.makeHisConnection(); - QueryRunner queryRunner = new QueryRunner(true); - String sql = "select id as id from cdfyhis.v_patientinfo where cardno = '"+vcCardNo+"'"; - - try - { dzReplaceList = queryRunner.query(conn,sql,new BeanListHandler(DzReplace.class)); - - } - catch (Exception e) - { - DbUtils.closeQuietly(conn); - ExceptionUtils.catchException(e, "cd his exception "); + if(CollectionUtils.isNotEmpty(dzReplaceList)) + { + return dzReplaceList.get(0).getId(); + } } - finally - { - DbUtils.closeQuietly(conn); - } - } - if(CollectionUtils.isNotEmpty(dzReplaceList)){ - return dzReplaceList.get(0); - }else - return null; - - + catch (Exception e) + { + ExceptionUtils.catchException(e, "cd his exception "); + } + finally + { + DbUtils.closeQuietly(conn); + } + return null; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index 14e50a4..79232ef 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.facade; +import com.lyms.hospitalapi.Cdfy.CdfyHisService; import com.lyms.hospitalapi.Nczxyy.NczxyyLisService; import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.hospitalapi.pojo.CheckByDate; @@ -62,6 +63,9 @@ public class LisFacade { private DzfyHisService dzfyHisService; @Autowired + private CdfyHisService cdfyHisService; + + @Autowired @Qualifier("commonThreadPool") private ThreadPoolTaskExecutor commonThreadPool; @@ -472,6 +476,11 @@ public class LisFacade { { model.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); } + //承德查询lis + else if ("16".equals(HIS_VERSION)) + { + model.setVcCardNo(cdfyHisService.getPatientIdByVcCardNo(vcCardNo)); + } else { model.setVcCardNo(vcCardNo); @@ -598,6 +607,11 @@ public class LisFacade { { vcCardNos.addAll(dzfyHisService.getDzVcCardNos(pat.getVcCardNo())); } + //承德查询lis + else if ("16".equals(HIS_VERSION)) + { + vcCardNos.add(cdfyHisService.getPatientIdByVcCardNo(pat.getVcCardNo())); + } else { vcCardNos.add(pat.getVcCardNo()); @@ -810,7 +824,7 @@ public class LisFacade { end = lises.size(); } final List models = lises.subList(i, end); - Callable c = new LisHandleTask(patientsService,models,map,dzfyHisService); + Callable c = new LisHandleTask(patientsService,models,map,dzfyHisService,cdfyHisService); Future f = commonThreadPool.submit(c); futures.add(f); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java index ae8cf41..98b037d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/LisHandleTask.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.utils; +import com.lyms.hospitalapi.Cdfy.CdfyHisService; import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.enums.YnEnums; @@ -28,15 +29,18 @@ public class LisHandleTask implements Callable { private Map hospitalMap; private DzfyHisService dzfyHisService; + private CdfyHisService cdfyHisService; public LisHandleTask(PatientsService patientsService,List lises, Map hospitalMap, - DzfyHisService dzfyHisService) + DzfyHisService dzfyHisService, + CdfyHisService cdfyHisService) { this.patientsService = patientsService; this.lises = lises; this.hospitalMap = hospitalMap; this.dzfyHisService = dzfyHisService; + this.cdfyHisService = cdfyHisService; } @Override @@ -67,6 +71,11 @@ public class LisHandleTask implements Callable { { patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(lisReportModel.getVcCardNo())); } + //承德查询lis + else if ("16".equals(HIS_VERSION)) + { + patientsQuery.setVcCardNo(cdfyHisService.getPatientIdByVcCardNo(lisReportModel.getVcCardNo())); + } else { patientsQuery.setVcCardNo(lisReportModel.getVcCardNo()); -- 1.8.3.1