diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java index c251784..42214a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyFmService.java @@ -256,6 +256,15 @@ public class QhdfyFmService { } + Date dueTime = null; + try{ + dueTime = fmt.parse(item.getJlrq()); + }catch (Exception e) + { + dueTime = fmt2.parse(item.getJlrq()); + } + + FmPatInfo patInfo = getFmPatInfoById(item.getSyxh()); if (patInfo != null && StringUtils.isNotEmpty(patInfo.getPhone())) { PatientsQuery query = new PatientsQuery(); @@ -367,7 +376,7 @@ public class QhdfyFmService { baby.setDeformity("无".equals(item.getJx()) ? 0 : 1); //畸形 0非畸形 1畸形 baby.setAsphyxiaM(item.getZx()); //窒息分钟 baby.setPregnancyOut(RenShenJieJuEnums.getIdByName(item.getCcqk())); // 妊娠结局 - baby.setDueTime(fmt1.format(dueDate));//分娩时间 + baby.setDueTime(fmt1.format(dueTime));//分娩时间 babies.add(baby); deliverAddRequest.setBabies(babies); deliverAddRequest.setFmHospital("216"); //设置为秦皇岛分娩医院 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 a5587d9..cbc01d2 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 @@ -372,8 +372,8 @@ public class LisFacade { List reportModelList = new ArrayList<>(); //通过就诊卡号和医院id查询到医院下面的lis记录 if (StringUtils.isNotEmpty(vcCardNo)) { - //德州 - if ("6".equals(HIS_VERSION)) { + //德州市妇幼 + if ("1000000114".equals(model.getHospitalId())) { model.setVcCardNos(dzfyHisService.getDzVcCardNos(vcCardNo)); } //承德查询lis @@ -382,16 +382,20 @@ public class LisFacade { model.setVcCardNo(cdfyHisService.getIdByVcCardNo(vcCardNo)); } //威县人民医院lis - else if ("20".equals(HIS_VERSION)) { + else if ("199".equals(model.getHospitalId())) { model.setVcCardNo(wxrmyyHisService.findId(vcCardNo)); } //诸城 - else if ("21".equals(HIS_VERSION)) { + else if ("2100001634".equals(model.getHospitalId())) { //model.setVcCardNo(getZcVcardNo(vcCardNo)); model.setVcCardNos(zcfyHisService.getZcVcCardNos(vcCardNo)); } //威海市妇幼 因为威海市妇幼有些孕妇没有就诊卡直接用身份证，lis把身份证号码存在就诊卡号字段的 - else if ("22".equals(HIS_VERSION)&&perType==1) { + else if ("2100001635".equals(model.getHospitalId())&&perType==1) { + model.setVcCardNo(cardNo); + } + //仪陇县人民医院 就诊卡号字段存的身份证号码 + else if ("2100001718".equals(model.getHospitalId())&&perType==1) { model.setVcCardNo(cardNo); } //秦皇岛工人医院lis数据查询，就诊卡号字段保存的是病人ID @@ -524,9 +528,22 @@ public class LisFacade { vcCardNos.add(cdfyHisService.getIdByVcCardNo(pat.getVcCardNo())); } //威海市妇幼 因为威海市妇幼有些孕妇没有就诊卡直接用身份证，lis把身份证号码存在就诊卡号字段的 - else if ("22".equals(HIS_VERSION)) { + else if ("2100001635".equals(pat.getHospitalId())) { vcCardNos.add(pat.getCardNo()); - } else { + } + //诸城 + else if ("2100001634".equals(pat.getHospitalId())) { + //model.setVcCardNo(getZcVcardNo(vcCardNo)); + vcCardNos.addAll(zcfyHisService.getZcVcCardNos(pat.getVcCardNo())); + } + //秦皇岛工人医院lis数据查询，就诊卡号字段保存的是病人ID + else if("2100001097".equals(pat.getHospitalId())){ + vcCardNos.add(gryyHisService.getIdByVcCardNo(pat.getVcCardNo())); + } + //仪陇县人民医院 就诊卡号字段存的身份证号码 + else if ("2100001718".equals(pat.getHospitalId())) { + vcCardNos.add(pat.getCardNo()); + }else { vcCardNos.add(pat.getVcCardNo()); } @@ -719,7 +736,7 @@ public class LisFacade { end = lises.size(); } final List models = lises.subList(i, end); - Callable c = new LisHandleTask(patientsService, models, map, dzfyHisService, cdfyHisService); + Callable c = new LisHandleTask(patientsService, models, map, dzfyHisService, cdfyHisService,gryyHisService, zcfyHisService); 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 06621cb..a063d88 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 @@ -2,6 +2,8 @@ package com.lyms.platform.operate.web.utils; import com.lyms.hospitalapi.Cdfy.CdfyHisService; import com.lyms.hospitalapi.dzfy.DzfyHisService; +import com.lyms.hospitalapi.gryy.GryyHisService; +import com.lyms.hospitalapi.zcfy.ZcfyHisService; import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.utils.DateUtil; @@ -30,17 +32,23 @@ public class LisHandleTask implements Callable { private Map hospitalMap; private DzfyHisService dzfyHisService; private CdfyHisService cdfyHisService; + private GryyHisService gryyHisService; + private ZcfyHisService zcfyHisService; public LisHandleTask(PatientsService patientsService,List lises, Map hospitalMap, DzfyHisService dzfyHisService, - CdfyHisService cdfyHisService) + CdfyHisService cdfyHisService, + GryyHisService gryyHisService, + ZcfyHisService zcfyHisService) { this.patientsService = patientsService; this.lises = lises; this.hospitalMap = hospitalMap; this.dzfyHisService = dzfyHisService; this.cdfyHisService = cdfyHisService; + this.gryyHisService = gryyHisService; + this.zcfyHisService = zcfyHisService; } @Override @@ -67,15 +75,31 @@ public class LisHandleTask implements Callable { { //德州市妇幼保健院 解决德州妇幼孕妇换卡的问题 - if ("6".equals(HIS_VERSION) && "1000000114".equals(lisReportModel.getHospitalId())) + if ("1000000114".equals(lisReportModel.getHospitalId())) { patientsQuery.setVcCardNos(dzfyHisService.getDzVcCardNos(lisReportModel.getVcCardNo())); } //承德查询lis - else if ("16".equals(HIS_VERSION)) + else if ("2100001291".equals(lisReportModel.getHospitalId())) { - patientsQuery.setVcCardNo(lisReportModel.getVcCardNo()); - //patientsQuery.setVcCardNo(cdfyHisService.getPatientIdByVcCardNo(lisReportModel.getVcCardNo())); + //patientsQuery.setVcCardNo(lisReportModel.getVcCardNo()); + patientsQuery.setVcCardNo(cdfyHisService.getIdByVcCardNo(lisReportModel.getVcCardNo())); + } + //秦皇岛工人医院lis数据查询，就诊卡号字段保存的是病人ID + else if("2100001097".equals(lisReportModel.getHospitalId())){ + patientsQuery.setVcCardNo(gryyHisService.getIdByVcCardNo(lisReportModel.getVcCardNo())); + } + //仪陇县人民医院 就诊卡号字段存的身份证号码 + else if ("2100001718".equals(lisReportModel.getHospitalId())) { + patientsQuery.setCardNo(lisReportModel.getVcCardNo()); + } + //诸城妇幼，通过就诊卡查询用过的所有就诊卡 + else if ("2100001634".equals(lisReportModel.getHospitalId())) { + patientsQuery.setVcCardNos(zcfyHisService.getZcVcCardNos(lisReportModel.getVcCardNo())); + } + //威海市妇幼 因为威海市妇幼有些孕妇没有就诊卡直接用身份证，lis把身份证号码存在就诊卡号字段的 + else if ("2100001635".equals(lisReportModel.getHospitalId())) { + patientsQuery.setCardNo(lisReportModel.getVcCardNo()); } else {