From ffc8a91273004333428a56abb91ce399376120c6 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Fri, 9 Aug 2024 09:42:10 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E4=BA=A7=E5=A6=87=E6=9C=8D=E5=8A=A1=E5=BC=80=E9=80=9A?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/BirthController.java | 28 ++++++++---- .../platform/operate/web/facade/CourseFacade.java | 17 +++++-- .../operate/web/facade/MatDeliverFacade.java | 53 +++++++++++----------- 3 files changed, 58 insertions(+), 40 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java index 86aabf4..7043736 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BirthController.java @@ -100,17 +100,25 @@ public class BirthController extends BaseController { String history1 = JsonUtil.obj2JsonString(map.get("history")); Map history = JsonUtil.str2Obj(history1, Map.class); if (history.get("yqWeight")!=null&&history.get("height")!=null){ - BigDecimal height= new BigDecimal(String.valueOf(history.get("height"))); - if (height.compareTo(BigDecimal.ZERO)>0){ - height=height.multiply(height); + try { + if (StringUtils.isNotEmpty(String.valueOf(history.get("height")))){ + BigDecimal height= new BigDecimal(String.valueOf(history.get("height"))); + if (height.compareTo(BigDecimal.ZERO)>0){ + height=height.multiply(height); + } + if (StringUtils.isNotEmpty(String.valueOf(history.get("yqWeight")))){ + BigDecimal bim= new BigDecimal(String.valueOf(history.get("yqWeight"))).divide(height,2, RoundingMode.HALF_UP); + if (bim.compareTo(new BigDecimal("28"))>0){ + Map map1=new HashMap<>(); + map1.put("idCard",archiveData.getIdCard()); + map1.put("BMI",bim.toPlainString()); + mapList.add(map1); + } + } + } + }catch (Exception e){ + System.out.println(history); } - BigDecimal bim= new BigDecimal(String.valueOf(history.get("yqWeight"))).divide(height,2, RoundingMode.HALF_UP); - if (bim.compareTo(new BigDecimal("28"))>0){ - Map map1=new HashMap<>(); - map1.put("idCard",archiveData.getIdCard()); - map1.put("BMI",bim.toPlainString()); - mapList.add(map1); - } } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java index b7cc9d9..3266be5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java @@ -350,7 +350,7 @@ public class CourseFacade { String id=courseModel.getId(); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setHospitalId(courseModel.getHospitalId()); - if (courseModel.getCourseObjId()!=null){ + if (courseModel.getCourseObjId()!=null&&courseModel.getCourseObjId()!=0){ patientsQuery.setType(courseModel.getCourseObjId()); } patientsQuery.setExtEnable(false); @@ -364,9 +364,12 @@ public class CourseFacade { List messages=new ArrayList<>(); for (Patients model : patientsModels) { - messages= saveMsg(model.getHospitalId(),model.getPhone(),model.getId(), + List msgRequests= saveMsg(model.getHospitalId(),model.getPhone(),model.getId(), courseModel.getCourseName(),courseModel.getCourseSpeaker(),model.getId(),id, "孕妇学校新课程已发布，点击进入小程序预约",1); + if (CollectionUtils.isNotEmpty(msgRequests)){ + messages.addAll(msgRequests); + } } if (CollectionUtils.isNotEmpty(messages)) { @@ -415,9 +418,12 @@ public class CourseFacade { List messages=new ArrayList<>(); for (PatientCourseModel model : patientCourseModels) { - messages= saveMsg(model.getHospitalId(),model.getPhone(),model.getPatientId(), + List msgRequests= saveMsg(model.getHospitalId(),model.getPhone(),model.getPatientId(), courseModel.getCourseName(),courseModel.getCourseSpeaker(),model.getId(),model.getCourseId(), "您本次参加的孕妇学校课程已经取消，请注意安排时间。",null); + if (CollectionUtils.isNotEmpty(msgRequests)){ + messages.addAll(msgRequests); + } } if (CollectionUtils.isNotEmpty(messages)) { @@ -572,9 +578,12 @@ public class CourseFacade { } String courseName = CollectionUtils.isNotEmpty(courseModels1) ? courseModels1.get(0).getCourseName() : ""; - messages= saveMsg(patientCourseModel.getHospitalId(),patientCourseModel.getPhone(),patientCourseModel.getPatientId(), + List msgRequests= saveMsg(patientCourseModel.getHospitalId(),patientCourseModel.getPhone(),patientCourseModel.getPatientId(), courseName,speaker,patientCourseModel.getId(),patientCourseModel.getCourseId(), "您本次参加的孕妇学校课程已经结束，请点击详情回顾课程内容并对本次课程评分。我们会根据您的评价结果相应做相应的评估的课程调整等。",null); + if (CollectionUtils.isNotEmpty(msgRequests)){ + messages.addAll(msgRequests); + } } if (CollectionUtils.isNotEmpty(messages)) { logger.info("messages{},"+messages.toString()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 22b974a..fca74d8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -4347,40 +4347,41 @@ public class MatDeliverFacade { List list = mongoTemplate.find(query, MaternalDeliverModel.class); if (CollectionUtils.isNotEmpty(list)) { //高危因素 - List riskId = patientsList.get(0).getRiskFactorId(); - StringBuffer sb = new StringBuffer(); - if (CollectionUtils.isNotEmpty(riskId)) { - HighScoreResult highScoreResult = queryRisk(riskId); - List riskList = highScoreResult.getHighRisk(); - if (CollectionUtils.isNotEmpty(riskList)) { - for (Map risk : riskList) { - sb.append(risk.get("name")).append(","); - } - } - } - - String highRisk = sb.toString(); - if (highRisk.length() > 0) { - params.put("riskType", highRisk.substring(0, highRisk.length() - 1)); - } MaternalDeliverModel maternalDeliverModel = list.get(0); String dueDate = maternalDeliverModel.getDueDate() + " 00:00:00"; //分娩类型 基于ID查询对应文章 String deliveryMode = getDelivery(maternalDeliverModel); params.put("dueDate", dueDate.equals("") ? dueDate : getTime(DateUtil.parseYMDHMS(dueDate))); params.put("deliveryMode", deliveryMode); - PatientServiceQuery serviceQueryQuery = new PatientServiceQuery(); - //产后康复 - serviceQueryQuery.setSerType(20); - serviceQueryQuery.setPerType(3); - //服务状态1-开通、2-退订、3-过期、4-暂停 - serviceQueryQuery.setSerStatus(1); - serviceQueryQuery.setParentid(maternalDeliverModel.getParentId()); - List patientServices = patientServiceService.queryPatientService(serviceQueryQuery); - params.put("status",CollectionUtils.isNotEmpty(patientServices)?1:0); params.put("parentId",maternalDeliverModel.getParentId()); - objectResponse.setData(params); + + } + List riskId = patientsList.get(0).getRiskFactorId(); + StringBuffer sb = new StringBuffer(); + if (CollectionUtils.isNotEmpty(riskId)) { + HighScoreResult highScoreResult = queryRisk(riskId); + List riskList = highScoreResult.getHighRisk(); + if (CollectionUtils.isNotEmpty(riskList)) { + for (Map risk : riskList) { + sb.append(risk.get("name")).append(","); + } + } + } + + String highRisk = sb.toString(); + if (highRisk.length() > 0) { + params.put("riskType", highRisk.substring(0, highRisk.length() - 1)); } + PatientServiceQuery serviceQueryQuery = new PatientServiceQuery(); + //产后康复 + serviceQueryQuery.setSerType(20); + serviceQueryQuery.setPerType(3); + //服务状态1-开通、2-退订、3-过期、4-暂停 + serviceQueryQuery.setSerStatus(1); + serviceQueryQuery.setParentid(patientsList.get(0).getId()); + List patientServices = patientServiceService.queryPatientService(serviceQueryQuery); + params.put("status",CollectionUtils.isNotEmpty(patientServices)?1:0); + objectResponse.setData(params); } return objectResponse; } -- 1.8.3.1