优化医生端sop任务查询逻辑

fs-doctor-app/src/main/java/com/fs/app/controller/FsSopDoctorTaskController.java

@@ -45,13 +45,10 @@ public class FsSopDoctorTaskController extends BaseController
     @Autowired
     JwtUtils jwtUtils;
 
-    @Autowired
-    RedisCache redisCache;
-
     /**
      * 查询医生处理sop任务列表
      */
-    @PreAuthorize("@ss.hasPermi('his:doctorTask:list')")
+    //@PreAuthorize("@ss.hasPermi('his:doctorTask:list')")
     @GetMapping("/list")
     public TableDataInfo list(SopDoctorTaskDto queryDto)
     {
@@ -64,7 +61,7 @@ public class FsSopDoctorTaskController extends BaseController
     /**
      * 导出医生处理sop任务列表
      */
-    @PreAuthorize("@ss.hasPermi('his:doctorTask:export')")
+    //@PreAuthorize("@ss.hasPermi('his:doctorTask:export')")
     @Log(title = "医生处理sop任务", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(SopDoctorTaskDto queryDto)
@@ -77,7 +74,7 @@ public class FsSopDoctorTaskController extends BaseController
     /**
      * 获取医生处理sop任务详细信息
      */
-    @PreAuthorize("@ss.hasPermi('his:doctorTask:query')")
+    //@PreAuthorize("@ss.hasPermi('his:doctorTask:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -87,7 +84,7 @@ public class FsSopDoctorTaskController extends BaseController
     /**
      * 新增医生处理sop任务
      */
-    @PreAuthorize("@ss.hasPermi('his:doctorTask:add')")
+    //@PreAuthorize("@ss.hasPermi('his:doctorTask:add')")
     @Log(title = "医生处理sop任务", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody FsSopDoctorTask fsSopDoctorTask)
@@ -98,7 +95,7 @@ public class FsSopDoctorTaskController extends BaseController
     /**
      * 修改医生处理sop任务
      */
-    @PreAuthorize("@ss.hasPermi('his:doctorTask:edit')")
+    //@PreAuthorize("@ss.hasPermi('his:doctorTask:edit')")
     @Log(title = "医生处理sop任务", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody FsSopDoctorTask fsSopDoctorTask)
@@ -109,7 +106,7 @@ public class FsSopDoctorTaskController extends BaseController
     /**
      * 删除医生处理sop任务
      */
-    @PreAuthorize("@ss.hasPermi('his:doctorTask:remove')")
+    //@PreAuthorize("@ss.hasPermi('his:doctorTask:remove')")
     @Log(title = "医生处理sop任务", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)

fs-service/src/main/java/com/fs/his/domain/FsSopDoctorTask.java

@@ -19,9 +19,11 @@ public class FsSopDoctorTask extends BaseEntity{
     private Long id;
 
     /** 销售id */
-    @Excel(name = "销售id")
     private Long companyUserId;
 
+    /** 医生id */
+    private Long doctorId;
+
     /** 用户id */
     @Excel(name = "用户id")
     private Long userId;

fs-service/src/main/resources/mapper/his/FsSopDoctorTaskMapper.xml

@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="companyUserId"    column="company_user_id"    />
         <result property="userId"    column="user_id"    />
+        <result property="doctorId"    column="doctor_id"    />
         <result property="status"    column="status"    />
         <result property="createTime"    column="create_time"    />
         <result property="updateTime"    column="update_time"    />
@@ -39,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsSopDoctorTaskVo">
-        select id, company_user_id, user_id, status, create_time, update_time, remark, package_id, order_code, standby_id from fs_sop_doctor_task
+        select id, company_user_id,doctor_id, user_id, status, create_time, update_time, remark, package_id, order_code, standby_id from fs_sop_doctor_task
     </sql>
 
     <select id="selectFsSopDoctorTaskVoList" parameterType="com.fs.his.vo.SopDoctorTaskVo" resultMap="SopDoctorTaskVoResult">
@@ -106,6 +107,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into fs_sop_doctor_task
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="companyUserId != null">company_user_id,</if>
+            <if test="doctorId != null">doctor_id,</if>
             <if test="userId != null">user_id,</if>
             <if test="status != null">status,</if>
             <if test="createTime != null">create_time,</if>
@@ -117,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyUserId != null">#{companyUserId},</if>
+            <if test="doctorId != null">#{doctorId},</if>
             <if test="userId != null">#{userId},</if>
             <if test="status != null">#{status},</if>
             <if test="createTime != null">#{createTime},</if>
@@ -132,6 +135,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update fs_sop_doctor_task
         <trim prefix="SET" suffixOverrides=",">
             <if test="companyUserId != null">company_user_id = #{companyUserId},</if>
+            <if test="doctorId != null">doctor_id = #{doctorId},</if>
             <if test="userId != null">user_id = #{userId},</if>
             <if test="status != null">status = #{status},</if>
             <if test="createTime != null">create_time = #{createTime},</if>