From 4df8d76a42643eaae6037f0befb9f3bb2d3aeb4a Mon Sep 17 00:00:00 2001
From: lichuanyang <1176537920@qq.com>
Date: Wed, 13 Nov 2024 12:04:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/tblist/patientexamlist/index.vue    | 64 +++++++++----------
 .../tblist/patientexamlistPathology/index.vue | 12 ++--
 .../patientexamlistultrasonic/index.vue       | 14 ++--
 3 files changed, 46 insertions(+), 44 deletions(-)

diff --git a/src/views/tblist/patientexamlist/index.vue b/src/views/tblist/patientexamlist/index.vue
index c34b6f37..ce801153 100644
--- a/src/views/tblist/patientexamlist/index.vue
+++ b/src/views/tblist/patientexamlist/index.vue
@@ -271,31 +271,30 @@
             申请
           </el-button>
           <el-button link type="danger" @click.stop="collect(scope.row.id, scope.row.isFavourite)">
-            <el-icon v-if="scope.row.isFavourite==='1'"><StarFilled /></el-icon>
+            <el-icon v-if="scope.row.isFavourite === '1'"><StarFilled /></el-icon>
             <el-icon v-else><Star /></el-icon>
           </el-button>
 
-            <el-button
+          <el-button
             link
             @dblclick.stop
             style="color: rgb(56, 119, 246)"
             size="small"
             type="primary"
-            @click.stop="openexe(scope.row.id,scope.row.orgId,scope.row.regId,scope.row.examId)"
+            @click.stop="openexe(scope.row.id, scope.row.orgId, scope.row.regId, scope.row.examId)"
           >
             调图
           </el-button>
-         
+
           <el-button
             link
             style="color: rgb(56, 119, 246)"
             size="small"
             type="primary"
-            @click.stop=" handleEdit(scope.row,'1')"
+            @click.stop="handleEdit(scope.row, '1')"
           >
             报告
           </el-button>
-         
         </template>
       </el-table-column>
     </el-table>
@@ -313,7 +312,7 @@
 </template>
 
 <script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, beginOfDay } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { PatientexamlistApi, PatientexamlistVO } from '@/api/tblist/patientexamlist'
 import PatientexamlistForm from './PatientexamlistForm.vue'
