Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue

@@ -17,7 +17,7 @@
             <div
               v-else
               class="dicom-desc"
-              style="width: 150px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
+              style="width: 135px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;"
             >
                 <div>
                   <div style="text-overflow: ellipsis;overflow: hidden;" v-if="!study.StudyName">
@@ -32,7 +32,37 @@
                     <div>{{ study.Modalities }} ({{ study.SeriesCount }})</div>
                   </div>
                   <div style="text-overflow: ellipsis;overflow: hidden;" :title="study.Description">{{ study.Description }}</div>
-                  
+                  <div class="patient-info" v-if="['PT、CT', 'CT、PT', 'PET-CT'].includes(study.Modalities)">
+                    <el-popover placement="right-start" trigger="hover" popper-class="patient-info-popper">
+                      <h4>{{ $t('trials:ptData:title') }}</h4>
+                      <div class="patient-info-row">
+                        <label>{{ $t('trials:ptData:label:patientSex') }}</label>
+                        <span>{{ study.PatientSex }}</span>
+                      </div>
+                      <div class="patient-info-row">
+                        <label>{{ $t('trials:ptData:label:patientWeight') }}</label>
+                        <span>{{ study.PatientWeight }}</span>
+                      </div>
+                      <div class="patient-info-row">
+                        <label>{{ $t('trials:ptData:label:totalDose') }}</label>
+                        <span>{{ study.RadionuclideTotalDose }}</span>
+                      </div>
+                      <div class="patient-info-row">
+                        <label>{{ $t('trials:ptData:label:halfLife') }}</label>
+                        <span>{{ study.RadionuclideHalfLife }}</span>
+                      </div>
+                      <div class="patient-info-row">
+                        <label>{{ $t('trials:ptData:label:injectTime') }}</label>
+                        <span>{{ study.RadiopharmaceuticalStartTime }}</span>
+                      </div>
+                      <div class="patient-info-row">
+                        <label>{{ $t('trials:ptData:label:acquisitionTime') }}</label>
+                        <span>{{ study.AcquisitionTime }}</span>
+                      </div>
+                      <i slot="reference" class="el-icon-document"
+                        style="font-size: 15px;cursor: pointer;color: #f5f7fa;" />
+                    </el-popover>
+                  </div>
                 </div>
 
             </div>
@@ -99,37 +129,7 @@
                     <el-tooltip class="item" effect="dark" :content="series.description" placement="right">
                       <div style="">{{ series.description }}</div>
                     </el-tooltip>
-                    <div class="patient-info" style="position: absolute;right: 0;top: 30px;" v-if="['PT','PET'].includes(series.modality)">
+                    
-                      <el-popover placement="right" trigger="hover" popper-class="patient-info-popper">
-                        <h4>{{ $t('trials:ptData:title') }}</h4>
-                        <div class="patient-info-row">
-                          <label>{{ $t('trials:ptData:label:patientSex') }}</label>
-                          <span>{{ study.PatientSex }}</span>
-                        </div>
-                        <div class="patient-info-row">
-                          <label>{{ $t('trials:ptData:label:patientWeight') }}</label>
-                          <span>{{ study.PatientWeight }}</span>
-                        </div>
-                        <div class="patient-info-row">
-                          <label>{{ $t('trials:ptData:label:totalDose') }}</label>
-                          <span>{{ study.RadionuclideTotalDose }}</span>
-                        </div>
-                        <div class="patient-info-row">
-                          <label>{{ $t('trials:ptData:label:halfLife') }}</label>
-                          <span>{{ study.RadionuclideHalfLife }}</span>
-                        </div>
-                        <div class="patient-info-row">
-                          <label>{{ $t('trials:ptData:label:injectTime') }}</label>
-                          <span>{{ study.RadiopharmaceuticalStartTime }}</span>
-                        </div>
-                        <div class="patient-info-row">
-                          <label>{{ $t('trials:ptData:label:acquisitionTime') }}</label>
-                          <span>{{ study.AcquisitionTime }}</span>
-                        </div>
-                        <i slot="reference" class="el-icon-document"
-                          style="font-size: 15px;cursor: pointer;color: #f5f7fa;" />
-                      </el-popover>
-                    </div>
                   </p>
 
                   <p v-show="series.sliceThickness && !study.IsCriticalSequence">
@@ -1140,6 +1140,10 @@ export default {
 }
 </style>
 <style lang="scss">
