feat(surgicalschedule): 添加费用类别字段支持
- 在手术安排界面中添加费用类别字段映射 - 在申请单页面DTO中新增费用类别属性 - 在数据映射文件中添加费用类别结果映射 - 通过关联账户和合同表查询费用类别信息 - 实现手术安排中费用类别的完整数据流处理
This commit is contained in:
@@ -77,4 +77,8 @@ public class RequestFormPageDto {
|
|||||||
* 申请时间
|
* 申请时间
|
||||||
*/
|
*/
|
||||||
private String applyTime;
|
private String applyTime;
|
||||||
|
/**
|
||||||
|
* 费用类别
|
||||||
|
*/
|
||||||
|
private String feeType;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -63,6 +63,7 @@
|
|||||||
<result column="apply_dept_name" property="applyDeptName"/>
|
<result column="apply_dept_name" property="applyDeptName"/>
|
||||||
<result column="encounter_id" property="encounterId"/>
|
<result column="encounter_id" property="encounterId"/>
|
||||||
<result column="surgery_type_enum" property="surgeryTypeEnum"/>
|
<result column="surgery_type_enum" property="surgeryTypeEnum"/>
|
||||||
|
<result column="fee_type" property="feeType"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
<!-- 分页查询申请单 -->
|
<!-- 分页查询申请单 -->
|
||||||
@@ -83,11 +84,14 @@
|
|||||||
cs.main_surgeon_name,
|
cs.main_surgeon_name,
|
||||||
cs.apply_dept_id,
|
cs.apply_dept_id,
|
||||||
cs.apply_dept_name,
|
cs.apply_dept_name,
|
||||||
cs.surgery_type_enum
|
cs.surgery_type_enum,
|
||||||
|
fc.contract_name AS fee_type
|
||||||
FROM doc_request_form drf
|
FROM doc_request_form drf
|
||||||
LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no
|
LEFT JOIN cli_surgery cs ON cs.surgery_no = drf.prescription_no
|
||||||
LEFT JOIN adm_patient ap ON ap.id = cs.patient_id
|
LEFT JOIN adm_patient ap ON ap.id = cs.patient_id
|
||||||
LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id
|
LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id
|
||||||
|
LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
|
||||||
|
LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
|
||||||
<where>
|
<where>
|
||||||
<if test="requestFormDto.applyTimeStart != null">
|
<if test="requestFormDto.applyTimeStart != null">
|
||||||
AND drf.create_time >= #{requestFormDto.applyTimeStart}
|
AND drf.create_time >= #{requestFormDto.applyTimeStart}
|
||||||
|
|||||||
@@ -1751,6 +1751,7 @@ function confirmApply() {
|
|||||||
form.surgeryNature = selectedRow.surgeryTypeEnum//手术性质
|
form.surgeryNature = selectedRow.surgeryTypeEnum//手术性质
|
||||||
form.surgeonCode = selectedRow.mainSurgeonId//主刀医生id
|
form.surgeonCode = selectedRow.mainSurgeonId//主刀医生id
|
||||||
form.surgeonName = selectedRow.mainSurgeonName//主刀医生姓名
|
form.surgeonName = selectedRow.mainSurgeonName//主刀医生姓名
|
||||||
|
form.feeType = selectedRow.feeType//费用类别
|
||||||
showApplyDialog.value = false
|
showApplyDialog.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user