Merge branch 'master' of http://114.55.171.231:3000/lxd/FlowVue

src/api/tblist/patientexamlist/index.ts

@@ -80,4 +80,9 @@ export const PatientexamlistApi = {
   examine: async (id: String) => {
   return await request.get({ url: `/tblist/patientexamlist/examine?id=` + id })
  },
+
+   // dicom数据同步
+   dicomDataSync: async () => {
+    return await request.get({ url: `/tblist/patientexamlist/dicomDataSync` })
+  },
 }

src/views/tblist/patientexamlist/index.vue

@@ -264,6 +264,7 @@
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
+        <el-button @click="dicomDataSync"><Icon icon="ep:refresh" class="mr-5px" /> 同步</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -447,17 +448,18 @@ const exportLoading = ref(false) // 导出的加载中
 
 /** 影像组件 */
 const dicomViewRef = ref()
+
 const opendicomViewFrom= (id: number, orgid: string, regid: string,examId:string) => {
   dicomViewRef.value.open(id, orgid, regid,examId)
-}
+
 /** 表格行点击 */
 const clickNumber = ref(0)
 function handleEdit(row) {
   console.log(111111121212)
+
   if(!row.deviceType.includes("US"))//US是超声类
   {
     opendicomViewFrom(row.id,row.orgId,row.regId,row.examId)
-  }
 
 
   /*  clickNumber.value++;
@@ -466,6 +468,7 @@ function handleEdit(row) {
     }
     clickNumber.value = 0; */
 }
+}
 
 /** aaaaa **/
 const examDate_picker = ref(null)
@@ -520,6 +523,10 @@ const getList = async () => {
   }
 }
 
+const dicomDataSync = async () => {
+  PatientexamlistApi.dicomDataSync()
+}
+
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1

src/views/tblist/patientexamlistultrasonic/index.vue

@@ -46,12 +46,16 @@
       </el-form-item> -->
       <el-form-item label="检查日期" prop="examDate">
         <!-- aaaaa -->
-         <el-radio-group ref="examDate_radio" v-model="examDate_radio_value" @change="examDate_radio_change">
+        <el-radio-group
-            <el-radio style="margin-right: 15px;" :value="1">今天</el-radio>
+          ref="examDate_radio"
-            <el-radio style="margin-right: 15px;" :value="2">昨天</el-radio>
+          v-model="examDate_radio_value"
-            <el-radio style="margin-right: 15px;" :value="3">三天内</el-radio>
+          @change="examDate_radio_change"
-            <el-radio style="margin-right: 15px;" :value="4">一周</el-radio>
+        >
-            <el-radio style="margin-right: 25px;" :value="5">
+          <el-radio style="margin-right: 15px" :value="1">今天</el-radio>
+          <el-radio style="margin-right: 15px" :value="2">昨天</el-radio>
+          <el-radio style="margin-right: 15px" :value="3">三天内</el-radio>
+          <el-radio style="margin-right: 15px" :value="4">一周</el-radio>
+          <el-radio style="margin-right: 25px" :value="5">
             <el-date-picker
               ref="examDate_picker"
               :disabled="examDate_radio_value === 5 ? false : true"
@@ -61,7 +65,8 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-                  class="!w-240px"/>
+              class="!w-240px"
+            />
           </el-radio>
         </el-radio-group>
       </el-form-item>
@@ -87,7 +92,6 @@
         />
       </el-form-item> -->
 
-
       <el-form-item label="检查项目" prop="examItemName">
         <el-input
           v-model="queryParams.examItemName"
@@ -260,13 +264,20 @@
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
+        <el-button @click="dicomDataSync"><Icon icon="ep:refresh" class="mr-5px" /> 同步</el-button>
       </el-form-item>
     </el-form>
   </ContentWrap>
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @row-dblclick="handleEdit">
+    <el-table
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      @row-dblclick="handleEdit"
+    >
       <el-table-column type="index" width="50px" />
       <el-table-column label="" width="150px">
         <template #default="scope">
@@ -313,7 +324,12 @@
       />
       <el-table-column label="机构名称" align="center" prop="orgName" width="180px" />
       <el-table-column label="机构ID" align="center" prop="orgId" v-if="false" />
