ソースを参照

删除没用的东西,医技切换调用的地址

xiaochan 2 年 前
コミット
fe89571ebb

+ 1 - 1
.env.production

@@ -1,5 +1,5 @@
 ENV = 'production'
 
-VITE_BASE_URL = 'http://172.16.32.160:8706'
+VITE_BASE_URL = 'http://172.16.32.160:8077'
 VITE_SOCKET_URL = 'ws://172.16.32.160:8707/websocket/'
 VITE_EMR_CONTROL_URL = '172.16.32.160:9227'

+ 0 - 8
src/api/querydata/consumables-statistics.js

@@ -14,11 +14,3 @@ export function getDropdownBox() {
     method: 'get',
   })
 }
-
-export function chaKanXiangMuHuoYaoPin(data) {
-  return request({
-    url: '/consumablesStatistics/chaKanXiangMuHuoYaoPin',
-    method: 'post',
-    data,
-  })
-}

+ 4 - 2
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/yz-edit/YzEditor.vue

@@ -326,9 +326,11 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
     qingKong()
     return BizException(ExceptionEnum.LOGICAL_ERROR, '出院带药不能开项目')
   }
-  if (yiZhuData.value.actOrderNo === addTempOrderNo) {
+
+  if (typeof row.actOrderNo === 'undefined' && laiyuan === 1) {
     yiZhuData.value.actOrderNo = await getOrderNo()
   }
+
   let tempOrderNo = null
   // 查询医嘱是不会有医嘱号的,医生会在原来的医嘱上面修改成项目或者药品
   // 保留一下医嘱号 不然  yiZhuData.value = row 这个会把医嘱号给干掉
@@ -566,7 +568,7 @@ const fuYiZhuClick = async () => {
   XEUtils.lastArrayEach(yzData.value, (item) => {
     let {statusFlag, serial, parentNo, drugFlag, actOrderNo} = item
     if (statusFlag === '1') {
-      if ( serial !== '00' && stringIsBlank(parentNo) && drugFlag !== 'd'){
+      if (serial !== '00' && stringIsBlank(parentNo) && drugFlag !== 'd') {
         if (yiZhuData.value.actOrderNo !== actOrderNo) {
           fuYiZhuData.value.push(item)
         }

+ 2 - 1
src/views/med-tec-mod/YiJiFeiYongLuRu.vue

@@ -119,13 +119,14 @@ import {getDateRangeFormatDate} from '@/utils/date'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import {downloadExcel} from '@/utils/excel'
 import {getServerDateApi} from "@/api/public-api";
+import {userInfoStore} from "@/utils/store-public";
 
 export default {
   components: {HuanZheFeiYong, XiangMuLuRu},
   name: 'yiJiFeiYongLuRu',
   setup() {
     const dangQianShiJian = new Date()
-    const deptList = store.state.user.info.partTimeDeptMap
+    const deptList = userInfoStore.value.partTimeDeptMap
 
     const queryTerm = ref({
       inpatientNo: '',