diff --git a/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue b/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue index da0b02dd..a1887acf 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/emr/emrtemplate.vue @@ -43,11 +43,7 @@ const props = defineProps({ required: true, }, }); -<<<<<<< HEAD getList(); -======= -getList(); ->>>>>>> upstream/develop function getList() { queryParams.value.useScopeCode = 1; getEmrTemplateList(queryParams.value).then((res) => { diff --git a/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue b/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue index 68e5998a..ed3ef42b 100644 --- a/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue +++ b/openhis-ui-vue3/src/views/doctorstation/components/tcm/tcmAdvice.vue @@ -18,7 +18,6 @@ 药品数: {{ getPrescriptionMedicineCount(index) }}种 总价: ¥ {{ getPrescriptionTotalPrice(index) }} -======= - class="add-icon" - title="删除处方" - @click="deletePrescription()" - style="font-size: 26px !important; margin-left: 10px; color: red" - > - - - -
- - 药品数: - {{ prescription.prescriptionList ? prescription.prescriptionList.length : '0' }}种 - - 总价: ¥ {{ calculatePrescriptionTotal(pIndex) }} ->>>>>>> upstream/develop
@@ -86,15 +69,10 @@ :value="item.accountId" /> -<<<<<<< HEAD 配方名称： 用药途径： -======= - 用法： - ->>>>>>> upstream/develop @@ -265,7 +244,6 @@ /> -<<<<<<< HEAD 脚注： -======= - - - - - - ->>>>>>> upstream/develop
总金额：{{ @@ -503,7 +462,6 @@ const tcmPrescriptionList = ref([ const unitCodeList = ref([]); const adviceTableRef = ref([]); const organization = ref([]); -<<<<<<< HEAD const conditionDefinitionId = ref(''); const encounterDiagnosisId = ref(''); const diagnosisName = ref(''); @@ -528,11 +486,6 @@ const rowRules = ref({ rateCode: [{ required: true, message: '请选择频次', trigger: 'change' }], methodCode: [{ required: true, message: '请选择给药途径', trigger: 'change' }], orgId: [{ required: true, message: '请选择执行科室', trigger: 'change' }], -======= -const loading = ref(false); -const rowRules = ref({ - minUnitQuantity: [{ required: true, message: '请输入单次剂量', trigger: 'change' }], ->>>>>>> upstream/develop }); const unitMap = ref({ dose: 'dose', @@ -562,7 +515,6 @@ const inputRefs = ref({}); // 存储输入框实例 const requiredProps = ref([]); // 存储必填项 prop 顺序 const totalAmount = ref(0); const tcmDianosis = ref(); -<<<<<<< HEAD const { method_code, unit_code, rate_code, method_of_decocting_medicine,hjerbal_footnotes,distribution_category_code } = proxy.useDict( 'method_code', 'unit_code', @@ -594,17 +546,6 @@ const adviceTypeList = ref([ value: '', }, ]); -======= -const { method_code, unit_code, rate_code, distribution_category_code, dosage_instruction } = - proxy.useDict( - 'method_code', - 'unit_code', - 'rate_code', - 'distribution_category_code', - 'dosage_instruction' - ); - ->>>>>>> upstream/develop onMounted(() => { document.addEventListener('keydown', escKeyListener); }); @@ -630,7 +571,6 @@ function getList() { }); } -<<<<<<< HEAD function getListInfo(addNewRow) { isAdding.value = false; @@ -675,83 +615,11 @@ function getListInfo(addNewRow) { } else { console.error('获取医嘱列表失败或数据格式错误:', res); prescriptionList.value = []; -======= -async function getListInfo(addNewRow) { - // 重置所有处方的添加状态 - tcmPrescriptionList.value.forEach((prescription) => { - prescription.isAdding = false; - }); - await getTcmAdviceList({ encounterId: props.patientInfo.encounterId }).then(async (res) => { - // 按 groupId 分组数据 - const groupedData = {}; - res.data.forEach((item) => { - const groupId = item.groupId || 'default'; - if (!groupedData[groupId]) { - groupedData[groupId] = []; - } - groupedData[groupId].push({ - ...item, - doseQuantity: JSON.parse(item.contentJson)?.doseQuantity, - doseUnitCode_dictText: JSON.parse(item.contentJson)?.doseUnitCode_dictText, - }); - }); - - await getContract({ encounterId: props.patientInfo.encounterId }).then((res) => { - contractList.value = res.data; - }); - // 更新处方列表 - const groupIds = Object.keys(groupedData); - tcmPrescriptionList.value = groupIds.map((groupId, index) => { - const prescription = tcmPrescriptionList.value[index] || { - prescriptionList: [], - conditionDefinitionId: '', - accountId: contractList.value[0].accountId, - methodCode: '', - rateCode: '', - dispensePerDuration: '', - chineseHerbsDoseQuantity: '', - sufferingFlag: '0', - checkAll: false, - groupIndexList: [], - expandOrder: [], - totalAmount: 0, - nextId: 1, - isAdding: false, - }; - - prescription.prescriptionList = groupedData[groupId]; - return prescription; - }); - - // 如果没有处方数据，确保至少有一个空处方 - if (tcmPrescriptionList.value.length === 0) { - tcmPrescriptionList.value.push({ - prescriptionList: [], - conditionDefinitionId: '', - accountId: contractList.value[0].accountId, - methodCode: '', - rateCode: '', - dispensePerDuration: '', - chineseHerbsDoseQuantity: '', - sufferingFlag: '0', - checkAll: false, - groupIndexList: [], - expandOrder: [], - totalAmount: 0, - nextId: 1, - isAdding: false, - }); - } - tcmPrescriptionList.value.accountId = contractList.value[0].accountId; - if (props.activeTab == 'prescription' && addNewRow) { - handleAddMedicine(0); ->>>>>>> upstream/develop } }).catch(error => { console.error('获取医嘱列表异常:', error); prescriptionList.value = []; }); -<<<<<<< HEAD tcmDiagnosisList.value = getFromDiagnosis(props.patientInfo.encounterId); @@ -762,11 +630,6 @@ async function getListInfo(addNewRow) { }); accountId.value = props.patientInfo.accountId || ''; -======= - - tcmDiagnosisList.value = getFromDiagnosis(props.patientInfo.encounterId); - accountId.value = props.patientInfo.accountId; ->>>>>>> upstream/develop } function getDiagnosisInfo() { @@ -875,32 +738,27 @@ function handleChange(value) { adviceQueryParams.value.searchKey = value; } -function addNewPrescription() { - tcmPrescriptionList.value.push({ - prescriptionList: [], - conditionDefinitionId: '', - accountId: accountId.value, - methodCode: '', - rateCode: '', - dispensePerDuration: '', - chineseHerbsDoseQuantity: '', - sufferingFlag: '0', - checkAll: false, - groupIndexList: [], - expandOrder: [], - totalAmount: 0, - nextId: 1, - isAdding: false, - }); +function openDialog() { + tcmDianosis.value.openDialog(); } -function deletePrescription(index) { - if (tcmPrescriptionList.value.length <= 1) { - proxy.$modal.msgError('至少保留一张处方'); - return; - } +function deleteDiagnosisBind(id) { + const data = localStorage.getItem(`tcmDiagnosisList_${props.patientInfo.encounterId}`); + let list = []; + list = JSON.parse(data); + // 添加到列表 + const index = list.findIndex((item) => item.id === id); + if (index === -1) return; - tcmPrescriptionList.value.splice(index, 1); + list.splice(index, 1); + localStorage.removeItem(`tcmDiagnosisList_${props.patientInfo.encounterId}`); + // 保存到本地缓存 + localStorage.setItem(`tcmDiagnosisList_${props.patientInfo.encounterId}`, JSON.stringify(list)); + getListInfo(); +} + +function addNewPrescription(){ + tcmPrescriptionList.value.push({}) } // 删除处方单 @@ -1103,25 +961,17 @@ function handleDelete(pIndex) { prescription.expandOrder = []; prescription.isAdding = false; adviceQueryParams.value.adviceType = undefined; + groupMarkers.value = getGroupMarkers(prescriptionList.value); // 删除行会出现组号混乱的情况，所以这里重新更新标记 } -<<<<<<< HEAD -function handleNumberClick(item, index) { - prescriptionList.value[index].unitPrice = item.price; - // prescriptionList.value[index].lotNumber = item.lotNumber; - prescriptionList.value[index].locationId = item.locationId; - prescriptionList.value[index].positionId = item.locationId; - prescriptionList.value[index].positionName = item.locationName; -======= function handleNumberClick(item, index, pIndex) { const prescription = tcmPrescriptionList.value[pIndex]; prescription.prescriptionList[index].unitPrice = item.price; prescription.prescriptionList[index].locationId = item.locationId; prescription.prescriptionList[index].positionId = item.locationId; prescription.prescriptionList[index].positionName = item.locationName; ->>>>>>> upstream/develop } /** @@ -1195,7 +1045,6 @@ function handleSave(pIndex) { } // 单行处方保存 -<<<<<<< HEAD function handleSaveSign(row, index) { try { // 直接执行保存逻辑，不再进行表单验证 @@ -1269,37 +1118,6 @@ function handleSaveSign(row, index) { function handleSaveBatch() { let saveList = prescriptionList.value -======= -function handleSaveSign(row, index, pIndex) { - const prescription = tcmPrescriptionList.value[pIndex]; - const formRefName = 'formRef' + pIndex + '-' + index; - proxy.$refs[formRefName][0].validate((valid) => { - row.isEdit = false; - prescription.isAdding = false; - prescription.expandOrder = []; - row.contentJson = undefined; - row.patientId = props.patientInfo.patientId; - row.encounterId = props.patientInfo.encounterId; - row.accountId = prescription.accountId; - row.quantity = row.minUnitQuantity; - row.conditionId = prescription.conditionId; - row.unitPrice = - row.unitCodeList.find((item) => item.value == row.unitCode).type == 'unit' - ? row.unitPrice - : new Decimal(row.unitPrice).div(row.partPercent).toFixed(2); - row.conditionDefinitionId = prescription.conditionDefinitionId; - row.encounterDiagnosisId = prescription.encounterDiagnosisId; - row.diagnosisName = prescription.diagnosisName; - row.contentJson = JSON.stringify(row); - }); -} - -function handleSaveBatch(pIndex) { - const prescription = tcmPrescriptionList.value[pIndex]; - - let timestamp = new Date().getTime(); - let saveList = prescription.prescriptionList ->>>>>>> upstream/develop .filter((item) => { return item.statusEnum == 1; }) diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue index 488c11bd..1c58b4ea 100644 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue @@ -2,7 +2,6 @@
-<<<<<<< HEAD -======= -
- - - -
- ->>>>>>> upstream/develop diff --git a/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue index 906ca0e3..3bf4944b 100644 --- a/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue +++ b/openhis-ui-vue3/src/views/medicationmanagement/chkstock/chkstockBatch/index.vue @@ -701,7 +701,6 @@ import { addBatch, //保存批量盘点 productStocktakingApproved, reject, -<<<<<<< HEAD getpharmacyCabinetList } from "../components/api"; import PopoverList from "@/components/OpenHis/popoverList/index.vue"; @@ -709,14 +708,6 @@ import MedicineList from "../components/medicineList.vue"; import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue' import { formatDate,formatDateymd } from "@/utils/index"; import { ref } from "vue"; -======= -} from '../components/api'; -import PopoverList from '@/components/OpenHis/popoverList/index.vue'; -import MedicineList from '../components/medicineList.vue'; -import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue'; -import { formatDate, formatDateymd } from '@/utils/index'; -import { ref } from 'vue'; ->>>>>>> upstream/develop const router = useRouter(); const route = useRoute(); @@ -2174,13 +2165,7 @@ function getStockReceiptTypeList() { console.log('详情页查询下拉树response1111111', response); // categoryListOptions.value = response.data.categoryListOptions; // 药品类型 -<<<<<<< HEAD profitReasonOptions.value = response.data.profitReasonOptions; // 盈亏原因 -======= - profitReasonOptions.value = response.data.profitReasonOptions; // 盈亏原因 - // receiptHeaderForm.purposeTypeEnum = warehous_type.value[0].value // 仓库类型默认值 - // handleChangePurposeTypeEnum(receiptHeaderForm.purposeTypeEnum) ->>>>>>> upstream/develop // cabinetListOptionsBk.value = response.data.purposeTypeListOptions; // 盘点仓库列表（未过滤） // purposeTypeListOptions.value = cabinetListOptionsBk.value.filter(item => item.formEnum === receiptHeaderForm.purposeTypeEnum) // 盘点仓库列表 @@ -2291,7 +2276,6 @@ function totalQuantityChange(rowData, index, value) { editBatchTransfer(index); } // 切换仓库类型获取药房/药库列表 目的仓库切换 -<<<<<<< HEAD function handleChangePurposeTypeEnum(value,type) { // 确保value是数字类型 const numValue = Number(value); @@ -2315,26 +2299,6 @@ function handleChangePurposeTypeEnum(value,type) { console.error('获取仓库列表失败:', error); purposeTypeListOptions.value = []; freightListOptions.value = []; -======= -function handleChangePurposeTypeEnum(value, type) { - if (value == 16) { - getPharmacyList().then((res) => { - purposeTypeListOptions.value = res.data; - if (!route.query.supplyBusNo && !type) { - receiptHeaderForm.purposeLocationId = ''; - receiptHeaderForm.purposeLocationId1 = ''; - } - // getinitValue() - }); - } else if (value == 11) { - getDispensaryList().then((res) => { - purposeTypeListOptions.value = res.data; - if (!route.query.supplyBusNo && !type) { - receiptHeaderForm.purposeLocationId = ''; - receiptHeaderForm.purposeLocationId1 = ''; - } - // getinitValue() ->>>>>>> upstream/develop }); } else if (numValue === 17) { // 处理耗材库类型