-      <el-table-column label="上级判读机构id列表：orgid1,orgid2,orgid3" align="center" prop="highLevelOrgId" v-if="false" />
+      <el-table-column
+        label="上级判读机构id列表：orgid1,orgid2,orgid3"
+        align="center"
+        prop="highLevelOrgId"
+        v-if="false"
+      />
       <el-table-column
         label="创建时间：年月日时分秒"
         align="center"
@@ -354,7 +370,6 @@
         <template #default="scope">
           <el-button
             size="small"
-            
             type="primary"
             @click="getuporghiorgid(scope.row.id, scope.row.orgId, scope.row.reportstatus)"
             v-hasPermi="['tblist:patientexamlist:query']"
@@ -394,7 +409,6 @@ import { PatientexamlistApi, PatientexamlistVO } from '@/api/tblist/patientexaml
 import PatientexamlistForm from './PatientexamlistForm.vue'
 import Ultrasonic from '/src/views/ultrasoniccom/ultrasonicForm.vue'
 
-
 /** PACS检查列表 列表 */
 defineOptions({ name: 'Patientexamlistultrasonic' })
 
@@ -412,15 +426,15 @@ const queryParams = reactive({
   gender: undefined,
   birthday: undefined,
   examDate: [],
-  deviceType: "",
+  deviceType: '',
   seDc: undefined,
   examItemName: undefined,
   reportstatus: undefined,
   applicationDate: [],
   uploadDate: [],
   orgName: undefined,
-  orgId: "",
+  orgId: '',
-  highLevelOrgId: "",
+  highLevelOrgId: '',
   createDate: [],
   examDescription: undefined,
   diagResults: undefined,
@@ -429,27 +443,23 @@ const queryParams = reactive({
   reviewDoctor: undefined,
   reviewDate: [],
   thumbnailImgUrl: undefined,
-  createTime: [],
+  createTime: []
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
-
 /** 超声组件 */
-const ultrasonic = ref();
+const ultrasonic = ref()
 const openultrForm = (id: number, orgid: string, regid: string) => {
-
   ultrasonic.value.open(id, orgid, regid)
 }
 /** 表格行点击 */
-const clickNumber = ref(0);
+const clickNumber = ref(0)
 function handleEdit(row) {
   console.log(111111121212)
-  openultrForm(row.id,row.orgId,row.regId)
   if(row.deviceType.includes("US"))//US是超声类
   {
     openultrForm(row.id,row.orgId,row.regId)
-  }
 
 
   /*  clickNumber.value++;
@@ -458,66 +468,53 @@ function handleEdit(row) {
     }
     clickNumber.value = 0; */
 }
-
+}
 
 /** aaaaa **/
-const examDate_picker = ref(null);
+const examDate_picker = ref(null)
-const examDate_radio = ref(null);
+const examDate_radio = ref(null)
-const examDate_radio_value = ref(1);
+const examDate_radio_value = ref(1)
-
 
 const examDate_radio_change = () => {
-  if([1,2,3,4].includes(examDate_radio_value.value))
+  if ([1, 2, 3, 4].includes(examDate_radio_value.value)) {
-  {
     let timesta = new Date()
     let timeend = new Date()
     //判断当前选择的是那个时间
     if (examDate_radio_value.value === 1) {
-      
+      queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
-      queryParams.examDate=[nowDate(timesta),nowDate(timeend)];
+    } else if (examDate_radio_value.value === 2) {
-    } else if (examDate_radio_value.value===2)
-    {
       timesta.setDate(timesta.getDate() - 1)
-      queryParams.examDate=[nowDate(timesta),nowDate(timeend)];
+      queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
-    }
+    } else if (examDate_radio_value.value === 3) {
-    else if(examDate_radio_value.value===3)
-    {
       timesta.setDate(timesta.getDate() - 3)
-      queryParams.examDate=[nowDate(timesta),nowDate(timeend)];
+      queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
-    }
+    } else if (examDate_radio_value.value === 4) {
-    else if(examDate_radio_value.value===4)
-    {
       timesta.setDate(timesta.getDate() - 7)
-      queryParams.examDate=[nowDate(timesta),nowDate(timeend)];
+      queryParams.examDate = [nowDate(timesta), nowDate(timeend)]
     }
 
-    handleQuery();
+    handleQuery()
-  }else if(5===examDate_radio_value.value)
+  } else if (5 === examDate_radio_value.value) {
-  {
+    queryParams.examDate = []
-    queryParams.examDate=[];
   }
 }
 
 ///转换时间格式
 function nowDate(time) {
-    var year = time.getFullYear(); // 年
+  var year = time.getFullYear() // 年
-    var month = (time.getMonth() + 1).toString().padStart(2, '0'); // 月
+  var month = (time.getMonth() + 1).toString().padStart(2, '0') // 月
-    var date = time.getDate().toString().padStart(2, '0'); // 日
+  var date = time.getDate().toString().padStart(2, '0') // 日
-    var hour = time.getHours().toString().padStart(2, '0'); // 时
+  var hour = time.getHours().toString().padStart(2, '0') // 时
-    var minute = time.getMinutes().toString().padStart(2, '0'); // 分
+  var minute = time.getMinutes().toString().padStart(2, '0') // 分
-    var second = time.getSeconds().toString().padStart(2, '0'); // 秒
+  var second = time.getSeconds().toString().padStart(2, '0') // 秒
-    return (
+  return year + '-' + month + '-' + date + ' ' + hour + ':' + minute + ':' + second
-      year + "-" + month + "-" + date + " " + hour + ":" + minute + ":" + second
-    )
 }
 
-
-
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
   try {
-     queryParams.deviceType="US"
+    queryParams.deviceType = 'US'
     const data = await PatientexamlistApi.getPatientexamlistPage(queryParams)
     list.value = data.list
     total.value = data.total
@@ -526,25 +523,29 @@ const getList = async () => {
   }
 }
 
+const dicomDataSync = async () => {
+  PatientexamlistApi.dicomDataSync()
+}
+
 /** 搜索按钮操作 */
 const handleQuery = () => {
   queryParams.pageNo = 1
   //获取到当前登陆用户的机构时 要进行赋值
-  queryParams.orgId=""
+  queryParams.orgId = ''
-  queryParams.highLevelOrgId=""
+  queryParams.highLevelOrgId = ''
-  queryParams.deviceType="US"
+  queryParams.deviceType = 'US'
   getList()
 }
 
 /** 重置按钮操作 */
 const resetQuery = () => {
-  queryFormRef.value.resetFields();
+  queryFormRef.value.resetFields()
 
   /** aaaaa **/
   //新写法
-  examDate_radio_value.value=1;
+  examDate_radio_value.value = 1
-  examDate_radio_change();
+  examDate_radio_change()
-  if(5===examDate_radio_value.value) handleQuery();
+  if (5 === examDate_radio_value.value) handleQuery()
 
   //老写法
   //handleQuery();
@@ -559,24 +560,18 @@ const openForm = (type: string, id?: number) => {
 /** 申请后更新上级机构字段*/
 const getuporghiorgid = async (id: number, orgId: string, reportstatus: string) => {
   try {
-  if(reportstatus=="未申请")
+    if (reportstatus == '未申请') {
-  {
+      await message.confirm('是否要进行申请？', '确认提示')
-    await message.confirm("是否要进行申请？","确认提示")
       await PatientexamlistApi.getuporghiid(id, orgId)
       message.success(t('common.delSuccess'))
       // 刷新列表
       await getList()
+    } else {
+      await message.info('只有未申请才可以进行操作')
     }
-  else
-  {
-    await message. info("只有未申请才可以进行操作")
-  }
- 
   } catch {}
 }
 
-
-
 /** 删除按钮操作 */
 const handleDelete = async (id: number) => {
   try {
@@ -618,12 +613,11 @@ const handleExport = async () => {
 
 /** 初始化 **/
 onMounted(() => {
-
   //在初始化的时候查询到当前登陆用户的机构 和上级机构
   /** aaaaa **/
   //新代码
-  examDate_radio_change();
+  examDate_radio_change()
-  if(5===examDate_radio_value.value) handleQuery();
+  if (5 === examDate_radio_value.value) handleQuery()
 
   //老代码
   //getList();