提交merge1.3

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

@@ -15,17 +15,7 @@
             <el-tab-pane label="临床医嘱" name="prescription">
               <Advice ref="adviceRef" />
             </el-tab-pane>
-<<<<<<< HEAD
-            <el-tab-pane label="诊断录入" name="diagnosis">
-              <Diagnose ref="diagnosisRef" :patientInfo="patientInfo" />
-            </el-tab-pane>
-            <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="fourth">Task</el-tab-pane> -->
->>>>>>> v1.3
             <el-tab-pane label="检验申请" name="test">
               <TestApplication ref="testApplicationRef" />
             </el-tab-pane>
@@ -38,18 +28,12 @@
             <el-tab-pane label="输血申请" name="blood">
               <BloodTtransfusionAapplication ref="bloodTtransfusionAapplicationRef" />
             </el-tab-pane>
-<<<<<<< HEAD
-            <el-tab-pane label="护理状态" name="nursing">
-              <NursingStatus />
-            </el-tab-pane>
-=======
             <el-tab-pane label="报告查询" name="report">
               <ReportQuery />
             </el-tab-pane>
             <!-- <el-tab-pane label="护理状态" name="nursing">
               <NursingStatus />
             </el-tab-pane> -->
->>>>>>> v1.3
           </el-tabs>
         </el-main>
       </el-container>
@@ -57,15 +41,6 @@
   </div>
 </template>
 <script setup>
-<<<<<<< HEAD
-import { getCurrentInstance, onBeforeMount, onMounted, reactive, ref } from 'vue';
-// const { proxy } = getCurrentInstance()
-// const emits = defineEmits([])
-// const props = defineProps({})
-import Emr from './emr/index.vue';
-import inPatientBarDoctorFold from '@/components/patientBar/inPatientBarDoctorFold.vue';
-=======
->>>>>>> v1.3
 import {
   getCurrentInstance,
   onBeforeMount,
@@ -90,10 +65,7 @@ import {
   SurgeryApplication,
   TestApplication,
   NursingStatus,
-<<<<<<< HEAD
-=======
   ReportQuery,
->>>>>>> v1.3
 } from './index.js';
 const state = reactive({});
 onBeforeMount(() => {});