diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 54d1d36..b13201c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -11,6 +11,7 @@ import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.AntExAddRequest; import com.lyms.platform.operate.web.request.AntExManagerQueryRequest; import com.lyms.platform.operate.web.request.CjStatisticsQueryRequest; +import com.lyms.platform.operate.web.request.NutritionInfoRequest; import com.lyms.platform.operate.web.result.AntExManagerResult; import com.lyms.platform.operate.web.result.CjStatisticsListResult; import com.lyms.platform.operate.web.result.CjStatisticsResult; @@ -1168,20 +1169,35 @@ public class AntExRecordFacade { * 如果是体重测量在后,就通过测量体重时候去修改产检中的体重 * @param hospitalId * @param pid - * @param currentWeight + * @param nutritionInfoRequest */ - public void updateAntenatal(String hospitalId,String pid,Double currentWeight) + public void updateAntenatal(String hospitalId,String pid,NutritionInfoRequest nutritionInfoRequest) { if (!isOpenAutoSaveAntenatal(hospitalId)) { return; } - List examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid)), AntenatalExaminationModel.class); + + List antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("yn").is(YnEnums.YES.getId())), AntExChuModel.class); + if (CollectionUtils.isNotEmpty(antExChuModels)) { + for (AntExChuModel model : antExChuModels) { + if (StringUtils.isNotEmpty(DateUtil.getyyyy_MM_dd(model.getCheckTime())) && + DateUtil.getyyyy_MM_dd(new Date()).equals(DateUtil.getyyyy_MM_dd(model.getCheckTime()))) { + model.setWeight(String.valueOf(Double.parseDouble(nutritionInfoRequest.getCurrentWeight()))); + model.setHeight(nutritionInfoRequest.getBeforeHeight()); + model.setYqWeight(nutritionInfoRequest.getBeforeWeight()); + antenatalExaminationService.updateAntExChu(model, model.getId()); + break; + } + } + } + + List examinationModel = mongoTemplate.find(Query.query(Criteria.where("pid").is(pid).and("yn").is(YnEnums.YES.getId())), AntenatalExaminationModel.class); if (CollectionUtils.isNotEmpty(examinationModel)) { for (AntenatalExaminationModel model : examinationModel) { if (StringUtils.isNotEmpty(DateUtil.getyyyy_MM_dd(model.getCheckDate())) && DateUtil.getyyyy_MM_dd(new Date()).equals(DateUtil.getyyyy_MM_dd(model.getCheckDate()))) { - model.setWeight(currentWeight); + model.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight())); antenatalExaminationService.updateOneAnt(model, model.getId()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index 10a5587..7c2aeab 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -1087,7 +1087,7 @@ public class MeasureInfoFacade { } //更新当天产检记录的体重 - antExRecordFacade.updateAntenatal(hospitalId, patients.getPid(), Double.parseDouble(currentWeight)); + antExRecordFacade.updateAntenatal(hospitalId, patients.getPid(), nutritionInfoRequest); MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); measureInfoRequest.setCertNo(patients.getCardNo()); 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 9dca35a..28ff225 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 @@ -289,6 +289,23 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient for (PatientWeight patientWeight : patientWeights) { Patients p = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); if (p != null) { + + if (p.getType() == 3) + { + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setExtSource(false); + patientsQuery.setType(1); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setSort("created"); + patientsQuery.setPid(p.getPid()); + List patients = patientsService.queryPatient(patientsQuery); + if (CollectionUtils.isNotEmpty(patients)) + { + p = patients.get(0); + } + } + Map temp = new LinkedHashMap<>(); temp.put("id", patientWeight.getId()); temp.put("username", p.getUsername());