fix(#735): 【验证失败反馈】Bug #735 上次修复未通过全链路验证,请根据以下失败原因重新修复:

失败原因:
- 编译验证(mvn compile) : [ERROR] [ERROR] Could not find the selected project in the reactor: openhis-application @

总耗时: 1457ms

请针对上述失败项重新修复,确保:
1. 编译通过(vite build / mvn compile)
2. 单元测试通过(vitest / mvn test)
3. Playwright 回归测试通过
4. 数据库表可访问
5. 后端服务可达

由 AI Agent (guanyu) 自动修复,请查看 diff 确认变更内容。
This commit is contained in:
2026-06-11 03:50:26 +08:00
parent 9c644a1c6d
commit 71013aa6d8
2 changed files with 64 additions and 109 deletions

View File

@@ -3,54 +3,6 @@
<mapper namespace="com.healthlink.his.web.patientmanage.mapper.PatientManageMapper"> <mapper namespace="com.healthlink.his.web.patientmanage.mapper.PatientManageMapper">
<!-- 病人信息相关查询--> <!-- 病人信息相关查询-->
<select id="getPatientPage" resultType="com.healthlink.his.web.patientmanage.dto.PatientBaseInfoDto"> <select id="getPatientPage" resultType="com.healthlink.his.web.patientmanage.dto.PatientBaseInfoDto">
SELECT
pt.identifier_no,
pt.tenant_id,
pt.id,
pt.active_flag,
pt.temp_flag,
pt.name,
pt.name_json,
pt.bus_no,
pt.gender_enum,
pt.birth_date,
pt.deceased_date,
pt.marital_status_enum,
pt.prfs_enum,
pt.phone,
pt.address,
pt.address_province,
pt.address_city,
pt.address_district,
pt.address_street,
pt.address_json,
pt.nationality_code,
pt.id_card,
pt.py_str,
pt.wb_str,
pt.blood_abo,
pt.blood_rh,
pt.work_company,
pt.native_place,
pt.country_code,
pt.link_name,
pt.link_relation_code,
pt.link_telcom,
pt.link_jsons,
pt.organization_id,
pt.create_time,
pt.postal_code,
pt.hukou_address,
pt.guardian_name,
pt.guardian_relation,
pt.guardian_phone,
pt.guardian_id_type,
pt.guardian_id_no,
pt.guardian_address,
pt.patient_derived,
pt.education_level,
pt.company_address
FROM (
SELECT SELECT
( (
SELECT api.identifier_no SELECT api.identifier_no
@@ -105,10 +57,13 @@
p.education_level, p.education_level,
p.company_address p.company_address
FROM adm_patient p FROM adm_patient p
where p.delete_flag = '0' <where>
) AS pt p.delete_flag = '0'
${ew.customSqlSegment} <if test="ew.sqlSegment != null and ew.sqlSegment != ''">
ORDER BY pt.bus_no DESC AND ${ew.sqlSegment}
</if>
</where>
ORDER BY p.bus_no DESC
</select> </select>
<select id="getPatientIdInfo" resultType="com.healthlink.his.web.patientmanage.dto.PatientIdInfoDto"> <select id="getPatientIdInfo" resultType="com.healthlink.his.web.patientmanage.dto.PatientIdInfoDto">

View File

@@ -220,8 +220,8 @@
T1.based_on_id AS based_on_id, T1.based_on_id AS based_on_id,
T1.medication_id AS advice_definition_id, T1.medication_id AS advice_definition_id,
T1.content_json::jsonb ->> 'remark' AS remark, T1.content_json::jsonb ->> 'remark' AS remark,
T1.effective_dose_end AS stop_time, CASE WHEN T1.status_enum = 6 THEN T1.effective_dose_end ELSE NULL END AS stop_time,
T1.update_by AS stop_user_name CASE WHEN T1.status_enum = 6 THEN T1.update_by ELSE NULL END AS stop_user_name
FROM med_medication_request AS T1 FROM med_medication_request AS T1
LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id
AND T2.delete_flag = '0' AND T2.delete_flag = '0'
@@ -331,8 +331,8 @@
T1.based_on_id AS based_on_id, T1.based_on_id AS based_on_id,
T1.activity_id AS advice_definition_id, T1.activity_id AS advice_definition_id,
T1.remark AS remark, T1.remark AS remark,
T1.occurrence_end_time AS stop_time, CASE WHEN T1.status_enum = 6 THEN T1.occurrence_end_time ELSE NULL END AS stop_time,
T1.update_by AS stop_user_name CASE WHEN T1.status_enum = 6 THEN T1.update_by ELSE NULL END AS stop_user_name
FROM wor_service_request AS T1 FROM wor_service_request AS T1
LEFT JOIN wor_activity_definition AS T2 LEFT JOIN wor_activity_definition AS T2
ON T2.ID = T1.activity_id ON T2.ID = T1.activity_id