feat(organization): 优化科室分类查询功能
- 修改 getOrganizationTree 方法参数,将 classEnum 字符串改为 classEnumList 列表 - 实现多选科室分类的精确匹配查询逻辑 - 添加分页查询时只显示未删除记录的过滤条件 - 更新控制器中对逗号分隔参数的解析逻辑 - 修复查询条件构造中的逻辑错误 - 配置 Lombok 注解处理器路径 - 重命名诊断服务方法名以提高可读性 - 修复医保模块中诊断查询方法调用 - 修复集合初始化语法错误
This commit is contained in:
@@ -3,6 +3,7 @@ package com.openhis.administration.mapper;
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.openhis.administration.domain.Organization;
|
||||
import com.openhis.administration.dto.OrgDataDto;
|
||||
import org.apache.ibatis.annotations.Param;
|
||||
import org.springframework.stereotype.Repository;
|
||||
|
||||
import java.util.List;
|
||||
@@ -24,4 +25,5 @@ public interface OrganizationMapper extends BaseMapper<Organization> {
|
||||
**/
|
||||
List<OrgDataDto> searchOrgDataByHealth();
|
||||
|
||||
|
||||
}
|
||||
@@ -45,13 +45,13 @@ public interface IEncounterDiagnosisService extends IService<EncounterDiagnosis>
|
||||
List<EncounterDiagnosis> getDiagnosisList(Long encounterId);
|
||||
|
||||
/**
|
||||
* 查询 EncounterDiagnosis
|
||||
*
|
||||
* 查询特定类型的诊断
|
||||
*
|
||||
* @param encounterId 就诊id
|
||||
* @param ybIptDiseTypeCode 诊断类型
|
||||
* @return 诊断集合
|
||||
*/
|
||||
List<EncounterDiagnosis> getDiagnosisList(Long encounterId, YbIptDiseTypeCode ybIptDiseTypeCode);
|
||||
List<EncounterDiagnosis> getDiagnosisListByType(Long encounterId, YbIptDiseTypeCode ybIptDiseTypeCode);
|
||||
|
||||
/**
|
||||
* 查询 EncounterDiagnosis
|
||||
|
||||
@@ -55,4 +55,5 @@ public interface IOrganizationService extends IService<Organization> {
|
||||
* @return List<OrgDataDto>
|
||||
**/
|
||||
List<OrgDataDto> searchOrgDataByHealth();
|
||||
|
||||
}
|
||||
@@ -95,14 +95,14 @@ public class EncounterDiagnosisServiceImpl extends ServiceImpl<EncounterDiagnosi
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询 EncounterDiagnosis
|
||||
* 查询特定类型的诊断
|
||||
*
|
||||
* @param encounterId 就诊id
|
||||
* @param ybIptDiseTypeCode 诊断类型
|
||||
* @return 诊断集合
|
||||
*/
|
||||
@Override
|
||||
public List<EncounterDiagnosis> getDiagnosisList(Long encounterId, YbIptDiseTypeCode ybIptDiseTypeCode) {
|
||||
public List<EncounterDiagnosis> getDiagnosisListByType(Long encounterId, YbIptDiseTypeCode ybIptDiseTypeCode) {
|
||||
LambdaQueryWrapper<EncounterDiagnosis> queryWrapper =
|
||||
new LambdaQueryWrapper<EncounterDiagnosis>().eq(EncounterDiagnosis::getEncounterId, encounterId);
|
||||
if (ybIptDiseTypeCode != null) {
|
||||
|
||||
@@ -101,4 +101,5 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
|
||||
public List<OrgDataDto> searchOrgDataByHealth() {
|
||||
return this.organizationMapper.searchOrgDataByHealth();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user