pass按项目查询条件变更
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
403e78f1da
commit
1ffb033013
|
@ -9,7 +9,7 @@
|
||||||
<!-- TrialId -->
|
<!-- TrialId -->
|
||||||
<el-form-item class="my_multiple" :label="$t('trials:inspection:pullImage:search:TrialId')">
|
<el-form-item class="my_multiple" :label="$t('trials:inspection:pullImage:search:TrialId')">
|
||||||
<el-select v-model="searchData.TrialId" style="width: 140px" @change="searchData.PatientID = null">
|
<el-select v-model="searchData.TrialId" style="width: 140px" @change="searchData.PatientID = null">
|
||||||
<el-option v-for="(item, index) of trialList" :key="index.TrialId" :label="item.ExperimentName"
|
<el-option v-for="(item) of trialList" :key="item.TrialId" :label="item.ExperimentName"
|
||||||
:value="item.TrialId">
|
:value="item.TrialId">
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
|
@ -17,8 +17,7 @@
|
||||||
<!-- pacsDicomAEId -->
|
<!-- pacsDicomAEId -->
|
||||||
<el-form-item class="my_multiple" :label="$t('trials:inspection:pullImage:search:pacsDicomAEId')">
|
<el-form-item class="my_multiple" :label="$t('trials:inspection:pullImage:search:pacsDicomAEId')">
|
||||||
<el-select v-model="searchData.PacsDicomAEId" style="width: 140px" @change="pacsDicomAEIdChange">
|
<el-select v-model="searchData.PacsDicomAEId" style="width: 140px" @change="pacsDicomAEIdChange">
|
||||||
<el-option v-for="(item, index) of AElist" :key="index.Id" :label="item.CalledAE"
|
<el-option v-for="(item) of AElist" :key="item.Id" :label="item.CalledAE" :value="item.Id">
|
||||||
:value="item.Id">
|
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
@ -92,18 +91,18 @@
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item> -->
|
</el-form-item> -->
|
||||||
<!-- modalitiesInStudy -->
|
<!-- modalitiesInStudy -->
|
||||||
<el-form-item :label="$t('trials:inspection:pullImage:search:modalitiesInStudy')">
|
<!-- <el-form-item :label="$t('trials:inspection:pullImage:search:modalitiesInStudy')">
|
||||||
<el-select v-model="searchData.ModalitiesInStudyList" placeholder="" clearable multiple
|
<el-select v-model="searchData.ModalitiesInStudyList" placeholder="" clearable multiple
|
||||||
collapse-tags style="width: 140px">
|
collapse-tags style="width: 140px">
|
||||||
<el-option v-for="item in ModalityList" :key="item" :label="item" :value="item" />
|
<el-option v-for="item in ModalityList" :key="item" :label="item" :value="item" />
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<!-- studyDate -->
|
<!-- studyDate -->
|
||||||
<el-form-item :label="$t('trials:inspection:pullImage:search:studyDate')">
|
<!-- <el-form-item :label="$t('trials:inspection:pullImage:search:studyDate')">
|
||||||
<el-date-picker v-model="StudyDate" type="daterange" range-separator="至" start-placeholder="开始日期"
|
<el-date-picker v-model="StudyDate" type="daterange" range-separator="至" start-placeholder="开始日期"
|
||||||
end-placeholder="结束日期" value-format="yyyyMMdd" :picker-options="pickerOptions">
|
end-placeholder="结束日期" value-format="yyyyMMdd" :picker-options="pickerOptions">
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item> -->
|
||||||
<!-- studyTime -->
|
<!-- studyTime -->
|
||||||
<!-- <el-form-item
|
<!-- <el-form-item
|
||||||
:label="$t('trials:inspection:pullImage:search:studyTime')"
|
:label="$t('trials:inspection:pullImage:search:studyTime')"
|
||||||
|
@ -265,7 +264,7 @@ const defaultSearchData = () => {
|
||||||
PacsDicomAEId: null,
|
PacsDicomAEId: null,
|
||||||
PatientID: null,
|
PatientID: null,
|
||||||
PatientName: null,
|
PatientName: null,
|
||||||
ModalitiesInStudyList: null,
|
// ModalitiesInStudyList: null,
|
||||||
StudyDate: null,
|
StudyDate: null,
|
||||||
TrialId: null,
|
TrialId: null,
|
||||||
|
|
||||||
|
@ -304,7 +303,7 @@ export default {
|
||||||
timeFrame: null,
|
timeFrame: null,
|
||||||
MaxStudyCount: null,
|
MaxStudyCount: null,
|
||||||
PatientBirthDate: [],
|
PatientBirthDate: [],
|
||||||
StudyDate: [],
|
// StudyDate: [],
|
||||||
// 可加入项目列表
|
// 可加入项目列表
|
||||||
loading: false,
|
loading: false,
|
||||||
list: [],
|
list: [],
|
||||||
|
@ -319,81 +318,81 @@ export default {
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
pickerOptions() {
|
// pickerOptions() {
|
||||||
return {
|
// return {
|
||||||
shortcuts: [
|
// shortcuts: [
|
||||||
{
|
// {
|
||||||
text: this.$t('trials:inspection:pullImage:picker:today'),
|
// text: this.$t('trials:inspection:pullImage:picker:today'),
|
||||||
onClick: (picker) => {
|
// onClick: (picker) => {
|
||||||
const end = new Date()
|
// const end = new Date()
|
||||||
const start = new Date()
|
// const start = new Date()
|
||||||
// picker.$emit('pick', [start, end])
|
// // picker.$emit('pick', [start, end])
|
||||||
this.StudyDate = [start, end]
|
// this.StudyDate = [start, end]
|
||||||
},
|
// },
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
text: this.$t('trials:inspection:pullImage:picker:week'),
|
// text: this.$t('trials:inspection:pullImage:picker:week'),
|
||||||
onClick: (picker) => {
|
// onClick: (picker) => {
|
||||||
const end = new Date()
|
// const end = new Date()
|
||||||
const start = new Date()
|
// const start = new Date()
|
||||||
if (!this.timeFrame || this.timeFrame > 3) {
|
// if (!this.timeFrame || this.timeFrame > 3) {
|
||||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * 2)
|
// start.setTime(start.getTime() - 3600 * 1000 * 24 * 2)
|
||||||
} else {
|
// } else {
|
||||||
start.setTime(
|
// start.setTime(
|
||||||
start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
|
// start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
|
||||||
)
|
// )
|
||||||
}
|
// }
|
||||||
|
|
||||||
// picker.$emit('pick', [start, end])
|
// // picker.$emit('pick', [start, end])
|
||||||
this.StudyDate = [start, end]
|
// this.StudyDate = [start, end]
|
||||||
},
|
// },
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
text: this.$t('trials:inspection:pullImage:picker:month'),
|
// text: this.$t('trials:inspection:pullImage:picker:month'),
|
||||||
onClick: (picker) => {
|
// onClick: (picker) => {
|
||||||
const end = new Date()
|
// const end = new Date()
|
||||||
const start = new Date()
|
// const start = new Date()
|
||||||
let month = this.$moment().subtract(1, 'months')
|
// let month = this.$moment().subtract(1, 'months')
|
||||||
let day = this.$moment().diff(month, 'day')
|
// let day = this.$moment().diff(month, 'day')
|
||||||
if (!this.timeFrame || this.timeFrame > day) {
|
// if (!this.timeFrame || this.timeFrame > day) {
|
||||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * (day - 1))
|
// start.setTime(start.getTime() - 3600 * 1000 * 24 * (day - 1))
|
||||||
} else {
|
// } else {
|
||||||
start.setTime(
|
// start.setTime(
|
||||||
start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
|
// start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
|
||||||
)
|
// )
|
||||||
}
|
// }
|
||||||
// picker.$emit('pick', [start, end])
|
// // picker.$emit('pick', [start, end])
|
||||||
this.StudyDate = [start, end]
|
// this.StudyDate = [start, end]
|
||||||
},
|
// },
|
||||||
},
|
// },
|
||||||
{
|
// {
|
||||||
text: this.$t('trials:inspection:pullImage:picker:trimester'),
|
// text: this.$t('trials:inspection:pullImage:picker:trimester'),
|
||||||
onClick: (picker) => {
|
// onClick: (picker) => {
|
||||||
const end = new Date()
|
// const end = new Date()
|
||||||
const start = new Date()
|
// const start = new Date()
|
||||||
let month = this.$moment().subtract(3, 'months')
|
// let month = this.$moment().subtract(3, 'months')
|
||||||
let day = this.$moment().diff(month, 'day')
|
// let day = this.$moment().diff(month, 'day')
|
||||||
if (!this.timeFrame || this.timeFrame > day) {
|
// if (!this.timeFrame || this.timeFrame > day) {
|
||||||
start.setTime(start.getTime() - 3600 * 1000 * 24 * (day - 1))
|
// start.setTime(start.getTime() - 3600 * 1000 * 24 * (day - 1))
|
||||||
} else {
|
// } else {
|
||||||
start.setTime(
|
// start.setTime(
|
||||||
start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
|
// start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
|
||||||
)
|
// )
|
||||||
}
|
// }
|
||||||
// picker.$emit('pick', [start, end])
|
// // picker.$emit('pick', [start, end])
|
||||||
this.StudyDate = [start, end]
|
// this.StudyDate = [start, end]
|
||||||
},
|
// },
|
||||||
},
|
// },
|
||||||
],
|
// ],
|
||||||
disabledDate: (time) => {
|
// disabledDate: (time) => {
|
||||||
if (!this.timeFrame) return false
|
// if (!this.timeFrame) return false
|
||||||
let curDate = new Date().getTime()
|
// let curDate = new Date().getTime()
|
||||||
let three = this.timeFrame * 24 * 3600 * 1000
|
// let three = this.timeFrame * 24 * 3600 * 1000
|
||||||
let threeMonths = curDate - three
|
// let threeMonths = curDate - three
|
||||||
return time.getTime() >= Date.now() || time.getTime() <= threeMonths
|
// return time.getTime() >= Date.now() || time.getTime() <= threeMonths
|
||||||
},
|
// },
|
||||||
}
|
// }
|
||||||
},
|
// },
|
||||||
tip() {
|
tip() {
|
||||||
if (!this.searchData.PacsDicomAEId) return ''
|
if (!this.searchData.PacsDicomAEId) return ''
|
||||||
let message = `( ${this.$t('trials:inspection:pullImage:PacsTip')} )`
|
let message = `( ${this.$t('trials:inspection:pullImage:PacsTip')} )`
|
||||||
|
@ -437,7 +436,6 @@ export default {
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.getAEList()
|
this.getAEList()
|
||||||
this.getTrialList()
|
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
// 获取项目
|
// 获取项目
|
||||||
|
@ -446,6 +444,9 @@ export default {
|
||||||
let res = await getUserJoinedTrialPatientList()
|
let res = await getUserJoinedTrialPatientList()
|
||||||
if (res.IsSuccess) {
|
if (res.IsSuccess) {
|
||||||
this.trialList = res.Result
|
this.trialList = res.Result
|
||||||
|
if (!this.trialList || (this.trialList && this.trialList.length <= 1)) return false
|
||||||
|
this.searchData.TrialId = this.trialList[0].TrialId
|
||||||
|
this.getTrialList()
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
console.log(err)
|
console.log(err)
|
||||||
|
@ -492,14 +493,14 @@ export default {
|
||||||
// } else {
|
// } else {
|
||||||
// data.PatientBirthDate = null
|
// data.PatientBirthDate = null
|
||||||
// }
|
// }
|
||||||
if (this.StudyDate && this.StudyDate[0] && this.StudyDate[1]) {
|
// if (this.StudyDate && this.StudyDate[0] && this.StudyDate[1]) {
|
||||||
data.StudyDate =
|
// data.StudyDate =
|
||||||
this.$moment(this.StudyDate[0]).format('YYYYMMDD') +
|
// this.$moment(this.StudyDate[0]).format('YYYYMMDD') +
|
||||||
'-' +
|
// '-' +
|
||||||
this.$moment(this.StudyDate[1]).format('YYYYMMDD')
|
// this.$moment(this.StudyDate[1]).format('YYYYMMDD')
|
||||||
} else {
|
// } else {
|
||||||
data.StudyDate = null
|
// data.StudyDate = null
|
||||||
}
|
// }
|
||||||
// if (this.StudyTime && this.StudyTime[0] && this.StudyTime[1]) {
|
// if (this.StudyTime && this.StudyTime[0] && this.StudyTime[1]) {
|
||||||
// data.StudyTime =
|
// data.StudyTime =
|
||||||
// this.$moment(this.StudyTime[0]).format('HHmmss') +
|
// this.$moment(this.StudyTime[0]).format('HHmmss') +
|
||||||
|
@ -534,6 +535,7 @@ export default {
|
||||||
},
|
},
|
||||||
// 获取列表
|
// 获取列表
|
||||||
async getAEList(f = false) {
|
async getAEList(f = false) {
|
||||||
|
if (!this.searchData.TrialId) return false
|
||||||
let data = {
|
let data = {
|
||||||
CalledAE: null,
|
CalledAE: null,
|
||||||
IP: null,
|
IP: null,
|
||||||
|
@ -557,8 +559,8 @@ export default {
|
||||||
this.ModalityList = this.AElist[0].ModalityList
|
this.ModalityList = this.AElist[0].ModalityList
|
||||||
this.timeFrame = this.AElist[0].PacsSearchMaxDays
|
this.timeFrame = this.AElist[0].PacsSearchMaxDays
|
||||||
this.MaxStudyCount = this.AElist[0].MaxStudyCount
|
this.MaxStudyCount = this.AElist[0].MaxStudyCount
|
||||||
this.searchData.ModalitiesInStudyList = [this.ModalityList[0]]
|
// this.searchData.ModalitiesInStudyList = [this.ModalityList[0]]
|
||||||
this.StudyDate = [new Date(), new Date()]
|
// this.StudyDate = [new Date(), new Date()]
|
||||||
} else {
|
} else {
|
||||||
this.pacsDicomAEIdChange(this.searchData.PacsDicomAEId, true)
|
this.pacsDicomAEIdChange(this.searchData.PacsDicomAEId, true)
|
||||||
}
|
}
|
||||||
|
@ -592,12 +594,12 @@ export default {
|
||||||
reset() {
|
reset() {
|
||||||
// this.searchData = defaultSearchData()
|
// this.searchData = defaultSearchData()
|
||||||
Object.keys(this.searchData).forEach((key) => {
|
Object.keys(this.searchData).forEach((key) => {
|
||||||
if (key !== 'PacsDicomAEId') {
|
if (key !== 'PacsDicomAEId' && key !== 'TrialId') {
|
||||||
this.searchData[key] = null
|
this.searchData[key] = null
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
// this.PatientBirthDate = []
|
// this.PatientBirthDate = []
|
||||||
this.StudyDate = []
|
// this.StudyDate = []
|
||||||
// this.StudyTime = [new Date(new Date().getTime() - 10800000), new Date()]
|
// this.StudyTime = [new Date(new Date().getTime() - 10800000), new Date()]
|
||||||
},
|
},
|
||||||
// 表格排序
|
// 表格排序
|
||||||
|
|
Loading…
Reference in New Issue