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 c04caf6..528e594 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 @@ -6,6 +6,7 @@ import com.lyms.hospitalapi.pojo.CheckByDate; import com.lyms.hospitalapi.pojo.CheckItemResponse; import com.lyms.hospitalapi.pojo.CheckResponse; import com.lyms.hospitalapi.pojo.CheckType; +import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; @@ -55,10 +56,14 @@ public class LisFacade { private LisService lisService; @Autowired + private QhdfyHisService qhdfyHisService; + + @Autowired @Qualifier("commonThreadPool") private ThreadPoolTaskExecutor commonThreadPool; public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version"); + public static final String run_mode = PropertiesUtils.getPropertyValue("run.mode"); /** * 获取lis和ris检验报告 @@ -771,7 +776,7 @@ public class LisFacade { isQuery = true; } //如果不为上面的医院就直接返回 - if (!isQuery) + if (!isQuery || "2".equals(run_mode)) { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map); } @@ -779,7 +784,15 @@ public class LisFacade { query.setTitles(titles); query.setHospitalId(hospitalId); query.setCheckTime(DateUtil.parseYMD(checkTime)); - List lises = queryCheckLis(vcCardNo,phone,query); + List lises = null; + if ("216".equals(hospitalId)) + { + lises = qhdfyHisService.queryQhdCheckLisInfo(vcCardNo,phone,"('尿常规','[丙]血常规(24项)','血常规(24项)','血细胞分析(末梢)')", checkTime); + } + else + { + lises = queryCheckLis(vcCardNo,phone,query); + } if (CollectionUtils.isNotEmpty(lises)) { @@ -800,6 +813,10 @@ public class LisFacade { { for(LisReportItemModel item : items) { + if (item == null) + { + continue; + } if ("尿蛋白".equals(item.getName())) { map1.put("ndb",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); @@ -832,6 +849,10 @@ public class LisFacade { { for(LisReportItemModel item : items) { + if (item == null) + { + continue; + } if ("血红蛋白".equals(item.getName())) { map1.put("xhdb",item.getNumberResult()); @@ -864,6 +885,10 @@ public class LisFacade { { for(LisReportItemModel item : items) { + if (item == null) + { + continue; + } if ("尿蛋白".equals(item.getName())) { map1.put("ndb",item.getCharResult() == null ? item.getNumberResult() : item.getCharResult()); @@ -897,6 +922,10 @@ public class LisFacade { { for(LisReportItemModel item : items) { + if (item == null) + { + continue; + } if ("血红蛋白".equals(item.getName())) { map1.put("xhdb",item.getNumberResult());