diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java index abf7c3d..b32e3f6 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java @@ -231,8 +231,8 @@ public class NczxyyLisService { - public List queryLisCheckList(String cardNo){ - SimpleDateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd "); + public static List queryLisCheckList(String cardNo){ + SimpleDateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd"); List result = new ArrayList<>(); Calendar c = Calendar.getInstance(); SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); @@ -260,7 +260,8 @@ public class NczxyyLisService { CheckResponse CheckResponse=new CheckResponse(); CheckResponse.setHospitalName("四川省南充市中心医院"); CheckResponse.setName(nczxyyxq2.getData().get姓名()); - CheckResponse.setModified(formatter.parse(nczxyyxq2.getData().get报告时间())); + String s=nczxyyxq2.getData().get报告时间().substring(0,10); + CheckResponse.setModified(formatter.parse(s)); CheckResponse.setType(1); CheckResponse.setTitle(nczxyyxq2.getData().get申请项目()); CheckResponse.setAge(nczxyyxq2.getData().get年龄()); 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 7d0af62..d7b4337 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 @@ -9,6 +9,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.common.utils.PropertiesUtils; import com.lyms.platform.operate.web.facade.LisFacade; import com.lyms.platform.operate.web.request.LisReportModelRequest; import com.lyms.platform.permission.model.LisReportItemModel; @@ -35,6 +36,8 @@ public class LisController extends BaseController { @Autowired private LisFacade lisFacade; + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); + /** * 保存各个医院上传上来的lis数据,该数据保存在mysql数据库 * 每条lis数据中保存了属于那个医院的id 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 e6de4ed..3c240ed 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.Nczxyy.NczxyyLisService; import com.lyms.hospitalapi.pojo.CheckByDate; import com.lyms.hospitalapi.pojo.CheckItemResponse; import com.lyms.hospitalapi.pojo.CheckResponse; @@ -56,6 +57,8 @@ public class LisFacade { @Qualifier("commonThreadPool") private ThreadPoolTaskExecutor commonThreadPool; + public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); + /** * 获取lis和ris检验报告 * @param vcCardNo 就诊卡号 @@ -67,7 +70,12 @@ public class LisFacade { if(1 == sortType){ List result = new ArrayList<>(); //获取lis数据 - result.addAll(queryLisCheckList(vcCardNo,phone,userId)); + if("7".equals(HIS_VERSION)){ + //根据调用接口获取四川南充中心医院的Lis数据 + result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo)); + }else{ + result.addAll(queryLisCheckList(vcCardNo,phone,userId)); + } //result.addAll(queryPacsCheckList(cardNo)); List keyList = new ArrayList<>(); // 去重 @@ -150,7 +158,13 @@ public class LisFacade { } }else{ List result = new ArrayList(); - result.addAll(queryLisCheckList(vcCardNo,phone,userId)); + if("7".equals(HIS_VERSION)){ + //根据调用接口获取四川南充中心医院的Lis数据 + result.addAll(NczxyyLisService.queryLisCheckList(vcCardNo)); + }else{ + result.addAll(queryLisCheckList(vcCardNo,phone,userId)); + } + //result.addAll(queryPacsCheckList(cardNo)); List keyList = new ArrayList<>(); List listtype=new ArrayList<>();