diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index dc12677..6031d79 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -35,6 +35,8 @@ public class PatientsService { private ISieveApplyOrderDao sieveApplyOrderDao; @Autowired private IReferralApplyOrderDao iReferralApplyOrderDao; + @Autowired + private PersonService personService; public Patients addPatient(Patients obj) { return iPatientDao.addPatient(obj); @@ -62,7 +64,7 @@ public class PatientsService { return iPatientDao.queryPatient(mongoQuery); } - public List queryPatient1(PatientsQuery patientsQuery,String field) { + public List queryPatient1(PatientsQuery patientsQuery, String field) { MongoQuery query = patientsQuery.convertToQuery(); if (StringUtils.isNotEmpty(patientsQuery.getNeed())) { patientsQuery.mysqlBuild(iPatientDao.queryPatientCount(query)); @@ -191,12 +193,22 @@ public class PatientsService { patientsQuery.setType(1); patientsQuery.setLastMensesEnd(endDate); List patientses = queryPatient(patientsQuery); + List list = null; for (Patients patients : patientses) { patients.setType(3); patients.setBuildType(2); patients.setFmDate(DateUtil.addDay(patients.getLastMenses(), 293)); patients.setModified(new Date()); updatePatient(patients); + PersonModelQuery personYunModelQuery = new PersonModelQuery(); + personYunModelQuery.setYn(YnEnums.YES.getId()); + personYunModelQuery.setId(patients.getId()); + list = personService.queryPersons(personYunModelQuery); + if (CollectionUtils.isNotEmpty(list)) { + PersonModel pm = list.get(0); + pm.setType(3);//基本信息更新成产妇 + personService.updatePerson(pm, pm.getId()); + } } } @@ -213,13 +225,12 @@ public class PatientsService { } - /** * 修改产筛数据 * * @param patients */ - public void updateSieve(Patients patients){ + public void updateSieve(Patients patients) { if (null != patients && null != patients.getLastMenses()) { int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); //判断是否在区间 @@ -239,7 +250,7 @@ public class PatientsService { sieveModel.setName(patients.getUsername()); sieveModel.setLastMenses(patients.getLastMenses()); sieveModel.setCardNo(patients.getCardNo()); - if(null!= sieveModel.getDueWeek()){ + if (null != sieveModel.getDueWeek()) { sieveModel.setDueWeek(days); } sieveDao.updateChanQianSieve(sieveModel); @@ -269,7 +280,7 @@ public class PatientsService { sieveModel.setName(patients.getUsername()); sieveModel.setLastMenses(patients.getLastMenses()); sieveModel.setCardNo(patients.getCardNo()); - if(null!= sieveModel.getDueWeek()) { + if (null != sieveModel.getDueWeek()) { sieveModel.setDueWeek(days); } sieveDao.updateChanQianSieve(sieveModel); @@ -280,14 +291,13 @@ public class PatientsService { } - - public void updateRefer(BabyModel babyModel){ - ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); + public void updateRefer(BabyModel babyModel) { + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(babyModel.getId()); referralApplyOrderQuery.setHospitalId(babyModel.getHospitalId()); - List referralApplyOrderModel = iReferralApplyOrderDao.queryList(referralApplyOrderQuery.convertToQuery()); - if(CollectionUtils.isNotEmpty(referralApplyOrderModel)) { - Patients patients=findOnePatientById(babyModel.getParentId()); + List referralApplyOrderModel = iReferralApplyOrderDao.queryList(referralApplyOrderQuery.convertToQuery()); + if (CollectionUtils.isNotEmpty(referralApplyOrderModel)) { + Patients patients = findOnePatientById(babyModel.getParentId()); for (ReferralApplyOrderModel referralApplyOrderModel1 : referralApplyOrderModel) { referralApplyOrderModel1.setBirth(babyModel.getBirth()); referralApplyOrderModel1.setName(babyModel.getName()); @@ -306,13 +316,13 @@ public class PatientsService { * * @param patients */ - public void updateRefer(Patients patients){ - ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); + public void updateRefer(Patients patients) { + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setParentId(patients.getId()); referralApplyOrderQuery.setHospitalId(patients.getHospitalId()); - List referralApplyOrderModel = iReferralApplyOrderDao.queryList(referralApplyOrderQuery.convertToQuery()); - if(CollectionUtils.isNotEmpty(referralApplyOrderModel)){ - for(ReferralApplyOrderModel referralApplyOrderModel1:referralApplyOrderModel){ + List referralApplyOrderModel = iReferralApplyOrderDao.queryList(referralApplyOrderQuery.convertToQuery()); + if (CollectionUtils.isNotEmpty(referralApplyOrderModel)) { + for (ReferralApplyOrderModel referralApplyOrderModel1 : referralApplyOrderModel) { referralApplyOrderModel1.setBirth(patients.getBirth()); referralApplyOrderModel1.setLastMenses(patients.getLastMenses()); referralApplyOrderModel1.setName(patients.getUsername());