提交merge1.3

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue

@@ -164,11 +164,7 @@
 
 <script setup>
 import { getPrescriptionList, adviceExecute, adviceCancel, medicineSummary } from './api';
-<<<<<<< HEAD
-import { patientInfoList } from '../store/patient.js';
-=======
 import { patientInfoList } from '../../components/store/patient.js';
->>>>>>> v1.3
 import { formatDate, formatDateStr } from '@/utils/index';
 import { ref, getCurrentInstance } from 'vue';
 import useUserStore from '@/store/modules/user';
@@ -207,58 +203,6 @@ function handleGetPrescription() {
       therapyEnum: therapyEnum.value,
       exeStatus: props.exeStatus,
       requestStatus: props.requestStatus,
-<<<<<<< HEAD
-    }).then((res) => {
-      // try {
-      // 根据encounterId分组
-      const groupedPrescriptions = res.data.records.reduce((groups, prescription) => {
-        let times = new Set();
-        let rate = {};
-        let checkedRates = {};
-        // 汇总时间点 默认全部汇总
-        prescription.dispenseIds = [];
-        prescription.medicineSummaryParamList.forEach((item) => {
-          // 已汇总的时间点不需要显示
-          if (item.dispenseStatus != 8) {
-            prescription.dispenseIds.push({
-              dispenseId: item.dispenseId,
-              receiverId: userStore.id,
-            });
-
-            // 将全部的时间点拆分 把日期去重，页面显示示例 05-15 [01:30 02:30 03:30]
-            let time = item.dispenseTime.substring(5, 10);
-            let rateTime = item.dispenseTime.substring(11, 16);
-            times.add(time);
-            rate[time] = rate[time] || [];
-            rate[time].push({ rate: rateTime, dispenseId: item.dispenseId });
-            checkedRates[time] = checkedRates[time] || [];
-            checkedRates[time].push(rateTime);
-          }
-        });
-
-        prescription.times = Array.from(times);
-        prescription.rate = rate;
-        prescription.checkedRates = checkedRates;
-        // 把相同encounterId的医嘱放在同一个数组中
-        const encounterId = prescription.encounterId;
-        if (!groups[encounterId]) {
-          groups[encounterId] = [];
-        }
-        if (!activeNames.value.includes(encounterId)) {
-          activeNames.value.push(encounterId);
-        }
-        groups[encounterId].push(prescription);
-        return groups;
-      }, {});
-
-      // 将分组结果转换为数组形式
-      prescriptionList.value = Object.values(groupedPrescriptions);
-      loading.value = false;
-      // } catch {
-      //   loading.value = false;
-      // }
-    });
-=======
     })
       .then((res) => {
         // try {
@@ -319,7 +263,6 @@ function handleGetPrescription() {
             next({ path: '/' });
           });
       });
