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 e195f38..909a6c7 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 @@ -106,7 +106,7 @@ public class PatientCourseController extends BaseController { public BaseResponse signCourse( @RequestParam(required = true) String patientCourseId, @RequestParam(required = true) String courseId, - @RequestParam(required = true) Integer type, + @RequestParam(required = false) Integer type, HttpServletRequest request) { return patientCourseFacade.signCourse(patientCourseId, courseId,type); 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 58e8e4f..fd19096 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 @@ -325,14 +325,13 @@ public class PatientCourseFacade { objectResponse.setData(model.getId()); CourseModel courseModel = new CourseModel(); courseModel.setId(courseId); - if (type!=null){ // 1是线上 2是线下 - if (type==1){ + if (null==type||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); } @@ -494,14 +493,16 @@ public class PatientCourseFacade { model.setModified(new Date()); model.setYn(YnEnums.YES.getId()); model.setStatus(2); - model.setType(type); + if (type!=null){ + model.setType(type); + } patientCourseService.updatePatientCourse(model); CourseModel courseModel = new CourseModel(); courseModel.setId(courseId); //1是线上 2是线下 - if (type==1){ + if (null==type||type==1){ courseModel.setSignNum(courseModels.get(0).getSignNum() == null ? 1 : courseModels.get(0).getSignNum() + 1); }else { courseModel.setSignUnderNum(courseModels.get(0).getSignUnderNum() == null ? 1 : courseModels.get(0).getSignUnderNum() + 1); @@ -714,13 +715,11 @@ public class PatientCourseFacade { { CourseModel courseModel = new CourseModel(); courseModel.setId(courseId); - if (type!=null){ - if (type!=null&&type==2){ + 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); } }