优化医生端sop任务数据展示逻辑

fs-service/src/main/java/com/fs/his/service/impl/FsSopDoctorTaskServiceImpl.java

@@ -8,19 +8,26 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fs.his.dto.SopDoctorTaskDto;
 import com.fs.his.service.IFsSopDoctorTaskService;
 import com.fs.his.vo.SopDoctorTaskVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.his.mapper.FsSopDoctorTaskMapper;
 import com.fs.his.domain.FsSopDoctorTask;
 
+import static com.fs.his.utils.PhoneUtil.decryptPhone;
+
 /**
  * 医生处理sop任务Service业务层处理
  * 
  * @author fs
  * @date 2025-12-25
  */
+@Slf4j
 @Service
 public class FsSopDoctorTaskServiceImpl extends ServiceImpl<FsSopDoctorTaskMapper, FsSopDoctorTask> implements IFsSopDoctorTaskService {
 
+    @Autowired
+    private FsSopDoctorTaskMapper fsSopDoctorTaskMapper;
     /**
      * 查询医生处理sop任务
      * 
@@ -30,7 +37,12 @@ public class FsSopDoctorTaskServiceImpl extends ServiceImpl<FsSopDoctorTaskMappe
     @Override
     public SopDoctorTaskVo selectFsSopDoctorTaskById(Long id)
     {
-        return baseMapper.selectFsSopDoctorTaskById(id);
+        SopDoctorTaskVo sopDoctorTaskVo = fsSopDoctorTaskMapper.selectFsSopDoctorTaskById(id);
+        //医生端查看客户手机号直接解密
+        if (sopDoctorTaskVo!=null&&sopDoctorTaskVo.getPhone()!=null&&sopDoctorTaskVo.getPhone().length()>11){
+            sopDoctorTaskVo.setPhone(decryptPhone(sopDoctorTaskVo.getPhone()));
+        }
+        return sopDoctorTaskVo;
     }
 
     /**
@@ -47,7 +59,7 @@ public class FsSopDoctorTaskServiceImpl extends ServiceImpl<FsSopDoctorTaskMappe
         String todayEnd = new SimpleDateFormat("yyyy-MM-dd 23:59:59").format(new Date());
         queryDto.setBeginTime(todayStart);
         queryDto.setEndTime(todayEnd);
-        return baseMapper.selectFsSopDoctorTaskVoList(queryDto);
+        return fsSopDoctorTaskMapper.selectFsSopDoctorTaskVoList(queryDto);
     }
 
     /**
@@ -60,7 +72,7 @@ public class FsSopDoctorTaskServiceImpl extends ServiceImpl<FsSopDoctorTaskMappe
     public int insertFsSopDoctorTask(FsSopDoctorTask fsSopDoctorTask)
     {
         fsSopDoctorTask.setCreateTime(DateUtils.getNowDate());
-        return baseMapper.insertFsSopDoctorTask(fsSopDoctorTask);
+        return fsSopDoctorTaskMapper.insertFsSopDoctorTask(fsSopDoctorTask);
     }
 
     /**
@@ -73,7 +85,7 @@ public class FsSopDoctorTaskServiceImpl extends ServiceImpl<FsSopDoctorTaskMappe
     public int updateFsSopDoctorTask(FsSopDoctorTask fsSopDoctorTask)
     {
         fsSopDoctorTask.setUpdateTime(DateUtils.getNowDate());
-        return baseMapper.updateFsSopDoctorTask(fsSopDoctorTask);
+        return fsSopDoctorTaskMapper.updateFsSopDoctorTask(fsSopDoctorTask);
     }
 
     /**
@@ -85,7 +97,7 @@ public class FsSopDoctorTaskServiceImpl extends ServiceImpl<FsSopDoctorTaskMappe
     @Override
     public int deleteFsSopDoctorTaskByIds(Long[] ids)
     {
-        return baseMapper.deleteFsSopDoctorTaskByIds(ids);
+        return fsSopDoctorTaskMapper.deleteFsSopDoctorTaskByIds(ids);
     }
 
     /**
@@ -97,6 +109,6 @@ public class FsSopDoctorTaskServiceImpl extends ServiceImpl<FsSopDoctorTaskMappe
     @Override
     public int deleteFsSopDoctorTaskById(Long id)
     {
-        return baseMapper.deleteFsSopDoctorTaskById(id);
+        return fsSopDoctorTaskMapper.deleteFsSopDoctorTaskById(id);
     }
 }

fs-service/src/main/java/com/fs/his/vo/SopDoctorTaskVo.java

@@ -19,6 +19,9 @@ public class SopDoctorTaskVo {
     @Excel(name = "销售姓名")
     private String companyUserName;
 
+    @Excel(name = "套餐包")
+    private String packageName;
+
     /** 销售Id */
     private Long companyUserId;
 

fs-service/src/main/java/com/fs/qw/vo/SopCompanyUserTaskVo.java

@@ -19,6 +19,9 @@ public class SopCompanyUserTaskVo {
     @Excel(name = "医生姓名")
     private String doctorName;
 
+    @Excel(name = "套餐包")
+    private String packageName;
+
     /** 套餐包Id */
     private Long packageId;
 

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

@@ -35,6 +35,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <!-- 关联表字段 -->
         <result property="name"     column="name" />          <!-- qwec.name -->
         <result property="companyUserName"   column="company_user_name" />   <!-- cp.nick_name -->
+        <result property="packageName"  column="package_name" />
         <result property="avatar" column="avatar" />
         <result property="phone"  column="phone" />
     </resultMap>
@@ -50,9 +51,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         qwec.name,
         qwec.avatar,
         fu.phone,
+        fp.package_name,
         cp.nick_name as company_user_name,
         cp.user_id as company_user_id,
         sdt.status,
+        sdt.order_code,
         sdt.create_time,
         sdt.update_time,
         sdt.remark
@@ -61,6 +64,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN company_user cp ON sdt.company_user_id = cp.user_id
         LEFT JOIN qw_external_contact qwec ON sdt.user_id = qwec.id
         LEFT JOIN fs_user fu ON qwec.fs_user_id = fu.user_id
+        LEFT JOIN fs_package fp ON fp.package_id=sdt.package_id
         <where>
             <if test="id != null "> and sdt.id = #{id}</if>
             <if test="doctorId != null "> and sdt.doctor_id = #{doctorId}</if>
@@ -89,9 +93,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qwec.name,
             qwec.avatar,
             fu.phone,
+            fp.package_name,
             cp.nick_name as company_user_name,
             cp.user_id as company_user_id,
             sdt.status,
+            sdt.order_code,
             sdt.create_time,
             sdt.update_time,
             sdt.remark
@@ -100,6 +106,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN company_user cp ON sdt.company_user_id = cp.user_id
                 LEFT JOIN qw_external_contact qwec ON sdt.user_id = qwec.id
                 LEFT JOIN fs_user fu ON qwec.fs_user_id = fu.user_id
+                LEFT JOIN fs_package fp ON fp.package_id=sdt.package_id
         where sdt.id = #{id}
     </select>
         

fs-service/src/main/resources/mapper/qw/FsSopCompanyUserTaskMapper.xml

@@ -36,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="doctorName"   column="doctor_name" />   <!-- fd.doctor_name -->
         <result property="avatar" column="avatar" />
         <result property="phone"  column="phone" />
+        <result property="packageName"  column="package_name" />
     </resultMap>
 
     <sql id="selectFsSopCompanyUserTaskVo">
@@ -52,6 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         qwec.name,
         qwec.avatar,
         fu.phone,
+        fp.package_name,
         sct.doctor_id,
         fd.doctor_name,
         sct.STATUS,
@@ -63,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN fs_doctor fd ON sct.doctor_id = fd.doctor_id
         LEFT JOIN qw_external_contact qwec ON sct.user_id = qwec.id
         LEFT JOIN fs_user fu ON qwec.fs_user_id = fu.user_id
+        LEFT JOIN fs_package fp ON fp.package_id=sct.package_id
         <where>
             <if test="id != null "> and sct.id = #{id}</if>
             <if test="doctorId != null "> and sct.doctor_id = #{doctorId}</if>
@@ -94,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             qwec.name,
             qwec.avatar,
             fu.phone,
+            fp.package_name,
             sct.doctor_id,
             fd.doctor_name,
             sct.STATUS,
@@ -105,6 +109,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 LEFT JOIN fs_doctor fd ON sct.doctor_id = fd.doctor_id
                 LEFT JOIN qw_external_contact qwec ON sct.user_id = qwec.id
                 LEFT JOIN fs_user fu ON qwec.fs_user_id = fu.user_id
+                LEFT JOIN fs_package fp ON fp.package_id=sct.package_id
         where sct.id = #{id}
     </select>