From ff105d08004b784d9bc2f320e490f0052c8dca5b Mon Sep 17 00:00:00 2001 From: wangjian963 <15215920+aprilry@user.noreply.gitee.com> Date: Tue, 23 Jun 2026 13:48:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=A8=E8=AF=8A=E5=8C=BB?= =?UTF-8?q?=E7=94=9F=E7=AB=99=E6=A8=A1=E5=9D=97=E4=B8=AD=E5=8C=BBtab?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=97=A0=E6=B3=95=E5=8A=A0=E8=BD=BD=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/doctorstation/dto/RequestBaseDto.java | 6 ++++++ .../DoctorStationChineseMedicalAppMapper.xml | 6 ++++-- .../components/tcm/tcmAdvice.vue | 20 +++++++++++++------ .../inHospitalManagement/listFee/index.vue | 2 +- .../components/depositQuery.vue | 2 +- .../src/views/knowledgegraph/PathwayList.vue | 2 +- .../src/views/knowledgegraph/RelationList.vue | 2 +- .../transferManagent/batchTransfer/index.vue | 2 +- 8 files changed, 29 insertions(+), 13 deletions(-) diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/RequestBaseDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/RequestBaseDto.java index 4a0d18e26..b5dcc2e43 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/RequestBaseDto.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/RequestBaseDto.java @@ -224,6 +224,12 @@ public class RequestBaseDto { */ private Integer sortNumber; + /** + * 账户id (费用性质/合同) + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long accountId; + /** * 用药说明 */ diff --git a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml index 0ce2bc973..56a20a217 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml +++ b/healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml @@ -62,7 +62,8 @@ T1.suffering_flag AS suffering_flag, T1.dosage_instruction AS dosage_instruction, T2.part_percent AS part_percent, - ccd.name AS condition_definition_name + ccd.name AS condition_definition_name, + T4.account_id AS account_id FROM med_medication_request AS T1 LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id AND T2.delete_flag = '0' @@ -115,7 +116,8 @@ T1.chinese_herbs_dose_quantity AS chinese_herbs_dose_quantity, T1.suffering_flag AS suffering_flag, T2.part_percent AS part_percent, - ccd.name AS condition_definition_name + ccd.name AS condition_definition_name, + T4.account_id AS account_id FROM med_medication_request AS T1 LEFT JOIN med_medication_definition AS T2 ON T2.ID = T1.medication_id AND T2.delete_flag = '0' diff --git a/healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue b/healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue index 61fe1e594..1debfa34b 100755 --- a/healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue +++ b/healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue @@ -130,7 +130,7 @@ 煎药方式： @@ -569,6 +569,7 @@ const tcmPrescriptionList = ref([ rateCode: '', dispensePerDuration: '', chineseHerbsDoseQuantity: '', + dosageInstruction: '', sufferingFlag: '0', checkAll: false, groupIndexList: [], @@ -688,11 +689,12 @@ async function getListInfo(addNewRow) { id: generatePrescriptionId(), prescriptionList: [], conditionDefinitionId: '', - accountId: contractList.value[0].accountId, + accountId: contractList.value?.[0]?.accountId || '', methodCode: '', rateCode: '', dispensePerDuration: '', chineseHerbsDoseQuantity: '', + dosageInstruction: '', sufferingFlag: '0', checkAll: false, groupIndexList: [], @@ -729,6 +731,9 @@ async function getListInfo(addNewRow) { if (firstItem.sufferingFlag !== undefined && firstItem.sufferingFlag !== null) { prescription.sufferingFlag = firstItem.sufferingFlag; } + if (firstItem.dosageInstruction !== undefined && firstItem.dosageInstruction !== null) { + prescription.dosageInstruction = firstItem.dosageInstruction; + } } return prescription; @@ -740,11 +745,12 @@ async function getListInfo(addNewRow) { id: generatePrescriptionId(), prescriptionList: [], conditionDefinitionId: '', - accountId: contractList.value[0].accountId, + accountId: contractList.value?.[0]?.accountId || '', methodCode: '', rateCode: '', dispensePerDuration: '', chineseHerbsDoseQuantity: '', + dosageInstruction: '', sufferingFlag: '0', checkAll: false, groupIndexList: [], @@ -754,7 +760,7 @@ async function getListInfo(addNewRow) { isAdding: false, }); } - tcmPrescriptionList.value.accountId = contractList.value[0].accountId; + tcmPrescriptionList.value.accountId = contractList.value?.[0]?.accountId || ''; if (props.activeTab == 'prescription' && addNewRow) { handleAddMedicine(0); } @@ -898,6 +904,7 @@ function addNewPrescription() { rateCode: '', dispensePerDuration: '', chineseHerbsDoseQuantity: '', + dosageInstruction: '', sufferingFlag: '0', checkAll: false, groupIndexList: [], @@ -1160,7 +1167,7 @@ function handleSave(pIndex) { groupId: item.groupId, patientId: props.patientInfo.patientId, encounterId: props.patientInfo.encounterId, - accountId: accountId.value, + accountId: prescription.accountId, conditionId: prescription.conditionId, encounterDiagnosisId: prescription.encounterDiagnosisId, diagnosisName: prescription.diagnosisName, @@ -1237,7 +1244,7 @@ function handleSaveBatch(pIndex) { .map((item, index) => { return { ...item, - accountId: accountId.value, + accountId: prescription.accountId, conditionId: prescription.conditionId, encounterDiagnosisId: prescription.encounterDiagnosisId, conditionDefinitionId: prescription.conditionDefinitionId, @@ -1249,6 +1256,7 @@ function handleSaveBatch(pIndex) { rateCode: prescription.rateCode, dispensePerDuration: prescription.dispensePerDuration, chineseHerbsDoseQuantity: prescription.chineseHerbsDoseQuantity, + dosageInstruction: prescription.dosageInstruction, dbOpType: item.requestId ? '2' : '1', }; }); diff --git a/healthlink-his-ui/src/views/inHospitalManagement/listFee/index.vue b/healthlink-his-ui/src/views/inHospitalManagement/listFee/index.vue index af8244ad5..985310f35 100755 --- a/healthlink-his-ui/src/views/inHospitalManagement/listFee/index.vue +++ b/healthlink-his-ui/src/views/inHospitalManagement/listFee/index.vue @@ -159,7 +159,7 @@ const searchKey = ref('') const patientList = ref([]) const patientTotal = ref(0) const pageNo = ref(1) -const $110) +const pageSize = ref(10) const currentPatient = ref(null) const feeItems = ref([]) const feeLoading = ref(false) diff --git a/healthlink-his-ui/src/views/inpatientNurse/InpatientBilling/components/depositQuery.vue b/healthlink-his-ui/src/views/inpatientNurse/InpatientBilling/components/depositQuery.vue index 0e7766b82..bc0bc9532 100755 --- a/healthlink-his-ui/src/views/inpatientNurse/InpatientBilling/components/depositQuery.vue +++ b/healthlink-his-ui/src/views/inpatientNurse/InpatientBilling/components/depositQuery.vue @@ -300,7 +300,7 @@ const patientInfo = ref(''); // 分页相关 const currentPage = ref(1); -const $110); +const pageSize = ref(10) const total = ref(0); // 打印相关 diff --git a/healthlink-his-ui/src/views/knowledgegraph/PathwayList.vue b/healthlink-his-ui/src/views/knowledgegraph/PathwayList.vue index dbb4f4101..ca8f9a78b 100644 --- a/healthlink-his-ui/src/views/knowledgegraph/PathwayList.vue +++ b/healthlink-his-ui/src/views/knowledgegraph/PathwayList.vue @@ -84,7 +84,7 @@ const loading = ref(false) const tableData = ref([]) const total = ref(0) const pageNo = ref(1) -const $110) +const pageSize = ref(10) const keyword = ref('') const showEdit = ref(false) const showSteps = ref(false) diff --git a/healthlink-his-ui/src/views/knowledgegraph/RelationList.vue b/healthlink-his-ui/src/views/knowledgegraph/RelationList.vue index 99f0f818a..e7f6002a2 100644 --- a/healthlink-his-ui/src/views/knowledgegraph/RelationList.vue +++ b/healthlink-his-ui/src/views/knowledgegraph/RelationList.vue @@ -82,7 +82,7 @@ const loading = ref(false) const tableData = ref([]) const total = ref(0) const pageNo = ref(1) -const $110) +const pageSize = ref(10) const showForm = ref(false) const filters = ref({ sourceType: '', targetType: '', relationType: '' }) diff --git a/healthlink-his-ui/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue b/healthlink-his-ui/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue index ecf1c6414..fb4f927b1 100755 --- a/healthlink-his-ui/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue +++ b/healthlink-his-ui/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue @@ -666,7 +666,7 @@ const tableData = ref([]); // 当前页码 const pageNum = ref(1); // 每页显示数据 -const $110); +const pageSize = ref(10) const purchaseinventoryList = ref([]); const open = ref(false); const loading = ref(false);