->>>>>>> v1.3
     chooseAll.value = false;
   } else {
     prescriptionList.value = [];
@@ -391,8 +334,4 @@ defineExpose({
   font-size: 15px;
   font-weight: 500;
 }
-<<<<<<< HEAD
 </style>
-=======
-</style>
->>>>>>> v1.3

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/summaryMedicineList.vue

@@ -49,11 +49,7 @@
 
 <script setup>
 import { getMedicineSummary, getMedicineSummaryDetail } from './api';
-<<<<<<< HEAD
-import { patientInfoList } from '../store/patient.js';
-=======
 import { patientInfoList } from '../../components/store/patient.js';
->>>>>>> v1.3
 import { ref, getCurrentInstance } from 'vue';
 
 const medicineSummaryFormList = ref([]);

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue

@@ -6,17 +6,6 @@
           height: 40px;
           display: flex;
           align-items: center;
-<<<<<<< HEAD
-          justify-content: flex-end;
-          border-bottom: solid 2px #e4e7ed;
-        "
-      >
-        <el-icon
-          @click="refresh"
-          class="refresh-icon"
-          style="cursor: pointer; font-size: 20px; margin-right: 10px"
-        >
-=======
           justify-content: space-between;
           border-bottom: solid 2px #e4e7ed;
           padding: 0 10px;
@@ -26,7 +15,6 @@
           <ArrowLeft />
         </el-icon> -->
         <el-icon @click="refresh" class="refresh-icon" style="cursor: pointer; font-size: 20px">
->>>>>>> v1.3
           <Refresh />
         </el-icon>
       </div>
@@ -34,39 +22,6 @@
         <el-tab-pane label="在科" name="first" style="padding: 15px 10px">
           <PatientList />
         </el-tab-pane>
-<<<<<<< HEAD
-        <el-tab-pane label="转科" name="second" style="padding: 0 10px">
-          <PatientList />
-        </el-tab-pane>
-      </el-tabs>
-    </div>
-    <div style="width: 100%">
-      <div
-        style="
-          height: 40px;
-          display: flex;
-          align-items: center;
-          border-bottom: solid 2px #e4e7ed;
-          padding: 0 15px;
-          background: linear-gradient(90deg, #f0f8ff, #e6f7ff);
-        "
-      >
-        <div class="nav-button-group">
-          <el-button
-            v-for="nav in navigationButtons"
-            :key="nav.path"
-            :type="currentRoute.path === nav.path ? 'primary' : 'default'"
-            size="small"
-            @click="navigateTo(nav.path)"
-            class="nav-button"
-            :class="{ 'active-nav': currentRoute.path === nav.path }"
-          >
-            <el-icon v-if="nav.icon"><component :is="nav.icon" /></el-icon>
-            <span>{{ nav.label }}</span>
-          </el-button>
-        </div>
-      </div>
-=======
         <!-- 隐藏转科列表 
         <el-tab-pane label="转科" name="second" style="padding: 0 10px">
           <PatientList />
@@ -76,7 +31,6 @@
     </div>
     <div style="width: 100%">
       <!-- <NurseNavBar :navs="navigationButtons" /> -->
->>>>>>> v1.3
       <div
         style="
           height: 50px;
@@ -148,16 +102,6 @@
 
 <script setup>
 import { getCurrentInstance, ref } from 'vue';
-<<<<<<< HEAD
-import { useRoute, useRouter } from 'vue-router';
-import PatientList from './components/patientList.vue';
-import PrescriptionList from './components/prescriptionList.vue';
-import SummaryMedicineList from './components/summaryMedicineList.vue';
-
-const { proxy } = getCurrentInstance();
-const router = useRouter();
-const currentRoute = useRoute();
-=======
 import { useRouter } from 'vue-router';
 import PatientList from '../components/patientList.vue';
 import NurseNavBar from '../components/NurseNavBar.vue';
@@ -167,7 +111,6 @@ import { inpatientNurseNavs } from '../constants/navigation';
 
 const { proxy } = getCurrentInstance();
 const router = useRouter();
->>>>>>> v1.3
 
 const activeName = ref('preparation');
 const active = ref('first');
@@ -181,53 +124,7 @@ const isDetails = ref('1');
 // 存储子组件引用的对象
 const prescriptionRefs = ref();
 
-<<<<<<< HEAD
-// 导航按钮配置
-const navigationButtons = ref([
-  {
-    label: '入出转',
-    path: '/inHospital/statistics/inOut',
-    icon: 'Document',
-  },
-  {
-    label: '护理记录',
-    path: '/inHospital/statistics/nursingRecord',
-    icon: 'MedicineBox',
-  },
-  {
-    label: '三测单',
-    path: '/inHospital/statistics/tprChart',
-    icon: 'List',
-  },
-  {
-    label: '医嘱执行',
-    path: '/inHospital/statistics/medicalOrderExecution',
-    icon: 'Back',
-  },
-  {
-    label: '医嘱校对',
-    path: '/inHospital/statistics/medicalOrderProofread',
-    icon: 'Back',
-  },
-  {
-    label: '汇总发药申请',
-    path: '/inHospital/statistics/drugDistribution',
-    icon: 'Back',
-  },
-  {
-    label: '住院记账',
-    path: '/inHospital/statistics/InpatientBilling',
-    icon: 'Back',
-  },
-]);
-
-// 页面导航方法
-const navigateTo = (path) => {
-  router.push(path);
-};
-=======
 const navigationButtons = inpatientNurseNavs;
->>>>>>> v1.3
 
 // 定义处方列表tabs配置
 const prescriptionTabs = [
@@ -282,13 +179,10 @@ function handleExecute() {
   proxy.$refs['prescriptionRefs'].handleMedicineSummary();
 }
 
-<<<<<<< HEAD
-=======
 function handleBack() {
   router.back();
 }
 
->>>>>>> v1.3
 provide('handleGetPrescription', (value) => {
   prescriptionRefs.value.handleGetPrescription();
 });
@@ -316,31 +210,4 @@ provide('handleGetPrescription', (value) => {
 :deep(.el-tabs__header) {
   margin: 0;
 }
-<<<<<<< HEAD
-
-.nav-button-group {
-  display: flex;
-  gap: 10px;
-}
-
-.nav-button {
-  transition: all 0.3s ease;
-  border-radius: 20px;
-  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
-}
-
-.nav-button:hover {
-  transform: translateY(-2px);
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
-}
-
-.nav-button.active-nav {
-  box-shadow: 0 4px 8px rgba(64, 158, 255, 0.3);
-}
-
-.nav-button :deep(.el-icon) {
-  margin-right: 5px;
-}
-=======
->>>>>>> v1.3
 </style>