diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 08ff9e0..2b9f82b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -635,13 +635,11 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } - public void updateWeight(String beforeWeight,PatientWeight patientWeight,String bregmatic,String bregmaticOther) - { + public void updateWeight(String beforeWeight, PatientWeight patientWeight, String bregmatic, String bregmaticOther) { boolean isUpdate = false; PatientWeight patientWeightBefore = new PatientWeight(); - if (patientWeight != null && StringUtils.isNotEmpty(beforeWeight) && StringUtils.isNotEmpty(patientWeight.getBeforeHeight())) - { + if (patientWeight != null && StringUtils.isNotEmpty(beforeWeight) && StringUtils.isNotEmpty(patientWeight.getBeforeHeight())) { isUpdate = true; patientWeightBefore.setBeforeWeight(beforeWeight); String bmi = getBmi(beforeWeight, patientWeight.getBeforeHeight()); @@ -650,8 +648,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient patientWeight.setBmi(bmi); } - if (StringUtils.isNotEmpty(bregmatic)) - { + if (StringUtils.isNotEmpty(bregmatic)) { patientWeightBefore.setBregmatic(bregmatic); patientWeightBefore.setBregmaticOther(bregmaticOther); @@ -659,15 +656,14 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient patientWeight.setBregmaticOther(bregmaticOther); } - if (isUpdate) - { + if (isUpdate) { patientWeightService2.update(Query.query(Criteria.where("_id").is(patientWeight.getId())), patientWeightBefore); } } @Override - public BaseResponse report(String id, Integer userId, String rid, String version, String doctorId,String beforeWeight,String bregmatic,String bregmaticOther) { + public BaseResponse report(String id, Integer userId, String rid, String version, String doctorId, String beforeWeight, String bregmatic, String bregmaticOther) { String hospitalId = autoMatchFacade.getHospitalId(userId); Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId)); @@ -852,6 +848,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient //同时修改初诊的末次月经 Patients patient = new Patients(); patient.setLastMenses(lastMenstrualData); + Date dueDate = DateUtil.addDay(DateUtil.addMonth(lastMenstrualData, 9), 7); + patient.setDueDate(dueDate); for (Patients p : patients) { patientsService.updatePatientOne(patient, p.getId()); } @@ -2234,12 +2232,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } @Override - public BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version, String doctorId,String beforeWeight,String bregmatic1,String bregmaticOther) { + public BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version, String doctorId, String beforeWeight, String bregmatic1, String bregmaticOther) { Map> series = new HashMap<>(); Map> datas = new TreeMap<>(); PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(pid)), PatientWeight.class); - updateWeight(beforeWeight,patientWeight, bregmatic1, bregmaticOther); + updateWeight(beforeWeight, patientWeight, bregmatic1, bregmaticOther); //1.获取该孕妇是否有推荐的高危项 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(patientWeight.getPatientId())), Patients.class); @@ -2374,7 +2372,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } if (datas.size() == 0) { - BaseResponse baseResponse = this.report(pid, userId, rid, version, doctorId,beforeWeight, bregmatic, bregmaticOther); + BaseResponse baseResponse = this.report(pid, userId, rid, version, doctorId, beforeWeight, bregmatic, bregmaticOther); return baseResponse; } //同时出现高血压和肝硬化或肝功能不全则按照肝硬化或肝功能不全 @@ -2394,12 +2392,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient * 秦皇岛高危报告 */ @Override - public BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version, String doctorId,String beforeWeight,String bregmatic1,String bregmaticOther) { + public BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version, String doctorId, String beforeWeight, String bregmatic1, String bregmaticOther) { Map> series = new HashMap<>(); Map> datas = new TreeMap<>(); PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(pid)), PatientWeight.class); - updateWeight(beforeWeight,patientWeight, bregmatic1, bregmaticOther); + updateWeight(beforeWeight, patientWeight, bregmatic1, bregmaticOther); //1.获取该孕妇是否有推荐的高危项 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(patientWeight.getPatientId())), Patients.class); @@ -2499,7 +2497,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } if (datas.size() == 0) { - BaseResponse baseResponse = this.report(pid, userId, rid, "1", doctorId,beforeWeight,bregmatic1,bregmaticOther); + BaseResponse baseResponse = this.report(pid, userId, rid, "1", doctorId, beforeWeight, bregmatic1, bregmaticOther); return baseResponse; } /*//同时出现高血压和肝硬化或肝功能不全则按照肝硬化或肝功能不全