Merge remote-tracking branch 'origin/master'

openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerRoleService.java

@@ -1,6 +1,7 @@
 package com.openhis.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.openhis.administration.domain.Practitioner;
 import com.openhis.administration.domain.PractitionerRole;
 
 /**
@@ -11,4 +12,12 @@ import com.openhis.administration.domain.PractitionerRole;
  */
 public interface IPractitionerRoleService extends IService<PractitionerRole> {
 
+    /**
+     * 根据执行人ID查询
+     *
+     * @param practitionerId 执行人ID
+     * @return 岗位管理实体
+     */
+    PractitionerRole getPractitionerRoleById(long practitionerId);
+
 }

openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPractitionerService.java

@@ -2,6 +2,7 @@ package com.openhis.administration.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.domain.PractitionerRole;
 
 /**
  * 医疗参与者管理Service接口
@@ -11,4 +12,12 @@ import com.openhis.administration.domain.Practitioner;
  */
 public interface IPractitionerService extends IService<Practitioner> {
 
+    /**
+     * 根据系统登录的userId查询
+     *
+     * @param userId 系统登录的userId
+     * @return 医疗参与者管理实体
+     */
+    Practitioner getPractitionerByUserId(long userId);
+
 }

openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerRoleServiceImpl.java

@@ -1,8 +1,11 @@
 package com.openhis.administration.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.openhis.administration.domain.Practitioner;
 import com.openhis.administration.domain.PractitionerRole;
 import com.openhis.administration.mapper.PractitionerRoleMapper;
 import com.openhis.administration.service.IPractitionerRoleService;
@@ -14,6 +17,23 @@ import com.openhis.administration.service.IPractitionerRoleService;
  * @date 2025-02-20
  */
 @Service
-public class PractitionerRoleServiceImpl extends ServiceImpl<PractitionerRoleMapper, PractitionerRole> implements IPractitionerRoleService {
+public class PractitionerRoleServiceImpl extends ServiceImpl<PractitionerRoleMapper, PractitionerRole>
+    implements IPractitionerRoleService {
+
+    @Autowired
+    PractitionerRoleMapper practitionerRoleMapper;
+
+    /**
+     * 根据执行人ID查询
+     *
+     * @param practitionerId 执行人ID
+     * @return 岗位管理实体
+     */
+    @Override
+    public PractitionerRole getPractitionerRoleById(long practitionerId) {
+        QueryWrapper<PractitionerRole> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("practitioner_id", practitionerId);
+        return practitionerRoleMapper.selectOne(queryWrapper);
+    }
 
 }

openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PractitionerServiceImpl.java

@@ -1,9 +1,13 @@
 package com.openhis.administration.service.impl;
 
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.core.common.utils.SecurityUtils;
 import com.openhis.administration.domain.Practitioner;
+import com.openhis.administration.mapper.PatientMapper;
 import com.openhis.administration.mapper.PractitionerMapper;
 import com.openhis.administration.service.IPractitionerService;
 
@@ -14,6 +18,23 @@ import com.openhis.administration.service.IPractitionerService;
  * @date 2025-02-20
  */
 @Service
-public class PractitionerServiceImpl extends ServiceImpl<PractitionerMapper, Practitioner> implements IPractitionerService {
+public class PractitionerServiceImpl extends ServiceImpl<PractitionerMapper, Practitioner>
+    implements IPractitionerService {
 
+    @Autowired
+    PractitionerMapper practitionerMapper;
+
+    /**
+     * 根据执行人ID查询
+     *
+     * @param userId 系统用户id
+     * @return 医疗参与者管理实体
+     */
+    @Override
+    public Practitioner getPractitionerByUserId(long userId) {
+
+        QueryWrapper<Practitioner> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("user_id", userId);
+        return practitionerMapper.selectOne(queryWrapper);
+    }
 }