diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java index d64ac37..1c46c1e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java @@ -230,7 +230,7 @@ public class SieveController extends BaseController { * @return */ @ResponseBody - @RequestMapping(value = "/cqsieves",method = RequestMethod.GET) + @RequestMapping(value = "",method = RequestMethod.GET) @TokenRequired public BaseResponse queryChanQianSieve(@Valid CqSieveQueryRequest cqSieveQueryRequest,HttpServletRequest request){ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); 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 f9c8365..5f83a34 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 @@ -95,6 +95,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient @Autowired private AntenatalExaminationService antenatalExaminationService; + @Autowired + private AntExRecordService recordService; + /** * 最低:0~13 : 0~1.9 13~40 1.9~11.9 * 最高: 0~2.2 2.2~15.9 @@ -800,9 +803,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient @Override public BaseResponse updateLastMenstrual(String lastMenstrual, String pid) { if (StringUtils.isEmpty(pid)) { - return RespBuilder.buildSuccess("查询号不能为空!"); + return RespBuilder.buildSuccess(ResponseCode.PATIENT_NOT_FOUND, "查询号不能为空!"); } else if (StringUtils.isEmpty(lastMenstrual)) { - return RespBuilder.buildSuccess("请填写需要纠正的末次月经!"); + return RespBuilder.buildErro(ResponseCode.DATA_ERROR, "请填写需要纠正的末次月经!"); } Date lastMenstrualData = DateUtil.parseYMD(lastMenstrual); @@ -811,27 +814,36 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if (CollectionUtils.isNotEmpty(patients)) { Patients patients1 = patients.get(0); //同时修改初诊的末次月经 + Patients patient = new Patients(); + patient.setLastMenses(lastMenstrualData); + for (Patients p : patients) { + patientsService.updatePatientOne(patient, p.getId()); + } AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients1.getPid())), AntExChuModel.class); if (antExChuModel != null) { + //修改产检记录表末次月经 + List antExRecordModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(antExChuModel.getPid())), AntExRecordModel.class); + if (CollectionUtils.isNotEmpty(antExRecordModels)) { + for (AntExRecordModel antExRecordModel : antExRecordModels) { + antExRecordModel.setLastMenses(lastMenstrualData); + recordService.updateOne(antExRecordModel, antExChuModel.getId()); + } + } antExChuModel.setLastMenses(lastMenstrualData); antenatalExaminationService.updateAntExChu(antExChuModel, antExChuModel.getId()); List antenatalExaminationModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("yn").is(YnEnums.YES.getId())), AntenatalExaminationModel.class); if (CollectionUtils.isNotEmpty(antenatalExaminationModels)) { + //循环修修改初诊的末次月经 for (AntenatalExaminationModel antenatalList : antenatalExaminationModels) { - - // antenatalExaminationService.updateAntenatalExamination() + antenatalList.setLastMenses(lastMenstrualData); + antenatalExaminationService.updateOneAnt(antenatalList, antenatalList.getId()); } } } - Patients patient = new Patients(); - patient.setLastMenses(lastMenstrualData); - for (Patients p : patients) { - patientsService.updatePatientOne(patient, p.getId()); - } return RespBuilder.buildSuccess("成功!"); } else { - return RespBuilder.buildSuccess("该孕妇已分娩或未建档!"); + return RespBuilder.buildSuccess(ResponseCode.PATIENT_NOT_FOUND, "该孕妇已分娩或未建档!"); } }