jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8bb104088c6d2278d2a8ae067733218096fefb6f

Authored by wangbo
1 parent ad196ef599
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

高危因素添加修改

Showing 3 changed files with 7 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ 8bb1040
... ... @@ -1311,12 +1311,10 @@
1311 1311 List<PatientSerResult> patientSerResults = (List<PatientSerResult>) baseResponse.getObject();
1312 1312 result.setPatientSerResults(patientSerResults);
1313 1313  
1314   - if (!isBuild && StringUtils.isNotEmpty(model.getParentId()))
1315   - {
  1314 + if (!isBuild && StringUtils.isNotEmpty(model.getParentId())) {
1316 1315 Patients patients = patientsService.findOnePatientById(model.getParentId());
1317   - if (patients != null)
1318   - {
1319   - List<Map<String,Object>> riskList = mongoUtil.findColor(patients.getRiskFactorId());
  1316 + if (patients != null) {
  1317 + List<Map<String, Object>> riskList = mongoUtil.findColor(patients.getRiskFactorId());
1320 1318 result.setmHighRiskReason(riskList);
1321 1319 }
1322 1320 }
... ... @@ -2750,7 +2748,7 @@
2750 2748 if (CollectionUtils.isNotEmpty(models)) {
2751 2749 for (BabyModel model : models) {
2752 2750 Map<String, Object> data = new HashMap<>();
2753   - if (model.getLastHighRisk() == null || model.getLastHighRisk() == 0) {
  2751 + if (model.getHighRisk() == null || model.getHighRisk() == 0) {
2754 2752 data.put("highRisk", ""); //jira WEB-1547
2755 2753 } else {
2756 2754 data.put("highRisk", "高危");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 8bb1040
... ... @@ -597,7 +597,7 @@
597 597 if (babyModel != null && org.apache.commons.lang.StringUtils.isNotEmpty(babyModel.getSource())) {
598 598 BabyModel babyModel1 = new BabyModel();
599 599 babyModel1.setNextDate(babyModel.getNextDate());
600   - babyModel1.setLastHighRisk(babyModel.getLastHighRisk());
  600 + babyModel1.setHighRisk(babyModel.getHighRisk());
601 601 babyModel1.setLastDiagnose(babyModel.getLastDiagnose());
602 602 babyModel1.setId(babyModel.getSource());
603 603 babyBookbuildingService.updateBabyBuild(babyModel1, babyModel.getSource());
... ... @@ -610,7 +610,7 @@
610 610 for (BabyModel baby : babyModels) {
611 611 BabyModel babyModel1 = new BabyModel();
612 612 babyModel1.setNextDate(babyModel.getNextDate());
613   - babyModel1.setLastHighRisk(babyModel.getLastHighRisk());
  613 + babyModel1.setHighRisk(babyModel.getHighRisk());
614 614 babyModel1.setLastDiagnose(babyModel.getLastDiagnose());
615 615 babyModel1.setId(baby.getId());
616 616 babyBookbuildingService.updateBabyBuild(babyModel1, baby.getId());
... ... @@ -2067,7 +2067,7 @@
2067 2067 for (BabyModel model : babyModels) {
2068 2068 BabyManageListResult result = new BabyManageListResult();
2069 2069 result.setId(model.getId());
2070   - if (model.getLastHighRisk() == null || model.getLastHighRisk() == 0) {
  2070 + if (model.getHighRisk() == null || model.getHighRisk() == 0) {
2071 2071 result.setHighRisk("健康");
2072 2072 } else {
2073 2073 result.setHighRisk("高危");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java View file @ 8bb1040
... ... @@ -1324,7 +1324,6 @@
1324 1324  
1325 1325 double kauls = getBasicKaul(month, model.getWeight(), model.getHeight(), baby.getSex());
1326 1326 if (month >= 0 && month <= 5) {
1327   - System.out.println("=========" + model.getFeedType());
1328 1327 List<BabyDietReportModel> babyDietReport = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month).and("feedingPattern").is(Integer.valueOf(model.getFeedType()))), BabyDietReportModel.class);
1329 1328  
1330 1329 for (BabyDietReportModel babyDiet : babyDietReport) {