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

46 门诊医生站-》开立诊断：优化 修改数据库中一些字段不能为null

Browse Source
This commit is contained in:
huhuihua
2026-01-23 13:58:33 +08:00
parent 9408cf6c2d
commit 61be9ff552
3 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
View File

@@ -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);
}

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/SaveDiagnosisChildParam.java
View File

@@ -94,6 +94,6 @@ public class SaveDiagnosisChildParam {
*/
private String updateConditionId;
private String longTermFlag;
private Integer longTermFlag;
}

5
openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/EncounterDiagnosis.java
View File

@@ -81,5 +81,10 @@ public class EncounterDiagnosis extends HisBaseEntity {
*/
private String classification;
/**
* 长诊断标识
*/
private Integer longTermFlag;
}