From 9c98ef3d12714a45aed38763fef4ec3b9f142ecf Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 23 Mar 2021 11:26:13 +0800 Subject: [PATCH] update --- .../operate/web/facade/AntExRecordFacade.java | 72 ++++++++++++++++++++-- .../operate/web/facade/MeasureInfoFacade.java | 4 +- .../platform/operate/web/facade/PatientFacade.java | 12 ++-- .../operate/web/facade/TrackDownFacade.java | 24 +++++--- 4 files changed, 92 insertions(+), 20 deletions(-) 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 c7b5be6..45c8d63 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 @@ -1676,6 +1676,22 @@ public class AntExRecordFacade { model.setCheckDoctor(doctorId); model.setEdema(edema); antenatalExaminationService.updateOneAnt(model, model.getId()); + + if (StringUtils.isNotEmpty(nextTime) && StringUtils.isNotEmpty(doctorId) ) + { + AntExRecordQuery antExRecordQuery = new AntExRecordQuery(); + antExRecordQuery.setfId(model.getId()); + List recordModels = recordService.queryAntExRecords(antExRecordQuery); + if (CollectionUtils.isNotEmpty(recordModels)) + { + AntExRecordModel model1 = recordModels.get(0); + model1.setNextCheckTime(DateUtil.parseYMD(nextTime)); + model1.setCheckDoctor(doctorId); + recordService.updateOne(model1,model1.getId()); + } + } + + falg = false; break; } @@ -1882,7 +1898,10 @@ public class AntExRecordFacade { 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(Double.parseDouble(nutritionInfoRequest.getCurrentWeight())); + if (StringUtils.isNotEmpty(nutritionInfoRequest.getCurrentWeight()) && !"null".equals(nutritionInfoRequest.getCurrentWeight())) + { + model.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight())); + } if (StringUtils.isNotEmpty(nutritionInfoRequest.getSsy()) && StringUtils.isNotEmpty(nutritionInfoRequest.getSzy())) { Map map = new HashMap(); @@ -1923,6 +1942,41 @@ public class AntExRecordFacade { if (CollectionUtils.isNotEmpty(antExChuModels)) { AntExAddRequest antExAddRequest = new AntExAddRequest(); + + /** + * 0周至19周预约到 24周的日期 + 20周至24周预约到 28周的日期 + 25周至28周预约到 30周的日期 + 28周至35周预约到 两周后的日期 + 36周后 预约到 一周后的日期 + */ + + String nextCheckTime = null; + int week = DateUtil.getWeek2(patients.getLastMenses(),new Date()); + if (week <= 19) + { + nextCheckTime = DateUtil.getyyyy_MM_dd(DateUtil.addWeek(patients.getLastMenses(),24)); + } + else if (week >= 20 && week <= 24) + { + nextCheckTime = DateUtil.getyyyy_MM_dd(DateUtil.addWeek(patients.getLastMenses(),28)); + } + else if (week >= 25 && week <= 28) + { + nextCheckTime = DateUtil.getyyyy_MM_dd(DateUtil.addWeek(patients.getLastMenses(),30)); + } + else if (week > 28 && week <= 35) + { + nextCheckTime = DateUtil.getyyyy_MM_dd(DateUtil.addWeek(patients.getLastMenses(),week+2)); + } + else if (week >= 36) + { + nextCheckTime = DateUtil.getyyyy_MM_dd(DateUtil.addWeek(patients.getLastMenses(),week+1)); + } + if (nextCheckTime != null) + { + antExAddRequest.setNextCheckTime(nextCheckTime); + } antExAddRequest.setCheckDate(DateUtil.getyyyy_MM_dd(new Date())); antExAddRequest.setDiagnosisOther(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));// diagnosisOther: "29+4周妊娠 " antExAddRequest.setCurrentDueDate(DateUtil.getWeekDesc(patients.getLastMenses(), new Date()));//currentDueDate: "孕29周+4天" @@ -1947,7 +2001,11 @@ public class AntExRecordFacade { antExAddRequest.setOtherRisk(maps); } antExAddRequest.setRiskFactor(patients.getRiskFactorId()); - antExAddRequest.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight())); + + if (StringUtils.isNotEmpty(nutritionInfoRequest.getCurrentWeight()) && !"null".equals(nutritionInfoRequest.getCurrentWeight())) + { + antExAddRequest.setWeight(Double.parseDouble(nutritionInfoRequest.getCurrentWeight())); + } antExAddRequest.setTireNumber(nutritionInfoRequest.getTireNumber()); GuidelinesQuery guidelinesQuery = new GuidelinesQuery(); @@ -1983,10 +2041,12 @@ public class AntExRecordFacade { } else { - Map mapBp = new HashMap(); - mapBp.put("ssy", nutritionInfoRequest.getSsy()); - mapBp.put("szy", nutritionInfoRequest.getSzy()); - antExAddRequest.setBp(mapBp); + if (StringUtils.isNotEmpty(nutritionInfoRequest.getSsy()) && StringUtils.isNotEmpty(nutritionInfoRequest.getSzy())) { + Map mapBp = new HashMap(); + mapBp.put("ssy", nutritionInfoRequest.getSsy()); + mapBp.put("szy", nutritionInfoRequest.getSzy()); + antExAddRequest.setBp(mapBp); + } } UsersQuery query = new UsersQuery(); 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 f2a8495..0c023a0 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 @@ -1162,7 +1162,7 @@ public class MeasureInfoFacade { temp.put("timestamp", DateUtil.getyyyy_MM_dd_hms(new Date())); temp.put("hospitalId", hospitalId); Patients p = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class); - nutritionInfoRequest.setPid(p.getPid()); + BloodPressure bp = null; if (p != null) { bp = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(p.getPid())), BloodPressure.class); @@ -1188,7 +1188,7 @@ public class MeasureInfoFacade { bloodPressure.setPid(bp.getPid()); bloodPressureService.update(bloodPressure); } - + nutritionInfoRequest.setPid(p.getPid()); boolean isInput = false; //初诊自动填写血压 List antExChuModels = mongoTemplate.find(Query.query(Criteria.where("pid").is(p.getPid()).and("yn").is(YnEnums.YES.getId())), AntExChuModel.class); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index 3ade21f..9d8b4c7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -771,11 +771,15 @@ public class PatientFacade extends BaseServiceImpl { Query query = Query.query(Criteria.where("hospitalId").is(hospital).and("yn").ne("0")); String formatBmi = ""; if ("1".equals(riskPatientsQueryRequest.getBmi())) { - formatBmi = String.format("function () { return this.bmi >= %s && this.bmi <= %s; }", "25", "28"); + formatBmi = String.format("function () { return this.bmi >= %s && this.bmi < %s; }", "25", "28"); } else if ("2".equals(riskPatientsQueryRequest.getBmi())) { - formatBmi = String.format("function () { return this.bmi >= %s; }", "28"); - } else { - formatBmi = String.format("function () { return this.bmi >= %s; }", "25"); + formatBmi = String.format("function () { return this.bmi >= %s && this.bmi < %s; }", "28", "30"); + } else if ("3".equals(riskPatientsQueryRequest.getBmi())) { + formatBmi = String.format("function () { return this.bmi >= %s && this.bmi < %s; }", "30", "35"); + } else if ("4".equals(riskPatientsQueryRequest.getBmi())) { + formatBmi = String.format("function () { return this.bmi >= %s && this.bmi < %s; }", "35", "40"); + } else if ("5".equals(riskPatientsQueryRequest.getBmi())) { + formatBmi = String.format("function () { return this.bmi > %s; }", "40"); } query.addCriteria(Criteria.where("$where").is(formatBmi)); PageResult pageResult = findMongoPage(PatientWeight.class, query.with(new Sort(Sort.Direction.DESC, "modified")), riskPatientsQueryRequest.getPage(), riskPatientsQueryRequest.getLimit()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index fcd61af..c6f540d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -1199,18 +1199,26 @@ public class TrackDownFacade { if (antExChuModel != null) { temp.put("cjDate", DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime())); /** 产检日期 */ // if (downRecord.getTrackType() == TrackDownDateEnums.C.getId() || downRecord.getTrackType() == TrackDownDateEnums.I.getId()) {//产检追访查询预约产检日期 - if (antExChuModel.getNextCheckTime() != null) { - temp.put("yyTime", DateUtil.getyyyy_MM_dd(downRecord.getNextCheckTime())); /** 预约产检日期 */ - int days = DateUtil.getDays(downRecord.getNextCheckTime(), new Date()); - temp.put("yyTimeDays", days); /** 预约逾期天数 */ - } +// if (antExChuModel.getNextCheckTime() != null) { +// temp.put("yyTime", DateUtil.getyyyy_MM_dd(downRecord.getNextCheckTime())); /** 预约产检日期 */ +// int days = DateUtil.getDays(downRecord.getNextCheckTime(), new Date()); +// temp.put("yyTimeDays", days); /** 预约逾期天数 */ +// } //} - } else { - temp.put("yyTime", "--"); - temp.put("yyTimeDays", "--"); } } + if (downRecord.getNextCheckTime() != null) + { + temp.put("yyTime", DateUtil.getyyyy_MM_dd(downRecord.getNextCheckTime())); /** 预约产检日期 */ + int days = DateUtil.getDays(downRecord.getNextCheckTime(), new Date()); + temp.put("yyTimeDays", days); /** 预约逾期天数 */ + } else { + temp.put("yyTime", "--"); + temp.put("yyTimeDays", "--"); + } + + //如果是产筛追访列表，查询产筛预约时间 if (downRecord.getTrackType() == TrackDownDateEnums.D.getId() || downRecord.getTrackType() == TrackDownDateEnums.H.getId()) {//产前筛查 try { -- 1.8.3.1