fix: 接诊人数

eitc-patient-base/src/main/java/com/eitc/patient/service/IDoctorService.java

@@ -4,7 +4,6 @@ import com.eitc.patient.vo.DoctorVO;
 import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -23,4 +22,13 @@ public interface IDoctorService {
      * @date: 2024/6/13 15:01
      */
     List<DoctorVO> list(String selectDateStr) throws ParseException;
+
+    /**
+     * 根据医生id查询医生信息
+     * @param doctorId 医生id
+     * @return 返回结果
+     * @author mtx
+     * @date: 2024/6/13 15:01
+     */
+    DoctorVO getById(Long doctorId);
 }

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/DoctorServiceImpl.java

@@ -45,7 +45,6 @@ public class DoctorServiceImpl implements IDoctorService {
      */
     @Override
     public List<DoctorVO> list(String selectDateStr) throws ParseException {
-        Date date = new Date();
         // 获取医生列表
         List<SysUser> sysUsers = sysUserMapper.selectUserList(new SysUser());
         List<DoctorVO> list = new ArrayList<>();
@@ -64,17 +63,38 @@ public class DoctorServiceImpl implements IDoctorService {
             if (!PatientUtil.checkDoctorWorkStatus(String.valueOf(sysUser.getUserId()), selectDate)) {
                 continue;
             }
-            DoctorVO vo = new DoctorVO();
-            BeanUtils.copyProperties(sysUser, vo);
-            long count = patientAppointmentService.count(Wrappers.<PatientAppointment>lambdaQuery()
-                    .lt(PatientAppointment::getAppointmentStartTime, date)
-                    .gt(PatientAppointment::getAppointmentEndTime, date)
-                    .eq(PatientAppointment::getAttendingDoctorId, sysUser.getUserId()));
-
-            vo.setIsFree(count > 0 ? 1 : 0);
-            vo.setDeptName(UserCacheUtil.getSysDeptById(sysUser.getDeptId()).getDeptName());
+            DoctorVO vo = getDoctorVO(sysUser);
             list.add(vo);
         }
         return list;
     }
+
+    private DoctorVO getDoctorVO(SysUser sysUser) {
+        Date date = new Date();
+        DoctorVO vo = new DoctorVO();
+        BeanUtils.copyProperties(sysUser, vo);
+        long count = patientAppointmentService.count(Wrappers.<PatientAppointment>lambdaQuery()
+                .lt(PatientAppointment::getAppointmentStartTime, date)
+                .gt(PatientAppointment::getAppointmentEndTime, date)
+                .eq(PatientAppointment::getAttendingDoctorId, sysUser.getUserId()));
+
+        vo.setIsFree(count > 0 ? 1 : 0);
+        vo.setDeptName(UserCacheUtil.getSysDeptById(sysUser.getDeptId()).getDeptName());
+        vo.setReceivePatientNum(patientAppointmentService.count(Wrappers.<PatientAppointment>lambdaQuery()
+                .eq(PatientAppointment::getAttendingDoctorId, sysUser.getUserId())));
+        return vo;
+    }
+
+    /**
+     * 根据医生id查询医生信息
+     * @param doctorId 医生id
+     * @return 返回结果
+     * @author mtx
+     * @date: 2024/6/13 15:01
+     */
+    @Override
+    public DoctorVO getById(Long doctorId) {
+        SysUser sysUser = sysUserMapper.selectUserById(doctorId);
+        return getDoctorVO(sysUser);
+    }
 }

eitc-patient-base/src/main/java/com/eitc/patient/vo/DoctorVO.java

@@ -22,5 +22,5 @@ public class DoctorVO extends SysUser {
     @ApiModelProperty(value = "是否空闲（0未收藏，1收藏）")
     private Integer isCollection;
     @ApiModelProperty(value = "接诊人数")
-    private Integer receivePatientNum;
+    private Long receivePatientNum;
 }