diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java index 81a440d..040abad 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PatientRegistrationModel.java @@ -36,6 +36,15 @@ public class PatientRegistrationModel extends BaseModel { //是否出院 1未出院 2出院 private Integer outType; + private Date dueDate;//孕产期 + + public Date getDueDate() { + return dueDate; + } + + public void setDueDate(Date dueDate) { + this.dueDate = dueDate; + } public Integer getOutType() { return outType; diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java index c104e11..71e4c9e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientRegistrationModelQuery.java @@ -43,6 +43,11 @@ public class PatientRegistrationModelQuery extends BaseQuery implements IConvert //是否出院 1未出院 2出院 private Integer outType; + //预产期 + private Date dueDateStart; + private Date dueDateEnd; + + @Override public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); @@ -92,6 +97,22 @@ public class PatientRegistrationModelQuery extends BaseQuery implements IConvert c = Criteria.where("orderDate").lte(orderDateEnd); } } + + //预产期 + if (null != dueDateStart) { + if (null != c) { + c = c.and("dueDate").gte(dueDateStart); + } else { + c = Criteria.where("dueDate").gte(dueDateStart); + } + } + if (null != dueDateEnd) { + if (null != c) { + c = c.lte(dueDateEnd); + } else { + c = Criteria.where("dueDate").lte(dueDateEnd); + } + } // 登记时间 if (null != createDateStart) { if (null != c) { @@ -127,6 +148,22 @@ public class PatientRegistrationModelQuery extends BaseQuery implements IConvert return condition.toMongoQuery(); } + public Date getDueDateStart() { + return dueDateStart; + } + + public void setDueDateStart(Date dueDateStart) { + this.dueDateStart = dueDateStart; + } + + public Date getDueDateEnd() { + return dueDateEnd; + } + + public void setDueDateEnd(Date dueDateEnd) { + this.dueDateEnd = dueDateEnd; + } + public Integer getOutType() { return outType; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 7d2ed0c..919f3b9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -398,9 +398,13 @@ public class AntenatalExaminationFacade { } } else { + + Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); if (antExAddRequest.getRegistration() != null && StringUtils.isNotEmpty(antExAddRequest.getRegistration().getPid())) { - patientRegistrationFacade.add(antExAddRequest.getRegistration()); + PatientRegistrationRequest registrationRequest = antExAddRequest.getRegistration(); + registrationRequest.setDueDate(DateUtil.getYyyyMmDd(patients.getDueDate())); + patientRegistrationFacade.add(registrationRequest); } model.setOperator(userId); @@ -419,7 +423,7 @@ public class AntenatalExaminationFacade { } } - Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); + model.setPid(patients.getPid()); /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java index 7fe1251..beaa006 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientRegistrationFacade.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.beans.MsgRequest; import com.lyms.platform.biz.service.PatientRegistrationService; +import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseListResponse; @@ -22,8 +23,10 @@ import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.AntenatalExaminationModel; import com.lyms.platform.pojo.PatientRegistrationModel; +import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.PersonModel; import com.lyms.platform.query.PatientRegistrationModelQuery; +import com.lyms.platform.query.PatientsQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; @@ -52,10 +55,7 @@ public class PatientRegistrationFacade extends BaseServiceImpl { private AutoMatchFacade autoMatchFacade; @Autowired - private OrganizationService organizationService; - - @Autowired - private UsersService usersService; + private PatientsService patientsService; @Autowired private MongoTemplate mongoTemplate; @@ -77,6 +77,7 @@ public class PatientRegistrationFacade extends BaseServiceImpl { model.setType(request.getType()); model.setBedType(request.getBedType()); model.setOrderDate(DateUtil.parseYMD(request.getOrderDate())); + model.setDueDate(DateUtil.parseYMD(request.getDueDate())); return model; } @@ -93,6 +94,18 @@ public class PatientRegistrationFacade extends BaseServiceImpl { if (StringUtils.isNotEmpty(request.getPid())) { PersonModel personModels = mongoTemplate.findOne(Query.query(Criteria.where("id").is(request.getPid())), PersonModel.class); + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setPid(request.getPid()); + patientsQuery.setType(1); + List patients = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patients)) + { + Patients pat = patients.get(0); + model.setDueDate(pat.getDueDate()); + } + model.setName(personModels.getName()); model.setCardno(personModels.getCardNo()); model.setPhone(personModels.getPhone()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientRegistrationRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientRegistrationRequest.java index 4718357..78ef3c2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientRegistrationRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientRegistrationRequest.java @@ -35,6 +35,16 @@ public class PatientRegistrationRequest { //预约时间 private String orderDate; + private String dueDate;//孕产期 + + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } + public String getPid() { return pid; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java index 5a8c286..5971dc6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientRegistrationResult.java @@ -22,6 +22,8 @@ public class PatientRegistrationResult implements IBasicResultConvert