From 07a14d3da05f922bff786f2a5b7fe7c0f941fc87 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Wed, 7 Jun 2017 11:10:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=B7=E5=B7=9E=E5=A6=87=E5=B9=BCLis?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java | 2 +- .../java/com/lyms/platform/operate/web/facade/LisFacade.java | 12 ++++++++++-- platform-operate-api/src/main/resources/config.properties | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java index 51dff38..9d6bc9f 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java @@ -231,7 +231,7 @@ public class DzfyHisService { - public List queryLisCheckList(String cardNo) { + public static List queryLisCheckList(String cardNo) { List result = new ArrayList<>(); if (StringUtils.isNotBlank(cardNo)) { Connection conn = com.lyms.hospitalapi.dzfy.ConnTools.makeHisConnection(); 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 0bf5e7d..b884e9e 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,6 +1,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.hospitalapi.Nczxyy.NczxyyLisService; +import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.hospitalapi.pojo.CheckByDate; import com.lyms.hospitalapi.pojo.CheckItemResponse; import com.lyms.hospitalapi.pojo.CheckResponse; @@ -73,7 +74,11 @@ public class LisFacade { if("7".equals(HIS_VERSION)){ //根据调用接口获取四川南充中心医院的Lis数据 result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo)); - }else{ + }else if("6".equals(HIS_VERSION)){ + //调用德州妇幼lis接口 + result.addAll(DzfyHisService.queryLisCheckList(vcCardNo)); + } + else{ result.addAll(queryLisCheckList(vcCardNo,phone,userId)); } //result.addAll(queryPacsCheckList(cardNo)); @@ -161,6 +166,9 @@ public class LisFacade { if("7".equals(HIS_VERSION)){ //根据调用接口获取四川南充中心医院的Lis数据 result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo)); + }else if("6".equals(HIS_VERSION)){ + //调用德州妇幼lis接口 + result.addAll(DzfyHisService.queryLisCheckList(vcCardNo)); }else{ result.addAll(queryLisCheckList(vcCardNo,phone,userId)); } @@ -804,7 +812,7 @@ public class LisFacade { map1.put("bxbjs","");//白细胞计数 map1.put("xxbjs",""); //血小板计数 String itemJson = model.getItemJson(); - List items = JsonUtil.toList(itemJson,LisReportItemModel.class); + List items = JsonUtil.toList(itemJson, LisReportItemModel.class); if (CollectionUtils.isNotEmpty(items)) { for(LisReportItemModel item : items) diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 589b67c..333ea76 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -14,7 +14,7 @@ shanDong_Dezhou_youHuiQuan_money_Number=500 #His系统版本 0：未使用，1：桓台，2：新乐，3：青龙县医院，4：秦皇岛妇幼，5：抚宁妇幼, 6: 德州妇幼，7：南充中心医院 -his_version=0 +his_version=6 #统计中心url center_statistics_url=http://api.healthbaby.com.cn/ -- 1.8.3.1