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

Merge remote-tracking branch 'origin/develop' into zhaoyun

Browse Source
This commit is contained in:
华佗
2026-06-18 23:55:43 +08:00
parent 26cb4a20c8 3198eef403
commit 72a02848ba
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -255,6 +255,8 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述 encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述
encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码 encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor()); encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor());
encounterDiagnosis.setClassification(saveDiagnosisChildParam.getClassification()); // 分类
encounterDiagnosis.setName(saveDiagnosisChildParam.getName()); // 病名
encounterDiagnosis.setDiagnosisTime(saveDiagnosisChildParam.getDiagnosisTime()); encounterDiagnosis.setDiagnosisTime(saveDiagnosisChildParam.getDiagnosisTime());
encounterDiagnosis.setOnsetDate(saveDiagnosisChildParam.getOnsetDate()); encounterDiagnosis.setOnsetDate(saveDiagnosisChildParam.getOnsetDate());
// 设置租户ID，避免数据库约束错误 // 设置租户ID，避免数据库约束错误

5
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/DiagnosisQueryDto.java
View File

@@ -106,4 +106,9 @@ public class DiagnosisQueryDto {
*/ */
private Integer hasInfectiousReport; private Integer hasInfectiousReport;
/**
* 分类（西医/中医等）
*/
private String classification;
} }

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

@@ -174,4 +174,5 @@
) AS counts ) AS counts
</select> </select>
</mapper> </mapper>
T1.classification,