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

需求111

Browse Source
This commit is contained in:
Ranyunqiao
2026-05-09 09:36:24 +08:00
parent 23fe4f207c
commit 5b029270cf
7 changed files with 1301 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -75,11 +75,19 @@ public class NursingRecordAppServiceImpl implements INursingRecordAppService {
public R<?> getPatientInfoPage(NursingSearchParam nursingSearchParam, String searchKey, Integer pageNo,
Integer pageSize, HttpServletRequest request) {
// 构建查询条件
QueryWrapper<NursingSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(nursingSearchParam, searchKey,
new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientName, CommonConstants.FieldName.PatientBusNo)),
// 构建查询条件（租户ID）
QueryWrapper<NursingSearchParam> queryWrapper = HisQueryUtils.buildQueryWrapper(nursingSearchParam, null, null,
request);
// 搜索条件：姓名、病历号、床位号（全部放入一个 and() 块，避免 AND 重复）
if (searchKey != null && !searchKey.isEmpty()) {
queryWrapper.and(wrapper -> {
wrapper.or().like("T5.patient_name", searchKey);
wrapper.or().like("T5.patient_bus_no", searchKey);
wrapper.or().like("T5.bed_location_name", searchKey);
});
}
// 分页查询,查询患者信息
IPage<NursingPageDto> NursingInfoPage = nursingRecordAppMapper.getPatientPage(new Page<>(pageNo, pageSize),
EncounterClass.IMP.getValue(), LocationForm.BED.getValue(), LocationForm.WARD.getValue(),

3
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingPageDto.java
View File

@@ -62,7 +62,8 @@ public class NursingPageDto {
@JsonSerialize(using = ToStringSerializer.class)
@Dict(dictTable = "adm_location", dictCode = "id", dictText = "name")
private Long bedLocationId;
private String bedLocationId_dictText;
/** 床位号名称（用于搜索） */
private String bedLocationName;
/** 病区 */
@JsonSerialize(using = ToStringSerializer.class)

3
openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/dto/NursingSearchParam.java
View File

@@ -17,6 +17,9 @@ public class NursingSearchParam {
/** 床位号 */
private Long bedLocationId;
/** 床位名称（用于模糊搜索） */
private String bedLocationName;
/** 科室ID */
private Long orgId;