提交merge1.3

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js

@@ -1,9 +1,4 @@
-<<<<<<< HEAD
-
-import request from '@/utils/request'
-=======
 import request from '@/utils/request';
->>>>>>> v1.3
 // 申请单相关接口
 
 /**
@@ -58,19 +53,6 @@ export function getNursingOrdersInfos() {
 }
 
 /**
-<<<<<<< HEAD
- * 查询护理医嘱信息
- */
-export function getNursingOrdersInfos() {
-  return request({
-    url: '/reg-doctorstation/special-advice/nursing-orders',
-    method: 'get'
-  })
-}
-
-/**
-=======
->>>>>>> v1.3
  * 保存护理医嘱信息
  * @param {Object} data - 护理医嘱数据
  * @param {number} data.encounterId - 就诊id
@@ -87,13 +69,8 @@ export function saveNursingOrders(data) {
   return request({
     url: '/reg-doctorstation/special-advice/nursing-orders',
     method: 'post',
-<<<<<<< HEAD
-    data: data
-  })
-=======
     data: data,
   });
->>>>>>> v1.3
 }
 
 /**
@@ -103,13 +80,8 @@ export function getEncounterNursingOrders(params) {
   return request({
     url: '/reg-doctorstation/special-advice/encounter-nursing-orders',
     method: 'get',
-<<<<<<< HEAD
-    params: params
-  })
-=======
     params: params,
   });
->>>>>>> v1.3
 }
 
 /**

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/nursingStatus.vue

@@ -24,16 +24,12 @@
         <el-table-column prop="item" label="项目" width="180" align="center" />
         <el-table-column prop="currentStatus" label="当前状态" width="260" align="center">
           <template #default="scope">
-<<<<<<< HEAD
-            <el-tag :type="getStatusType(scope.row.currentStatus)" size="small" class="status-tag">
-=======
             <el-tag
               v-if="scope.row.currentStatus"
               :type="getStatusType(scope.row.currentStatus)"
               size="small"
               class="status-tag"
             >
->>>>>>> v1.3
               {{ scope.row.currentStatus }}
             </el-tag>
           </template>
@@ -148,13 +144,8 @@
       </el-table>
       <!-- 操作按钮区域 -->
       <div class="nursing-status-actions">
-<<<<<<< HEAD
-        <el-button @click="handleCancel" size="small">取消</el-button>
-        <el-button type="primary" @click="handleConfirm" size="small">确定</el-button>
-=======
         <el-button @click="handleCancel" size="medium">取消</el-button>
         <el-button type="primary" @click="handleConfirm" size="medium">确定</el-button>
->>>>>>> v1.3
       </div>
     </template>
   </div>
@@ -390,10 +381,6 @@ const fetchNursingStatusData = () => {
       loading.value = false;
 
       if (res.code === 200 && res.data) {
-<<<<<<< HEAD
-        // 填充各列表数据
-        nursingLevelList.value = res.data.nursingList || [];
-=======
         let nursingList = [];
         let nursingOrderNameList = ['I级护理', 'II级护理', 'III级护理', '特级护理'];
         nursingOrderNameList.forEach((str) => {
@@ -405,7 +392,6 @@ const fetchNursingStatusData = () => {
         });
         // 填充各列表数据
         nursingLevelList.value = nursingList || [];
->>>>>>> v1.3
         conditionList.value = res.data.conditionList || [];
         dietList.value = res.data.dietList || [];
         positionList.value = res.data.positionList || [];