From f250373ba5162c81ffb62e87eb58400ad8791cbf Mon Sep 17 00:00:00 2001
From: zhangchao <allen_adc@sina.com>
Date: Fri, 9 Aug 2024 14:47:13 +0800
Subject: [PATCH] =?UTF-8?q?#fix:=E4=BC=98=E5=8C=96=E5=AD=95=E5=A6=87?=
 =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E8=AF=BE=E7=A8=8B=E7=AD=BE=E5=88=B0=E7=AD=89?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/PatientCourseController.java   |  2 +-
 .../platform/operate/web/facade/PatientCourseFacade.java  | 15 +++++++--------
 2 files changed, 8 insertions(+), 9 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 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);
             }
         }
-- 
1.8.3.1