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

解决合并冲突

Browse Source
This commit is contained in:
chenqi
2025-12-10 14:20:24 +08:00
parent e1385cb3e6
commit 18f6a845e6
804 changed files with 61881 additions and 13577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
openhis-server-new/openhis-application/src/main/resources/mapper/outpatientmanage/OutpatientTreatmentAppMapper.xml
View File

@@ -10,8 +10,7 @@
ii.patient_name,
ii.patient_py_str,
ii.patient_wb_str,
ii.birth_date,
ii.status_enum
ii.birth_date
FROM (
SELECT T1.tenant_id,
T1.id AS encounter_id,
@@ -21,8 +20,7 @@
T2."name" AS patient_name,
T2.py_str AS patient_py_str,
T2.wb_str AS patient_wb_str,
T2.birth_date,
T3.status_enum
T2.birth_date
FROM adm_encounter AS T1
INNER JOIN adm_patient AS T2
ON T1.patient_id = T2.id
@@ -32,6 +30,7 @@
AND T3.refund_service_id IS NULL
AND T3.delete_flag = '0'
WHERE T1.class_enum = #{amb}
AND T3.status_enum IN (#{completed},#{cancelled})
AND T1.delete_flag = '0'
GROUP BY T1.tenant_id,
T1.id,
@@ -41,8 +40,7 @@
T2.name,
T2.py_str,
T2.wb_str,
T2.birth_date,
T3.status_enum
T2.birth_date
ORDER BY T1.bus_no DESC
) AS ii
${ew.customSqlSegment}
@@ -245,7 +243,7 @@
ap.gender_enum,
ap.birth_date,
wad.NAME AS activity_name,
SUBSTRING(wad.bus_no FROM 3) AS bus_no,
SUBSTRING(wsr.bus_no FROM 3) AS bus_no,
aper.name AS practitioner_name,
ao.name AS org_name
FROM wor_service_request AS wsr