提交merge1.3

This commit is contained in:
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions

View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.web.Inspection.mapper.GroupRecMapper">
</mapper>

View File

@@ -0,0 +1,140 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.web.Inspection.mapper.LisReportMapper">
<select id="getReportResultList" resultType="com.openhis.web.Inspection.dto.ReportResultManageDto">
SELECT
*
FROM
(
SELECT
t2.service_id AS parentId,
t1.id,
t5.name AS patient_name,
t6.patient_id,
t5.gender_enum,
t4.charge_name,
t7.specimen_name,
t8."name" AS doctor_name,
t6.authored_time,
t2.tenant_id,
t1.observation_result,
t1.observation_date,
t9."name" as observation_name,
t9.reference_range
FROM
lab_observation t1
INNER JOIN lab_specimen t2 ON t1.specimen_id = t2.id
INNER JOIN wor_service_request t6 ON t2.service_id = t6.id
AND t6.category_enum = 22
LEFT JOIN adm_charge_item t3 ON t3.service_id = t6.id
LEFT JOIN adm_charge_item_definition t4 ON t3.definition_id = t4."id"
AND t4.delete_flag = '0'
LEFT JOIN adm_patient t5 ON t6.patient_id = t5.id
LEFT JOIN adm_specimen_definition t7 ON t2.specimen_definition_id = t7.id
LEFT JOIN adm_practitioner t8 ON t6.requester_id = t8.id
AND t8.delete_flag = '0'
Left join adm_observation_definition t9 on t1.observation_definition_id = t9.id and t9.delete_flag = '0'
UNION
SELECT
0 AS parentId,
t2.service_id AS id,
t5.name AS patient_name,
t6.patient_id,
t5.gender_enum,
t4.charge_name,
NULL AS specimen_name,
t8."name" AS doctor_name,
t6.authored_time AS authored_time,
t2.tenant_id,
NULL observation_result,
NULL observation_date,
NULL as observation_name,
NULL as reference_range
FROM
lab_observation t1
INNER JOIN lab_specimen t2 ON t1.specimen_id = t2.id
INNER JOIN wor_service_request t6 ON t2.service_id = t6.id
AND t6.category_enum = 22
LEFT JOIN adm_charge_item t3 ON t3.service_id = t6.id
LEFT JOIN adm_charge_item_definition t4 ON t3.definition_id = t4."id"
AND t4.delete_flag = '0'
LEFT JOIN adm_patient t5 ON t6.patient_id = t5.id
LEFT JOIN adm_practitioner t8 ON t6.requester_id = t8.id
AND t8.delete_flag = '0'
Left join adm_observation_definition t9 on t1.observation_definition_id = t9.id and t9.delete_flag = '0'
WHERE
t2.service_id IN (SELECT DISTINCT service_id FROM lab_specimen)
) T1
${ew.customSqlSegment}
</select>
<select id="getReportResultListTotal" resultType="java.lang.Long">
SELECT
COUNT(1)
from (
SELECT
DISTINCT
0 AS parentId,
t2.service_id AS id,
t5.name AS patient_name,
t6.patient_id,
t5.gender_enum,
t4.charge_name,
NULL AS specimen_name,
t8."name" AS doctor_name,
t6.authored_time AS authored_time,
t2.tenant_id,
NULL observation_result,
NULL observation_date,
NULL as observation_name,
NULL as reference_range
FROM
lab_observation t1
INNER JOIN lab_specimen t2 ON t1.specimen_id = t2.id
INNER JOIN wor_service_request t6 ON t2.service_id = t6.id
AND t6.category_enum = 22
LEFT JOIN adm_charge_item t3 ON t3.service_id = t6.id
LEFT JOIN adm_charge_item_definition t4 ON t3.definition_id = t4."id"
AND t4.delete_flag = '0'
LEFT JOIN adm_patient t5 ON t6.patient_id = t5.id
LEFT JOIN adm_practitioner t8 ON t6.requester_id = t8.id
AND t8.delete_flag = '0'
Left join adm_observation_definition t9 on t1.observation_definition_id = t9.id and t9.delete_flag = '0'
WHERE
t2.service_id IN (SELECT DISTINCT service_id FROM lab_specimen)
)
${ew.customSqlSegment}
</select>
<select id="getReportListById" resultType="com.openhis.web.Inspection.dto.ReportResultManageDto">
SELECT
t2.service_id AS parentId,
t1.id,
t5.name AS patient_name,
t6.patient_id,
t5.gender_enum,
t4.charge_name,
t7.specimen_name,
t8."name" AS doctor_name,
t6.authored_time,
t2.tenant_id,
t1.observation_result,
t1.observation_date,
t9."name" as observation_name,
t9.reference_range
FROM
lab_observation t1
INNER JOIN lab_specimen t2 ON t1.specimen_id = t2.id
INNER JOIN wor_service_request t6 ON t2.service_id = t6.id
AND t6.category_enum = 22
LEFT JOIN adm_charge_item t3 ON t3.service_id = t6.id
LEFT JOIN adm_charge_item_definition t4 ON t3.definition_id = t4."id"
AND t4.delete_flag = '0'
LEFT JOIN adm_patient t5 ON t6.patient_id = t5.id
LEFT JOIN adm_specimen_definition t7 ON t2.specimen_definition_id = t7.id
LEFT JOIN adm_practitioner t8 ON t6.requester_id = t8.id
AND t8.delete_flag = '0'
Left join adm_observation_definition t9 on t1.observation_definition_id = t9.id and t9.delete_flag = '0'
${ew.customSqlSegment}
</select>
</mapper>

