优化

src/api/base-data/report-center.ts

@@ -81,26 +81,18 @@ export function setPermissions(data) {
     })
 }
 
-export function reportQueryCenterApi(url: string, data: any = {}) {
-    return request({
+export function reportQueryCenterApi<D = any>(url: string, data: any = {}) {
+    return request<D>({
         url: "/thyy/api" + url,
         method: 'post',
         data: data,
     })
 }
 
-export function reportQueryCenterApiByGet(url: string, params: any = {}) {
-    return request({
+export function reportQueryCenterApiByGet<D = any>(url: string, params: any = {}) {
+    return request<D>({
         url: "/thyy/api" + url,
         method: 'get',
         params,
     })
 }
-
-export function getEmrPatientData(patNo: string, times: number) {
-    return request({
-        url: "/thyy/api/dataEmr/patInfo",
-        method: 'get',
-        params: {patNo, times}
-    })
-}

src/components/js-dialog-comp/useDialogToJs.ts

@@ -1,27 +1,24 @@
-import {ref, h, Component,} from 'vue';
+import {ref, h, Component} from 'vue';
 
 import {generateRandomString} from "../../utils/getUuid";
-import {ComponentPropsOptions} from "@vue/runtime-core";
 
 export enum ClosingMethod {
     CONFIRM = 'confirm',
     CANCEL = 'cancel'
 }
 
-export type DialogEmits = {
-    (e: "closed", closingMethod: ClosingMethod, ...val: any[]): void,
-}
 
 export const dialogEmits = {
     ['closed']: (closingMethod: ClosingMethod, ...val: any[]) => closingMethod && val
 }
 
+
 export const compList = ref<{
     [key: string]: any
 }>({})
 
 
-function setDialogToJ<T extends Component>(comp: T, data: ComponentPropsOptions<T>) {
+function setDialogToJ<P extends Component>(comp: P, data: any) {
     return new Promise<any>((resolve, reject) => {
         const id = "cy_" + generateRandomString(5)
 

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

@@ -185,14 +185,15 @@
               <div class="creator_prompt" v-loading="emrConfig.loadDocument">
 
                 <div class="creator_prompt-grid">
-                  <div> 创建：{{ createName }}</div>
+                  <div>创建：{{ createName }}</div>
                   <div>等级：{{ createLevel }}</div>
 
-                  <div> 当前：{{ userInfoStore.name }}</div>
+                  <div>当前：{{ userInfoStore.name }}</div>
                   <div>等级：{{ doctorLevel }}</div>
 
-                  <div> 现编辑：{{ currentEditorUser?.name }}</div>
+                  <div>现编辑：{{ currentEditorUser?.name }}</div>
                   <div>科室：{{ currentEditorUser?.deptName }}</div>
+
                 </div>
 
                 <div class="creator_prompt-btn">
@@ -329,7 +330,6 @@ import {getServerDateApi, getUuid} from "@/api/public-api";
 import {
   audit,
   getDrgIntelligentGrouping,
-  getExtractDataElement,
   getHistory,
   hotSearchSorting,
   submitMedicalRecord
@@ -345,7 +345,7 @@ import EmrWebSocket from "@/components/zhu-yuan-yi-sheng/emr/web-socket/EmrWebSo
 import {stringIsBlank, stringNotBlank} from "@/utils/blank-utils";
 import {isDev} from "@/utils/public";
 import {forcedKickingOutOfPersonnelByDocumentId, isThereADoctorEditing} from "@/api/zhu-yuan-yi-sheng/emr-socket";
-import {computed, nextTick, onDeactivated, onMounted, toRaw, ref, watch, unref} from "vue";
+import {computed, nextTick, onDeactivated, onMounted,  ref, watch, unref} from "vue";
 import EmrFirstPageOfMedicalRecord from "@/components/zhu-yuan-yi-sheng/emr/EmrFirstPageOfMedicalRecord.vue";
 import EmrResultReturns
   from "@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/components/EmrResultReturns.vue";
@@ -391,7 +391,7 @@ import moment from "moment";
 import {formatDateToStr} from "@/utils/moment-utils";
 import EmrOutline
   from "@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/components/EmrOutline.vue";
-import {getEmrPatientData} from "@/api/base-data/report-center";
+import {reportQueryCenterApiByGet} from "@/api/base-data/report-center";
 import {
   infectiousDiseasesAreRequired,
 } from "@/api/zhu-yuan-yi-sheng/infectious-diseasest";
@@ -1332,13 +1332,17 @@ const clickToSubmitTheMedicalRecord = async () => {
  * 查询患者信息
  */
 const queryingBasicPatientInformation = () => {
-  getEmrPatientData(patientInfo.value.inpatientNo, patientInfo.value.admissTimes).then(res => {
-    patientData.value = res
+  reportQueryCenterApiByGet<{
+    patientData: any,
+    extractData: any
+  }>("/dataEmr/patInfo", {
+    patNo: patientInfo.value.inpatientNo,
+    times: patientInfo.value.admissTimes
+  }).then(res => {
+    patientData.value = res.patientData
+    extractData = res.extractData
     getCurrentPersonnelInformation()
   })
-  getExtractDataElement(patientInfo.value.inpatientNo, patientInfo.value.admissTimes).then(res => {
-    extractData = res
-  })
 }
 
 // DRG 智能分组
@@ -2063,7 +2067,6 @@ defineExpose({
 
 .creator_prompt {
   position: absolute;
-
   width: max-content;
   top: 5px;
   color: black;
@@ -2072,7 +2075,9 @@ defineExpose({
   padding: 2px;
   z-index: 1;
   background-color: rgb(0 101 241 / 27%);
-  box-shadow: 0 4px 8px rgb(0 0 0 / 20%), 0 6px 20px rgb(0 0 0 / 19%);
+  backdrop-filter: blur(10px);
+  box-shadow: 0 5px 15px rgb(0, 0, 0, 0.1);
+  border-radius: 8px;
 
 
   .creator_prompt-grid {