Merge branch 'master' into test-ca

src/api/dictionary/yi-bao-ke-shi-pi-pei.js

@@ -15,10 +15,10 @@ export function getYiBaoKeShi() {
   })
 }
 
-export function piPeiKeShi(benYuanCode, yiBaoCode, flag) {
+export function piPeiKeShi(benYuanCode, yiBaoCode, yiBaoName, flag) {
   return request({
     url: '/yiBaoKeShi/piPeiKeShi',
     method: 'get',
-    params: { benYuanCode, yiBaoCode, flag },
+    params: { benYuanCode, yiBaoCode, yiBaoName, flag },
   })
 }

src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrElectrocardiogram.vue

@@ -1,20 +1,17 @@
 <script setup>
 const props = defineProps({
   patNo: String,
-})
+});
 
 const src = computed(() => {
-  return `http://pathology.thyy.cn/website/Service/Search.aspx?id=${props.patNo}`
-})
-
+  return `http://ecg.thyy.cn/website/Service/Search.aspx?id=${props.patNo}`;
+});
 </script>
 
 <template>
-  <div style="height: 100%;width: 100%">
-    <iframe :src="src" width="100%" height="100%"/>
+  <div style="height: 100%; width: 100%">
+    <iframe :src="src" width="100%" height="100%" />
   </div>
 </template>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>

src/views/dictionary/YiBaoKeShiPiPei.vue

@@ -163,24 +163,21 @@ const keShiPiPeiClick = () => {
           dangerouslyUseHTMLString: true,
           type: 'warning',
         }
-    )
-        .then(() => {
-          piPeiKeShi(benYuanRadio.value.code, yiBaoRadio.value.code, 1).then((res) => {
-            for (let i = 0; i < benYuanKeShiTable.value.length; i++) {
-              if (benYuanKeShiTable.value[i].code === benYuanRadio.value.code) {
-                benYuanKeShiTable.value.splice(i, 1)
-              }
-            }
-            chongZhi()
-          })
-        })
-        .catch((e) => {
-        })
+    ).then(() => {
+      piPeiKeShi(benYuanRadio.value.code, yiBaoRadio.value.code, yiBaoRadio.value.name, 1).then((res) => {
+        for (let i = 0; i < benYuanKeShiTable.value.length; i++) {
+          if (benYuanKeShiTable.value[i].code === benYuanRadio.value.code) {
+            benYuanKeShiTable.value.splice(i, 1)
+          }
+        }
+        chongZhi()
+      })
+    }).catch((e) => {})
   }
 }
 
 const shanChuPiPei = (index, row) => {
-  piPeiKeShi(row.code, row.siCaty, 2).then((res) => {
+  piPeiKeShi(row.code, row.siCaty, row.siCaty,2).then((res) => {
     benYuanKeShiTable.value.splice(index, 1)
   })
 }