zengfanwei 1 week ago
parent
commit
08e2986bd3

+ 12 - 3
src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrTestV2/EmrTestV2.vue

@@ -83,9 +83,12 @@ const query = () => {
 };
 
 const sidebarRowClick = (row: SidebarData) => {
+  
+  resultRef.value?.setData([]);
   console.log("row",row)
   currentReportForm.value = row;
-  getLabRpt(row.reportId,props.patNo).then(res => {
+  if (row.reportId) {
+    getLabRpt(row.reportId,props.patNo).then(res => {
     if (XEUtils.isEmpty(res)) {
       inspectionHeader.value = {
         aply_cntn: "",
@@ -114,6 +117,10 @@ const sidebarRowClick = (row: SidebarData) => {
       resultRef.value?.setData(res);
     });
   });
+  } else {
+    xcMessage.error("此检验报告暂未发布!");
+  }
+  
 };
 
 function filterSex(val) {
@@ -160,7 +167,7 @@ const resultRef = ref<{
 let copyData = [];
 let copyDataStr = "";
 const appendCopy = () => {
-  console.log("343243",resultRef.value)
+  // console.log("343243",resultRef.value)
   if (props.isEmr) {
     if (XEUtils.isArray(resultRef.value?.selectedData?.())) {
       copyData.push(...resultRef.value?.selectedData?.());
@@ -197,12 +204,14 @@ const copyAndPaste = (paste = false) => {
 };
 
 function referenceData() {
+  // console.log("ptnt_name",resultRef.value.getSelectedStr())
   if (stringIsBlank(resultRef.value?.getSelectedStr?.())) {
     return;
   }
+  
   props.getEditor().cy.createDataSource({
     text:
-      currentReportForm.value.examPurpose + resultRef.value?.getSelectedStr?.(),
+      currentReportForm.value.groupName + resultRef.value?.getSelectedStr?.(),
     source: currentReportForm.value.reportId,
     type: DataSource.jianYan,
   });

+ 5 - 4
src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrTestV2/ResultTable.vue

@@ -95,7 +95,7 @@ const selectedData = () => {
       data += `${item.rptItemname}${danger(item)}:${item.resultStr} ${item.resultUnit} ${getItemAlertStr(item.resultFlag)},`;
     });
   }
-  console.log("temp",props.reqItemname + ":" + data)
+  
   return {
     type: "text",
     data: props.reqItemname + ":" + data,
@@ -103,11 +103,12 @@ const selectedData = () => {
 };
 
 const getSelectedStr = () => {
-  const temp = mainTableRef.value.getSelectionRows() as Measurement[];
+  const temp = mainTableRef.value.getSelectionRows();
+  
   let data = "";
   if (temp) {
-    XEUtils.arrayEach(temp, (item: Measurement) => {
-      data += `${item.itm_name}${danger(item)}:${result(item)} ${item.itm_unit} ${getItemStr(item.itm_alert, item.itm_str_value, item.itm_value)},`;
+    XEUtils.arrayEach(temp, (item: any) => {
+      data += `${item.rptItemname}${danger(item)}:${item.resultStr} ${item.resultUnit} ${getItemAlertStr(item.resultFlag)},`;
     });
   }
   return data;