feat: 门诊手术中计费功能
- 数据库：在adm_charge_item表添加SourceBillNo字段 - 后端实体类：更新ChargeItem.java添加SourceBillNo字段 - 前端组件：创建手术计费界面（基于门诊划价界面） - 后端API：扩展PrePrePaymentDto支持手术计费标识 - 后端Service：扩展getChargeItems方法支持手术计费过滤 - 门诊手术安排界面：添加【计费】按钮 注意事项： - 需要手动执行SQL脚本：openhis-server-new/sql/add_source_bill_no_to_adm_charge_item.sql - 术后一站式结算功能待后续开发
This commit is contained in:
@@ -0,0 +1,25 @@
|
||||
<?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.consultation.mapper.ConsultationConfirmationMapper">
|
||||
|
||||
<resultMap type="com.openhis.consultation.domain.ConsultationConfirmation" id="ConsultationConfirmationResult">
|
||||
<result property="id" column="id"/>
|
||||
<result property="consultationRequestId" column="consultation_request_id"/>
|
||||
<result property="confirmingDepartmentId" column="confirming_department_id"/>
|
||||
<result property="confirmingDepartmentName" column="confirming_department_name"/>
|
||||
<result property="confirmingDoctorId" column="confirming_doctor_id"/>
|
||||
<result property="confirmingDoctorName" column="confirming_doctor_name"/>
|
||||
<result property="confirmationStatus" column="confirmation_status"/>
|
||||
<result property="confirmationReason" column="confirmation_reason"/>
|
||||
<result property="confirmationDate" column="confirmation_date"/>
|
||||
<result property="creatorId" column="creator_id"/>
|
||||
<result property="creatorName" column="creator_name"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updaterId" column="updater_id"/>
|
||||
<result property="updaterName" column="updater_name"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="validFlag" column="valid_flag"/>
|
||||
<result property="tenantId" column="tenant_id"/>
|
||||
</resultMap>
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,25 @@
|
||||
<?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.consultation.mapper.ConsultationRecordMapper">
|
||||
|
||||
<resultMap type="com.openhis.consultation.domain.ConsultationRecord" id="ConsultationRecordResult">
|
||||
<result property="id" column="id"/>
|
||||
<result property="consultationRequestId" column="consultation_request_id"/>
|
||||
<result property="participantDoctorId" column="participant_doctor_id"/>
|
||||
<result property="participantDoctorName" column="participant_doctor_name"/>
|
||||
<result property="participantDepartmentId" column="participant_department_id"/>
|
||||
<result property="participantDepartmentName" column="participant_department_name"/>
|
||||
<result property="opinion" column="opinion"/>
|
||||
<result property="suggestion" column="suggestion"/>
|
||||
<result property="recordDate" column="record_date"/>
|
||||
<result property="creatorId" column="creator_id"/>
|
||||
<result property="creatorName" column="creator_name"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updaterId" column="updater_id"/>
|
||||
<result property="updaterName" column="updater_name"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="validFlag" column="valid_flag"/>
|
||||
<result property="tenantId" column="tenant_id"/>
|
||||
</resultMap>
|
||||
|
||||
</mapper>
|
||||
@@ -0,0 +1,50 @@
|
||||
<?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.consultation.mapper.ConsultationRequestMapper">
|
||||
|
||||
<resultMap type="com.openhis.consultation.domain.ConsultationRequest" id="ConsultationRequestResult">
|
||||
<result property="id" column="id"/>
|
||||
<result property="consultationId" column="consultation_id"/>
|
||||
<result property="patientId" column="patient_id"/>
|
||||
<result property="encounterId" column="encounter_id"/>
|
||||
<result property="orderId" column="order_id"/>
|
||||
<result property="patientName" column="patient_name"/>
|
||||
<result property="patientBusNo" column="patient_bus_no"/>
|
||||
<result property="patientIdentifierNo" column="patient_identifier_no"/>
|
||||
<result property="genderEnum" column="gender_enum"/>
|
||||
<result property="age" column="age"/>
|
||||
<result property="department" column="department"/>
|
||||
<result property="departmentId" column="department_id"/>
|
||||
<result property="requestingPhysician" column="requesting_physician"/>
|
||||
<result property="requestingPhysicianId" column="requesting_physician_id"/>
|
||||
<result property="consultationRequestDate" column="consultation_request_date"/>
|
||||
<result property="invitedObject" column="invited_object"/>
|
||||
<result property="consultationDate" column="consultation_date"/>
|
||||
<result property="consultationPurpose" column="consultation_purpose"/>
|
||||
<result property="provisionalDiagnosis" column="provisional_diagnosis"/>
|
||||
<result property="consultationOpinion" column="consultation_opinion"/>
|
||||
<result property="consultationStatus" column="consultation_status"/>
|
||||
<result property="consultationUrgency" column="consultation_urgency"/>
|
||||
<result property="confirmingPhysician" column="confirming_physician"/>
|
||||
<result property="confirmingPhysicianId" column="confirming_physician_id"/>
|
||||
<result property="confirmingDate" column="confirming_date"/>
|
||||
<result property="signature" column="signature"/>
|
||||
<result property="signaturePhysicianId" column="signature_physician_id"/>
|
||||
<result property="signatureDate" column="signature_date"/>
|
||||
<result property="cancelNatureDate" column="cancel_nature_date"/>
|
||||
<result property="cancelReason" column="cancel_reason"/>
|
||||
<result property="createTime" column="create_time"/>
|
||||
<result property="updateTime" column="update_time"/>
|
||||
<result property="createBy" column="create_by"/>
|
||||
<result property="updateBy" column="update_by"/>
|
||||
<result property="tenantId" column="tenant_id"/>
|
||||
<result property="isDeleted" column="is_deleted"/>
|
||||
<result property="remark" column="remark"/>
|
||||
<result property="consultationActivityId" column="consultation_activity_id"/>
|
||||
<result property="consultationActivityName" column="consultation_activity_name"/>
|
||||
<result property="confirmingPhysicianName" column="confirming_physician_name"/>
|
||||
<result property="confirmingDepartmentName" column="confirming_department_name"/>
|
||||
<result property="confirmingPhysicianParticipation" column="confirming_physician_participation"/>
|
||||
</resultMap>
|
||||
|
||||
</mapper>
|
||||
Reference in New Issue
Block a user