diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index d8e8e98..806d59a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -114,6 +114,8 @@ public class MaternalDeliverModel extends BaseModel { private List baby; //分娩医院 private String fmHospital; + //访视医院 + private String fsHospital; //接生医生 private String deliverDoctor; private Integer yn; @@ -159,6 +161,14 @@ public class MaternalDeliverModel extends BaseModel { */ private Integer isClose; + public String getFsHospital() { + return fsHospital; + } + + public void setFsHospital(String fsHospital) { + this.fsHospital = fsHospital; + } + public Map getHandDueWeek() { return handDueWeek; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index e3430eb..e7a8985 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -563,6 +563,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { // 这个是分娩医院+建档医院的综合查询 private List fmHospitalQueryList; private List fmHospitalList; + private List fsHospitalList; // 分娩年龄 private Integer fmAgeStart; private Integer fmAgeEnd; @@ -1382,10 +1383,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { MongoCondition c = MongoCondition.newInstance(); MongoCondition con1 = MongoCondition.newInstance("hospitalId", fmHospitalQueryList, MongoOper.IN); MongoCondition con2 = MongoCondition.newInstance("fmHospital", fmHospitalQueryList, MongoOper.IN); + MongoCondition con3 = MongoCondition.newInstance("fsHospital", fsHospitalList, MongoOper.IN); if (c1 != null) { - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria()); + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria()); } else { - c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria(); + c1 = c.orCondition(new MongoCondition[]{con1, con2,con3}).getCriteria(); } } 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 e643732..97d8972 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 @@ -113,7 +113,8 @@ public class MatDeliverFacade { @Autowired @Qualifier("commonThreadPool") private ThreadPoolTaskExecutor commonThreadPool; - + @Autowired + private PostVisitHospitalService postVisitHospitalService; @Autowired private BookbuildingFacade bookbuildingFacade; @@ -203,6 +204,21 @@ public class MatDeliverFacade { return new BaseResponse().setErrormsg("您已分娩").setErrorcode(ErrorCodeConstants.DATA_EXIST); } Patients patients2 = patientsService.findOnePatientById(deliverAddRequest.getParentId()); + if(CollectionUtils.isNotEmpty(patients2.getChildExtAddrs())){ + List childExts = patients2.getChildExtAddrs(); + String extId = childExts.get(childExts.size()-1); + PostVisitHospitalModelQuery postQuery = new PostVisitHospitalModelQuery(); + postQuery.setHosptialId(hospitalId); + postQuery.setAreaTiters(Arrays.asList(extId)); + List postVisitHospitalModels = postVisitHospitalService.queryPostVisitHospitalModel(postQuery); + if(CollectionUtils.isNotEmpty(postVisitHospitalModels)){ + PostVisitHospitalModel postVisitHospitalModel = postVisitHospitalModels.get(postVisitHospitalModels.size()-1); + String postHosptial = postVisitHospitalModel.getPostHosptial(); + maternalDeliverModel.setFsHospital(postHosptial); + } + } + + matDeliverQuery.setDueDate(deliverAddRequest.getDueDate()); matDeliverQuery.setParentId(null); matDeliverQuery.setPid(patients2.getPid());