wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix(#668): 中医处方签发 groupingBy null key 崩溃修复 — 过滤 null groupId 后再分组，无 groupId 的处方各自生成处方号

Browse Source
This commit is contained in:
华佗
2026-06-10 16:57:16 +08:00
parent bbf4c8441b
commit e4fe900618
1 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/appservice/impl/DoctorStationChineseMedicalAppServiceImpl.java
View File

@@ -459,22 +459,39 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
}
if (is_sign) {
// 按groupId分组
Map<Long, List<AdviceSaveDto>> groupMap
= insertOrUpdateList.stream().collect(Collectors.groupingBy(AdviceSaveDto::getGroupId));
// 为每个分组生成唯一的处方号
groupMap.forEach((groupId, groupList) -> {
// 先查询当前groupId是否已经被签发生成过处方号
List<MedicationRequest> list = iMedicationRequestService
.list(new LambdaQueryWrapper<MedicationRequest>().eq(MedicationRequest::getGroupId, groupId));
if (!list.isEmpty() && StringUtils.isNotEmpty(list.get(0).getPrescriptionNo())) {
groupList.forEach(dto -> dto.setPrescriptionNo(list.get(0).getPrescriptionNo()));
} else {
String prescriptionNo
= assignSeqUtil.getSeq(AssignSeqEnum.PRESCRIPTION_CHINESE_HERBAL_MEDICINE.getPrefix(), 8);
groupList.forEach(dto -> dto.setPrescriptionNo(prescriptionNo));
// 🔧 Bug Fix #668: groupingBy 不接受 null key，先过滤有 groupId 的按组生成处方号
insertOrUpdateList.stream()
.filter(e -> e.getGroupId() != null)
.collect(Collectors.groupingBy(AdviceSaveDto::getGroupId))
.forEach((groupId, groupList) -> {
// 先查询当前groupId是否已经被签发生成过处方号
List<MedicationRequest> list = iMedicationRequestService
.list(new LambdaQueryWrapper<MedicationRequest>()
.eq(MedicationRequest::getGroupId, groupId));
if (!list.isEmpty() && StringUtils.isNotEmpty(list.get(0).getPrescriptionNo())) {
groupList.forEach(dto -> dto.setPrescriptionNo(list.get(0).getPrescriptionNo()));
} else {
String prescriptionNo = assignSeqUtil.getSeq(
AssignSeqEnum.PRESCRIPTION_CHINESE_HERBAL_MEDICINE.getPrefix(), 8);
groupList.forEach(dto -> dto.setPrescriptionNo(prescriptionNo));
}
});
// 🔧 Bug Fix #668: 无 groupId 的各自生成处方号
for (AdviceSaveDto dto : insertOrUpdateList) {
if (dto.getGroupId() != null) {
continue;
}
});
if (dto.getRequestId() != null) {
MedicationRequest existing = iMedicationRequestService.getById(dto.getRequestId());
if (existing != null && StringUtils.isNotEmpty(existing.getPrescriptionNo())) {
dto.setPrescriptionNo(existing.getPrescriptionNo());
continue;
}
}
dto.setPrescriptionNo(assignSeqUtil.getSeq(
AssignSeqEnum.PRESCRIPTION_CHINESE_HERBAL_MEDICINE.getPrefix(), 8));
}
}
// 医嘱签发编码