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

提交merge1.3

Browse Source
This commit is contained in:
chenqi
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
View File

@@ -8,14 +8,38 @@
<el-button icon="Search" @click="queryDiagnosisUse" />
</template>
</el-input>
<<<<<<< HEAD
<el-tree ref="treeRef" :data="tree" node-key="id" :props="{ label: 'name', children: 'children' }"
highlight-current default-expand-all :filter-node-method="filterNode" @node-click="handleNodeClick">
=======
<el-tree
ref="treeRef"
:data="tree"
node-key="id"
:props="{ label: 'name', children: 'children' }"
highlight-current
default-expand-all
:filter-node-method="filterNode"
class="tree-with-scrollbar"
@node-click="handleNodeClick"
max-height="650"
>
>>>>>>> v1.3
<template #default="{ node, data }">
<div class="custom-tree-node">
<span>{{ node.label }}</span>
<span class="tree-node-actions">
<template v-if="node.level === 1 && data.name != '常用' && data.name != '历史'">
<<<<<<< HEAD
<el-button style="color: #000000" type="text" size="small" @click.stop="addChild(data)">
=======
<el-button
style="color: #000000"
type="text"
size="small"
@click.stop="addChild(data)"
>
>>>>>>> v1.3
<el-icon>
<Plus />
</el-icon>
@@ -24,11 +48,25 @@
<el-popconfirm width="200" :hide-after="10" title="确认删除此常用诊断吗" placement="top-start"
@confirm="deleteChild(data)">
<template #reference>
<<<<<<< HEAD
<el-button style="color: #000000" v-if="
node.level === 2 &&
node.parent.data.name != '常用' &&
node.parent.data.name != '历史'
" type="text" size="small" @click.stop="">
=======
<el-button
style="color: #000000"
v-if="
node.level === 2 &&
node.parent.data.name != '常用' &&
node.parent.data.name != '历史'
"
type="text"
size="small"
@click.stop=""
>
>>>>>>> v1.3
<el-icon>
<Minus />
</el-icon>
@@ -46,6 +84,9 @@
<el-button type="primary" plain @click="handleSaveDiagnosis()"> 保存诊断 </el-button>
<el-button type="primary" plain @click="handleAddTcmDiagonsis()"> 中医诊断 </el-button>
<el-button type="primary" plain @click="handleImport()"> 导入慢性病诊断 </el-button>
<span style="font-size: 12px; margin-left: 10px"
>注意 : 若使用电子处方，请不要导入慢性病诊断</span
>
</div>
<el-form :model="form" :rules="rules" ref="formRef">
@@ -76,9 +117,24 @@
<el-table-column label="诊断名称" align="center" prop="name">
<template #default="scope">
<el-form-item :prop="`diagnosisList.${scope.$index}.name`" :rules="rules.name">
<<<<<<< HEAD
<el-popover :popper-style="{ padding: '0' }" placement="bottom-start" :visible="scope.row.showPopover"
trigger="manual" :width="800">
<diagnosislist :diagnosisSearchkey="diagnosisSearchkey" @selectDiagnosis="handleSelsectDiagnosis" />
=======
<el-popover
:popper-style="{ padding: '0' }"
placement="bottom-start"
:visible="scope.row.showPopover"
trigger="manual"
:width="800"
>
<diagnosislist
:diagnosisSearchkey="diagnosisSearchkey"
@selectDiagnosis="handleSelsectDiagnosis"
/>
>>>>>>> v1.3
<template #reference>
<el-input v-model="scope.row.name" placeholder="请选择诊断" @input="handleChange"
@focus="handleFocus(scope.row, scope.$index)" @blur="handleBlur(scope.row)" />
@@ -87,11 +143,17 @@
</el-form-item>
</template>
</el-table-column>
<<<<<<< HEAD
<el-table-column label="诊断医生" align="center" prop="diagnosisDoctor" width="120" />
<el-table-column label="诊断时间" align="center" prop="diagnosisTime" width="150" />
<el-table-column label="诊断代码" align="center" prop="ybNo" width="180" />
<el-table-column label="诊断类型" align="center" prop="maindiseFlag" width="120">
=======
<el-table-column label="医保码" align="center" prop="ybNo" width="180" />
<el-table-column label="类别" align="center" prop="typeName" width="100" />
<el-table-column label="诊断类型" align="center" prop="maindiseFlag">
>>>>>>> v1.3
<template #default="scope">
<div style="display:flex;flex-direction:column;align-items:center;gap:5px;">
<el-checkbox
@@ -130,9 +192,23 @@
</el-form>
</el-col>
</el-row>
<<<<<<< HEAD
<diagnosisdialog :openDiagnosis="openDiagnosis" @close="closeDiagnosisDialog" :radio="orgOrUser" />
<AddDiagnosisDialog :openAddDiagnosisDialog="openAddDiagnosisDialog" :patientInfo="props.patientInfo"
@close="closeDiagnosisDialog" />
=======
<diagnosisdialog
:openDiagnosis="openDiagnosis"
@close="closeDiagnosisDialog"
:radio="orgOrUser"
/>
<AddDiagnosisDialog
:openAddDiagnosisDialog="openAddDiagnosisDialog"
:updateZy="updateZy"
:patientInfo="props.patientInfo"
@close="closeDiagnosisDialog"
/>
>>>>>>> v1.3
</div>
</template>
@@ -155,10 +231,12 @@ import {
import diagnosisdialog from '../diagnosis/diagnosisdialog.vue';
import AddDiagnosisDialog from './addDiagnosisDialog.vue';
import diagnosislist from '../diagnosis/diagnosislist.vue';
import { onMounted, onBeforeUnmount } from 'vue';
// const diagnosisList = ref([]);
const allowAdd = ref(false);
const tree = ref([]);
const openDiagnosis = ref(false);
const updateZy = ref([]);
const openAddDiagnosisDialog = ref(false);
const diagnosisSearchkey = ref('');
const diagnosisOptions = ref([]);
@@ -167,6 +245,7 @@ const diagnosis = ref();
const orgOrUser = ref();
const form = ref({
diagnosisList: [],
isDataLoaded: false,
});
const props = defineProps({
patientInfo: {
@@ -203,7 +282,12 @@ function getDetail(encounterId) {
});
}
function refreshData() {
getList();
}
let maxNo = 99;
function getList() {
<<<<<<< HEAD
if (!props.patientInfo || !props.patientInfo.encounterId) {
console.warn('患者就诊信息不完整，无法获取诊断数据');
return;
@@ -242,6 +326,43 @@ function getList() {
}
});
=======
getEncounterDiagnosis(props.patientInfo.encounterId)
.then((res) => {
if (res.code == 200) {
form.value.diagnosisList = res.data;
emits('diagnosisSave', false);
}
maxNo = form.value.diagnosisList.length;
})
.then(() => {
getTcmDiagnosis({ encounterId: props.patientInfo.encounterId }).then((res) => {
if (res.code == 200) {
if (res.data.illness.length > 0) {
res.data.illness.forEach((item, index) => {
if (item.diagSrtNo <= maxNo) {
return;
}
form.value.diagnosisList.push({
name: item.name + '-' + res.data.symptom[index].name,
diagSrtNo: item.diagSrtNo,
ybNo: item.ybNo,
medTypeCode: item.medTypeCode,
syndromeGroupNo: item.syndromeGroupNo,
typeName: '中医诊断',
updateId:item.encounterDiagnosisId+'-'+res.data.symptom[index].encounterDiagnosisId,
illnessDefinitionId : item.definitionId,
symptomDefinitionId : res.data.symptom[index].definitionId,
symptomYbNo: res.data.symptom[index].ybNo,
});
maxNo = item.diagSrtNo;
});
}
emits('diagnosisSave', false);
}
});
});
>>>>>>> v1.3
getTree();
}
@@ -366,6 +487,7 @@ function getTree() {
function handleAddDiagnosis() {
proxy.$refs.formRef.validate((valid) => {
if (valid) {
<<<<<<< HEAD
if (!allowAdd.value) {
proxy.$modal.msgWarning('请先填写病历');
return;
@@ -375,6 +497,12 @@ function handleAddDiagnosis() {
? Math.max(...form.value.diagnosisList.map(item => item.diagSrtNo || 0))
: 0;
=======
// if (!allowAdd.value) {
// proxy.$modal.msgWarning('请先填写病历');
// return;
// }
>>>>>>> v1.3
form.value.diagnosisList.push({
showPopover: false,
name: undefined,
@@ -399,6 +527,7 @@ function handleAddDiagnosis() {
// 添加中医诊断
function handleAddTcmDiagonsis() {
updateZy.value = [];
openAddDiagnosisDialog.value = true;
}
@@ -414,6 +543,11 @@ function handleDeleteDiagnosis(row, index) {
getTree();
}
});
} else if (row.syndromeGroupNo) {
deleteTcmDiagnosis(row.syndromeGroupNo).then(() => {
getList();
getTree();
});
} else {
form.value.diagnosisList.splice(index, 1);
// 删除后不重新计算排序号，保持用户设置的排序不变
@@ -487,9 +621,9 @@ function closeDiagnosisDialog(str) {
if (str === 'success') {
proxy.$modal.msgSuccess('操作成功');
}
openAddDiagnosisDialog.value = false;
openDiagnosis.value = false;
getList();
getTree();
}
@@ -509,8 +643,24 @@ function handleSelsectDiagnosis(row) {
}
/**获取焦点时 打开列表 */
function handleFocus(row, index) {
rowIndex.value = index;
row.showPopover = true;
if(row.typeName==='中医诊断'){
updateZy.value = [];
updateZy.value.push({
illnessDefinitionId: row.illnessDefinitionId,
symptomDefinitionId: row.symptomDefinitionId,
syndromeGroupNo: row.syndromeGroupNo,
symptomYbNo:row.symptomYbNo,
ybNo:row.ybNo,
updateId: row.updateId,
diagSrtNo: row.diagSrtNo,
name:row.name,
});
openAddDiagnosisDialog.value = true;
}else{
rowIndex.value = index;
row.showPopover = true;
}
}
/**失去焦点时 关闭列表 */
function handleBlur(row) {
@@ -524,10 +674,10 @@ function handleNodeClick(data) {
// 如果是根节点，不执行任何操作
return;
}
if (!allowAdd.value) {
proxy.$modal.msgWarning('请先填写病历');
return;
}
// if (!allowAdd.value) {
// proxy.$modal.msgWarning('请先填写病历');
// return;
// }
const isDuplicate = form.value.diagnosisList.some(
(diagnosis) => diagnosis.ybNo === data.ybNo || diagnosis.name === data.name
);
@@ -567,7 +717,14 @@ defineExpose({ getList, getDetail, handleSaveDiagnosis });
.el-checkbox.is-bordered.el-checkbox--small {
background-color: #ffffff;
}
<<<<<<< HEAD
=======
.tree-with-scrollbar {
max-height: 650px;
overflow-y: auto;
}
>>>>>>> v1.3
.custom-tree-node {
display: flex;
align-items: center;