From 5fcefa8179b3eb5bbb03b61a8fe6b57f89569a00 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 25 Jul 2017 14:05:19 +0800 Subject: [PATCH] update code --- .../src/main/resources/config.properties | 2 +- .../platform/operate/web/facade/LisFacade.java | 23 ++++++++++++---------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/platform-msg-generate/src/main/resources/config.properties b/platform-msg-generate/src/main/resources/config.properties index 22fd6b6..7e6bc7e 100644 --- a/platform-msg-generate/src/main/resources/config.properties +++ b/platform-msg-generate/src/main/resources/config.properties @@ -7,7 +7,7 @@ center_token=e0c56363-00d6-42ee-bbe0-23c553583062 #AMS地址 线上：http://data.api.healthbaby.com.cn/v1/messages 测试：http://data.api.stage.healthbaby.com.cn/v1/messages #演示地址 https://stage-rp-data-api.healthbaby.com.cn/v1/messages -ams_sms=http://data.api.healthbaby.com.cn/v1/messages +ams_sms=http://data.api.stage.healthbaby.com.cn/v1/messages #短信当天发送时间 如16:00 send_time=16:00 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 978e2b4..05ac8a1 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 @@ -76,16 +76,19 @@ public class LisFacade { if(1 == sortType){ List result = new ArrayList<>(); //获取lis数据 - 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)); - } +// 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)); +// } + + result.addAll(queryLisCheckList(vcCardNo,phone,userId)); + //result.addAll(queryPacsCheckList(cardNo)); List keyList = new ArrayList<>(); // 排序 -- 1.8.3.1