diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java index 3f75498..dfa01b6 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java @@ -4610,8 +4610,8 @@ public class CdGwInterface { /*String startDate = DateUtil.getyyyy_MM_dd_hms(start); String endDate = DateUtil.getyyyy_MM_dd_hms(end);*/ - String startDate = "2017-10-01 00:00:00"; - String endDate = "2018-12-17 23:59:59"; + String startDate = start; + String endDate = end; System.out.println("start=" + startDate + "end=" + endDate); saveYf(startDate, endDate); saveChuZhen(startDate, endDate); diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/WhfyHisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/WhfyHisService.java index 80dd7e3..76d6cfb 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/WhfyHisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/whfy/WhfyHisService.java @@ -24,7 +24,7 @@ public class WhfyHisService { WhfyHisModel whfyHisModel = new WhfyHisModel(); if(StringUtils.isNotEmpty(bhnum)){ String sql = "select patient_id as bhnum,name,sex,to_char(date_of_birth,'yyyy-mm-dd') as birth," + - "id_no as idno,next_of_kin_phone as phone from lyms.v_patient_idno"; + "id_no as idno,next_of_kin_phone as phone from lyms.v_patient_idno where patient_id='"+bhnum+"'"; try{ QueryRunner queryRunner = new QueryRunner(true); List whList = queryRunner.query(conn,sql,new BeanListHandler(WhfyHisModel.class)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 34105c7..7ac6c01 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -3,6 +3,8 @@ package com.lyms.platform.operate.web.facade; import com.lyms.hospitalapi.lcdcf.LcdcfFmService; import com.lyms.hospitalapi.lcdcf.LcdcfHisModel; import com.lyms.hospitalapi.lcdcf.LcdcfHisService; +import com.lyms.hospitalapi.pojo.WhfyHisModel; +import com.lyms.hospitalapi.whfy.WhfyHisService; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.dao.operator.MongoOper; @@ -78,6 +80,8 @@ public class MatDeliverFacade { private SieveService sieveService; @Autowired private LcdcfHisService lcdcfHisService; + @Autowired + private WhfyHisService whfyHisService; @Autowired private LcdcfFmService lcdcfFmService; @@ -1157,6 +1161,7 @@ public class MatDeliverFacade { String hospital = autoMatchFacade.getHospitalId(userId); LcdcfHisModel lcdcfHisModel = null; + WhfyHisModel whfyHisModel = null; //聊城东昌府分娩界面通过住院号从his中查询到孕妇的身份号码,然后用身份证号码作为院内系统的查询条件查询孕妇信息 if ("2100001305".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())) { @@ -1167,6 +1172,13 @@ public class MatDeliverFacade { } else { return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); } + }else if("2100001635".equals(hospital) && StringUtils.isNotEmpty(deliverQueryRequest.getZhuYuanNo())){ + whfyHisModel = whfyHisService.getIdNo(deliverQueryRequest.getZhuYuanNo()); + if (whfyHisModel != null && StringUtils.isNotEmpty(whfyHisModel.getIdno())) { + deliverQueryRequest.setCardNo(whfyHisModel.getIdno()); + } else { + return new BaseResponse().setErrormsg("该孕妇还未在本院建档不能进行分娩").setErrorcode(ErrorCodeConstants.NO_DATA); + } } //获取 /* Patients patients = antenatalExaminationFacade.findOnePatient(deliverQueryRequest.getCardNo(), deliverQueryRequest.getVcCardNo(), null, hospital, -1);