wangyizhe/his
3
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

24
openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
View File

@@ -227,6 +227,7 @@
SELECT
T1.id AS inventory_id,
T1.item_id,
T1.category_code,
T1.item_table,
T1.quantity,
T1.unit_code,
@@ -300,6 +301,15 @@
AND (T1.status_enum = #{status1} OR T1.status_enum = #{status2})
</select>
<select id="getMedLocationConfig" resultType="com.openhis.web.doctorstation.dto.AdviceInventoryDto">
SELECT aol.distribution_category_code AS category_code,
aol.def_location_id AS location_id
FROM adm_organization_location AS aol
WHERE aol.delete_flag = '0'
AND aol.organization_id = #{organizationId}
AND (CURRENT_TIME :: TIME ( 6 ) BETWEEN aol.start_time AND aol.end_time)
</select>
<select id="getChildCharge" resultType="com.openhis.web.doctorstation.dto.AdvicePriceDto">
SELECT
T1.definition_id,
@@ -475,6 +485,7 @@
LEFT JOIN adm_organization AS ao ON ao.ID = T1.org_id AND ao.delete_flag = '0'
WHERE T1.delete_flag = '0'
AND T1.based_on_table is null
AND T1.parent_id IS NULL
<if test="historyFlag == '0'.toString()">
AND T1.encounter_id = #{encounterId}
</if>
@@ -495,4 +506,17 @@
AND aa.encounter_id = #{encounterId}
</select>
<select id="getActivityBindDevice" resultType="com.openhis.web.doctorstation.dto.ActivityBindDeviceDetailDto">
SELECT item_no AS activity_id,
dev_act_id AS device_id,
quantity,
unit_code
FROM tmp_activity_device
WHERE delete_flag = '0'
AND status_enum = #{status}
AND type_code = '2'
AND dev_act_table = #{tableName}
AND item_no = #{activityId}
</select>
</mapper>

5
openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationMainAppMapper.xml
View File

@@ -55,10 +55,13 @@
LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0'
LEFT JOIN adm_encounter_participant AS T4
ON T1.ID = T4.encounter_id AND T4.type_code = #{participantType} AND T4.delete_flag = '0'
ON T1.ID = T4.encounter_id AND T4.type_code = #{participantType}
AND T4.status_enum = #{activityStatus}
AND T4.delete_flag = '0'
LEFT JOIN adm_practitioner AS T5 ON T5.ID = T4.practitioner_id AND T5.delete_flag = '0'
LEFT JOIN adm_encounter_participant AS aep ON T1.ID = aep.encounter_id
AND aep.type_code = #{participantType2}
AND aep.status_enum = #{activityStatus}
AND aep.delete_flag = '0'
LEFT JOIN adm_practitioner AS ap ON ap.ID = aep.practitioner_id
AND ap.delete_flag = '0'

7
openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/ReservationRecordAppMapper.xml
View File

@@ -15,7 +15,8 @@
ri.org_name,
ri.practitioner_id,
ri.practitioner_name,
ri.remark
ri.remark,
ri.tooth_position
from (SELECT crr.tenant_id,
crr.id,
crr.patient_name,
@@ -26,14 +27,14 @@
ao.NAME AS org_name,
crr.practitioner_id,
ap.NAME AS practitioner_name,
crr.remark
crr.remark,
crr.tooth_position
FROM cli_reservation_record AS crr
LEFT JOIN adm_organization AS ao ON ao.ID = crr.org_id
AND ao.delete_flag = '0'
LEFT JOIN adm_practitioner AS ap ON ap.ID = crr.practitioner_id
AND ap.delete_flag = '0'
WHERE crr.delete_flag = '0'
AND (crr.org_id = #{orgId} OR crr.practitioner_id = #{practitionerId})
order by crr.reservation_time) AS ri
${ew.customSqlSegment}
</select>