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

fix: bug364 - 添加病历号搜索支持

Browse Source
This commit is contained in:
赵云
2026-04-09 16:16:09 +08:00
parent 6642fd9e1c
commit d8511ecb1b
3 changed files with 9 additions and 1 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/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
View File

@@ -101,7 +101,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
// 构建查询条件 // 构建查询条件
QueryWrapper<RegPatientMainInfoDto> queryWrapper QueryWrapper<RegPatientMainInfoDto> queryWrapper
= HisQueryUtils.buildQueryWrapper(regPatientMainInfoDto, searchKey, = HisQueryUtils.buildQueryWrapper(regPatientMainInfoDto, searchKey,
new HashSet<>(Arrays.asList("bus_no", "patient_name", "in_hospital_org_name", "house_name")), request); new HashSet<>(Arrays.asList("bus_no", "patient_bus_no", "patient_name", "in_hospital_org_name", "house_name")), request);
// 当前登录所属的科室 // 当前登录所属的科室
Long currentUserOrganizationId = SecurityUtils.getLoginUser().getOrgId(); Long currentUserOrganizationId = SecurityUtils.getLoginUser().getOrgId();
// 住院医生站-只查询当前登录的科室相关的患者 // 住院医生站-只查询当前登录的科室相关的患者

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RegPatientMainInfoDto.java
View File

@@ -35,6 +35,11 @@ public class RegPatientMainInfoDto {
*/ */
private String busNo; private String busNo;
/**
* 患者病历号
*/
private String patientBusNo;
/** /**
* 入院时间 * 入院时间
*/ */

3
openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
View File

@@ -10,6 +10,7 @@
rpmi.encounter_id, rpmi.encounter_id,
rpmi.status_enum, rpmi.status_enum,
rpmi.bus_no, rpmi.bus_no,
rpmi.patient_bus_no,
rpmi.in_hospital_time, rpmi.in_hospital_time,
rpmi.in_hospital_days, rpmi.in_hospital_days,
rpmi.out_hospital_time, rpmi.out_hospital_time,
@@ -31,6 +32,7 @@
ae.ID AS encounter_id, ae.ID AS encounter_id,
ae.status_enum AS status_enum, ae.status_enum AS status_enum,
ae.bus_no AS bus_no, ae.bus_no AS bus_no,
ap.bus_no AS patient_bus_no,
ae.start_time AS in_hospital_time, ae.start_time AS in_hospital_time,
(EXTRACT(DAY FROM (CURRENT_DATE - ae.start_time)) :: INTEGER + 1) AS in_hospital_days, (EXTRACT(DAY FROM (CURRENT_DATE - ae.start_time)) :: INTEGER + 1) AS in_hospital_days,
ae.end_time AS out_hospital_time, ae.end_time AS out_hospital_time,
@@ -110,6 +112,7 @@
ae.ID AS encounter_id, ae.ID AS encounter_id,
ae.status_enum AS status_enum, ae.status_enum AS status_enum,
ae.bus_no AS bus_no, ae.bus_no AS bus_no,
ap.bus_no AS patient_bus_no,
ae.start_time AS in_hospital_time, ae.start_time AS in_hospital_time,
(EXTRACT(DAY FROM (CURRENT_DATE - ae.start_time)) :: INTEGER + 1) AS in_hospital_days, (EXTRACT(DAY FROM (CURRENT_DATE - ae.start_time)) :: INTEGER + 1) AS in_hospital_days,
ae.end_time AS out_hospital_time, ae.end_time AS out_hospital_time,