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 cc7bdbe..eb8bfe1 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 @@ -273,7 +273,7 @@ public class QhdfyFmService { FmPatInfo patInfo = getFmPatInfoById(item.getSyxh()); - if (patInfo != null && StringUtils.isNotEmpty(patInfo.getPhone())) { + if (patInfo != null && (StringUtils.isNotEmpty(patInfo.getPhone()) || StringUtils.isNotEmpty(patInfo.getCardNo()))) { PatientsQuery query = new PatientsQuery(); query.setYn(YnEnums.YES.getId()); query.setType(1); //孕妇 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 811e6d1..d722860 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.hospitalapi.Cdfy.CdfyHisService; import com.lyms.hospitalapi.dzfy.DzfyHisService; import com.lyms.hospitalapi.fnfy.FnfyHisService; +import com.lyms.hospitalapi.qhdfy.QhdfyFmService; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.hospitalapi.qinglongxian.QingLongXianHisService; import com.lyms.hospitalapi.v2.HisService; @@ -150,10 +151,14 @@ public class BookbuildingFacade { @Autowired private ITrackDownService trackDownService; + @Autowired private TrackDownRecordService trackDownRecordService; @Autowired + private QhdfyFmService qhdfyFmService; + + @Autowired private CdfyHisService cdfyHisService; @@ -383,16 +388,24 @@ public class BookbuildingFacade { } } - if (type == ServiceObjEnums.YUNOBJ.getId()) { - final Patients tempP = p; - commonThreadPool.execute(new Runnable() { - @Override - public void run() { + + final Patients tempP = p; + commonThreadPool.execute(new Runnable() { + @Override + public void run() { + if (tempP.getType() == ServiceObjEnums.YUNOBJ.getId()) { //生成建档短信 createBuildMsg(tempP); } - }); - } + //秦皇岛建档获取分娩信息 + if ("4".equals(HIS_VERSION) && "216".equals(tempP.getHospitalId())) { + Date startDate = DateUtil.addMonth(new Date(),-3); + Date endDate = DateUtil.addDay(new Date(), 1); + qhdfyFmService.syncByCardNo(DateUtil.getyyyy_MM_dd(startDate),DateUtil.getyyyy_MM_dd(endDate),tempP.getCardNo()); + } + } + }); + br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setErrormsg("成功");