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

后端最新版本同步

Browse Source
This commit is contained in:
Zhang.WH
2025-09-25 10:43:25 +08:00
parent 1276dc4adb
commit c8014404f1
355 changed files with 10070 additions and 5578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/AdmissionAppServiceImpl.java
View File

@@ -214,7 +214,7 @@ public class AdmissionAppServiceImpl implements IAdmissionAppService {
EncounterLocation encounterLocation = new EncounterLocation();
encounterLocation.setLocationId(admissionUpDto.getWardLocationId()).setEncounterId(admissionUpDto.getId())
.setFormEnum(LocationForm.WARD.getValue()).setStartTime(admissionUpDto.getStartTime())
.setStatusEnum(EncounterLocationStatus.ACTIVE.getValue());
.setStatusEnum(EncounterActivityStatus.ACTIVE.getValue());
boolean encounterLocationSuccess = encounterLocationService.saveOrUpdateEncounterLocation(encounterLocation);
return encounterSuccess && updateAccountSuccess && encounterLocationSuccess;

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/NursingRecordAppServiceImpl.java
View File

@@ -8,6 +8,7 @@ import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import com.openhis.common.enums.EncounterActivityStatus;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -26,7 +27,6 @@ import com.openhis.common.constant.CommonConstants;
import com.openhis.common.constant.PromptMsgConstant;
import com.openhis.common.enums.AdministrativeGender;
import com.openhis.common.enums.EncounterClass;
import com.openhis.common.enums.EncounterLocationStatus;
import com.openhis.common.enums.LocationForm;
import com.openhis.common.utils.EnumUtils;
import com.openhis.common.utils.HisQueryUtils;
@@ -85,7 +85,7 @@ public class NursingRecordAppServiceImpl implements INursingRecordAppService {
// 分页查询,查询患者信息
IPage<NursingPageDto> NursingInfoPage = nursingRecordAppMapper.getPatientPage(new Page<>(pageNo, pageSize),
EncounterClass.IMP.getValue(), LocationForm.BED.getValue(), LocationForm.WARD.getValue(),
EncounterLocationStatus.ACTIVE.getValue(), queryWrapper);
EncounterActivityStatus.ACTIVE.getValue(), queryWrapper);
NursingInfoPage.getRecords().forEach(e -> {
// 性别枚举类回显赋值
@@ -118,7 +118,7 @@ public class NursingRecordAppServiceImpl implements INursingRecordAppService {
// 分页查询,查询患者护理记录单信息
IPage<NursingDetailDto> NursingPatientPage = nursingRecordAppMapper.getNursingPatientPage(
new Page<>(pageNo, pageSize), EncounterClass.IMP.getValue(), LocationForm.BED.getValue(),
LocationForm.WARD.getValue(), EncounterLocationStatus.ACTIVE.getValue(), queryWrapper);
LocationForm.WARD.getValue(), EncounterActivityStatus.ACTIVE.getValue(), queryWrapper);
NursingPatientPage.getRecords().forEach(e -> {
// 性别枚举类回显赋值

4
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/appservice/impl/PatientHomeAppServiceImpl.java
View File

@@ -168,7 +168,7 @@ public class PatientHomeAppServiceImpl implements IPatientHomeAppService {
// 设置物理枚举为 8:病床
.setFormEnum(LocationForm.BED.getValue())
// 状态为使用中
.setStatusEnum(EncounterLocationStatus.ACTIVE.getValue());
.setStatusEnum(EncounterActivityStatus.ACTIVE.getValue());
encounterLocationService.saveOrUpdateEncounterLocation(encounterLocation);
// 2.位置表
@@ -273,7 +273,7 @@ public class PatientHomeAppServiceImpl implements IPatientHomeAppService {
// 设置就诊ID
.setEncounterId(encounterId)
// 设置状态枚举
.setStatusEnum(EncounterLocationStatus.COMPLETED.getValue())
.setStatusEnum(EncounterActivityStatus.COMPLETED.getValue())
// 设置物理枚举为 8:病床
.setFormEnum(LocationForm.BED.getValue());
encounterLocationService.saveOrUpdateEncounterLocation(encounterLocation);