wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

修复门诊医生站模块中医tab页面无法加载的问题

Browse Source
This commit is contained in:
wangjian963
2026-06-23 13:48:35 +08:00
parent 3ce2119319
commit ff105d0800
8 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/doctorstation/dto/RequestBaseDto.java
View File

@@ -224,6 +224,12 @@ public class RequestBaseDto {
*/
private Integer sortNumber;
/**
* 账户id (费用性质/合同)
*/
@JsonSerialize(using = ToStringSerializer.class)
private Long accountId;
/**
* 用药说明
*/

6
healthlink-his-server/healthlink-his-application/src/main/resources/mapper/doctorstation/DoctorStationChineseMedicalAppMapper.xml
View File

@@ -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'

20
healthlink-his-ui/src/views/doctorstation/components/tcm/tcmAdvice.vue
View File

@@ -130,7 +130,7 @@
</el-select>
<span class="doctor-station"> 煎药方式： </span>
<el-select
v-model="decoctionMethod"
v-model="prescription.dosageInstruction"
placeholder=""
style="width: 120px"
>
@@ -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',
};
});

2
healthlink-his-ui/src/views/inHospitalManagement/listFee/index.vue
View File

@@ -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)

2
healthlink-his-ui/src/views/inpatientNurse/InpatientBilling/components/depositQuery.vue
View File

@@ -300,7 +300,7 @@ const patientInfo = ref('');
// 分页相关
const currentPage = ref(1);
const $110);
const pageSize = ref(10)
const total = ref(0);
// 打印相关

2
healthlink-his-ui/src/views/knowledgegraph/PathwayList.vue
View File

@@ -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)

2
healthlink-his-ui/src/views/knowledgegraph/RelationList.vue
View File

@@ -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: '' })

2
healthlink-his-ui/src/views/medicationmanagement/transferManagent/batchTransfer/index.vue
View File

@@ -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);