TrizTech/ohif-viewer
15
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

LT-63: Applying date range filter for DicomWeb and DIMSE services on study list

Browse Source
This commit is contained in:
Bruno Alves de Faria 2016-09-30 11:19:46 -03:00
parent 8d5d1ee360
commit ed86c14807
2 changed files with 73 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Packages/worklist/client/components/worklistResult/worklistResult.js
View File

@ -218,13 +218,20 @@ Template.worklistResult.onRendered(() => {
const instance = Template.instance();
// Initialize daterangepicker
instance.$('#studyDate').daterangepicker({
const today = moment();
const lastWeek = moment().subtract(6, 'days');
const lastMonth = moment().subtract(29, 'days');
const datePicker = instance.$('#studyDate').daterangepicker({
maxDate: today,
autoUpdateInput: true,
ranges: {
Today: [moment(), moment()],
'Last 7 Days': [moment().subtract(6, 'days'), moment()],
'Last 30 Days': [moment().subtract(29, 'days'), moment()]
Today: [today, today],
'Last 7 Days': [lastWeek, today],
'Last 30 Days': [lastMonth, today]
}
});
}).data('daterangepicker');
datePicker.setStartDate(lastWeek);
datePicker.setEndDate(today);
// Retrieve all studies
search();
@ -287,4 +294,3 @@ Template.worklistResult.events({
Session.set('sortOption', sortOption);
}
});

12
Packages/worklist/server/services/dimse/studies.js
View File

@ -1,3 +1,5 @@
import { moment } from 'meteor/mrt:moment';
/**
* Parses resulting data from a QIDO call into a set of Study MetaData
*
@ -32,10 +34,20 @@ function resultDataToStudies(resultData) {
Services.DIMSE.Studies = function(filter) {
log.info('Services.DIMSE.Studies');
let filterStudyDate = '';
if (filter.studyDateFrom && filter.studyDateTo) {
const convertDate = date => moment(date, 'MM/DD/YYYY').format('YYYYMMDD');
const dateFrom = convertDate(filter.studyDateFrom);
const dateTo = convertDate(filter.studyDateTo);
filterStudyDate = `${dateFrom}-${dateTo}`;
}
var parameters = {
0x00100010: filter.patientName,
0x00100020: filter.patientId,
0x00080050: filter.accessionNumber,
0x00080020: filterStudyDate,
0x00081030: filter.studyDescription,
0x00100040: '',
0x00201208: '',