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

fix(#672): guanyu (文件合入)

Browse Source
This commit is contained in:
关羽
2026-06-13 22:14:26 +08:00
committed by 华佗
parent 7da7ec80aa
commit 8c6eb1efde
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,6 +236,9 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码 encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
encounterDiagnosis.setTcmFlag(Whether.YES.getValue());// 中医标识 encounterDiagnosis.setTcmFlag(Whether.YES.getValue());// 中医标识
encounterDiagnosis.setSyndromeGroupNo(saveDiagnosisChildParam.getSyndromeGroupNo());// 中医证候组号 encounterDiagnosis.setSyndromeGroupNo(saveDiagnosisChildParam.getSyndromeGroupNo());// 中医证候组号
encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor()); // 诊断医生
encounterDiagnosis.setDiagnosisTime(saveDiagnosisChildParam.getDiagnosisTime()); // 诊断日期
encounterDiagnosis.setOnsetDate(saveDiagnosisChildParam.getOnsetDate()); // 发病日期
// 设置租户ID，避免数据库约束错误 // 设置租户ID，避免数据库约束错误
encounterDiagnosis.setTenantId(SecurityUtils.getLoginUser().getTenantId()); encounterDiagnosis.setTenantId(SecurityUtils.getLoginUser().getTenantId());
// 设置创建人，避免数据库约束错误 // 设置创建人，避免数据库约束错误
@@ -312,6 +315,9 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码 encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
encounterDiagnosis.setTcmFlag(Whether.YES.getValue());// 中医标识 encounterDiagnosis.setTcmFlag(Whether.YES.getValue());// 中医标识
encounterDiagnosis.setSyndromeGroupNo(saveDiagnosisChildParam.getSyndromeGroupNo());// 中医证候组号 encounterDiagnosis.setSyndromeGroupNo(saveDiagnosisChildParam.getSyndromeGroupNo());// 中医证候组号
encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor()); // 诊断医生
encounterDiagnosis.setDiagnosisTime(saveDiagnosisChildParam.getDiagnosisTime()); // 诊断日期
encounterDiagnosis.setOnsetDate(saveDiagnosisChildParam.getOnsetDate()); // 发病日期
// 设置租户ID，避免数据库约束错误 // 设置租户ID，避免数据库约束错误
encounterDiagnosis.setTenantId(SecurityUtils.getLoginUser().getTenantId()); encounterDiagnosis.setTenantId(SecurityUtils.getLoginUser().getTenantId());
// 设置创建人，避免数据库约束错误 // 设置创建人，避免数据库约束错误
@@ -461,7 +467,7 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
} }
if (is_sign) { if (is_sign) {
// 🔧 Bug Fix #668: groupingBy 不接受 null key，先过滤有 groupId 的按组生成处方号 // 有 groupId 的按组生成处方号（groupingBy 不接受 null key，先过滤）
insertOrUpdateList.stream() insertOrUpdateList.stream()
.filter(e -> e.getGroupId() != null) .filter(e -> e.getGroupId() != null)
.collect(Collectors.groupingBy(AdviceSaveDto::getGroupId)) .collect(Collectors.groupingBy(AdviceSaveDto::getGroupId))
@@ -479,7 +485,7 @@ public class DoctorStationChineseMedicalAppServiceImpl implements IDoctorStation
} }
}); });
// 🔧 Bug Fix #668: 无 groupId 的各自生成处方号 // 无 groupId 的各自生成处方号
for (AdviceSaveDto dto : insertOrUpdateList) { for (AdviceSaveDto dto : insertOrUpdateList) {
if (dto.getGroupId() != null) { if (dto.getGroupId() != null) {
continue; continue;

3
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
View File

@@ -14,6 +14,9 @@
T1.maindise_flag, T1.maindise_flag,
T1.diag_srt_no, T1.diag_srt_no,
T1.med_type_code, T1.med_type_code,
T1.onset_date,
T1.diagnosis_time,
T1.doctor,
T2.verification_status_enum, T2.verification_status_enum,
T2.yb_no T2.yb_no
FROM adm_encounter_diagnosis AS T1 FROM adm_encounter_diagnosis AS T1