From a0af7a36ea581d67570bd33bd008afc783931d73 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Fri, 9 Aug 2024 14:10:38 +0800 Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=A4=A7=E5=90=8C?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/PatientCourseController.java | 2 +- .../operate/web/facade/MatDeliverFacade.java | 4 +--- .../operate/web/facade/PatientCourseFacade.java | 27 ++++++++++++++-------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java index 43c7142..e195f38 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java @@ -130,7 +130,7 @@ public class PatientCourseController extends BaseController { @RequestParam(required = true) String patientId, @RequestParam(required = true) String hospitalId, @RequestParam(required = true) Integer orderType, - @RequestParam(required = true) Integer type, + @RequestParam(required = false) Integer type, HttpServletRequest request) { return patientCourseFacade.orderCourse(courseId, patientId, hospitalId, orderType,type); 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 fca74d8..229266e 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 @@ -4353,8 +4353,6 @@ public class MatDeliverFacade { String deliveryMode = getDelivery(maternalDeliverModel); params.put("dueDate", dueDate.equals("") ? dueDate : getTime(DateUtil.parseYMDHMS(dueDate))); params.put("deliveryMode", deliveryMode); - params.put("parentId",maternalDeliverModel.getParentId()); - } List riskId = patientsList.get(0).getRiskFactorId(); StringBuffer sb = new StringBuffer(); @@ -4367,7 +4365,7 @@ public class MatDeliverFacade { } } } - + params.put("parentId",patientsList.get(0).getId()); String highRisk = sb.toString(); if (highRisk.length() > 0) { params.put("riskType", highRisk.substring(0, highRisk.length() - 1)); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java index d6db08e..58e8e4f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java @@ -317,16 +317,21 @@ public class PatientCourseFacade { model.setModified(new Date()); model.setYn(YnEnums.YES.getId()); model.setStatus(1); - model.setType(type); + if (type!=null){ + model.setType(type); + } + patientCourseService.addPatientCourse(model); objectResponse.setData(model.getId()); CourseModel courseModel = new CourseModel(); courseModel.setId(courseId); - // 1是线上 2是线下 - if (type==1){ - courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 1 : courseModels.get(0).getEnrolmentNum()+1); - }else { - courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 1 : courseModels.get(0).getEnrolmentUnderNum()+1); + if (type!=null){ + // 1是线上 2是线下 + if (type==1){ + courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 1 : courseModels.get(0).getEnrolmentNum()+1); + }else { + courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 1 : courseModels.get(0).getEnrolmentUnderNum()+1); + } } courseService.updateCourse(courseModel); @@ -709,10 +714,12 @@ public class PatientCourseFacade { { CourseModel courseModel = new CourseModel(); courseModel.setId(courseId); - if (type!=null&&type==2){ - courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 0 : courseModels.get(0).getEnrolmentUnderNum() - 1 >0 ? courseModels.get(0).getEnrolmentUnderNum() - 1 : 0); - }else { - courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1 >0 ? courseModels.get(0).getEnrolmentNum() - 1 : 0); + if (type!=null){ + if (type!=null&&type==2){ + courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 0 : courseModels.get(0).getEnrolmentUnderNum() - 1 >0 ? courseModels.get(0).getEnrolmentUnderNum() - 1 : 0); + }else { + courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1 >0 ? courseModels.get(0).getEnrolmentNum() - 1 : 0); + } } courseService.updateCourse(courseModel); } -- 1.8.3.1