解决冲突

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

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