feat(organization): 优化科室分类查询功能
- 修改 getOrganizationTree 方法参数,将 classEnum 字符串改为 classEnumList 列表 - 实现多选科室分类的精确匹配查询逻辑 - 添加分页查询时只显示未删除记录的过滤条件 - 更新控制器中对逗号分隔参数的解析逻辑 - 修复查询条件构造中的逻辑错误 - 配置 Lombok 注解处理器路径 - 重命名诊断服务方法名以提高可读性 - 修复医保模块中诊断查询方法调用 - 修复集合初始化语法错误
This commit is contained in:
@@ -2032,7 +2032,7 @@ public class YbDao {
|
||||
}
|
||||
}
|
||||
Yb2301InputFeeDetail yb2301InputFeeDetail;
|
||||
List<Yb2301InputFeeDetail> yb2301InputFeeDetailList = new ArrayList();
|
||||
List<Yb2301InputFeeDetail> yb2301InputFeeDetailList = new ArrayList<>();
|
||||
// int i = 1;
|
||||
for (ChargeItemBaseInfoDto chargeItemBaseInfoDto : chargeItemBaseInfoDtosList) {
|
||||
yb2301InputFeeDetail = new Yb2301InputFeeDetail();
|
||||
@@ -2378,7 +2378,7 @@ public class YbDao {
|
||||
// throw new ServiceException("未查询到患者的医保信息");
|
||||
// }
|
||||
List<EncounterDiagnosis> diagnosisList
|
||||
= iEncounterDiagnosisService.getDiagnosisList(encounterId, YbIptDiseTypeCode.DISCHARGE_DIAGNOSIS);
|
||||
= iEncounterDiagnosisService.getDiagnosisListByType(encounterId, YbIptDiseTypeCode.DISCHARGE_DIAGNOSIS);
|
||||
if (diagnosisList.isEmpty()) {
|
||||
throw new ServiceException("未查询到出院诊断信息");
|
||||
}
|
||||
@@ -2558,7 +2558,7 @@ public class YbDao {
|
||||
// throw new ServiceException("未查询到患者的医保信息");
|
||||
// }
|
||||
List<EncounterDiagnosis> diagnosisList
|
||||
= iEncounterDiagnosisService.getDiagnosisList(encounterId, YbIptDiseTypeCode.DISCHARGE_DIAGNOSIS);
|
||||
= iEncounterDiagnosisService.getDiagnosisListByType(encounterId, YbIptDiseTypeCode.DISCHARGE_DIAGNOSIS);
|
||||
if (diagnosisList.isEmpty()) {
|
||||
throw new ServiceException("未查询到出院诊断信息");
|
||||
}
|
||||
|
||||
@@ -920,7 +920,7 @@ public class YbManager {
|
||||
}
|
||||
|
||||
Yb2301InputFeeDetail yb2301InputFeeDetail;
|
||||
List<Yb2301InputFeeDetail> yb2301InputFeeDetailList = new ArrayList();
|
||||
List<Yb2301InputFeeDetail> yb2301InputFeeDetailList = new ArrayList<>();
|
||||
BigDecimal quantity = BigDecimal.ZERO;
|
||||
// 分组分类
|
||||
Map<String, List<ChargeItemBaseInfoDto>> groupByTable
|
||||
|
||||
Reference in New Issue
Block a user