优化代码

src/api/inpatient/xiang-mu-lu-ru.js

@@ -109,15 +109,6 @@ export function getBingQuDuiYingKeShi(ward) {
         params: {ward},
     })
 }
-
-export function cheXiaoTuiFei(inpatientNo, admissTimes, ledger, detailSn) {
-    return request({
-        url: '/xmlr/cheXiaoTuiFei',
-        method: 'get',
-        params: {inpatientNo, admissTimes, ledger, detailSn},
-    })
-}
-
 export function weiGuiFeiYongFenXi(inpatientNo, execUnit) {
     return request({
         url: '/xmlr/weiGuiFeiYongFenXi',

src/components/inpatient/XiangMuLuRu.vue

@@ -164,23 +164,6 @@
                   </span>
                 </template>
               </el-table-column>
-              <el-table-column v-if="quanXian.indexOf(1) > -1 || quanXian.indexOf(35) > -1" label="撤销退费">
-                <template #default="scope">
-                  <el-popconfirm
-                      v-if="scope.row.oriDetailSn !== -1 && scope.row.transFlagYb === '0' && (quanXian.indexOf(1) > -1 || quanXian.indexOf(35) > -1)"
-                      cancel-button-text="取消"
-                      confirm-button-text="确认"
-                      icon="Info"
-                      iconColor="red"
-                      title="是否删除该数据"
-                      @confirm="cheXiaoTuiFeiClick(scope.$index, scope.row)"
-                  >
-                    <template #reference>
-                      <el-button type="danger">撤销</el-button>
-                    </template>
-                  </el-popconfirm>
-                </template>
-              </el-table-column>
             </el-table>
             <el-pagination
                 :current-page="patient.currentPage"
@@ -378,14 +361,12 @@ import store from '@/store'
 import {costState, cptSex, conversionRefundFlag} from '@/utils/computed'
 import {shortcuts} from '@/data/shortcuts'
 import {
-  cheXiaoTuiFei,
   getChargeCode,
   getHuanZheFeiYong,
   getPyCode,
   queryDanGeXiangMu,
   shangChuanMuBan,
   xiangMuFeiYongShangChuan,
-  xiangMuTuiFei,
   xiuGaiZiFeiBiaoZhi,
 } from '@/api/inpatient/xiang-mu-lu-ru'
 import {ElMessage, ElMessageBox} from 'element-plus'
@@ -401,13 +382,6 @@ import Sleep from "@/utils/sleep";
 import RefundForProjectEntry from "@/components/med-tec-mod/RefundForProjectEntry";
 import XcComboGrid from "@/components/xiao-chan/combo-grid/XcComboGrid.vue";
 
-const props = defineProps({
-  init: {
-    type: Number,
-    default: -1,
-  },
-})
-
 const emit = defineEmits(['close-xmlr'])
 
 const windowSize = store.state.app.windowSize
@@ -421,10 +395,7 @@ const zhiXingKeShi = ref('')
 const dateRange = ref([])
 // DESC 降 ASC 升
 const riQiPaiXu = ref('DESC')
-
-const quanXian = store.state.user.info.roles
 const activeName = ref('1')
-
 const feiYongLeiXingCode = ref(0)
 
 /**
@@ -469,11 +440,7 @@ const chaXunHuanZheXinXi = () => {
   getPatientInfo(inpatientNo.value)
       .then((res) => {
         patient.value = res
-        patient.value.currentPage = 1
-        patient.value.pageSize = 40
-        patient.value.total = 0
-        patient.value.orderNo = 2
-        patient.value.deptCode = store.state.user.info.deptCode
+        setDefault()
         queryFeiYong()
         if (patient.value.ward === store.state.user.info.deptCode) {
           panDuanSFTongGuoBingShiJinRu.value = true
@@ -488,14 +455,6 @@ const chaXunHuanZheXinXi = () => {
       })
 }
 
-const encodingIsChanged = () => {
-  if (patient.value.chargeCode) {
-    dateRange.value = [];
-    patient.value.orderNo = 2;
-    patient.value.tuiFeiFlag = 3
-  }
-}
-
 const total = ref(0)
 const elTableRef = ref()
 /**
@@ -615,25 +574,6 @@ const xiangMuTuiFeiClick = () => {
   }
 }
 
-
-const confirmRefund = () => {
-  if (feiYongLeiXingCode.value === 1) {
-    if (!patient.value.groupNo) {
-      ElMessage.error('请先选择药房。')
-      return
-    }
-  }
-  xiangMuTuiFei(patient.value).then((res) => {
-    queryFeiYong()
-    refundConfirmation.dialog = false
-  })
-}
-
-const cheXiaoTuiFeiClick = (index, row) => {
-  cheXiaoTuiFei(row.inpatientNo, row.admissTimes, row.ledgerSn, row.detailSn).then(() => {
-  })
-}
-
 //////////////////////////////////// 以上全部是 已录入项目 //////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -654,9 +594,6 @@ const xuanZeXiangMuTable = (param) => {
   }
 }
 
-const muBanCurrentPage = ref(1)
-
-
 /**
  * 删除项目
  */
@@ -835,33 +772,35 @@ const guanBiDialog = () => {
   emit('close-xmlr')
 }
 
+/**
+ * 设置患者默认值
+ */
+const setDefault = () => {
+  patient.value.currentPage = 1
+  patient.value.pageSize = 40
+  patient.value.total = 0
+  patient.value.tuiFeiFlag = 3
+  patient.value.orderNo = 2
+  patient.value.deptCode = store.state.user.info.deptCode
+  zhiXingKeShi.value = patient.value.zkWard
+}
+
 onMounted(() => {
   if (!baseinfo().inpatientNo) {
-    patient.value.currentPage = 1
-    patient.value.pageSize = 40
-    patient.value.total = 0
-    patient.value.tuiFeiFlag = 3
-    patient.value.orderNo = 2
-    patient.value.deptCode = store.state.user.info.deptCode
-    zhiXingKeShi.value = patient.value.zkWard
     jinRuPanDuanSFXieDaiHuanZheXinXi()
   } else {
     patient.value = clone(baseinfo())
-    patient.value.currentPage = 1
-    patient.value.pageSize = 40
-    patient.value.total = 0
-    patient.value.tuiFeiFlag = 3
-    patient.value.orderNo = 2
-    patient.value.deptCode = store.state.user.info.deptCode
     panDuanSFTongGuoBingShiJinRu.value = true
-    zhiXingKeShi.value = patient.value.zkWard
     queryFeiYong()
   }
+  setDefault()
+
   getDept().then((res) => {
     deptData.value = res
   })
 })
 
+
 const xieGaiZhiXingKeShi = () => {
   for (let i = 0; i < muBanNeiRongData.value.length; i++) {
     muBanNeiRongData.value[i].deptCode = zhiXingKeShi.value

src/components/med-tec-mod/RefundForProjectEntry.vue

@@ -104,7 +104,7 @@ const props = defineProps({
   }
 })
 
-const emit = defineEmits(['uncheck', 'update:modelValue', 'refreshFee', 'popUpTheDrugRefundBox'])
+const emit = defineEmits(['uncheck', 'update:modelValue', 'refreshFee'])
 
 let chargeAmount = $ref(0)
 let chargeFee = $ref(0)
@@ -126,9 +126,6 @@ const confirmRefund = (flag) => {
     xiangMuTuiFei(props.patient).then((res) => {
       emit('refreshFee')
       emit('update:modelValue', false)
-      if (isDrugWithdrawal) {
-        emit('popUpTheDrugRefundBox')
-      }
     })
   }).catch(() => {
 

src/components/medical-insurance/medicine-return-order/GenerateMedicineReturnOrder.vue

@@ -25,7 +25,6 @@
       <el-button type="primary" icon="Printer" @click="printThePrescription">打印</el-button>
     </div>
 
-
     <div style="display: flex">
       <div style="flex: 1">
         <div v-for="(value,key) in pageNoList"
@@ -98,7 +97,7 @@ import {
   getPrescription
 } from "@/api/inpatient/xiang-mu-lu-ru";
 import {BizException, ExceptionEnum} from "@/utils/BizException";
-import {listIsBlank} from "@/utils/blank-utils";
+import {listIsBlank, stringIsBlank} from "@/utils/blank-utils";
 import {getLodop, initLodop} from "@/utils/c-lodop";
 import {clone} from "@/utils/clone";
 
@@ -114,10 +113,13 @@ let groupNo = $ref('73')
 
 const submit = () => {
   let dateS = getDateRangeFormatDate(dateRange.value)
+  if (stringIsBlank(dateS.startTime)) {
+    BizException(ExceptionEnum.MESSAGE_ERROR, "时间不能为空。")
+  }
   getNoMedicineReturnOrderGenerated(dateS.startTime, dateS.endTime, groupNo).then((res) => {
     data.notGenerated = res
     data.pageNo = null
-  })
+  });
 }
 
 const dateRangeChange = () => {

src/layout/HeaderV2/Notice.vue

@@ -34,6 +34,7 @@ import {onMounted, ref} from 'vue'
 import sleep from "@/utils/sleep";
 import {setCallback} from '@/utils/websocket'
 import store from '@/store'
+import {isDev} from '@/utils/public'
 
 const isShow = ref(false)
 const displaySeconds = 1000 * 2
@@ -78,9 +79,25 @@ const mouseEvent = (flag) => {
   isMouse.value = flag
 }
 
+const test = () => {
+  if (isDev) {
+    let value = {
+      avatar: 'asd',
+      deptName: '测试',
+      name: '测试发送',
+      msg: '阿三发射点',
+      title: 'title',
+      countDown: 2,
+    }
+    queue.enqueue(value)
+    fillData()
+  }
+}
+
 // 是否开启显示通知
 let open = true
 onMounted(() => {
+  // test()
   setCallback('avatarNotification', async (value) => {
     let newCount = store.state.app.unreadMessageCount + value.count
     store.commit('app/setUnreadMessageCount', newCount)
@@ -133,7 +150,7 @@ $img_size: 50px;
   height: $height;
   left: 50%;
   top: 2%;
-  margin-left: -$width / 2;
+  margin-left: (-$width/2);
   border-radius: 5px;
   display: flex;
   align-items: center;

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/EmrMain.vue

@@ -198,7 +198,7 @@
               <el-button-group>
                 <el-popover
                     :width="0"
-                    trigger="click">
+                    trigger="hover">
                   <template #reference>
                     <el-button title="无序列表">
                       <i class="iconfont icon-wuxuliebiao"></i>
@@ -208,7 +208,7 @@
                 </el-popover>
                 <el-popover
                     :width="0"
-                    trigger="click">
+                    trigger="hover">
                   <template #reference>
                     <el-button title="有序列表">
                       <i class="iconfont icon-youxuliebiao"></i>

src/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng.js

@@ -6,6 +6,7 @@ import {BizException, ExceptionEnum} from "@/utils/BizException";
 import {ref} from "vue";
 import {getServerDateApi} from "@/api/public-api";
 import {getFormatDatetime} from "@/utils/date";
+import {isDev} from "@/utils/public";
 
 // 患者信息
 export const huanZheXinXi = ref({})
@@ -63,7 +64,6 @@ export function shouShuDengJi(val) {
 }
 
 export let zkList = ref([])
-let isDev = import.meta.env.VITE_BASE_URL !== 'http://172.16.32.160:8706'
 // 医嘱查询条件
 export const queryParam = ref({
     displayRange: 0,

src/views/medical-insurance/inpatient/AdmRegistration.vue

@@ -236,7 +236,10 @@
     <Assignmentinfo v-if="showAssigninfo" :admdvs="patient.admdvs" :social-no="patient.socialNo"
                     @close="showAssigninfo = false"/>
   </div>
-  <el-dialog v-model="openXmlr" :fullscreen="true" destroy-on-close title="项目录入" @close="openXmlr = false">
+  <el-dialog v-model="openXmlr"
+             :fullscreen="true"
+             destroy-on-close
+             title="项目录入">
     <Xmlr @closeXmlr="openXmlr = false"/>
   </el-dialog>
   <el-dialog v-model="showSearchSpecialDiag" :close-on-click-modal="false" title="医保患者病种录入" width="60%">