Merging from upstream

This commit is contained in:
Bruno Alves de Faria committed 2016-09-09 14:58:54 -03:00
commit e088eca37a
10 files changed
+16 -9

No files matched your search

@@ -167,7 +167,7 @@ function search() {
(convertStringToStudyDate(study.studyDate) <= new Date(studyDateTo).setHours(0, 0, 0, 0) || !studyDateTo || studyDateTo === '')) {
// Convert numberOfStudyRelatedInstance string into integer
study.numberOfStudyRelatedInstances = !isNaN(study.numberOfStudyRelatedInstances) ? parseInt(study.numberOfStudyRelatedInstances) : 0;
study.numberOfStudyRelatedInstances = !isNaN(study.numberOfStudyRelatedInstances) ? parseInt(study.numberOfStudyRelatedInstances) : undefined;
// Insert any matching studies into the WorklistStudies Collection
WorklistStudies.insert(study);