Commit 454206fd4847413df456d6c519faa35c47fd9bfa
1 parent
e6df0f92cc
Exists in
master
and in
6 other branches
体成分分析
Showing 1 changed file with 5 additions and 5 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java
View file @
454206f
| ... | ... | @@ -77,8 +77,8 @@ |
| 77 | 77 | Calendar todayStart = Calendar.getInstance(); |
| 78 | 78 | todayStart.set(Calendar.HOUR_OF_DAY,0); |
| 79 | 79 | todayStart.set(Calendar.MINUTE,0); |
| 80 | - todayStart.set(Calendar.SECOND,0); | |
| 81 | - todayStart.set(Calendar.MILLISECOND,0); | |
| 80 | + todayStart.set(Calendar.SECOND, 0); | |
| 81 | + todayStart.set(Calendar.MILLISECOND, 0); | |
| 82 | 82 | return todayStart.getTime(); |
| 83 | 83 | } |
| 84 | 84 | |
| ... | ... | @@ -186,7 +186,7 @@ |
| 186 | 186 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
| 187 | 187 | VolumeComponentAnalysisModel volumeComponentAnalysisModel = mongoTemplate.findById(id, VolumeComponentAnalysisModel.class); |
| 188 | 188 | if (volumeComponentAnalysisModel != null) { |
| 189 | - Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(volumeComponentAnalysisModel.getPatientId()).and("yn").is(YnEnums.YES.getId()).and("hospitalId").is(hospitalId)), Patients.class); | |
| 189 | + 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); | |
| 190 | 190 | if (patients != null) { |
| 191 | 191 | data = setData(patients, volumeComponentAnalysisModel,userId); |
| 192 | 192 | } |
| ... | ... | @@ -226,7 +226,7 @@ |
| 226 | 226 | userMap.put("username", patients.getUsername()); |
| 227 | 227 | userMap.put("age", patients.getAge()); |
| 228 | 228 | userMap.put("height", volumeComponentAnalysisModel.getHeight()); |
| 229 | - userMap.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//孕周 | |
| 229 | + userMap.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), volumeComponentAnalysisModel.getCreated()));//孕周 | |
| 230 | 230 | //获取bmi值 |
| 231 | 231 | double bmi = Double.valueOf(patientWeightService.getBmi( |
| 232 | 232 | volumeComponentAnalysisModel.getBeforeWeight(),//孕前体重 |
| ... | ... | @@ -235,7 +235,7 @@ |
| 235 | 235 | Map<String, String> kmap = computeKulServiceManager.getComputeKulByRisk("").getComputeKul( |
| 236 | 236 | Double.parseDouble(volumeComponentAnalysisModel.getBeforeWeight()),//孕前体重 |
| 237 | 237 | Double.parseDouble(volumeComponentAnalysisModel.getWeight()),//当前体重 |
| 238 | - DateUtil.getWeek(patients.getLastMenses(), new Date()),//孕周 | |
| 238 | + DateUtil.getWeek(patients.getLastMenses(), volumeComponentAnalysisModel.getCreated()),//孕周 | |
| 239 | 239 | bmi,//bmi |
| 240 | 240 | "2".equals(volumeComponentAnalysisModel.getBregmatic()) ? "2" : "1",// 1 表达单胎 2 表示多胎 |
| 241 | 241 | volumeComponentAnalysisModel.getHeight(),//孕前身高(当前身高^) |