From 454206fd4847413df456d6c519faa35c47fd9bfa Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 21 Oct 2021 14:27:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E6=88=90=E5=88=86=E5=88=86=E6=9E=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/VolumeComponentAnalysisFacade.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java index 91ff6ff..816e682 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java @@ -77,8 +77,8 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { Calendar todayStart = Calendar.getInstance(); todayStart.set(Calendar.HOUR_OF_DAY,0); todayStart.set(Calendar.MINUTE,0); - todayStart.set(Calendar.SECOND,0); - todayStart.set(Calendar.MILLISECOND,0); + todayStart.set(Calendar.SECOND, 0); + todayStart.set(Calendar.MILLISECOND, 0); return todayStart.getTime(); } @@ -186,7 +186,7 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { String hospitalId = autoMatchFacade.getHospitalId(userId); VolumeComponentAnalysisModel volumeComponentAnalysisModel = mongoTemplate.findById(id, VolumeComponentAnalysisModel.class); if (volumeComponentAnalysisModel != null) { - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(volumeComponentAnalysisModel.getPatientId()).and("yn").is(YnEnums.YES.getId()).and("hospitalId").is(hospitalId)), Patients.class); + Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(volumeComponentAnalysisModel.getPatientId()).and("yn").is(YnEnums.YES.getId()).and("type").is(1).and("hospitalId").is(hospitalId)), Patients.class); if (patients != null) { data = setData(patients, volumeComponentAnalysisModel,userId); } @@ -226,7 +226,7 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { userMap.put("username", patients.getUsername()); userMap.put("age", patients.getAge()); userMap.put("height", volumeComponentAnalysisModel.getHeight()); - userMap.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//孕周 + userMap.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), volumeComponentAnalysisModel.getCreated()));//孕周 //获取bmi值 double bmi = Double.valueOf(patientWeightService.getBmi( volumeComponentAnalysisModel.getBeforeWeight(),//孕前体重 @@ -235,7 +235,7 @@ public class VolumeComponentAnalysisFacade extends BaseServiceImpl { Map kmap = computeKulServiceManager.getComputeKulByRisk("").getComputeKul( Double.parseDouble(volumeComponentAnalysisModel.getBeforeWeight()),//孕前体重 Double.parseDouble(volumeComponentAnalysisModel.getWeight()),//当前体重 - DateUtil.getWeek(patients.getLastMenses(), new Date()),//孕周 + DateUtil.getWeek(patients.getLastMenses(), volumeComponentAnalysisModel.getCreated()),//孕周 bmi,//bmi "2".equals(volumeComponentAnalysisModel.getBregmatic()) ? "2" : "1",// 1 表达单胎 2 表示多胎 volumeComponentAnalysisModel.getHeight(),//孕前身高(当前身高^) -- 1.8.3.1