@@ -336,7 +335,7 @@ const queryParams = reactive({
   pname: undefined,
   gender: undefined,
   birthday: undefined,
-  examDate: [],
+  examDate: [] as any[],
   deviceType: '',
   seDc: undefined,
   examItemName: undefined,
@@ -363,17 +362,23 @@ const exportLoading = ref(false) // 导出的加载中
 /** 影像组件 */
 const dicomViewRef = ref()
 
-const opendicomViewFrom = (id: number, orgid: string, regid: string, examId: string,isLoaded:string) => {
-  dicomViewRef.value.open(id, orgid, regid, examId,isLoaded)
+const opendicomViewFrom = (
+  id: number,
+  orgid: string,
+  regid: string,
+  examId: string,
+  isLoaded: string
+) => {
+  dicomViewRef.value.open(id, orgid, regid, examId, isLoaded)
 }
 /** 表格行点击 */
 const clickNumber = ref(0)
-function handleEdit(row,isLoaded:string) {
+function handleEdit(row, isLoaded: string) {
   console.log(111111121212)
 
   if (!row.deviceType.includes('US')) {
     //US是超声类
-    opendicomViewFrom(row.id, row.orgId, row.regId, row.examId,isLoaded)
+    opendicomViewFrom(row.id, row.orgId, row.regId, row.examId, isLoaded)
 
     /*  clickNumber.value++;
   if (clickNumber.value == 2) {
@@ -390,22 +395,23 @@ const examDate_radio_value = ref(3)
 
 const examDate_radio_change = () => {
   if ([1, 2, 3, 4].includes(examDate_radio_value.value)) {
-    let timesta = new Date()
-    let timeend = new Date()
+    let timesta = beginOfDay(new Date())
+    let timeend = beginOfDay(new Date())
+    timeend.setDate(timeend.getDate() + 1)
     //判断当前选择的是那个时间
     if (examDate_radio_value.value === 1) {
       queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     } else if (examDate_radio_value.value === 2) {
       timesta.setDate(timesta.getDate() - 1)
+      timeend.setDate(timeend.getDate() - 1)
       queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     } else if (examDate_radio_value.value === 3) {
-      timesta.setDate(timesta.getDate() - 3)
+      timesta.setDate(timesta.getDate() - 2)
       queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     } else if (examDate_radio_value.value === 4) {
-      timesta.setDate(timesta.getDate() - 7)
+      timesta.setDate(timesta.getDate() - 6)
       queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     }
-
     handleQuery()
   } else if (5 === examDate_radio_value.value) {
     queryParams.examDate = []
@@ -441,11 +447,10 @@ const getList = async () => {
 // 收藏功能
 const collect = async (id: string, isFavourite: string) => {
   if (isFavourite == '0') {
-    await PatientexamlistApi.CollectAndCancellation(id,"1")
+    await PatientexamlistApi.CollectAndCancellation(id, '1')
     message.success('收藏成功')
-
   } else if (isFavourite == '1') {
-    await PatientexamlistApi.CollectAndCancellation(id,"0")
+    await PatientexamlistApi.CollectAndCancellation(id, '0')
     message.success('取消成功')
   }
   examDate_radio_change()
@@ -477,17 +482,16 @@ const dicomDataRefresh = async () => {
 const handleQuery = () => {
   queryParams.pageNo = 1
   queryParams.deviceType = 'CT'
-  queryParams.isFavourite=''
+  queryParams.isFavourite = ''
   getList()
 }
 
-// 只查询收藏的数据 
-const selectcollect=()=>
-{
+// 只查询收藏的数据
+const selectcollect = () => {
   queryFormRef.value.resetFields()
   queryParams.pageNo = 1
   queryParams.deviceType = 'CT'
-  queryParams.isFavourite='1'
+  queryParams.isFavourite = '1'
   getList()
 }
 /** 重置按钮操作 */
@@ -525,21 +529,17 @@ const getuporghiorgid = async (id: number, orgId: string, reportstatus: string)
   } catch {}
 }
 // 打开本地exe  通过注册表
-const openexe= (id: number, orgid: string, regid: string, examId: string)=>
-{
+const openexe = (id: number, orgid: string, regid: string, examId: string) => {
   // 先查询数据
   try {
-    const url = `f1://${examId+','+orgid+','+regid}`;
+    const url = `f1://${examId + ',' + orgid + ',' + regid}`
     console.log(url)
     window.location.href = url
-
   } catch (error) {
     console.error('Error fetching data:', error)
-
   }
 }
 
-
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
@@ -590,8 +590,6 @@ onMounted(() => {
   //老代码
   //getList();
 })
-
-
 </script>
 
 <style>
diff --git a/src/views/tblist/patientexamlistPathology/index.vue b/src/views/tblist/patientexamlistPathology/index.vue
index 88dc1727..28a1bce4 100644
--- a/src/views/tblist/patientexamlistPathology/index.vue
+++ b/src/views/tblist/patientexamlistPathology/index.vue
@@ -312,7 +312,7 @@
 </template>
 
 <script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, beginOfDay } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { PatientexamlistApi } from '@/api/tblist/patientexamlist'
 import DicomViewForm from '/src/views/dicomPathologyForm/dicomPathologyViewForm.vue'
@@ -397,19 +397,21 @@ const handleQuery = () => {
 
 const examDate_radio_change = () => {
   if ([1, 2, 3, 4].includes(examDate_radio_value.value)) {
-    let timesta = new Date()
-    let timeend = new Date()
+    let timesta = beginOfDay(new Date())
+    let timeend = beginOfDay(new Date())
+    timeend.setDate(timeend.getDate() + 1)
     //判断当前选择的是那个时间
     if (examDate_radio_value.value === 1) {
       queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     } else if (examDate_radio_value.value === 2) {
       timesta.setDate(timesta.getDate() - 1)
+      timeend.setDate(timeend.getDate() - 1)
       queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     } else if (examDate_radio_value.value === 3) {
-      timesta.setDate(timesta.getDate() - 3)
+      timesta.setDate(timesta.getDate() - 2)
       queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     } else if (examDate_radio_value.value === 4) {
-      timesta.setDate(timesta.getDate() - 7)
+      timesta.setDate(timesta.getDate() - 6)
       queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     }
     handleQuery()
diff --git a/src/views/tblist/patientexamlistultrasonic/index.vue b/src/views/tblist/patientexamlistultrasonic/index.vue
index f3af17d8..c9cf57c1 100644
--- a/src/views/tblist/patientexamlistultrasonic/index.vue
+++ b/src/views/tblist/patientexamlistultrasonic/index.vue
@@ -295,7 +295,7 @@
 </template>
 
 <script setup lang="ts">
-import { dateFormatter } from '@/utils/formatTime'
+import { dateFormatter, beginOfDay } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { PatientexamlistApi, PatientexamlistVO } from '@/api/tblist/patientexamlist'
 import PatientexamlistForm from './PatientexamlistForm.vue'
@@ -317,7 +317,7 @@ const queryParams = reactive({
   pname: undefined,
   gender: undefined,
   birthday: undefined,
-  examDate: [],
+  examDate: [] as any[],
   deviceType: '',
   seDc: undefined,
   examItemName: undefined,
@@ -369,19 +369,21 @@ const examDate_radio_value = ref(1)
 
 const examDate_radio_change = () => {
   if ([1, 2, 3, 4].includes(examDate_radio_value.value)) {
-    let timesta = new Date()
-    let timeend = new Date()
+    let timesta = beginOfDay(new Date())
+    let timeend = beginOfDay(new Date())
+    timeend.setDate(timeend.getDate() + 1)
     //判断当前选择的是那个时间
     if (examDate_radio_value.value === 1) {
       queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     } else if (examDate_radio_value.value === 2) {
       timesta.setDate(timesta.getDate() - 1)
+      timeend.setDate(timeend.getDate() - 1)
       queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     } else if (examDate_radio_value.value === 3) {
-      timesta.setDate(timesta.getDate() - 3)
+      timesta.setDate(timesta.getDate() - 2)
       queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     } else if (examDate_radio_value.value === 4) {
-      timesta.setDate(timesta.getDate() - 7)
+      timesta.setDate(timesta.getDate() - 6)
       queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     }