Merge branch 'master' into develop

src/app/views/new-statistics/components/query-range/query-range.component.ts

@@ -51,6 +51,7 @@ export class QueryRangeComponent implements OnInit {
     }
     if (this.validateForm.invalid) return;
     let queryType = this.validateForm.value.queryType;
+		let parent = this.validateForm.value.parent;
     let hospital;
     let duty;
     switch (queryType) {
@@ -68,7 +69,7 @@ export class QueryRangeComponent implements OnInit {
         duty = this.dutyOneList.find(v => v.id == this.validateForm.value.dutyOne);
         break;
     }
-    this.submitQueryRange.emit({queryType, hospital, duty});
+    this.submitQueryRange.emit({queryType, hospital, duty, parent});
     this.hideModal();
   }