Browse Source

医嘱查询优化

xiaochan 2 years ago
parent
commit
4a2ccbdbcd

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

@@ -250,7 +250,6 @@ import {
   confirmOrders, copyOrder,
   enterOrders,
   getOrderNo,
-  getParentOrders,
   huoQuFeiYongXinXi,
   huoQuXiangMu,
   huoQuZhiXinKeShi,
@@ -283,7 +282,7 @@ import {
   frequencyConfig,
   addTempOrderNo,
   yiZhuDataInit,
-  setOrderDataAndTwinkle
+  setOrderDataAndTwinkle, feeKey
 } from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
 import {ElMessageBox} from "element-plus";
 import YzDialog from "@/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/dialog/YzDialog";
@@ -349,9 +348,8 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
   // 00 是项目
   if (row.serial !== '00') {
     try {
-      let queryKey = row.orderCode + '_' + row.serial + '_' + props.patientInfo.zkWard + '_' + queryParam.value.groupNo + "_" + yiZhuData.value.superiorDoctor
-      let res = await huoQuFeiYongXinXi(queryKey)
-
+      let queryKey2 = feeKey(row.orderCode, row.serial, props.patientInfo.zkWard, queryParam.value.groupNo, yiZhuData.value.superiorDoctor, yiZhuData.value.statusFlag)
+      let res = await huoQuFeiYongXinXi(queryKey2)
       if (res.permissionPrompt) {
         let authorization = await yzMitt.emit('openDoctorAuthoriztion', row.orderCode + '_' + row.serial)
         yiZhuData.value.superiorDoctor = authorization.code
@@ -423,8 +421,8 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
   } else {
     yiZhuData.value.kjywFlag = 0
     try {
-      let queryKey = row.orderCode + '_' + '00' + '_' + props.patientInfo.zkWard + '_' + queryParam.value.groupNo + "_" + yiZhuData.value.superiorDoctor
-      let res = await huoQuFeiYongXinXi(queryKey)
+      let queryKey2 = feeKey(row.orderCode, '00', props.patientInfo.zkWard, queryParam.value.groupNo, yiZhuData.value.superiorDoctor, yiZhuData.value.statusFlag)
+      let res = await huoQuFeiYongXinXi(queryKey2)
       tiShiBiaoTi.value = res.prompt
       if (newData) {
         openTheOrderPopUpWindow('请输入处置医嘱名')
@@ -447,8 +445,7 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
   }
   if (newData) {
     // 判断这个是不是 新添加的数据 如果是空的就是 新数据
-    let serverDate = await getServerDateApi()
-
+    let serverDate = await getServerDateApi();
     if (!yiZhuData.value.orderTime) {
       yiZhuData.value.orderTime = serverDate
     }
@@ -565,13 +562,18 @@ const metZhiXingKeShi = (val) => {
 const fuYiZhuData = ref([])
 const fuYiZhuClick = async () => {
   fuYiZhuData.value = []
-  fuYiZhuData.value = await getParentOrders(props.patientInfo.inpatientNo, props.patientInfo.admissTimes)
-  let tempIndex = fuYiZhuData.value.findIndex(item => {
-    return item.actOrderNo == yiZhuData.value.actOrderNo
+
+  XEUtils.lastArrayEach(yzData.value, (item) => {
+    let {statusFlag, serial, parentNo, drugFlag, actOrderNo} = item
+    if (statusFlag === '1') {
+      if ( serial !== '00' && stringIsBlank(parentNo) && drugFlag !== 'd'){
+        if (yiZhuData.value.actOrderNo !== actOrderNo) {
+          fuYiZhuData.value.push(item)
+        }
+      }
+    }
   })
-  if (tempIndex > -1) {
-    fuYiZhuData.value.splice(tempIndex, 1)
-  }
+
 }
 
 const modifyDosingMethod = (val) => {

+ 1 - 1
src/utils/ExportExcel.js

@@ -8,7 +8,7 @@ export function Export(json, fields, filename) {
     XEUtils.arrayEach(json, (item) => {
         let tempData = {}
         for (let key in fields) {
-            tempData[fields[key]] = item[key]
+            tempData[fields[key]] = item[key] ? item[key] : "";
         }
         temp.push(tempData)
     })

+ 14 - 0
src/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng.ts

@@ -756,3 +756,17 @@ export const yzSize = ref({
 })
 
 export const confirmLoading = ref<boolean>(false)
+
+
+/**
+ * 参数一 : 项目编码
+ * 参数二:项目的类型 00 - 项目 01-小包装 09 - 大包装
+ * 参数三: 患者当前科室
+ * 参数四,当前选中的药房
+ * 参数五:授权的医生
+ * 参数六:当前医嘱的状态
+ * @param val 参数
+ */
+export function feeKey(...val: string[]) {
+    return val.join("_")
+}

+ 5 - 5
src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/TemplateMaintenance.vue

@@ -324,7 +324,7 @@ import {
 import {
   getSelfBuy,
   zkList,
-  tableHeader, yaoPinPingLvData, geiYaoFangShiData
+  tableHeader, yaoPinPingLvData, geiYaoFangShiData, feeKey
 } from '@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng'
 import store from '../../../../store'
 import {listIsBlank, listNotBlank, stringIsBlank, stringNotBlank} from '@/utils/blank-utils'
@@ -448,9 +448,9 @@ const xuanZhongFeiYong = async (row, newData = true) => {
   await Sleep(200)
   yiZhuData.value = row
   if (row.serial !== '00') {
-    let queryKey = row.orderCode + '_' + row.serial + '_' + ' ' + '_' + groupNo.value + "_" + ' '
+    let queryKey2 = feeKey(row.orderCode, row.serial, "", groupNo.value, "", "-1")
     try {
-      let res = await huoQuFeiYongXinXi(queryKey)
+      let res = await huoQuFeiYongXinXi(queryKey2)
       yiZhuData.value.drugFlag = row.drugFlag ? row.drugFlag : row.orderType
       // 是否是 抗菌药物
       yiZhuData.value.kjywFlag = res.data.kjywFlag
@@ -499,9 +499,9 @@ const xuanZhongFeiYong = async (row, newData = true) => {
     }
   } else {
     yiZhuData.value.kjywFlag = 0
-    let key = row.orderCode + '_' + '00' + '_' + '' + '_' + groupNo.value
+    let queryKey2 = feeKey(row.orderCode, "00", "", groupNo.value, "", "-1")
     try {
-      let res = await huoQuFeiYongXinXi(key)
+      let res = await huoQuFeiYongXinXi(queryKey2)
       yiZhuData.value.drugFlag = row.drugFlag ? row.drugFlag : row.orderType
       if (stringNotBlank(res.prompt)) {
         tiShiBiaoTi.value = res.prompt