住院医生优化

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/BaoCunXinXi.vue

@@ -14,6 +14,7 @@
           @click="clickToModify(key,value)">
         <div class="name">
           医嘱号: {{ key }}
+          序号:{{ getYzIndex(key) + 1 }}
           {{ value?.data?.orderName }}
         </div>
         <div v-if="value?.error" class="error">
@@ -51,7 +52,7 @@
 
 <script setup name='BaoCunXinXi'>
 import XcDialog from "../../xiao-chan/dialog/XcDialog.vue";
-import {errorMsg} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
+import {errorMsg, getYzIndex} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
 
 
 const props = defineProps({

src/layout/HeaderV2/function-list/Message.vue

@@ -1,5 +1,6 @@
 <template>
-  <div title="消息" @click="showMessageLayer" style="height: 18px" class="twinkle">
+  <div title="消息" @click="showMessageLayer" style="height: 18px"
+       :class="unreadCount > 0 ? 'twinkle' : ''">
     <el-badge :hidden="unreadCount <= 0" :value="unreadCount" :max="99" type="danger">
       <el-icon>
         <Message/>
@@ -179,7 +180,7 @@ export default defineComponent({
     opacity: 1.0;
   }
   50% {
-    opacity: 0.4;
+    opacity: 0;
   }
   to {
     opacity: 1.0;
@@ -191,7 +192,7 @@ export default defineComponent({
     opacity: 1.0;
   }
   50% {
-    opacity: 0.4;
+    opacity: 0;
   }
   to {
     opacity: 1.0;

src/views/hospitalization/zhu-yuan-yi-sheng/Home.vue

@@ -1,6 +1,7 @@
 <template>
-  <div style="overflow: auto">
-    <div style="color:#000; height: 947px;width:2063px ">
+  <div style="overflow: auto; width: calc(100% - 10px)"
+       :style="{height: windowSize.h + 'px'}">
+    <div style="color:#000; height: 947px;width:2063px;  ">
       <div class="yz__header">
         <div class="yz__close" @click="basicPatientInformation = !basicPatientInformation">
           <el-icon>
@@ -67,7 +68,6 @@ const basicPatientInformation = ref(true)
 let fileName = $ref('v1.1.0')
 
 watch(() => router.currentRoute.value.path, () => {
-
   let path = router.currentRoute.value.path
   if (path === '/inpatient/zhuYuanYiSheng/dianZiBingLi') {
     xianShiLieBiao.value = false
@@ -156,7 +156,6 @@ const downloadGuide = () => {
   })
 }
 
-
 const mainRef = ref()
 onMounted(async () => {
   getOperationGuide().then((res) => {

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

@@ -179,6 +179,7 @@ const clickSaveData = async () => {
       Object.assign(patientData, res)
       isEditorChange = false
       emrSidebarRef.value.queryData()
+      // 如果是第一次创建就需要跳转
       if (createId == null) {
         let temp = {
           documentId: data.emrDocumentId,
@@ -194,7 +195,6 @@ const clickSaveData = async () => {
       xcMessage.error('保存失败请重新保存')
     })
 
-
   }).catch(() => {
 
   })

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-init.js

@@ -95,7 +95,6 @@ export function EMRInteractive(data, editorEvent) {
             document._id = value.emrDocumentId
             this.runtime.saveDocument(document, (res) => {
                     console.log(res)
-                    console.log('保存成功')
                     resolve(res)
                 },
                 (err) => {

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

@@ -134,7 +134,7 @@ export const tempYzData = computed(() => {
         let flag = queryParam.value.displayRange === 0
         let frequFlag = queryParam.value.frequCode === 0
         let zhuangTai = queryParam.value.zhuangTai === 0
-        if (currentPage.value === 'takeMedicine') {
+        if (isCydy()) {
             return item.selfBuy === '4'
         }
 
@@ -171,7 +171,7 @@ export const selectedData = ref([])
 // 获取医嘱的下标
 export const getYzIndex = (key) => {
     let temp = tempYzData.value.findIndex(item => {
-        return item.id === key
+        return item.id == key
     })
     if (typeof temp === 'undefined') {
         return '没有找到序号'
@@ -212,6 +212,7 @@ export const jcTree = ref([])
  * @param patNo 住院号
  */
 export const clickOnThePatient = (patNo) => {
+
     let str = ''
 
     if (stringNotBlank(yiZhuData.value.actOrderNo) && yiZhuData.value.statusFlag === '1') {
@@ -236,10 +237,10 @@ export const clickOnThePatient = (patNo) => {
         getPatientInfo(patNo).then((res) => {
             huanZheXinXi.value = res
         });
-    }
-
-    if (stringNotBlank(str)) {
-        BizException(ExceptionEnum.LOGICAL_ERROR, str);
+    } else {
+        if (stringNotBlank(str)) {
+            BizException(ExceptionEnum.LOGICAL_ERROR, str);
+        }
     }
 
     getPatientInfo(patNo).then((res) => {