Compare commits
7 Commits
bugfix/518
...
4b9553323e
| Author | SHA1 | Date | |
|---|---|---|---|
|
4b9553323e | ||
|
|
c9a158ddee | ||
|
|
a2095775bd | ||
|
|
c6f58596c0 | ||
|
|
4492666008 | ||
|
|
884fe09706 | ||
|
|
94040e68fb |
@@ -8,13 +8,7 @@
|
||||
SELECT drf.id AS request_form_id,
|
||||
drf.encounter_id,
|
||||
drf.prescription_no,
|
||||
COALESCE(
|
||||
(SELECT STRING_AGG(DISTINCT wad.name, '、')
|
||||
FROM wor_service_request wsr2
|
||||
LEFT JOIN wor_activity_definition wad ON wad.id = wsr2.activity_id AND wad.delete_flag = '0'
|
||||
WHERE wsr2.prescription_no = drf.prescription_no AND wsr2.delete_flag = '0'),
|
||||
drf.name
|
||||
) AS name,
|
||||
drf.NAME,
|
||||
drf.desc_json,
|
||||
drf.requester_id,
|
||||
drf.create_time,
|
||||
|
||||
@@ -1034,17 +1034,6 @@ function normalizeSex(value) {
|
||||
return '未知';
|
||||
}
|
||||
|
||||
function normalizeSexFromPatientInfo(patientInfo) {
|
||||
// 优先使用文本字段
|
||||
if (patientInfo.genderEnum_enumText) return patientInfo.genderEnum_enumText;
|
||||
if (patientInfo.genderName) return patientInfo.genderName;
|
||||
if (patientInfo.sex) return normalizeSex(patientInfo.sex);
|
||||
// 使用数字枚举字段
|
||||
if (patientInfo.genderEnum === 1) return '男';
|
||||
if (patientInfo.genderEnum === 2) return '女';
|
||||
return '未知';
|
||||
}
|
||||
|
||||
function normalizeAgeUnit(value) {
|
||||
const ageUnitMap = {
|
||||
1: '岁',
|
||||
@@ -1306,7 +1295,7 @@ async function show(diagnosisData) {
|
||||
patName: patientInfo.patientName || patientInfo.name || '', // 患者姓名
|
||||
parentName: '', // 家长姓名（14岁以下患者必填）
|
||||
idNo: patientInfo.idCard, // 身份证号
|
||||
sex: normalizeSexFromPatientInfo(patientInfo), // 性别
|
||||
sex: patientInfo.sex || patientInfo.genderName || '男', // 性别
|
||||
|
||||
// 出生日期信息
|
||||
birthYear: birthInfo.year, // 出生年份
|
||||
|
||||
@@ -3591,10 +3591,13 @@ async function setValue(row) {
|
||||
prescriptionList.value[rowIndex.value].categoryEnum = 31; // 会诊的category_enum设置为31
|
||||
} else {
|
||||
// 诊疗类型（adviceType == 3）
|
||||
// 🔧 Bug #455: 诊疗项目执行科室强制使用患者就诊科室，
|
||||
// 不使用目录配置的执行科室（可能是错误ID或占位符，导致显示原始ID）
|
||||
prescriptionList.value[rowIndex.value].orgId = props.patientInfo.orgId;
|
||||
prescriptionList.value[rowIndex.value].positionName = findOrgNameById(props.patientInfo.orgId) || props.patientInfo.orgName || '';
|
||||
// 🔧 Bug Fix #238: 诊疗项目默认使用患者就诊科室
|
||||
if (!prescriptionList.value[rowIndex.value].orgId) {
|
||||
prescriptionList.value[rowIndex.value].orgId = props.patientInfo.orgId;
|
||||
}
|
||||
if (!prescriptionList.value[rowIndex.value].positionName) {
|
||||
prescriptionList.value[rowIndex.value].positionName = findOrgNameById(prescriptionList.value[rowIndex.value].orgId) || props.patientInfo.orgName || '';
|
||||
}
|
||||
// 🔧 Bug #218 修复：使用组套中维护的quantity，如果没有则默认1
|
||||
prescriptionList.value[rowIndex.value].quantity = row.quantity || 1;
|
||||
// 🔧 Bug #144 修复：安全访问 priceList，防止 orderDetailInfos 为空时出错
|
||||
|
||||
@@ -1142,8 +1142,7 @@ function submitForm() {
|
||||
// 保存麻醉方式
|
||||
sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
|
||||
open.value = false
|
||||
getList() // 提交成功后直接刷新列表
|
||||
emit('saved') // 通知父组件刷新医嘱列表
|
||||
emit('saved') // 通知父组件刷新医嘱列表及手术申请列表
|
||||
} else {
|
||||
proxy.$modal.msgError(res.msg || '新增手术失败，请检查表单信息')
|
||||
}
|
||||
@@ -1159,8 +1158,7 @@ function submitForm() {
|
||||
// 保存麻醉方式
|
||||
sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
|
||||
open.value = false
|
||||
getList() // 修改成功后直接刷新列表
|
||||
emit('saved') // 通知父组件刷新医嘱列表
|
||||
emit('saved') // 通知父组件刷新医嘱列表及手术申请列表
|
||||
} else {
|
||||
proxy.$modal.msgError(res.msg || '更新手术失败，请检查表单信息')
|
||||
}
|
||||
|
||||
@@ -86,11 +86,7 @@
|
||||
</template>
|
||||
<el-table-column type="index" label="序号" width="60" align="center" />
|
||||
<el-table-column prop="patientName" label="患者姓名" width="120" />
|
||||
<el-table-column label="申请单名称" width="140">
|
||||
<template #default="scope">
|
||||
<span>{{ buildApplicationName(scope.row) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="name" label="申请单名称" width="140" />
|
||||
<el-table-column prop="createTime" label="创建时间" width="160" />
|
||||
<el-table-column prop="prescriptionNo" label="申请单号" width="140" />
|
||||
<el-table-column prop="requesterId_dictText" label="申请者" width="120" />
|
||||
@@ -433,23 +429,6 @@ const parseStatus = (status) => {
|
||||
return statusMap[String(status)] || '-';
|
||||
};
|
||||
|
||||
/**
|
||||
* 根据申请单详情构建申请单名称
|
||||
* 单一项目：显示项目名称
|
||||
* 多个项目：显示首个项目名称+"等X项"
|
||||
*/
|
||||
const buildApplicationName = (row) => {
|
||||
const details = row.requestFormDetailList;
|
||||
if (!details || details.length === 0) {
|
||||
return row.name || '-';
|
||||
}
|
||||
if (details.length === 1) {
|
||||
return details[0].adviceName || row.name || '-';
|
||||
}
|
||||
const first = details[0];
|
||||
return `${first.adviceName || ''}等${details.length}项`;
|
||||
};
|
||||
|
||||
/**
|
||||
* 获取状态标签类型 - 参考临床医嘱样式
|
||||
* @param {string|number} status - 状态码
|
||||
|
||||
@@ -545,7 +545,6 @@ const submit = () => {
|
||||
applicationListAllFilter = applicationListAllFilter.map((item) => {
|
||||
return {
|
||||
adviceDefinitionId: item.adviceDefinitionId,
|
||||
adviceName: item.adviceName,
|
||||
quantity: 1,
|
||||
unitCode: item.priceList[0].unitCode,
|
||||
unitPrice: item.priceList[0].price,
|
||||
|
||||
@@ -19,9 +19,11 @@
|
||||
<el-tab-pane label="检验申请" name="test">
|
||||
<TestApplication ref="testApplicationRef" :show-status-column="true" />
|
||||
</el-tab-pane>
|
||||
```vue
|
||||
<el-tab-pane label="检查申请" name="examine">
|
||||
<ExamineApplication ref="examineApplicationRef" />
|
||||
</el-tab-pane>
|
||||
```
|
||||
<el-tab-pane label="汇总发药申请" name="summaryDrug">
|
||||
<SummaryDrugApplication ref="summaryDrugApplicationRef" />
|
||||
</el-tab-pane>
|
||||
@@ -47,7 +49,6 @@
|
||||
import {computed, onBeforeMount, onMounted, provide, reactive, ref, watch,} from 'vue';
|
||||
|
||||
import Emr from './emr/index.vue';
|
||||
import SummaryDrugApplication from './components/applicationShow/summaryDrugApplication.vue';
|
||||
import inPatientBarDoctorFold from '@/components/patientBar/inPatientBarDoctorFold.vue';
|
||||
import PatientList from '@/components/PatientList/patient-list.vue';
|
||||
import {localPatientInfo, updateLocalPatientInfo} from './store/localPatient';
|
||||
@@ -83,7 +84,6 @@ const currentPatientInfo = ref({});
|
||||
const testApplicationRef = ref();
|
||||
const examineApplicationRef = ref();
|
||||
const surgeryApplicationRef = ref();
|
||||
const summaryDrugApplicationRef = ref();
|
||||
const bloodTtransfusionAapplicationRef = ref();
|
||||
|
||||
// 患者列表相关逻辑
|
||||
|
||||
@@ -251,7 +251,7 @@
|
||||
</div>
|
||||
</el-dialog>
|
||||
<!-- 划价组套选择对话框 -->
|
||||
<el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body :z-index="3000">
|
||||
<el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body>
|
||||
<div style="margin-bottom: 15px; display: flex; align-items: center; gap: 10px">
|
||||
<el-input
|
||||
v-model="groupSetSearchText"
|
||||
|
||||
@@ -534,7 +534,6 @@ const userStore = useUserStore();
|
||||
const openTraceNoDialog = ref(false)
|
||||
const rowData = ref({})
|
||||
const ypName = ref('')
|
||||
const currentIndex = ref(-1)
|
||||
|
||||
const { proxy } = getCurrentInstance();
|
||||
const { warehous_type, category_code, service_type_code, specialty_code, purchase_type } =
|
||||
@@ -1073,6 +1072,13 @@ function onHeaderWarehouseChange() {
|
||||
|
||||
// 选择仓库 / 选药品后拉取该仓库存
|
||||
function handleLocationClick(item, row, index) {
|
||||
getCount({
|
||||
itemId: form.purchaseinventoryList[index].itemId,
|
||||
orgLocationId: form.purchaseinventoryList[index].sourceLocationId,
|
||||
}).then((res) => {
|
||||
if (res.data && res.data.length > 0) {
|
||||
form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || '';
|
||||
form.purchaseinventoryList[index].totalQuantity = res.data[0].orgQuantity || 0;
|
||||
const r = form.purchaseinventoryList[index];
|
||||
let orgLocationId = r.sourceLocationId || receiptHeaderForm.headerLocationId || '';
|
||||
if (!orgLocationId) {
|
||||
@@ -1475,7 +1481,7 @@ function handleScan(row,index){
|
||||
rowData.value = row
|
||||
rowData.value.itemType = receiptHeaderForm.medicationType
|
||||
ypName.value = row.name
|
||||
openTraceNoDialog.value = true;
|
||||
openTraceNoDialog .value = true;
|
||||
currentIndex.value = index
|
||||
}
|
||||
|
||||
@@ -1698,17 +1704,6 @@ const exportRequiredParams = ref({
|
||||
pageSize: 10,
|
||||
busNo: route.query.supplyBusNo
|
||||
});
|
||||
|
||||
// 追溯码对话框提交处理
|
||||
function submit(traceNoData) {
|
||||
if (currentIndex.value >= 0 && form.purchaseinventoryList[currentIndex.value]) {
|
||||
form.purchaseinventoryList[currentIndex.value].traceNo = traceNoData.traceNo;
|
||||
form.purchaseinventoryList[currentIndex.value].ybNo = traceNoData.ybNo;
|
||||
proxy.$message.success('追溯码保存成功');
|
||||
}
|
||||
openTraceNoDialog.value = false;
|
||||
}
|
||||
|
||||
function handleExport() {
|
||||
proxy.downloadGet(
|
||||
'/issue-manage/requisition/excel-out',
|
||||
|
||||
Reference in New Issue
Block a user