From 61be9ff55221447d0424e3ead5e59c3c6dd9bce9 Mon Sep 17 00:00:00 2001 From: huhuihua Date: Fri, 23 Jan 2026 13:58:33 +0800 Subject: [PATCH] =?UTF-8?q?46=20=E9=97=A8=E8=AF=8A=E5=8C=BB=E7=94=9F?= =?UTF-8?q?=E7=AB=99-=E3=80=8B=E5=BC=80=E7=AB=8B=E8=AF=8A=E6=96=AD?= =?UTF-8?q?=EF=BC=9A=E4=BC=98=E5=8C=96=20=E4=BF=AE=E6=94=B9=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E4=B8=AD=E4=B8=80=E4=BA=9B=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DoctorStationDiagnosisAppServiceImpl.java | 34 ++++++++++++++++++- .../dto/SaveDiagnosisChildParam.java | 2 +- .../domain/EncounterDiagnosis.java | 5 +++ 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java index cffe3776..85bc48d9 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java @@ -260,7 +260,8 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn .eq(EncounterDiagnosis::getEncounterId, encounterId) .set(EncounterDiagnosis::getMaindiseFlag, 0)); } - + Integer tenantId = SecurityUtils.getLoginUser().getTenantId(); + String username = SecurityUtils.getUsername(); // 保存诊断管理 Condition condition; for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) { @@ -277,6 +278,17 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn condition.setYbNo(saveDiagnosisChildParam.getYbNo()); condition.setRecordedDatetime(new Date()); condition.setRecorderId(SecurityUtils.getLoginUser().getPractitionerId());// 记录人 + + if(condition.getCreateBy() == null){ + condition.setCreateBy(username); + } + condition.setUpdateBy(username); + + condition.setTenantId(tenantId); + if(condition.getCreateTime() == null){ + condition.setCreateTime(new Date()); + } + condition.setUpdateTime(new Date()); iConditionService.saveOrUpdate(condition); saveDiagnosisChildParam.setConditionId(condition.getId()); } @@ -309,6 +321,16 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor()); encounterDiagnosis.setClassification(saveDiagnosisChildParam.getClassification()); encounterDiagnosis.setName(saveDiagnosisChildParam.getName()); + encounterDiagnosis.setTenantId(tenantId); + encounterDiagnosis.setLongTermFlag(saveDiagnosisChildParam.getLongTermFlag()); + if(encounterDiagnosis.getCreateBy() == null){ + encounterDiagnosis.setCreateBy(username); + } + encounterDiagnosis.setUpdateBy(username); + if(encounterDiagnosis.getCreateTime() == null){ + encounterDiagnosis.setCreateTime(new Date()); + } + encounterDiagnosis.setUpdateTime(new Date()); iEncounterDiagnosisService.saveOrUpdate(encounterDiagnosis); i++; } @@ -325,6 +347,16 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn encounterDiagnosis.setDoctor(saveDiagnosisChildParam.getDiagnosisDoctor()); encounterDiagnosis.setClassification(saveDiagnosisChildParam.getClassification()); encounterDiagnosis.setName(saveDiagnosisChildParam.getName()); + encounterDiagnosis.setTenantId(tenantId); + encounterDiagnosis.setLongTermFlag(saveDiagnosisChildParam.getLongTermFlag()); + if(encounterDiagnosis.getCreateBy() == null){ + encounterDiagnosis.setCreateBy(username); + } + encounterDiagnosis.setUpdateBy(username); + if(encounterDiagnosis.getCreateTime() == null){ + encounterDiagnosis.setCreateTime(new Date()); + } + encounterDiagnosis.setUpdateTime(new Date()); iEncounterDiagnosisService.saveOrUpdate(encounterDiagnosis); } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java index b85da82f..ce932917 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java @@ -94,6 +94,6 @@ public class SaveDiagnosisChildParam { */ private String updateConditionId; - private String longTermFlag; + private Integer longTermFlag; } diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java index c2b3e661..188bd2fa 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java @@ -81,5 +81,10 @@ public class EncounterDiagnosis extends HisBaseEntity { */ private String classification; + /** + * 长诊断标识 + */ + private Integer longTermFlag; + } \ No newline at end of file