解决合并冲突
This commit is contained in:
@@ -0,0 +1,155 @@
|
||||
<?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.nenu.mapper.GfRatioApplicationRecordAppMapper">
|
||||
|
||||
<select id="selectGfRatioApplicationRecordPage" resultType="com.openhis.web.nenu.dto.GfRatioApplicationRecordDto">
|
||||
SELECT T.id
|
||||
, T.application_no
|
||||
, T.item_type
|
||||
, T.application_ratio
|
||||
, T.twice_ratio
|
||||
, T.start_date
|
||||
, T.end_date
|
||||
, T.application_status
|
||||
, T.applicant
|
||||
, T.application_time
|
||||
, T.application_reason
|
||||
, T.initial_approver
|
||||
, T.initial_approval_result
|
||||
, T.initial_approval_time
|
||||
, T.initial_approval_opinion
|
||||
, T.finance_approver
|
||||
, T.finance_approval_result
|
||||
, T.finance_approval_time
|
||||
, T.finance_approval_opinion
|
||||
, T.final_recorder
|
||||
, T.final_approval_result
|
||||
, T.final_record_time
|
||||
, T.final_approval_opinion
|
||||
, T.definition_id
|
||||
, T.bus_no
|
||||
, T.name
|
||||
, T.py_str
|
||||
, T.wb_str
|
||||
, T.yb_no
|
||||
from (SELECT T1.id
|
||||
, T1.bus_no AS application_no
|
||||
, T1.item_type
|
||||
, T1.application_ratio
|
||||
, T1.twice_ratio
|
||||
, T1.start_date
|
||||
, T1.end_date
|
||||
, T1.application_status
|
||||
, T1.applicant
|
||||
, T1.application_time
|
||||
, T1.application_reason
|
||||
, T1.initial_approver
|
||||
, T1.initial_approval_result
|
||||
, T1.initial_approval_time
|
||||
, T1.initial_approval_opinion
|
||||
, T1.finance_approver
|
||||
, T1.finance_approval_result
|
||||
, T1.finance_approval_time
|
||||
, T1.finance_approval_opinion
|
||||
, T1.final_recorder
|
||||
, T1.final_approval_result
|
||||
, T1.final_record_time
|
||||
, T1.final_approval_opinion
|
||||
, T1.definition_id
|
||||
, CASE
|
||||
WHEN T1.item_type = 1 THEN T2.bus_no
|
||||
WHEN T1.item_type = 2 THEN T3.bus_no
|
||||
ELSE '' END AS bus_no
|
||||
, CASE
|
||||
WHEN T1.item_type = 1 THEN T2."name"
|
||||
WHEN T1.item_type = 2 THEN T3."name"
|
||||
ELSE '' END AS "name"
|
||||
, CASE
|
||||
WHEN T1.item_type = 1 THEN T2.py_str
|
||||
WHEN T1.item_type = 2 THEN T3.py_str
|
||||
ELSE '' END AS py_str
|
||||
, CASE
|
||||
WHEN T1.item_type = 1 THEN T2.wb_str
|
||||
WHEN T1.item_type = 2 THEN T3.wb_str
|
||||
ELSE '' END AS wb_str
|
||||
, CASE
|
||||
WHEN T1.item_type = 1 THEN T2.yb_no
|
||||
WHEN T1.item_type = 2 THEN T3.yb_no
|
||||
ELSE '' END AS yb_no
|
||||
, T1.tenant_id
|
||||
, T1.delete_flag
|
||||
, T1.create_by
|
||||
, T1.create_time
|
||||
, T1.update_by
|
||||
, T1.update_time
|
||||
FROM nenu_gf_ratio_application T1
|
||||
LEFT JOIN med_medication_definition T2
|
||||
ON T2.id = T1.definition_id
|
||||
LEFT JOIN wor_activity_definition T3
|
||||
ON T3.id = T1.definition_id
|
||||
WHERE T1.delete_flag = '0'
|
||||
ORDER BY T1.id DESC) AS T
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
<select id="selectGfRatioApplicationDefinitionSelectPage"
|
||||
resultType="com.openhis.web.nenu.dto.GfRatioApplicationDefinitionSelectDto">
|
||||
SELECT T.id
|
||||
, T.bus_no
|
||||
, T."name"
|
||||
, T.yb_no
|
||||
, T.chrgitm_lv
|
||||
, T.py_str
|
||||
, T.wb_str
|
||||
, T.manufacturer_text
|
||||
, T.total_volume
|
||||
, T.tenant_id
|
||||
, T.delete_flag
|
||||
, T.create_by
|
||||
, T.create_time
|
||||
, T.update_by
|
||||
, T.update_time
|
||||
from (SELECT T1.id
|
||||
, T1.bus_no
|
||||
, T1."name"
|
||||
, T1.yb_no
|
||||
, T1.chrgitm_lv
|
||||
, T1.py_str
|
||||
, T1.wb_str
|
||||
<choose>
|
||||
<when test="itemType == 1">
|
||||
, T1.manufacturer_text
|
||||
, T2.total_volume
|
||||
</when>
|
||||
<otherwise>
|
||||
, '' AS manufacturer_text
|
||||
, '' AS total_volume
|
||||
</otherwise>
|
||||
</choose>
|
||||
, T1.tenant_id
|
||||
, T1.delete_flag
|
||||
, T1.create_by
|
||||
, T1.create_time
|
||||
, T1.update_by
|
||||
, T1.update_time
|
||||
FROM
|
||||
<choose>
|
||||
<when test="itemType == 1">
|
||||
med_medication_definition T1
|
||||
LEFT JOIN med_medication T2
|
||||
ON T2.medication_def_id = T1.id
|
||||
</when>
|
||||
<when test="itemType == 2">
|
||||
wor_activity_definition T1
|
||||
</when>
|
||||
<otherwise>
|
||||
wor_activity_definition T1
|
||||
</otherwise>
|
||||
</choose>
|
||||
WHERE T1.delete_flag = '0'
|
||||
ORDER BY T1.bus_no) AS T
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
</mapper>
|
||||
@@ -0,0 +1,73 @@
|
||||
<?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.nenu.mapper.GfRatioManageAppMapper">
|
||||
|
||||
<select id="selectGfIndividualRatioPage" resultType="com.openhis.web.nenu.dto.GfIndividualRatioDto">
|
||||
SELECT T.id
|
||||
, T.item_type
|
||||
, T.self_ratio
|
||||
, T.twice_ratio
|
||||
, T.start_date
|
||||
, T.end_date
|
||||
, T.bus_no
|
||||
, T.name
|
||||
, T.py_str
|
||||
, T.wb_str
|
||||
, T.yb_no
|
||||
, T.chrgitm_lv
|
||||
, T.tenant_id
|
||||
, T.delete_flag
|
||||
, T.create_by
|
||||
, T.create_time
|
||||
, T.update_by
|
||||
, T.update_time
|
||||
from (SELECT T1.id
|
||||
, T1.item_type
|
||||
, T1.self_ratio
|
||||
, T1.twice_ratio
|
||||
, T1.start_date
|
||||
, T1.end_date
|
||||
, CASE
|
||||
WHEN T1.item_type = 1 THEN T2.bus_no
|
||||
WHEN T1.item_type = 2 THEN T3.bus_no
|
||||
ELSE '' END AS bus_no
|
||||
, CASE
|
||||
WHEN T1.item_type = 1 THEN T2."name"
|
||||
WHEN T1.item_type = 2 THEN T3."name"
|
||||
ELSE '' END AS "name"
|
||||
, CASE
|
||||
WHEN T1.item_type = 1 THEN T2.py_str
|
||||
WHEN T1.item_type = 2 THEN T3.py_str
|
||||
ELSE '' END AS py_str
|
||||
, CASE
|
||||
WHEN T1.item_type = 1 THEN T2.wb_str
|
||||
WHEN T1.item_type = 2 THEN T3.wb_str
|
||||
ELSE '' END AS wb_str
|
||||
, CASE
|
||||
WHEN T1.item_type = 1 THEN T2.yb_no
|
||||
WHEN T1.item_type = 2 THEN T3.yb_no
|
||||
ELSE '' END AS yb_no
|
||||
, CASE
|
||||
WHEN T1.item_type = 1 THEN T2.chrgitm_lv
|
||||
WHEN T1.item_type = 2 THEN T3.chrgitm_lv
|
||||
ELSE 0 END AS chrgitm_lv
|
||||
, T1.tenant_id
|
||||
, T1.delete_flag
|
||||
, T1.create_by
|
||||
, T1.create_time
|
||||
, T1.update_by
|
||||
, T1.update_time
|
||||
FROM nenu_gf_ratio T1
|
||||
LEFT JOIN med_medication_definition T2
|
||||
ON T2.id = T1.definition_id
|
||||
LEFT JOIN wor_activity_definition T3
|
||||
ON T3.id = T1.definition_id
|
||||
WHERE T1.delete_flag = '0'
|
||||
AND T1.ratio_type = 2
|
||||
ORDER BY T1.id DESC) AS T
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,68 @@
|
||||
<?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.nenu.mapper.GfStudentListAppMapper">
|
||||
|
||||
<select id="selectGfStudentListPage" resultType="com.openhis.web.nenu.dto.GfStudentListDto">
|
||||
SELECT T.id
|
||||
, T.name
|
||||
, T.py_str
|
||||
, T.wb_str
|
||||
, T.gender
|
||||
, T.age
|
||||
, T.student_id
|
||||
, T.id_number
|
||||
, T.phone
|
||||
, T.college
|
||||
, T.major
|
||||
, T.education_level
|
||||
, T.enrollment_date
|
||||
, T.graduation_date
|
||||
, T.grade
|
||||
, T.study_mode
|
||||
, T.student_status
|
||||
, T.physical_exam_result
|
||||
, T.counselor
|
||||
, T.counselor_phone
|
||||
, T.patient_id
|
||||
, T.tenant_id
|
||||
, T.delete_flag
|
||||
, T.create_by
|
||||
, T.create_time
|
||||
, T.update_by
|
||||
, T.update_time
|
||||
from (SELECT T1.id
|
||||
, T1.name
|
||||
, T1.py_str
|
||||
, T1.wb_str
|
||||
, T1.gender
|
||||
, T1.age
|
||||
, T1.student_id
|
||||
, T1.id_number
|
||||
, T1.phone
|
||||
, T1.college
|
||||
, T1.major
|
||||
, T1.education_level
|
||||
, T1.enrollment_date
|
||||
, T1.graduation_date
|
||||
, T1.grade
|
||||
, T1.study_mode
|
||||
, T1.student_status
|
||||
, T1.physical_exam_result
|
||||
, T1.counselor
|
||||
, T1.counselor_phone
|
||||
, T1.patient_id
|
||||
, T1.tenant_id
|
||||
, T1.delete_flag
|
||||
, T1.create_by
|
||||
, T1.create_time
|
||||
, T1.update_by
|
||||
, T1.update_time
|
||||
FROM adm_patient_student AS T1
|
||||
WHERE T1.delete_flag = '0'
|
||||
ORDER BY T1.id DESC) AS T
|
||||
${ew.customSqlSegment}
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user