View File

@@ -0,0 +1,108 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.openhis.web.Inspection.mapper.SampleCollectMapper">
<select id="getSampleCollectList" resultType="com.openhis.web.Inspection.dto.SampleCollectManageDto">
-- 查询所有子数据
SELECT
*
FROM
(
SELECT
t1.service_id AS parentId,
t1.id,
t1.collection_status_enum,
t5.name AS patient_name,
t2.patient_id,
t5.gender_enum,
t4.charge_name,
t6.specimen_name,
t7."name" AS doctor_name,
t1.collection_date,
t1.received_date,
t2.authored_time,
t1.specimen_volume,
t1.specimen_unit,
t1.tenant_id
FROM
lab_specimen t1
INNER JOIN wor_service_request t2 ON t1.service_id = t2.id
AND t2.category_enum = 22
LEFT JOIN adm_charge_item t3 ON t3.service_id = t2.id
LEFT JOIN adm_charge_item_definition t4 ON t3.definition_id = t4."id"
AND t4.delete_flag = '0'
LEFT JOIN adm_patient t5 ON t2.patient_id = t5.id
LEFT JOIN adm_specimen_definition t6 ON t1.specimen_definition_id = t6.id
LEFT JOIN adm_practitioner t7 ON t2.requester_id = t7.id
AND t7.delete_flag = '0'
UNION
SELECT
0 AS parentId,
t1.service_id AS id,
NULL collection_status_enum,
t5.name AS patient_name,
t2.patient_id,
t5.gender_enum,
t4.charge_name,
NULL AS specimen_name,
t7."name" AS doctor_name,
NULL AS collection_date,
null received_date,
t2.authored_time AS authored_time,
null specimen_volume,
null specimen_unit,
t1.tenant_id
FROM
lab_specimen t1
INNER JOIN wor_service_request t2 ON t1.service_id = t2.id
AND t2.category_enum = 22
LEFT JOIN adm_charge_item t3 ON t3.service_id = t2.id
LEFT JOIN adm_charge_item_definition t4 ON t3.definition_id = t4."id"
AND t4.delete_flag = '0'
LEFT JOIN adm_patient t5 ON t2.patient_id = t5.id
LEFT JOIN adm_practitioner t7 ON t2.requester_id = t7.id
AND t7.delete_flag = '0'
WHERE
t1.service_id IN (SELECT DISTINCT service_id FROM lab_specimen)
) T1
${ew.customSqlSegment}
</select>
<select id="getSampleCollectListTotal" resultType="java.lang.Long">
SELECT
COUNT(1)
FROM
(
SELECT
DISTINCT
0 AS parentId,
t1.service_id AS id,
NULL collection_status_enum,
t5.name AS patient_name,
t2.patient_id,
t5.gender_enum,
t4.charge_name,
NULL AS specimen_name,
t7."name" AS doctor_name,
NULL AS collection_date,
null specimen_volume,
null specimen_unit,
t2.authored_time AS authored_time,
t1.tenant_id
FROM
lab_specimen t1
INNER JOIN wor_service_request t2 ON t1.service_id = t2.id
AND t2.category_enum = 22
LEFT JOIN adm_charge_item t3 ON t3.service_id = t2.id
LEFT JOIN adm_charge_item_definition t4 ON t3.definition_id = t4."id"
AND t4.delete_flag = '0'
LEFT JOIN adm_patient t5 ON t2.patient_id = t5.id
LEFT JOIN adm_practitioner t7 ON t2.requester_id = t7.id
AND t7.delete_flag = '0'
WHERE
t1.service_id IN (SELECT DISTINCT service_id FROM lab_specimen)
)
${ew.customSqlSegment}
</select>
</mapper>