xiaochan 1 yıl önce
ebeveyn
işleme
5e12ebe622

+ 1 - 1
src/components/zhu-yuan-yi-sheng/emr/emr-template/comp/PatientHistoryData.vue

@@ -51,7 +51,7 @@ const nodeClick = (data) => {
       </el-input>
     </template>
     <template #content>
-      <el-tree-v2 :data="props.data"
+      <el-tree :data="props.data"
                   ref="treeRef"
                   class='down-tree'
                   @nodeClick="nodeClick"

+ 1 - 3
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/EmrMain.vue

@@ -128,9 +128,7 @@
         <EmrSidebar
             ref="emrSidebarRef"
             :height="height"
-            :doctor-grade="doctorLevel"
-            :patientData="patientData"/>
-
+            :doctor-grade="doctorLevel"/>
         <div class="emr-editor">
           <CyFlex content-size>
             <template #header>

+ 10 - 11
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/components/EmrSidebar.tsx

@@ -16,12 +16,17 @@ import {
     getPastHistory,
     getPatientDataTree, whetherItExistsInTheDepartment
 } from "@/api/zhu-yuan-yi-sheng/emr-patient";
-import {Document, Folder} from "@element-plus/icons-vue";
+import {
+    Document,
+    Folder
+} from "@element-plus/icons-vue";
 import './emr-css.scss'
 import {
     canIUnlockIt,
-    emrConfig, emrMitt,
-    patientInfo, unlockEnum
+    emrConfig,
+    emrMitt,
+    patientInfo,
+    unlockEnum
 } from "@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/emr-init";
 import {isDev} from "@/utils/public";
 import {userInfoStore} from "@/utils/store-public";
@@ -29,7 +34,6 @@ import {getAllWards} from "@/api/zhu-yuan-yi-sheng/resident-doctor";
 import {BizException, ExceptionEnum} from "@/utils/BizException";
 import PatientEmrData from "@/components/zhu-yuan-yi-sheng/emr/emr-template/comp/PatientEmrData.vue";
 import PatientHistoryData from "@/components/zhu-yuan-yi-sheng/emr/emr-template/comp/PatientHistoryData.vue";
-import useFillHeight from "@/utils/useFillHeight";
 import CyFlex from "@/components/cy/flex/src/CyFlex.vue";
 
 const defaultProps = {
@@ -49,8 +53,6 @@ const HospitalTemplate = defineComponent({
     setup(props, {emit}) {
         const inputValue = ref('')
         const treeRef = useCompRef(ElTreeV2)
-        const divRef = ref()
-        const inputRef = ref()
 
         function filterMethod(query: string, node: TreeNodeData) {
             return node.name!.includes(query)
@@ -84,7 +86,6 @@ const HospitalTemplate = defineComponent({
                     {{
                         header: () => (
                             <ElInput
-                                ref={inputRef}
                                 modelValue={inputValue.value}
                                 onUpdate:modelValue={(value) => {
                                     inputValue.value = value
@@ -131,9 +132,7 @@ const HospitalTemplate = defineComponent({
 const emrSidebar = defineComponent({
     name: 'EmrSidebar',
     props: {
-        patientData: {
-            type: Object,
-        },
+
         doctorGrade: {
             type: Number,
         },
@@ -202,7 +201,7 @@ const emrSidebar = defineComponent({
 
         const determineWhetherItCanBeCreated = () => {
             // @ts-ignore
-            if (userInfoStore.value.code === props.patientData['管床医生编码'] || props!.doctorGrade > 1) {
+            if (userInfoStore.value.code === patientInfo.value.referPhysician || props!.doctorGrade > 1) {
                 return true;
             }
             return wardList.includes(patientInfo.value.ward);

+ 0 - 1
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/force-refresh-func.ts

@@ -1,4 +1,3 @@
-import {isDev} from "../../../../../utils/public";
 import {ref} from "vue";
 import requestV2 from "../../../../../utils/request-v2";