diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java index 1c4ce98..149207c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java @@ -306,8 +306,8 @@ public class PatientWeightController extends BaseController { @RequestMapping(value = "/updateLastMenstrual", method = RequestMethod.POST) @ResponseBody @TokenRequired - public BaseResponse updateLastMenstrual(String lastMenstrual, String cardNo) { - return patientWeightService.updateLastMenstrual(lastMenstrual, cardNo); + public BaseResponse updateLastMenstrual(String lastMenstrual, String pid) { + return patientWeightService.updateLastMenstrual(lastMenstrual, pid); } } 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 a68c163..05aabd6 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 @@ -3941,11 +3941,11 @@ public class AntenatalExaminationFacade { //1.判断是否为三个值还是七个值 if (StringUtils.isEmpty(item.getValueFour())) { if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne()) - && compare(item.getValueTwo(), item.getValueThree(), szy)) { + && compare(item.getValueTwo(), item.getValueThree(), szy) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne()) - && compare(item.getValueTwo(), item.getValueThree(), ssy)) { + && compare(item.getValueTwo(), item.getValueThree(), ssy) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } //七个值 @@ -3954,23 +3954,23 @@ public class AntenatalExaminationFacade { if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne()) && compare(item.getValueTwo(), item.getValueThree(), ssy) && String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive()) - && compare(item.getValueSix(), item.getValueSeven(), ssy)) { + && compare(item.getValueSix(), item.getValueSeven(), ssy) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne()) && compare(item.getValueTwo(), item.getValueThree(), ssy) && String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive()) - && compare(item.getValueSix(), item.getValueSeven(), szy)) { + && compare(item.getValueSix(), item.getValueSeven(), szy) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne()) && compare(item.getValueTwo(), item.getValueThree(), szy) && String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive()) - && compare(item.getValueSix(), item.getValueSeven(), ssy)) { + && compare(item.getValueSix(), item.getValueSeven(), ssy) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne()) && compare(item.getValueTwo(), item.getValueThree(), szy) && String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive()) - && compare(item.getValueSix(), item.getValueSeven(), szy)) { + && compare(item.getValueSix(), item.getValueSeven(), szy) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } @@ -3978,23 +3978,23 @@ public class AntenatalExaminationFacade { if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne()) && compare(item.getValueTwo(), item.getValueThree(), ssy) || String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive()) - && compare(item.getValueSix(), item.getValueSeven(), ssy)) { + && compare(item.getValueSix(), item.getValueSeven(), ssy) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueOne()) && compare(item.getValueTwo(), item.getValueThree(), ssy) || String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive()) - && compare(item.getValueSix(), item.getValueSeven(), szy)) { + && compare(item.getValueSix(), item.getValueSeven(), szy) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne()) && compare(item.getValueTwo(), item.getValueThree(), szy) || String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SSY.getId()).equals(item.getValueFive()) - && compare(item.getValueSix(), item.getValueSeven(), ssy)) { + && compare(item.getValueSix(), item.getValueSeven(), ssy) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } else if (String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueOne()) && compare(item.getValueTwo(), item.getValueThree(), szy) || String.valueOf(DiagnoseEnums.DiagnoseDetailItemEnums.SZY.getId()).equals(item.getValueFive()) - && compare(item.getValueSix(), item.getValueSeven(), szy)) { + && compare(item.getValueSix(), item.getValueSeven(), szy) && CollectionUtils.isNotEmpty(item.getRiskIds())) { list.addAll(item.getRiskIds()); } } @@ -4003,8 +4003,6 @@ public class AntenatalExaminationFacade { } } } - - if (isEnableItem(status, DiagnoseEnums.DiagnoseItemEnums.bc.getId())) { if (StringUtils.isNotEmpty(antExcAddRequest.getbChao())) { String bChao = antExcAddRequest.getbChao(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java index 3f36737..085c299 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java @@ -71,7 +71,7 @@ public interface PatientWeightService extends IBaseService { String getDoctorId(List> dayWeights2); - BaseResponse updateLastMenstrual(String lastMenstrual, String cardNo); + BaseResponse updateLastMenstrual(String lastMenstrual, String pid); } 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 67f16fc..f9c8365 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 @@ -1,14 +1,12 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.beans.MsgRequest; -import com.lyms.platform.biz.service.BasicConfigService; -import com.lyms.platform.biz.service.DoctorUserMapService; -import com.lyms.platform.biz.service.PatientWeightService2; -import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.*; import com.lyms.platform.common.utils.*; +import com.lyms.platform.operate.web.controller.AntenatalExaminationController; import com.lyms.platform.operate.web.facade.*; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.utils.CollectionUtils; @@ -94,6 +92,9 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient private HealthChargeFacade healthChargeFacade; + @Autowired + private AntenatalExaminationService antenatalExaminationService; + /** * 最低：0~13 : 0~1.9 13~40 1.9~11.9 * 最高： 0~2.2 2.2~15.9 @@ -797,19 +798,34 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient * 修改末次月经 */ @Override - public BaseResponse updateLastMenstrual(String lastMenstrual, String cardNo) { - if (StringUtils.isEmpty(cardNo)) { + public BaseResponse updateLastMenstrual(String lastMenstrual, String pid) { + if (StringUtils.isEmpty(pid)) { return RespBuilder.buildSuccess("查询号不能为空！"); } else if (StringUtils.isEmpty(lastMenstrual)) { return RespBuilder.buildSuccess("请填写需要纠正的末次月经！"); } + + Date lastMenstrualData = DateUtil.parseYMD(lastMenstrual); //只查孕妇 - List patients = mongoTemplate.find(Query.query(Criteria.where("cardNo").is(cardNo).and("type").is(1)), Patients.class); + List patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("type").is(1).and("yn").is(YnEnums.YES.getId())), Patients.class); if (CollectionUtils.isNotEmpty(patients)) { - Patients patient = new Patients(); - patient.setLastMenses(DateUtil.parseYMD(lastMenstrual)); + Patients patients1 = patients.get(0); + //同时修改初诊的末次月经 + AntExChuModel antExChuModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(patients1.getPid())), AntExChuModel.class); + if (antExChuModel != null) { + 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() + } + } + } - System.out.println(DateUtil.parseYMD(lastMenstrual)); + Patients patient = new Patients(); + patient.setLastMenses(lastMenstrualData); for (Patients p : patients) { patientsService.updatePatientOne(patient, p.getId()); }