|
@@ -4,6 +4,7 @@ import {ref} from 'vue'
|
|
|
import {EditType} from "../../../../../utils/emr/edit";
|
|
|
import {LoadParams} from "../../../../../utils/emr/emr-init-v2";
|
|
|
import Patient from "../../../../../ts-type/patient";
|
|
|
+import XEUtils from "xe-utils";
|
|
|
|
|
|
// 患者数据
|
|
|
export const query = ref({
|
|
@@ -440,11 +441,12 @@ export function parsingDataElements(data: any, name: string, codeName: string |
|
|
|
function isNullAndUndefined(value: any) {
|
|
|
return value === null || typeof value === 'undefined';
|
|
|
}
|
|
|
+
|
|
|
if (isNullAndUndefined(data)) return null;
|
|
|
if (isNullAndUndefined(data[name])) return null;
|
|
|
if (isNullAndUndefined(data[name].value)) return null;
|
|
|
const value = data[name].value
|
|
|
- if (value instanceof Array) {
|
|
|
+ if (XEUtils.isArray(value)) {
|
|
|
try {
|
|
|
return value[0][codeName]
|
|
|
} catch {
|
|
@@ -452,7 +454,7 @@ export function parsingDataElements(data: any, name: string, codeName: string |
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- if (value instanceof Object) {
|
|
|
+ if (XEUtils.isObject(value)) {
|
|
|
try {
|
|
|
return value[codeName]
|
|
|
} catch {
|