+.patient-info {
+  // display: inline-block;
+  text-align: right;
+}
 .patient-info-popper {
   font-size: 12px;
   color: #ddd;

src/views/trials/trials-panel/reading/dicoms3D/components/MPRViewport.vue

@@ -120,10 +120,6 @@ export default {
             type: Boolean,
             default: false
         },
-        isMPR: {
-            type: Boolean,
-            default: false
-        },
         actionConfiguration: {
             type: Object,
             default: () => {
@@ -231,7 +227,6 @@ export default {
         })
         DicomEvent.$on('renderSegmentation', async (viewportId) => {
             // if (this.curSegSeries.Id !== this.series.Id || this.curSegSeries.VisitTaskId !== this.series.VisitTaskId) return false
-            if (!this.isMPR) return false
             if (this.viewportId !== viewportId) return false
             await renderSegmentation(this.series, this.series.TaskInfo, this.viewportId, this.SegmentConfig, this.renderingEngineId, null, this.actionConfiguration, this.segmentationId, this.segmentIndex)
         })
@@ -256,7 +251,6 @@ export default {
         },
         SegmentConfig: {
             handler() {
-                if (!this.isMPR) return false
                 if (!this.segmentationId) return false
                 if (!this.series.TaskInfo) return false
                 readingSegmentByConfig(this.series, this.series.TaskInfo, this.viewportId, this.segmentationId, this.SegmentConfig)
@@ -264,13 +258,11 @@ export default {
             deep: true
         },
         segmentIndex() {
-            if (!this.isMPR) return false
             if (this.curSegSeries.Id !== this.series.Id || this.curSegSeries.VisitTaskId !== this.series.VisitTaskId) return false
             if (this.segmentIndex <= 0) return false
             selectSegment(this.viewportId, this.segmentationId, this.segmentIndex)
         },
         segmentationId() {
-            if (!this.isMPR) return false
             if (this.curSegSeries.Id !== this.series.Id || this.curSegSeries.VisitTaskId !== this.series.VisitTaskId) return false
             if (!this.segmentationId) return false
             selectSegmentation(this.viewportId, this.segmentationId)
@@ -673,11 +665,8 @@ export default {
                         renderingEngine.render()
                     }, 100)
                 }
-                if (this.isMPR) {
                 await renderSegmentation(this.series, this.series.TaskInfo, this.viewportId, this.SegmentConfig, this.renderingEngineId, null, this.actionConfiguration, this.segmentationId, this.segmentIndex)
                 DicomEvent.$emit('SegmentationLoading', this.viewportId)
-                }
-
                 let volume = cache.getVolume(this.volumeId)
                 // console.log(volume, 'volume')
                 if (this.series.orientation === 'AXIAL' && this.series.curIndex) return this.setFullScreen(this.series.curIndex)

src/views/trials/trials-panel/reading/dicoms3D/components/ReadPage.vue

@@ -344,7 +344,7 @@
                     :viewport-index="index" :histogramVisible="histogramVisible"
                     :actionConfiguration="actionConfiguration" :SegmentConfig="SegmentConfig"
                     :segmentationId.sync="segId" :segmentIndex.sync="segIndex" :curSegSeries.sync="curSegSeries"
-                    :isMPR="isMPR" :MPRInfo="MPRInfo" @activeViewport="activeViewport" @setMPRInfo="setMPRInfo"
+                    :MPRInfo="MPRInfo" @activeViewport="activeViewport" @setMPRInfo="setMPRInfo"
                     @toggleTaskByViewport="toggleTaskByViewport" @previewCD="previewCD"
                     @renderAnnotations="renderAnnotations" @contentMouseup="contentMouseup"
                     @resetHistogram="resetHistogram" v-resize="(e) => handleSizeChange(e, `viewport-MPR-${index}`)" />
@@ -1052,6 +1052,7 @@ export default {
       let imageId = imageIds[0]
       const imagePixelModule = metaData.get('imagePixelModule', imageId);
       const photometricInterpretation = imagePixelModule?.photometricInterpretation;
+      console.log(photometricInterpretation, 'photometricInterpretation')
       if (photometricInterpretation && photometricInterpretation !== 'MONOCHROME1' && photometricInterpretation !== 'MONOCHROME2') return this.$confirm(this.$t('trials:histogram:confirm:photometricInterpretationNotSupported'))
       this.histogramVisible = true
       this.setToolsPassive()

src/views/trials/trials-panel/reading/dicoms3D/components/Segmentations.vue

@@ -163,8 +163,7 @@
                             <i class="el-icon-warning-outline" style="color:red;margin-right: 5px;"
                                 :title="$t('trials:reading:Segmentations:tip:segmentationIsNotSave')"
                                 v-if="!curSegmentGroup.isSaved"></i>
-                            <el-button type="success" size="small"
+                            <el-button type="success" size="small" :disabled="saveLoading || isMPR"
-                                :disabled="saveLoading || isMPR || curSegmentGroup.isSaved"
                                 @click="saveSegmentGroup([curSegmentGroup])">
                                 {{ $t("trials:reading:Segmentations:button:save") }}
                             </el-button>
@@ -187,34 +186,21 @@
                             <div class="messageBox">
                                 <el-popover placement="left" :title="item.SegmentLabel" width="200" trigger="hover">
                                     <div class="Bidirectionalbox">
-                                        <!-- <div class="BidirectionalBtn" @click.stop="addTip(item)"
+                                        <div class="BidirectionalBtn" @click.stop="addTip(item)"
                                             v-if="!item.bidirectional">
                                             {{ $t('trials:reading:Segmentations:button:getBidirectional') }}
-                                        </div> -->
+                                        </div>
-                                        <template>
+                                        <template v-else>
                                             <div class="num">
-                                                <span>L: {{
+                                                <span>L:{{ Number(item.bidirectional.maxMajor).toFixed(2) }} mm</span>
-                                                    item.bidirectional && item.bidirectional.maxMajor
+                                                <span>S:{{ Number(item.bidirectional.maxMinor).toFixed(2) }} mm</span>
-                                                        ? Number(item.bidirectional.maxMajor).toFixed(2) : ' '
-                                                }} mm</span>
-                                                <span>S: {{
-                                                    item.bidirectional && item.bidirectional.maxMinor
-                                                        ? Number(item.bidirectional.maxMinor).toFixed(2) : ' '
-                                                }} mm</span>
                                             </div>
                                             <div class="btnBox">
                                                 <svg-icon :icon-class="!item.bidirectionalView ? 'eye' : 'eye-open'"
                                                     style="color:#000;margin-right: 5px;cursor: pointer;"
-                                                    @click.stop="viewBidirectional([item], !item.bidirectionalView)"
+                                                    @click.stop="viewBidirectional([item], !item.bidirectionalView)" />
-                                                    :title="!item.bidirectionalView ? $t('trials:reading:Segmentations:button:eye') : $t('trials:reading:Segmentations:button:eye-open')"
-                                                    v-if="item.bidirectional" />
                                                 <svg-icon icon-class="jumpto" style="color:#000;cursor: pointer;"
-                                                    :title="$t('trials:reading:Segmentations:button:jumpto')"
+                                                    @click.stop="jumpBidirectional(item)" />
-                                                    @click.stop="jumpBidirectional(item)" v-if="item.bidirectional" />
-                                                <i class="el-icon-plus" style="color:#000;cursor: pointer;"
-                                                    v-if="!item.bidirectional"
-                                                    :title="$t('trials:reading:Segmentations:button:getBidirectional')"
-                                                    @click.stop="addTip(item)" />
                                             </div>
                                         </template>
                                     </div>
@@ -267,8 +253,7 @@
             </el-collapse-item>
         </el-collapse>
         <div class="saveBtnBox" v-if="readingTaskState < 2 && segmentList && segmentList.length > 1">
-            <el-button type="success" size="small" :disabled="saveLoading || isMPR || curSegmentGroup.isSaved"
+            <el-button type="success" size="small" :disabled="saveLoading || isMPR" @click="saveSegmentGroup()">
-                @click="saveSegmentGroup()">
                 {{ $t("trials:reading:Segmentations:button:saveAll") }}
             </el-button>
         </div>

src/views/trials/trials-panel/reading/dicoms3D/components/StudyList.vue

@@ -32,6 +32,37 @@
                     <span :title="study.Modalities">{{ `${study.Modalities} (${study.SeriesCount})` }}</span>
                   </div>
                 </template>
+                <div class="patient-info" v-if="['PT、CT', 'CT、PT', 'PET-CT'].includes(study.Modalities)">
+                  <el-popover placement="right-start" trigger="hover" popper-class="patient-info-popper">
+                    <h4>{{ $t('trials:ptData:title') }}</h4>
+                    <div class="patient-info-row">
+                      <label>{{ $t('trials:ptData:label:patientSex') }}</label>
+                      <span>{{ study.PatientSex }}</span>
+                    </div>
+                    <div class="patient-info-row">
+                      <label>{{ $t('trials:ptData:label:patientWeight') }}</label>
+                      <span>{{ study.PatientWeight }}</span>
+                    </div>
+                    <div class="patient-info-row">
+                      <label>{{ $t('trials:ptData:label:totalDose') }}</label>
+                      <span>{{ study.RadionuclideTotalDose }}</span>
+                    </div>
+                    <div class="patient-info-row">
+                      <label>{{ $t('trials:ptData:label:halfLife') }}</label>
+                      <span>{{ study.RadionuclideHalfLife }}</span>
+                    </div>
+                    <div class="patient-info-row">
+                      <label>{{ $t('trials:ptData:label:injectTime') }}</label>
+                      <span>{{ study.RadiopharmaceuticalStartTime }}</span>
+                    </div>
+                    <div class="patient-info-row">
+                      <label>{{ $t('trials:ptData:label:acquisitionTime') }}</label>
+                      <span>{{ study.AcquisitionTime }}</span>
+                    </div>
+                    <i slot="reference" class="el-icon-document"
+                      style="font-size: 15px;cursor: pointer;color: #f5f7fa;" />
+                  </el-popover>
+                </div>
 
               </div>
               <div v-else>
@@ -74,41 +105,9 @@
                       #{{ series.SeriesNumber }}
 
                     </div>
-                    <div v-if="series.Description" class="text-desc" :title="series.Description"
+                    <div v-if="series.Description" class="text-desc" :title="series.Description">
-                      style="position: relative;">
                       {{ series.Description }}
-                      <div class="patient-info" style="position: absolute;right: 0;top: 0;"
+                      
-                        v-if="['PT', 'PET'].includes(series.Modality)">
-                        <el-popover placement="right" trigger="hover" popper-class="patient-info-popper">
-                          <h4>{{ $t('trials:ptData:title') }}</h4>
-                          <div class="patient-info-row">
-                            <label>{{ $t('trials:ptData:label:patientSex') }}</label>
-                            <span>{{ study.PatientSex }}</span>
-                          </div>
-                          <div class="patient-info-row">
-                            <label>{{ $t('trials:ptData:label:patientWeight') }}</label>
-                            <span>{{ study.PatientWeight }}</span>
-                          </div>
-                          <div class="patient-info-row">
-                            <label>{{ $t('trials:ptData:label:totalDose') }}</label>
-                            <span>{{ study.RadionuclideTotalDose }}</span>
-                          </div>
-                          <div class="patient-info-row">
-                            <label>{{ $t('trials:ptData:label:halfLife') }}</label>
-                            <span>{{ study.RadionuclideHalfLife }}</span>
-                          </div>
-                          <div class="patient-info-row">
-                            <label>{{ $t('trials:ptData:label:injectTime') }}</label>
-                            <span>{{ study.RadiopharmaceuticalStartTime }}</span>
-                          </div>
-                          <div class="patient-info-row">
-                            <label>{{ $t('trials:ptData:label:acquisitionTime') }}</label>
-                            <span>{{ study.AcquisitionTime }}</span>
-                          </div>
-                          <i slot="reference" class="el-icon-document"
-                            style="font-size: 15px;cursor: pointer;color: #f5f7fa;" />
-                        </el-popover>
-                      </div>
                     </div>
                     <div v-if="series.SliceThickness && !study.IsCriticalSequence" class="text-desc">
                       T: {{ parseFloat(series.SliceThickness).toFixed(digitPlaces) }}
@@ -200,9 +199,6 @@ export default {
   },
   methods: {
     activeSeries(series, seriesIndex, studyIndex) {
-      const photometricInterpretation = series?.InstanceInfoList[0]?.PhotometricInterpretation;
-      if (!photometricInterpretation || (photometricInterpretation !== 'MONOCHROME1' && photometricInterpretation !== 'MONOCHROME2'))
-        return this.$confirm(this.$t('trials:histogram:confirm:activeSeriesPhotometricInterpretationNotSupported'))
       this.activeStudyIndex = studyIndex
       this.activeSeriesIndex = seriesIndex
       this.$emit('activeSeries', series)
@@ -267,6 +263,10 @@ export default {
 }
 </script>
 <style lang="scss">
+.patient-info {
+  // display: inline-block;
+  text-align: right;
+}
 .patient-info-popper {
   font-size: 12px;
   color: #ddd;
@@ -299,6 +299,7 @@ export default {
   color: #bbb;
   // font-weight: 600;
   white-space: nowrap;
+  // text-align: right;
 }
 
 .patient-info-popper span {

src/views/trials/trials-panel/reading/dicoms3D/components/helpers/segmentations.js

@@ -112,7 +112,6 @@ async function loadSegmentation(arrayBuffer, series, segmentationId) {
     })
     const megmentGroup =
         segmentation.state.getSegmentation(segmentationId);
-    if (!megmentGroup) return false
     const { imageIds } = megmentGroup.representationData.Labelmap;
     const derivedSegmentationImages = imageIds.map(imageId =>
         cache.getImage(imageId)
@@ -227,11 +226,10 @@ async function readingSegmentByConfig(series, visitInfo, viewportId, segmentatio
     )
 }
 function selectSegmentation(viewportId, segmentationId) {
-    if (!segmentation.state.getSegmentation(segmentationId)) return false
     segmentation.activeSegmentation.setActiveSegmentation(viewportId, segmentationId)
 }
 function selectSegment(viewportId, segmentationId, segmentIndex) {
-    if (!segmentIndex || !segmentationId || !segmentation.state.getSegmentation(segmentationId)) return false
+    if (!segmentIndex || !segmentationId) return false
     selectSegmentation(viewportId, segmentationId)
     segmentation.segmentIndex.setActiveSegmentIndex(segmentationId, segmentIndex);
 }
@@ -356,7 +354,6 @@ async function renderSegmentation(series, visitInfo, viewportId, SegmentConfig,
             PageSize: 9999,
             PageIndex: 1,
         }
-        setTimeout(async () => {
         let res = await getSegmentationList(data);
         if (res.IsSuccess) {
             let list = res.Result.CurrentPageData;
@@ -414,8 +411,6 @@ async function renderSegmentation(series, visitInfo, viewportId, SegmentConfig,
             }
         }
         readingSegmentByConfig(series, visitInfo, viewportId, segmentationId, SegmentConfig)
-        }, 500)
-
     } catch (err) {
         console.log(err)
     }

src/views/trials/trials-panel/reading/dicoms3D/components/histogram.vue

@@ -221,7 +221,6 @@ export default {
             Object.keys(this.seriesData).forEach(key => {
                 if (key !== 'default' || this.isNeedDefault) seriesData.push(this.seriesData[key])
             })
-            seriesData = this.formatSeriesData(seriesData)
             this.chart.clear();
             const option = {
                 useUTC: true,
@@ -288,27 +287,6 @@ export default {
             };
             this.chart.setOption(option);
         },
-        formatSeriesData(seriesData) {
-            let arr = []
-            seriesData.forEach(serie => {
-                serie.data.forEach(item => {
-                    if (!arr.includes(item[0])) arr.push(item[0])
-                })
-            })
-            arr = arr.sort((a, b) => a - b)
-            seriesData.forEach(serie => {
-                let data = []
-                arr.forEach(item => {
-                    if (serie.objKey[item]) {
-                        data.push([item, serie.objKey[item]])
-                    } else {
-                        data.push([item, 0])
-                    }
-                })
-                serie.data = data
-            })
-            return seriesData
-        },
         async generateData(annotation) {
             var seriesData = [];
             var min = null;
@@ -319,8 +297,10 @@ export default {
             } else {
                 res = await this.getCurrentSliceValuesFromVoxelManager(this.renderingEngineId, `${this.viewportKey}-${this.activeViewportIndex}`)
             }
-            let obj = {}
             if (res) {
+                let obj = {
+
+                }
                 res.values.forEach(item => {
                     if (obj[item]) {
                         obj[item]++
@@ -347,8 +327,7 @@ export default {
                 seriesData: {
                     type: 'line',
                     symbolSize: 0,
-                    data: seriesData,
+                    data: seriesData
-                    objKey: obj
                 },
                 min: min,
                 max: max