Parcourir la source

合理用药和医嘱录入bug

DESKTOP-0GD05B0\Administrator il y a 2 ans
Parent
commit
1a79e58590

+ 8 - 0
src/api/heliyongyao/rational-use.js

@@ -7,3 +7,11 @@ export function rationalUseOfMedicine(patNo, times) {
         params: {patNo, times}
     })
 }
+
+export function auditingInterface(url) {
+    return request({
+        url: '/RationalUse/auditingInterface',
+        method: 'get',
+        params: {url}
+    })
+}

+ 2 - 2
src/api/zhu-yuan-yi-sheng/yi-zhu-lu-ru.js

@@ -127,11 +127,11 @@ export function huoQuXiangMu(code, groupNo) {
     })
 }
 
-export function huoQuFeiYongXinXi(code, serial, deptCode = '') {
+export function huoQuFeiYongXinXi(code, serial, deptCode = '',groupNo) {
     return request({
         url: url + '/huoQuFeiYongXinXi',
         method: 'get',
-        params: {code, serial, deptCode},
+        params: {code, serial, deptCode,groupNo},
     })
 }
 

+ 19 - 4
src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/RationalDrugUseWindow.vue

@@ -5,14 +5,17 @@
       <iframe :src="rationalUse.ShowUrl"/>
     </div>
     <template #footer>
+      <el-button type="danger" @click="dialog = false">close</el-button>
       <el-button type="primary" @click="continueToSubmit">继续提交</el-button>
     </template>
   </xc-dialog-v2>
 </template>
 
 <script setup name='RationalDrugUseWindow'>
-import {rationalUseOfMedicine} from "@/api/heliyongyao/rational-use";
+import {auditingInterface, rationalUseOfMedicine} from "@/api/heliyongyao/rational-use";
 import XcDialogV2 from "@/components/xiao-chan/dialog/XcDialogV2.vue";
+import {xcMessage} from "@/utils/xiaochan-element-plus";
+import {stringIsBlank} from "@/utils/blank-utils";
 
 const emit = defineEmits(['submit'])
 
@@ -29,9 +32,21 @@ const check = async (patNo, times) => {
   return true
 }
 
-const continueToSubmit = () => {
-  emit('submit')
-  dialog = false
+
+const continueToSubmit = async () => {
+  let temp = await auditingInterface(rationalUse.getResultUrl)
+  if (temp.success && temp.resultcode === 0) {
+    // 审核通过
+    xcMessage.success(temp.sh_msg);
+    emit('submit')
+    dialog = false
+  } else if (temp.success && temp.resultcode === 1) {
+    // 审核不通过
+    xcMessage.error(temp.sh_msg);
+  } else if (temp.resultcode === 0 && !temp.success) {
+    // 待审核中
+    xcMessage.error('请点击继续保存后,等待审核完成,点击继续提交。');
+  }
 }
 
 defineExpose({

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

@@ -335,7 +335,7 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
   let newData = yiZhuData.value.statusFlag === '1'
   if (row.serial === '01' || row.serial === '99') {
     try {
-      let res = await huoQuFeiYongXinXi(row.orderCode, row.serial, props.patientInfo.zkWard)
+      let res = await huoQuFeiYongXinXi(row.orderCode, row.serial, props.patientInfo.zkWard, queryParam.value.groupNo)
       // 加载药品计量
       yaoPinJiLiangData.value = res.yaoPingJiLiang
       if (newData) {
@@ -394,7 +394,7 @@ const xuanZhongFeiYong = async (row, laiyuan = 1) => {
   } else {
     yiZhuData.value.kjywFlag = 0
     try {
-      let res = await huoQuFeiYongXinXi(row.orderCode, '00', props.patientInfo.zkWard)
+      let res = await huoQuFeiYongXinXi(row.orderCode, '00', props.patientInfo.zkWard, queryParam.value.groupNo)
       if (newData) {
         openTheOrderPopUpWindow('请输入处置医嘱名')
         yiZhuData.value.drugFlag = row.drugFlag ? row.drugFlag : row.orderType