From af725645343e6f028c4cebf81219e90c42d40582 Mon Sep 17 00:00:00 2001
From: lxd <1004405501@qq.com>
Date: Thu, 5 Dec 2024 16:40:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=8D=B1=E6=80=A5=E5=80=BC=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                         |  2 +-
 src/api/tblist/patientexamlist/index.ts       | 89 ++++++++++---------
 src/views/ECG/ECGForm.vue                     | 15 ++--
 src/views/ECG/ECGWaring/ECGReport.vue         | 22 ++---
 src/views/ECG/ECGWaring/ECGWarningDialog.vue  |  5 +-
 src/views/tblist/patientexamlistECG/index.vue |  6 ++
 6 files changed, 76 insertions(+), 63 deletions(-)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 0aa8caa4..311eefa5 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -62,7 +62,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[typescript]": {
-    "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
+    "editor.defaultFormatter": "vscode.typescript-language-features"
   },
   "[typescriptreact]": {
     "editor.defaultFormatter": "rvest.vs-code-prettier-eslint"
diff --git a/src/api/tblist/patientexamlist/index.ts b/src/api/tblist/patientexamlist/index.ts
index 3dca2ac7..fd8e41eb 100644
--- a/src/api/tblist/patientexamlist/index.ts
+++ b/src/api/tblist/patientexamlist/index.ts
@@ -22,7 +22,7 @@ export interface PatientexamlistVO {
   diagResults: string // 诊断结论
   diagDate: Date // 下诊断结论的时间：年月日时分秒
   diagDoctor: string // 诊断医生
-  diagDoctorId:string
+  diagDoctorId: string
   reviewDoctor: string // 审核医生
   reviewDate: Date // 审核日期：年月日时分秒
   thumbnailImgUrl: string // 缩略图oss url, httP:oss url
@@ -30,20 +30,20 @@ export interface PatientexamlistVO {
   regId: string // 登记单号
   diagFlag: string // 阴性阳性标记
   deviceName: string // 影像设备名称
-  notes:string//备注
-  billDoctorDepartment:string// 开单科室 送检科室
-  StudyInsta:string
-  isFavourite:string  //是否收藏
-  pdfurl:String//pdf地址
-  warning:String//是否有危急值
-  applyhighLevelname:String//申请上级机构医生
+  notes: string//备注
+  billDoctorDepartment: string// 开单科室 送检科室
+  StudyInsta: string
+  isFavourite: string  //是否收藏
+  pdfurl: String//pdf地址
+  warning: String//是否有危急值
+  applyhighLevelname: String//申请上级机构医生
 }
 export interface inspdfscreenshotVO {
 
   id: string // 主键
   imagebase: string // 图片
-  model:string//类型 0 接口 1ftp
-  folderPath:string //
+  model: string//类型 0 接口 1ftp
+  folderPath: string //
 }
 // PACS检查列表 API
 export const PatientexamlistApi = {
@@ -77,46 +77,51 @@ export const PatientexamlistApi = {
     return await request.download({ url: `/tblist/patientexamlist/export-excel`, params })
   },
 
-   
-    getuporghiid: async (id: number,orgId:String) => {
-      return await request.get({ url: `/tblist/patientexamlist/UPDATEHigOrg?id=${id}&&orgId=${orgId}` })
-    },
 
-      // 超声保存修改
-      examineupdatelist: async (data: PatientexamlistVO) => {
+  getuporghiid: async (id: number, orgId: String) => {
+    return await request.get({ url: `/tblist/patientexamlist/UPDATEHigOrg?id=${id}&&orgId=${orgId}` })
+  },
+
+  // 超声保存修改
+  examineupdatelist: async (data: PatientexamlistVO) => {
     return await request.put({ url: `/tblist/patientexamlist/examineupdate`, data })
   },
 
   // 超声审核
   examine: async (id: String) => {
-  return await request.get({ url: `/tblist/patientexamlist/examine?id=` + id })
- },
+    return await request.get({ url: `/tblist/patientexamlist/examine?id=` + id })
+  },
 
-   // dicom数据同步
-   dicomDataSync: async () => {
+  // dicom数据同步
+  dicomDataSync: async () => {
     return await request.get({ url: `/tblist/patientexamlist/dicomDataSync` })
   },
+
+  // 分检数据刷新
+  dicomDataRefresh: async () => {
+    return await request.get({ url: `/tblist/patientexamlist/dicomDataRefresh` })
+  },
+
+  // 获取已检查全部的阴性阳性重大阳性统计
+  WholeDiagFlagCount: async () => {
+    return await request.get({ url: `/tblist/patientexamlist/WholeDiagFlagCount` })
+  },
+  // 获取一周已检查全部的阴性阳性重大阳性统计
+  GetDateYYZDYXCount: async () => {
+    return await request.get({ url: `/tblist/patientexamlist/GetDateYYZDYXCount` })
+  },
+
+  // 收藏功能
+  CollectAndCancellation: async (id: String, type: string) => {
+    return await request.get({ url: `/tblist/patientexamlist/CollectAndCancellation?id=${id}&&type=${type}` })
+  },
+
+  ftppdf: async (data: inspdfscreenshotVO) => {
+    return await request.post({ url: `/tblist/patientexamlist/ftppdf`, data })
+  },
+  // 更新危急值标识
+  Updatetblistwarning: async (id: String, type: string) => {
+    return await request.get({ url: `/tblist/patientexamlist/Updatetblistwarning?id=${id}&&type=${type}` })
+  },
   
-     // 分检数据刷新
-     dicomDataRefresh: async () => {
-      return await request.get({ url: `/tblist/patientexamlist/dicomDataRefresh` })
-    },
-
-      // 获取已检查全部的阴性阳性重大阳性统计
-      WholeDiagFlagCount: async () => {
-        return await request.get({ url: `/tblist/patientexamlist/WholeDiagFlagCount`})
-      },
-         // 获取一周已检查全部的阴性阳性重大阳性统计
-         GetDateYYZDYXCount: async () => {
-          return await request.get({ url: `/tblist/patientexamlist/GetDateYYZDYXCount`})
-        },
-
-// 收藏功能
-CollectAndCancellation: async (id: String,type:string) => {
-    return await request.get({ url: `/tblist/patientexamlist/CollectAndCancellation?id=${id}&&type=${type}`})
-    },
-
-    ftppdf: async (data:inspdfscreenshotVO) => {
-      return await request.post({ url: `/tblist/patientexamlist/ftppdf`,data})
-      },
 }
diff --git a/src/views/ECG/ECGForm.vue b/src/views/ECG/ECGForm.vue
index 805ddc53..5b5e9eb6 100644
--- a/src/views/ECG/ECGForm.vue
+++ b/src/views/ECG/ECGForm.vue
@@ -64,7 +64,7 @@
               <el-button type="primary" plain @click="openECGDialog" v-if="isshowwjz"
                 ><el-icon><Warning /></el-icon>危急值</el-button
               >
-              <el-button type="primary" plain @click="openreprotdiag" v-if="isshowysb"
+              <el-button type="danger" plain @click="openreprotdiag" v-if="isshowysb"
                 ><el-icon><Check /></el-icon>已上报</el-button
               >
             </el-button-group>
@@ -559,6 +559,7 @@ import ReportInfoECG from '@/views/applyregistration/reportPrintStatistics/Repor
 import htmlToPdf from '@/utils/htmlPdf'
 import ECGWarningDialog from '@/views/ECG/ECGWaring/ECGWarningDialog.vue'
 import ECGReport from '@/views/ECG/ECGWaring/ECGReport.vue'
+import { WarningApi, WarningVO } from '@/api/system/warning'
 
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
@@ -593,7 +594,7 @@ const imagebase64 = ref('')
 const isprintimage = ref(false) //是否生成打印文件base64
 const ECGDialog = ref() //危急值消息弹窗
 const isshowwjz = ref(false)
-const isshowysb=ref(false)
+const isshowysb = ref(false)
 const ECGReportDialog = ref() //危急值消息弹窗
 // 树配置项
 const treeDefaultProps = {
@@ -636,9 +637,13 @@ const open = async (row: any) => {
       eltextrow.value = integer
     }
   })
-    //判断是否显示危急值上报功能 条件是当前机构等于上级机构
-    isshowwjz.value=Profilevo.value.orgId===row.highLevelOrgId?true:false
-   isshowysb.value=Profilevo.value.orgId===row.orgId?true:false
+  //查询当前患者的危急值相关信息
+  const warningdata = await WarningApi.getexmidororgiddata(row.examId, row.orgId)
+  //判断是否显示危急值上报功能 条件是当前机构等于上级机构
+  isshowwjz.value = Profilevo.value.orgId === row.highLevelOrgId ? true : false
+  if (warningdata.reportDate) {
+    isshowysb.value = Profilevo.value.orgId === row.orgId ? true : false
+  }
 }
 
 // 返回的列表的数据
diff --git a/src/views/ECG/ECGWaring/ECGReport.vue b/src/views/ECG/ECGWaring/ECGReport.vue
index 597fb049..7ddc196b 100644
--- a/src/views/ECG/ECGWaring/ECGReport.vue
+++ b/src/views/ECG/ECGWaring/ECGReport.vue
@@ -1,10 +1,5 @@
 <template>
-  <el-dialog
-    v-model="dialogVisible"
-    title="危急值上报详情"
-    width="1000px"
-    style="height: 720px"
-  >
+  <el-dialog v-model="dialogVisible" title="危急值上报详情" width="1000px" style="height: 720px">
     <div class="modal">
       <div class="modal-content">
         <div class="left-side">
@@ -164,7 +159,7 @@ const warintinfo = ref()
 const rowinfo = ref() //外面传递的患者信息
 const conreadDateTime = ref() //检查段收到时间
 const Profilevo = ref<ProfileVO>({} as ProfileVO) //当前登录人信息
-const issaveshow=ref(false)//是否显示保存按钮
+const issaveshow = ref(false) //是否显示保存按钮
 const receivename = ref() //接受医生
 const dealname = ref() //处理医生
 const isshowwjztime = ref(false) //是否显示确认危急值时间
@@ -173,11 +168,10 @@ const opendiag = async (row) => {
   rowinfo.value = row
   resetForm()
   await getlogininfo() // 使用 ISO 格式的时间字符串
- 
+
   //查询当前患者的危急值相关信息
   const data = await WarningApi.getexmidororgiddata(rowinfo.value.examId, rowinfo.value.orgId)
   warintinfo.value = data
-
   //处理时间轴相关
   if (!data.readDateTime) {
     await updatereadDateTime(data.id)
@@ -188,11 +182,11 @@ const opendiag = async (row) => {
   if (data.checkDateTime) {
     formData.value.checkDateTime = formattedDate(data.checkDateTime)
     isshowwjztime.value = true
-    issaveshow.value=true
+    issaveshow.value = true
   } else {
     formData.value.checkDateTime = new Date().toLocaleString().replace(/\//g, '-')
     isshowwjztime.value = false
-    issaveshow.value=false
+    issaveshow.value = false
   }
 
   receivename.value = Profilevo.value.nickname
@@ -209,7 +203,7 @@ async function save() {
   const data = await WarningApi.SaveupdateWarning(savedata)
   if (data) {
     isshowwjztime.value = true
-    issaveshow.value=true
+    issaveshow.value = true
     message.alertSuccess('确认成功')
   }
 }
@@ -267,8 +261,8 @@ const resetForm = () => {
     warningProcess: undefined,
     readremark: undefined
   }
-     //重置一下数据
-    warintinfo.value=''
+  //重置一下数据
+  warintinfo.value = ''
 }
 defineExpose({ opendiag }) // 提供 open 方法，用于打开弹窗
 /** 提交表单 */
diff --git a/src/views/ECG/ECGWaring/ECGWarningDialog.vue b/src/views/ECG/ECGWaring/ECGWarningDialog.vue
index 34c461f9..ff3f7064 100644
--- a/src/views/ECG/ECGWaring/ECGWarningDialog.vue
+++ b/src/views/ECG/ECGWaring/ECGWarningDialog.vue
@@ -63,6 +63,7 @@ import { ref } from 'vue'
 import { getUserProfile, ProfileVO } from '@/api/system/user/profile'
 import { WarningApi, WarningVO } from '@/api/system/warning'
 import { ReportPrintStatisticsApi } from '@/api/applyregistration/reportPrintStatistics'
+import { PatientexamlistApi, PatientexamlistVO } from '@/api/tblist/patientexamlist'
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
 const orgInfo = ref<any>('')
@@ -103,7 +104,7 @@ const opendiag = async (type, row) => {
     //上报医生
     formData.value.reportDoctor = Profilevo.value.nickname
   }
-  
+
   formLoading.value = false
   dialogVisible.value = true
 }
@@ -126,6 +127,8 @@ async function report() {
   const data = formData.value as unknown as WarningVO
   const re = await WarningApi.createWarning(data)
   if (re) {
+    //更新数据列表的危急值状态
+    await PatientexamlistApi.Updatetblistwarning(rowinfo.value.id, '1')
     message.alertSuccess('上报成功')
   }
   dialogVisible.value = false
diff --git a/src/views/tblist/patientexamlistECG/index.vue b/src/views/tblist/patientexamlistECG/index.vue
index 1c3c3d92..3cf499a5 100644
--- a/src/views/tblist/patientexamlistECG/index.vue
+++ b/src/views/tblist/patientexamlistECG/index.vue
@@ -198,6 +198,12 @@
                 <span>已申请</span>
               </el-tag>
             </div>
+            <!--如果有危急值显示红心-->
+            <div v-if="scope.row.warning===1">
+              <el-tag>
+                <span> <el-icon><Star /></el-icon></span>
+              </el-tag>
+            </div>
           </div>
         </template>
       </el-table-column>