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

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

Browse Source
This commit is contained in:
chenqi
2026-01-23 16:13:57 +08:00
parent abd5bd9f2f 9000d66c0c
commit 73617e1b0f
7 changed files with 258 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
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,13 +278,24 @@ 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());
}
// 保存就诊诊断
EncounterDiagnosis encounterDiagnosis;
EncounterDiagnosis encounterDiagnosis = null;
for (SaveDiagnosisChildParam saveDiagnosisChildParam : diagnosisChildList) {
if (saveDiagnosisChildParam.getUpdateId() != null) {
String updateId = saveDiagnosisChildParam.getUpdateId();
@@ -306,6 +318,19 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述
encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
encounterDiagnosis.setTcmFlag(Whether.YES.getValue());// 中医标识
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++;
}
@@ -319,11 +344,24 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
encounterDiagnosis.setMedTypeCode(saveDiagnosisChildParam.getMedTypeCode());// 医疗类型
encounterDiagnosis.setDiagnosisDesc(saveDiagnosisChildParam.getDiagnosisDesc()); // 诊断描述
encounterDiagnosis.setIptDiseTypeCode(saveDiagnosisChildParam.getIptDiseTypeCode()); // 患者疾病诊断类型代码
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);
}
}
return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊断"}));
return R.ok(encounterDiagnosis, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊断"}));
}
/**

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

@@ -5,6 +5,8 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import lombok.Data;
import lombok.experimental.Accessors;
import java.util.Date;
/**
* 保存诊断 子参数类
*
@@ -33,6 +35,9 @@ public class SaveDiagnosisChildParam {
@JsonSerialize(using = ToStringSerializer.class)
private Long definitionId;
private String classification;
private String name;
/**
* 医保编码
*/
@@ -64,6 +69,18 @@ public class SaveDiagnosisChildParam {
*/
private String diagnosisDesc;
private String diagnosisDoctor;
/**
* 诊断时间
*/
private Date diagnosisTime;
/**
* 发病时间
*/
private Date onsetDate;
/** 患者疾病诊断类型代码 */
private Integer iptDiseTypeCode;
@@ -77,4 +94,6 @@ public class SaveDiagnosisChildParam {
*/
private String updateConditionId;
private Integer longTermFlag;
}

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

@@ -66,4 +66,25 @@ public class EncounterDiagnosis extends HisBaseEntity {
*/
private String diagnosisDesc;
/**
* 医生
*/
private String doctor;
/**
*病名
*/
private String name;
/**
*分类
*/
private String classification;
/**
* 长诊断标识
*/
private Integer longTermFlag;
}