优化

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

@@ -270,7 +270,7 @@ import {
   SearchOrdersType,
   RefFillingValue,
   errorMsgFunc,
-  errorMsg, yzInfoPrompt
+  errorMsg, yzInfoPrompt, jsQueryYzData
 } 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";
@@ -833,7 +833,7 @@ const toDeleteAnOrderClick = () => {
     dangerouslyUseHTMLString: true
   }).then(() => {
     toDeleteAnOrder(yiZhuData.value.actOrderNo).then(() => {
-      yzMitt.emit('queryYz', false)
+      jsQueryYzData()
       qingKong()
     })
   })
@@ -948,7 +948,7 @@ onMounted(() => {
       type: 'delete',
     }).then(() => {
       toDeleteAnOrder(actOrderNo).then(() => {
-        yzMitt.emit('queryYz', false)
+        jsQueryYzData()
         if (clearOrNot) {
           qingKong()
         }

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/EmrHeader.vue

@@ -50,7 +50,7 @@ emrMitt.on('setHeaderFunction', (value) => {
         </button>
       </div>
       <div class="mac_item"
-           v-if="patientInfo.dischargeDays > 0">
+           v-if="patientInfo.dischargeDays && patientInfo.dischargeDays > 0">
         <button>出院天数（{{ patientInfo.dischargeDays }}）</button>
       </div>
     </div>

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

@@ -81,9 +81,6 @@ export function clearPatInfo() {
 export const muBanMing = ref({})
 // 错误信息
 export const cuoWuXinXi = ref('')
-// 头部大小
-export const yzHeaderSize = ref(0)
-
 // 给药方式
 export const geiYaoFangShiData = ref([])
 // 频率
@@ -246,7 +243,6 @@ export interface YzType {
     execDeptName: string
 }
 
-
 export interface SearchOrdersType {
     id: string;
     pyCode: string;
@@ -754,17 +750,16 @@ interface ExtraInformationType {
 
 export const shouShuDiagnosis = ref([])
 
-const defaultExtraInformation: ExtraInformationType = {
-    diagCode: "",
-    diagText: "",
-    reqOtherResult: "",
-    reqTzComment: "",
-    reqComment: ''
+const defaultExtraInformation: () => ExtraInformationType = () => {
+    return {
+        diagCode: "",
+        diagText: "",
+        reqOtherResult: "",
+        reqTzComment: "",
+        reqComment: ''
+    }
 }
 
-const strDefaultExtraInformation = JSON.stringify(defaultExtraInformation)
-
-
 export function clickTimeLimitReminder() {
     timeLimitPromptByPatientNo(<string>huanZheXinXi.value!.inpatientNo).then(res => {
         yzMitt.emit('setTimeLimitPrompt', res)
@@ -803,24 +798,18 @@ export const clickOnThePatient = async (patNo: string) => {
         });
     }
 
-    if (yzMitt.exists('queryYz')) {
-        await nextTick();
-        await yzMitt.emit('queryYz');
-    } else {
-        await jsQueryYzData();
-    }
+    await jsQueryYzData();
     queryParam.value.frequCode = frequCodeEnum.all;
     queryParam.value.zhuangTai = 0;
     queryParam.value.displayRange = 2;
     clearAssociate();
     getAncillaryInformation(huanZheXinXi.value.inpatientNo, huanZheXinXi.value.admissTimes).then(temp => {
         if (temp) {
-            let str = JSON.stringify(temp);
-            jcExtraInformation.value = JSON.parse(str);
-            jyExtraInformation.value = JSON.parse(str);
+            jcExtraInformation.value = XEUtils.clone(temp);
+            jyExtraInformation.value = XEUtils.clone(temp);
         } else {
-            jcExtraInformation.value = JSON.parse(strDefaultExtraInformation);
-            jyExtraInformation.value = JSON.parse(strDefaultExtraInformation);
+            jcExtraInformation.value = defaultExtraInformation();
+            jyExtraInformation.value = defaultExtraInformation();
         }
     });
 }
@@ -992,7 +981,6 @@ export interface YzMitt {
     paste: () => void
     allowReplication: () => boolean,
     deleteAnOrderByOrderNo: (data: YzType, clearOrNot: boolean) => void
-    queryYz: (tableScrollTop?: boolean) => Promise<any>,
     confirmMedicalAdvice: () => void,
     allergen: () => void,
     clickOnTheOrderTemplate: () => void,
@@ -1012,6 +1000,7 @@ export interface YzMitt {
 
 export const yzMitt = new EventBus<YzMitt>();
 
+
 export const yzSize = ref({
     w: 0,
     h: 0

src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/YiZhuLuRu.vue

@@ -41,7 +41,7 @@ import {
   clickOnThePatient,
   confirmLoading,
   errorMsgFunc,
-  huanZheXinXi,
+  huanZheXinXi, jsQueryYzData,
   queryParam,
   setYzOrderGroup,
   youWuXuanZheHuanZhe,
@@ -106,7 +106,7 @@ const confirmOrder = async () => {
   // 确认医嘱
   await yzEditorRef.value.confirmOrdersClick()
   // 查询医嘱
-  await yzMitt.emit('queryYz');
+  await jsQueryYzData()
   confirmLoading.value = false
 }
 
@@ -289,7 +289,7 @@ const batchDeleteOrdersClick = () => {
         }
         errorMsgFunc.add(errData)
       } else {
-        yzMitt.emit('queryYz', false)
+        jsQueryYzData()
       }
     })
   }).catch(() => {
@@ -309,7 +309,7 @@ onActivated(async () => {
     const info = windowBtoaAndAtob.atob<{ inpatientNo: string }>(router.currentRoute.value.query.huiZhen)
     await nextTick();
     await clickOnThePatient(info!.inpatientNo);
-    await yzMitt.emit('queryYz');
+    await jsQueryYzData();
     router.replace(router.currentRoute.value.path)
   }
   doctorStore.setYzSidebar(YzSidebarEnum.PATIENT_LIST);

src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/components/OneClickStop.vue

@@ -1,8 +1,6 @@
 <script setup name='OneClickStop'>
 import {
-  huanZheXinXi,
-  youWuXuanZheHuanZhe,
-  yzMitt
+  huanZheXinXi, jsQueryYzData,
 } from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
 import XcDialogV2 from "@/components/xiao-chan/dialog/XcDialogV2.vue";
 import {stringIsBlank} from "@/utils/blank-utils";
@@ -47,7 +45,7 @@ const confirm = () => {
     type: 'warning'
   }).then((res) => {
     oneClickStopOrder(param.value)
-    yzMitt.emit('queryYz')
+    jsQueryYzData()
     cancel()
   }).catch(() => {
 

src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/components/table/YzTableV3.vue

@@ -3,6 +3,7 @@ import {stringIsBlank, stringNotBlank} from "@/utils/blank-utils";
 import {
   associateOrders,
   clearAssociate,
+  jsQueryYzData,
   openDrugManual,
   OrderBy,
   queryParam,
@@ -139,7 +140,7 @@ const rightFunc = {
   "relevancy": async (data: YzType) => {
     if (canBeAssociated(data, true)) {
       if (associateOrders.value.actOrderNo === null) {
-        await yzMitt.emit('queryYz')
+        await jsQueryYzData()
         associateOrders.value.actOrderNo = data.actOrderNo
       } else {
         xcMessage.error('请先确认当前关联医嘱。')