Commit f250373ba5162c81ffb62e87eb58400ad8791cbf
1 parent
a0af7a36ea
Exists in
dev
#fix:优化孕妇学校课程签到等接口逻辑
Showing 2 changed files with 8 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java
View file @
f250373
| ... | ... | @@ -106,7 +106,7 @@ |
| 106 | 106 | public BaseResponse signCourse( |
| 107 | 107 | @RequestParam(required = true) String patientCourseId, |
| 108 | 108 | @RequestParam(required = true) String courseId, |
| 109 | - @RequestParam(required = true) Integer type, | |
| 109 | + @RequestParam(required = false) Integer type, | |
| 110 | 110 | HttpServletRequest request) { |
| 111 | 111 | |
| 112 | 112 | return patientCourseFacade.signCourse(patientCourseId, courseId,type); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java
View file @
f250373
| ... | ... | @@ -325,14 +325,13 @@ |
| 325 | 325 | objectResponse.setData(model.getId()); |
| 326 | 326 | CourseModel courseModel = new CourseModel(); |
| 327 | 327 | courseModel.setId(courseId); |
| 328 | - if (type!=null){ | |
| 329 | 328 | // 1是线上 2是线下 |
| 330 | - if (type==1){ | |
| 329 | + if (null==type||type==1){ | |
| 331 | 330 | courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 1 : courseModels.get(0).getEnrolmentNum()+1); |
| 332 | 331 | }else { |
| 333 | 332 | courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 1 : courseModels.get(0).getEnrolmentUnderNum()+1); |
| 334 | 333 | } |
| 335 | - } | |
| 334 | + | |
| 336 | 335 | courseService.updateCourse(courseModel); |
| 337 | 336 | |
| 338 | 337 | } |
| 339 | 338 | |
| ... | ... | @@ -494,14 +493,16 @@ |
| 494 | 493 | model.setModified(new Date()); |
| 495 | 494 | model.setYn(YnEnums.YES.getId()); |
| 496 | 495 | model.setStatus(2); |
| 497 | - model.setType(type); | |
| 496 | + if (type!=null){ | |
| 497 | + model.setType(type); | |
| 498 | + } | |
| 498 | 499 | patientCourseService.updatePatientCourse(model); |
| 499 | 500 | |
| 500 | 501 | |
| 501 | 502 | CourseModel courseModel = new CourseModel(); |
| 502 | 503 | courseModel.setId(courseId); |
| 503 | 504 | //1是线上 2是线下 |
| 504 | - if (type==1){ | |
| 505 | + if (null==type||type==1){ | |
| 505 | 506 | courseModel.setSignNum(courseModels.get(0).getSignNum() == null ? 1 : courseModels.get(0).getSignNum() + 1); |
| 506 | 507 | }else { |
| 507 | 508 | courseModel.setSignUnderNum(courseModels.get(0).getSignUnderNum() == null ? 1 : courseModels.get(0).getSignUnderNum() + 1); |
| 508 | 509 | |
| ... | ... | @@ -714,13 +715,11 @@ |
| 714 | 715 | { |
| 715 | 716 | CourseModel courseModel = new CourseModel(); |
| 716 | 717 | courseModel.setId(courseId); |
| 717 | - if (type!=null){ | |
| 718 | - if (type!=null&&type==2){ | |
| 718 | + if (type!=null&&type==2){ | |
| 719 | 719 | courseModel.setEnrolmentUnderNum(courseModels.get(0).getEnrolmentUnderNum() == null ? 0 : courseModels.get(0).getEnrolmentUnderNum() - 1 >0 ? courseModels.get(0).getEnrolmentUnderNum() - 1 : 0); |
| 720 | 720 | }else { |
| 721 | 721 | courseModel.setEnrolmentNum(courseModels.get(0).getEnrolmentNum() == null ? 0 : courseModels.get(0).getEnrolmentNum() - 1 >0 ? courseModels.get(0).getEnrolmentNum() - 1 : 0); |
| 722 | 722 | } |
| 723 | - } | |
| 724 | 723 | courseService.updateCourse(courseModel); |
| 725 | 724 | } |
| 726 | 725 | } |