Merge branch 'openIm' of http://1.14.104.71:10880/root/ylrz_his_scrm_java into openIm

fs-user-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -8,9 +8,11 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fs.app.annotation.Login;
 import com.fs.app.param.FsBindCompanyUserParam;
+import com.fs.common.annotation.Log;
 import com.fs.common.config.FSConfig;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.exception.CustomException;
 import com.fs.common.exception.file.OssException;
 import com.fs.common.utils.SecurityUtils;
@@ -172,5 +174,17 @@ public class CompanyUserController extends  AppBaseController {
         return R.error();
 
     }
+    @ApiOperation("小程序销售绑定医生")
+    @Log(title = "小程序销售绑定医生", businessType = BusinessType.UPDATE)
+    @PostMapping("/bindDoctorId")
+    public R binDoctor(@RequestBody CompanyUser companyUser){
+        return companyUserService.bindDoctor(companyUser);
+    }
+    @ApiOperation("小程序销售解除绑定医生")
+    @Log(title = "小程序销售解除绑定医生", businessType = BusinessType.UPDATE)
+    @GetMapping("/unBindDoctorId/{userId}")
+    public R unBinDoctor(@PathVariable("userId") Long userId){
+        return companyUserService.unBindDoctor(userId);
+    }
 
 }

fs-user-app/src/main/java/com/fs/app/controller/DoctorController.java

@@ -143,4 +143,10 @@ public class DoctorController extends  AppBaseController {
     public R getAgreement(){
         return R.ok().put("doctor",userDoctorService.getAgreement());
     }
+
+    @ApiOperation("获取医生列表")
+    @GetMapping("/getOptionsVO")
+    public R getOptionsVO(){
+        return R.ok().put("data",doctorService.selectAllDocVoList());
+    }
 }