瀏覽代碼

优化病程的显示判断

xiaochan 9 月之前
父節點
當前提交
6fba9964ca

+ 19 - 8
src/components/zhu-yuan-yi-sheng/emr/emr-template/comp/PatientEmrData.vue

@@ -220,17 +220,28 @@ const fileName = val => {
 };
 
 function personnel(value: any) {
-  if (value.type === "group-category") {
-    return;
+  function document() {
+    const id = value.emrDocumentId;
+    const find = XEUtils.filter(root.store.store.currentDocumentData, item => {
+      return item.id === id;
+    });
+    if (find.length === 0) {
+      return null;
+    }
+    return <DocumentTag data={find} />;
   }
-  const id = value.emrDocumentId;
-  const find = XEUtils.filter(root.store.store.currentDocumentData, item => {
-    return item.id === id;
-  });
-  if (find.length === 0) {
+
+  const code = XEUtils.get(value, "emrCategoryCode", "");
+  if (isCourse(code) && value.type === "group-category") {
+    return document();
+  } else if (isCourse(code) && value.type === "category") {
+    return null;
+  }
+
+  if (value.type === "group-category") {
     return null;
   }
-  return <DocumentTag data={find} />;
+  return document();
 }
 </script>
 

+ 2 - 1
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/socket/useEmrSocket.ts

@@ -142,7 +142,8 @@ export function useEmrSocket(
 }
 
 export function documentSocket(kicked: EmrStore["kicked"]) {
-  let socketFun: UseWebSocketReturn = {
+  // @ts-ignore
+  let socketFun: UseWebSocketReturn<any> = {
     send: () => {},
     close: () => {},
     status: ref(),

+ 4 - 3
src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-func/useEmrStore.ts

@@ -79,14 +79,15 @@ export const useEmrStore = (patId: string) => {
       dialog: false,
       id: "",
       waitForSeconds: 0,
-      resolve: () => 0,
-      reject: () => 0,
+      resolve: () => {},
+      reject: () => {},
 
       open(value: string) {
         kicked.a.waitForSeconds = 0;
         kicked.a.id = value;
         kicked.a.dialog = true;
         return new Promise((resolve, reject) => {
+          //@ts-ignore
           kicked.a.resolve = resolve;
           kicked.a.reject = reject;
         });
@@ -98,7 +99,7 @@ export const useEmrStore = (patId: string) => {
       title: "",
       message: [],
       userInfo: {},
-      wsSend: (value: { code: string; data: any }) => 0,
+      wsSend: (value: { code: string; data: any }) => {},
       onMsg: {
         kickItOut: value => {
           kicked.b.userInfo = value;