解决合并冲突

openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue

@@ -21,8 +21,8 @@
             <el-tab-pane label="诊断录入" name="diagnosis">
               <Diagnose ref="diagnosisRef" :patientInfo="patientInfo" />
             </el-tab-pane>
-            <el-tab-pane label="住院病历" name="emr">
-              <emr />
+            <el-tab-pane label="住院病历" name="inhospitalEmr">
+              <Emr  ref="inhospitalEmrRef"/>
             </el-tab-pane>
             <el-tab-pane label="医技报告" name="fourth">Task</el-tab-pane>
             <el-tab-pane label="检验申请" name="test">
@@ -37,6 +37,9 @@
             <el-tab-pane label="输血申请" name="blood">
               <BloodTtransfusionAapplication />
             </el-tab-pane>
+            <el-tab-pane label="护理状态" name="nursing">
+              <NursingStatus />
+            </el-tab-pane>
           </el-tabs>
         </el-main>
       </el-container>
@@ -48,7 +51,7 @@ import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue
 // const { proxy } = getCurrentInstance()
 // const emits = defineEmits([])
 // const props = defineProps({})
-import Emr from "./emr/index.vue";
+import Emr from './emr/index.vue';
 import inPatientBarDoctorFold from '@/components/patientBar/inPatientBarDoctorFold.vue';
 import {
   PatientList,
@@ -58,6 +61,7 @@ import {
   ExamineApplication,
   SurgeryApplication,
   TestApplication,
+  NursingStatus,
 } from './index.js';
 const state = reactive({});
 onBeforeMount(() => {});