拉取代码

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.html

@@ -82,6 +82,11 @@
                         <nz-option *ngFor="let item of drugsManualList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
                       </nz-select>
                     </div>
+										<!-- 支持拍照留存 -->
+										<div class="display_flex align-items_center mb8">
+										  <nz-form-label class="label">支持拍照留存</nz-form-label>
+										  <nz-checkbox-group [(ngModel)]="item.postData.drugsEndPhoto"></nz-checkbox-group>
+										</div>
                   </ng-container>
 									<!-- 药单显示患者 -->
 									<div class="display_flex align-items_center mb8">
@@ -102,6 +107,17 @@
                 <!-- 自动建单配置 -->
                 <div *ngIf="tabModalName=='automaticOrderCreation'">
                   <!-- 自动建单 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">是否自动建单</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.autoCreate"></nz-checkbox-group>
+									</div>
+									<!-- 药品自动建单状态 -->
+									<div class="display_flex align-items_center mb8" *ngIf="item.postData.autoCreate[0].checked">
+									  <nz-form-label class="label">药品自动建单状态</nz-form-label>
+										<nz-select class="w320px" nzPlaceHolder="请选择" [(ngModel)]="item.postData.autoCreateState" nzAllowClear>
+										  <nz-option *ngFor="let item of drugStateData" [nzLabel]="item.name" [nzValue]="item.id"></nz-option>
+										</nz-select>
+									</div>
                 </div>
                 <div class="bottom">
                   <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.ts

@@ -32,6 +32,7 @@ export class ConfigurationDrugComponent implements OnInit {
   ngOnInit():void {
     this.activeDictionary = this.dictionaryKeyList[0];
     this.init();
+		this.getDrugState();
   }
 
   // 工单模式
@@ -63,7 +64,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
 				showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
-      }
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
     {
       name: '西药',
@@ -83,7 +86,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
-      }
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
     {
       name: '退药',
@@ -103,7 +108,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
-      }
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
     {
       name: '毒麻',
@@ -123,7 +130,9 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
-      }
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
     {
       name: '中草药',
@@ -143,10 +152,21 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
-      }
+				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
+				autoCreateState: undefined // 药品自动建单状态
+			}
     },
   ];
-
+	
+	
+	// 获取药品状态
+	drugStateData:any = []
+	getDrugState(){
+		this.mainService.getDictionary("list", "drug_state").subscribe((data) => {
+			this.drugStateData = data
+		});
+	}
+	
   // 点击数据字典key
   activeDictionary:any;
   clickDictionaryKey(item){
@@ -218,6 +238,10 @@ export class ConfigurationDrugComponent implements OnInit {
 			showPatientInfo: this.activeDictionary.postData.showPatientInfo[0].checked ? 1 : 0,
 			showDrugsBagTypeCount: this.activeDictionary.postData.showDrugsBagTypeCount[0].checked ? 1 : 0,
 			showDrugsBagDetails: this.activeDictionary.postData.showDrugsBagDetails[0].checked ? 1 : 0,
+			autoCreate: this.activeDictionary.postData.autoCreate[0].checked ? 1 : 0,
+			autoCreateState:{
+				id:this.activeDictionary.postData.autoCreateState || undefined
+			}
 		};
     this.btnLoading = true;
     this.mainService
@@ -315,6 +339,8 @@ export class ConfigurationDrugComponent implements OnInit {
 					this.activeDictionary.postData.showPatientInfo[0].checked = this.configs.showPatientInfo == 1;
 					this.activeDictionary.postData.showDrugsBagTypeCount[0].checked = this.configs.showDrugsBagTypeCount == 1;
 					this.activeDictionary.postData.showDrugsBagDetails[0].checked = this.configs.showDrugsBagDetails == 1;
+					this.activeDictionary.postData.autoCreate[0].checked = this.configs.autoCreate == 1;
+					this.activeDictionary.postData.autoCreateState = this.configs.autoCreateState && this.configs.autoCreateState.id || undefined;
 				}
       });
   }

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.html

@@ -85,6 +85,71 @@
                   <nz-form-label class="label">默认扫描标本进入标本扫描页</nz-form-label>
                   <nz-checkbox-group [(ngModel)]="defaultScanSpe"></nz-checkbox-group>
                 </div>
+								
+								<!-- 是否开通收取限制 -->
+								<div class="display_flex align-items_center mb8">
+								  <nz-form-label class="label">是否开通收取限制</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speCollectLimit"></nz-checkbox-group>
+								</div>
+								
+								<!-- 是否支持非起点科室收取 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+								  <nz-form-label class="label">是否支持非起点科室收取</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speCollectSupportNotStartDept"></nz-checkbox-group>
+								</div>
+								
+								<!-- 限制标本状态收取 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+									<nz-form-label class="label">限制标本状态收取</nz-form-label>
+									<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择限制标本状态收取" [(ngModel)]="speCollectLimitState">
+										<ng-container *ngFor="let option of specimenStateData">
+											<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+										</ng-container>
+									</nz-select>
+								</div>
+								
+								<!-- 限制终点科室收取 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+									<nz-form-label class="label">限制终点科室收取</nz-form-label>
+									<nz-select nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear
+									  (nzOnSearch)="changeEndDept($event)" nzPlaceHolder="请选择限制终点科室收取" [(ngModel)]="speCollectLimitEndDept">
+									  <ng-container *ngFor="let option of endDeptData">
+									    <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+									  </ng-container>
+									  <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+									    <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+									  </nz-option>
+									</nz-select>
+								</div>
+								
+								<!-- 限制普通或紧急收取 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+									<nz-form-label class="label">限制普通或紧急收取</nz-form-label>
+									<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择限制普通或紧急收取" [(ngModel)]="speCollectLimitUrgent">
+										<ng-container *ngFor="let option of astrictData">
+											<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+										</ng-container>
+									</nz-select>
+								</div>
+								
+								<!-- 是否限制重复收取标本 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+								  <nz-form-label class="label">是否限制重复收取标本</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speCollectLimitRepeat"></nz-checkbox-group>
+								</div>
+								
+								<!-- 是否限制试管类型收取标本 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+								  <nz-form-label class="label">是否限制试管类型收取标本</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speCollectLimitTubeType"></nz-checkbox-group>
+								</div>
+								
+								<!-- 是否开始收取前进入配置页 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
+								  <nz-form-label class="label">是否开始收取前进入配置页</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speStartCollectShowConfig"></nz-checkbox-group>
+								</div>
+								
               </div>
               <!-- 自动建单配置 -->
               <div *ngIf="tabModalName=='automaticOrderCreation'">

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.ts

@@ -87,6 +87,40 @@ export class ConfigurationSpecimenComponent implements OnInit {
     {label:'是否开启',value: 0}
   ];
 	
+	// 是否开通收取限制
+	speCollectLimit:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+	
+	// 是否支持非起点科室收取
+	speCollectSupportNotStartDept:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	
+	// 限制标本状态收取
+	speCollectLimitState:any = [];
+	
+	// 限制终点科室收取
+	speCollectLimitEndDept:any = [];
+	
+	// 限制普通或紧急收取
+	speCollectLimitUrgent:any = [];
+	
+	// 是否限制重复收取标本
+	speCollectLimitRepeat:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	
+	// 是否限制试管类型收取标本
+	speCollectLimitTubeType:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	
+	// 是否开始收取前进入配置页
+	speStartCollectShowConfig:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	
 	// 速冻标本数量控制
 	pathologyFrozenSpecimenNum:any = '0';
 	
@@ -100,6 +134,12 @@ export class ConfigurationSpecimenComponent implements OnInit {
   configs:any = {};
   // 任务类型
   tasktype:any = {};
+	specimenStateData:any = [];
+	endDeptData:any = [];
+	astrictData:any = [
+		{name:'普通',id:'0'},
+		{name:'紧急',id:'1'},
+	]
   searchTimerSubject = new Subject();
   constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
 
@@ -109,10 +149,40 @@ export class ConfigurationSpecimenComponent implements OnInit {
       let fun = v[0];
       fun.call(this, v[1]);
     });
+		this.getDeptDic();
     this.getDeptList();
     this.getTaskType();
   }
 	
+	// 获取科室类型
+	getDeptDic(e:string = ''){
+		this.mainService.getDictionary("list", "speState").subscribe((res) => {
+			this.specimenStateData = res
+		})
+		this.mainService.getDictionary("list", "dept_type").subscribe((res2) => {
+			let item = res2.find(i=>i.name=='检验科室')
+			let data1 = {
+			  idx: 0,
+			  sum: 9999,
+			  department: {
+			    hospital: { id: this.hosId || "" },
+			    type: { id: item.id || "" },
+					dept: e,
+			  },
+			};
+			this.mainService
+			  .getFetchDataList("data", "department", data1)
+			  .subscribe((res) => {
+			    this.endDeptData = res.list;
+			  });
+		})
+	}
+	
+	// 搜索起点科室
+	changeEndDept(e){
+		this.searchTimer(this.getDeptDic, e);
+	}
+	
 	// 点击数据字典key
 	activeDictionaryKey:any = 'examine';
 	clickDictionaryKey(item){
@@ -238,7 +308,32 @@ export class ConfigurationSpecimenComponent implements OnInit {
       bigScanShowCreateBtn: this.bigScanShowCreateBtn[0].checked ? 1 : 0,
       defaultScanSpe: this.defaultScanSpe[0].checked ? 1 : 0,
       deptNotAlertIds: this.deptNotAlertIds.length ? this.deptNotAlertIds.toString() : undefined,
-    };
+			speCollectLimit: this.speCollectLimit[0].checked ? 1 : 0,
+			speCollectSupportNotStartDept: null,
+			speCollectLimitRepeat: null,
+			speCollectLimitTubeType: null,
+			speStartCollectShowConfig: null,
+			speCollectLimitState: null,
+			speCollectLimitEndDept: null,
+			speCollectLimitUrgent: null,
+		};
+		if(this.speCollectLimit[0].checked){
+			postData.speCollectSupportNotStartDept = this.speCollectSupportNotStartDept[0].checked ? 1 : 0;
+			postData.speCollectLimitRepeat = this.speCollectLimitRepeat[0].checked ? 1 : 0;
+			postData.speCollectLimitTubeType = this.speCollectLimitTubeType[0].checked ? 1 : 0;
+			postData.speStartCollectShowConfig = this.speStartCollectShowConfig[0].checked ? 1 : 0;
+			postData.speCollectLimitState = this.speCollectLimitState.length ? this.speCollectLimitState.toString() : undefined;
+			postData.speCollectLimitEndDept = this.speCollectLimitEndDept.length ? this.speCollectLimitEndDept.toString() : undefined;
+			postData.speCollectLimitUrgent = this.speCollectLimitUrgent.length ? this.speCollectLimitUrgent.toString() : undefined;
+		}else{
+			postData.speCollectSupportNotStartDept = undefined;
+			postData.speCollectLimitRepeat = undefined;
+			postData.speCollectLimitTubeType = undefined;
+			postData.speStartCollectShowConfig = undefined;
+			postData.speCollectLimitState = undefined;
+			postData.speCollectLimitEndDept = undefined;
+			postData.speCollectLimitUrgent = undefined;
+		}
     this.btnLoading = true;
     this.mainService
       .simplePost("addData", "taskTypeConfig", postData)
@@ -342,6 +437,17 @@ export class ConfigurationSpecimenComponent implements OnInit {
 						this.defaultScanSpe[0].checked = this.configs.defaultScanSpe == 1;
 						this.deptNotAlertIds = this.configs.deptNotAlertIds ? this.configs.deptNotAlertIds.split(',').map(v => +v) : [];
 						this.deptList = this.configs.deptNotAlertList || [];
+						
+						this.speCollectLimit[0].checked = this.configs.speCollectLimit == 1;
+						if(this.configs.speCollectLimit == 1){
+							this.speCollectSupportNotStartDept[0].checked = this.configs.speCollectSupportNotStartDept == 1;
+							this.speCollectLimitRepeat[0].checked = this.configs.speCollectLimitRepeat == 1;
+							this.speCollectLimitTubeType[0].checked = this.configs.speCollectLimitTubeType == 1;
+							this.speStartCollectShowConfig[0].checked = this.configs.speStartCollectShowConfig == 1;
+							this.speCollectLimitState = this.configs.speCollectLimitState ? this.configs.speCollectLimitState.split(',').map(v => +v) : [];
+							this.speCollectLimitEndDept = this.configs.speCollectLimitEndDept ? this.configs.speCollectLimitEndDept.split(',').map(v => +v) : [];
+							this.speCollectLimitUrgent = this.configs.speCollectLimitUrgent ? this.configs.speCollectLimitUrgent.split(',').map(v => +v) : [];
+						}
 					}else{
 						// 病理标本
 						this.autoCreate[0].checked = this.configs.autoCreate == 1;

src/app/views/building-floor/building-floor.component.html

@@ -109,7 +109,14 @@
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="floorName">楼层名称</nz-form-label>
             <nz-form-control nzErrorTip="请输入楼层名称!">
               <nz-input-group>
-                <input nz-input formControlName="floorName" placeholder="请输入楼层名称" />
+                <nz-input-number 
+								[nzMin]="0"
+								[nzPrecision]="0"
+								[nzMax]="999999"
+								[nzStep]="1"
+								formControlName="floorName" 
+								placeholder="请输入楼层名称">
+								</nz-input-number>
               </nz-input-group>
             </nz-form-control>
           </nz-form-item>

src/app/views/building-floor/building-floor.component.less

@@ -260,6 +260,9 @@
                 line-height: 0;
                 text-align: left;
               }
+							.ant-input-number{
+								width: 100% !important;
+							}
             }
           }
 

src/app/views/jp-search/jp-search.component.html

@@ -4,7 +4,7 @@
       <div nz-col nzXl='16' class="list-template__searchBox">
         <div class="list-template__searchItem">
           <span class="label">静配标识：</span>
-          <input nz-input class="formItem" placeholder="请输入静配标识" [(ngModel)]="searchCriteria.id" />
+          <input nz-input class="formItem" placeholder="请输入静配标识" [(ngModel)]="searchCriteria.packid" />
         </div>
         <div class="list-template__searchItem">
           <span class="label">发药科室：</span>
@@ -82,7 +82,7 @@
             <td>{{ data.target?.dept }}</td>
             <td>{{ data.creatTime }}</td>
             <td>{{ data.jpstate?.name }}</td>
-            <td>{{data.id}}</td>
+            <td>{{data.packid}}</td>
           </tr>
         </tbody>
       </nz-table>

src/app/views/jp-search/jp-search.component.ts

@@ -14,7 +14,7 @@ export class JpSearchComponent implements OnInit {
 
   searchCriteria = {
     //搜索条件
-    id: "", //静配标识
+    packid: "", //静配标识
     launch: null, //发药科室
     target: null, //发药科室
     jpstate: null,
@@ -52,7 +52,7 @@ export class JpSearchComponent implements OnInit {
   reset() {
     this.searchCriteria = {
       //搜索条件
-      id: "",
+      packid: "",
       launch: null,
       target: null,
       jpstate: null,
@@ -134,8 +134,8 @@ export class JpSearchComponent implements OnInit {
     if (this.searchCriteria.launch) {
       postData.jPBag.launch = { id: this.searchCriteria.launch };
     }
-    if (this.searchCriteria.id) {
-      postData.jPBag.id = this.searchCriteria.id;
+    if (this.searchCriteria.packid) {
+      postData.jPBag.packid = this.searchCriteria.packid;
     }
     this.loading1 = true;
     this.mainService

src/app/views/new-statistics/components/distribution-search-more/distribution-search-more.component.html

@@ -6,7 +6,7 @@
       <form nz-form [formGroup]="validateForm" class="addForm">
         <nz-form-item [hidden]="!fieldConfig.config.group">
           <nz-form-label [nzSpan]="6" nzFor="groupId">分<span style="visibility: hidden;">囧囧</span>组</nz-form-label>
-          <nz-form-control [nzSpan]="16" nzErrorTip="请选择分组!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择分组!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择分组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
               <ng-container *ngFor="let option of groupList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
@@ -20,7 +20,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
           <nz-form-label [nzSpan]="6" nzFor="groupId">分<span style="visibility: hidden;">囧囧</span>组</nz-form-label>
-          <nz-form-control [nzSpan]="16" nzErrorTip="请选择分组!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择分组!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeGroupInp($event)" formControlName="groupId" nzPlaceHolder="请选择分组" (nzOpenChange)="openChangeGroup($event)" (ngModelChange)="changeGroup($event)">
               <ng-container *ngFor="let option of groupList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
@@ -34,7 +34,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.groupAndUser">
           <nz-form-label [nzSpan]="6" nzFor="userId">人<span style="visibility: hidden;">囧囧</span>员</nz-form-label>
-          <nz-form-control [nzSpan]="16" nzErrorTip="请选择人员!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择人员!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeUserInp($event)" formControlName="userId" nzPlaceHolder="请选择人员" (nzOpenChange)="openChangeUser($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of userList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -48,7 +48,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.statisticsType">
           <nz-form-label [nzSpan]="6" nzFor="statisticsTypeId">统计分类</nz-form-label>
-          <nz-form-control [nzSpan]="16" nzErrorTip="请选择统计分类!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择统计分类!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="statisticsTypeId" nzPlaceHolder="请选择统计分类">
               <ng-container *ngFor="let option of statisticsTypeList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -62,7 +62,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.taskType">
           <nz-form-label [nzSpan]="6" nzFor="taskTypeId">任务类型</nz-form-label>
-          <nz-form-control [nzSpan]="16" nzErrorTip="请选择任务类型!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择任务类型!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeTaskTypeInp($event)" formControlName="taskTypeId" nzPlaceHolder="请选择任务类型" (nzOpenChange)="openChangeTaskType($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of taskTypeList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hosId.hosName + '-' + option.taskName" [nzValue]="option.id"></nz-option>
@@ -76,7 +76,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.building">
           <nz-form-label [nzSpan]="6" nzFor="buildingId">楼<span style="visibility: hidden;">囧囧</span>栋</nz-form-label>
-          <nz-form-control [nzSpan]="16" nzErrorTip="请选择楼栋!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择楼栋!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeBuildingInp($event)" formControlName="buildingId" nzPlaceHolder="请选择楼栋" (nzOpenChange)="openChangeBuilding($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of buildingList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName + '-' + option.buildingName" [nzValue]="option.id"></nz-option>
@@ -90,7 +90,7 @@
 
         <nz-form-item [hidden]="!fieldConfig.config.dept">
           <nz-form-label [nzSpan]="6" nzFor="deptId">科<span style="visibility: hidden;">囧囧</span>室</nz-form-label>
-          <nz-form-control [nzSpan]="16" nzErrorTip="请选择科室!">
+          <nz-form-control [nzSpan]="17" nzErrorTip="请选择科室!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeRepairDeptInp($event)" formControlName="deptId" nzPlaceHolder="请选择科室" (nzOpenChange)="openChangeRepairDept($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of deptList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.hospital.hosName + '-' + option.dept" [nzValue]="option.id"></nz-option>
@@ -104,7 +104,7 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.source">
 				  <nz-form-label [nzSpan]="6" nzFor="sourceId">来<span style="visibility: hidden;">囧囧</span>源</nz-form-label>
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择来源!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择来源!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="sourceId" nzPlaceHolder="请选择来源">
 				      <ng-container *ngFor="let option of sourceList">
 				        <nz-option [nzLabel]="option.name " [nzValue]="option.sourceId"></nz-option>
@@ -115,7 +115,7 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.minute">
 				  <nz-form-label [nzSpan]="6" nzFor="minuteClose">分钟内关单</nz-form-label>
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请输入分钟内关单!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请输入分钟内关单!">
 						<nz-input-number
 							class="width-200"
 							formControlName="minuteClose"
@@ -129,8 +129,8 @@
 				</nz-form-item>
 				
 				<nz-form-item [hidden]="!fieldConfig.config.special">
-				  <nz-form-label [nzSpan]="8" nzFor="specialId">特殊情况关闭</nz-form-label>
-				  <nz-form-control [nzSpan]="14" nzErrorTip="请选择特殊情况关闭!">
+				  <nz-form-label [nzSpan]="7" nzFor="specialId">特殊情况关闭</nz-form-label>
+				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择特殊情况关闭!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="specialId" nzPlaceHolder="请选择特殊情况关闭">
 				      <ng-container *ngFor="let option of specialList">
 				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -139,31 +139,31 @@
 				  </nz-form-control>
 				</nz-form-item>
 				
-				<nz-form-item [hidden]="!fieldConfig.config.overtime">
+			<!-- 	<nz-form-item [hidden]="!fieldConfig.config.overtime">
 				  <nz-form-label [nzSpan]="6" nzFor="overtimeId">超时工单</nz-form-label>
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择超时工单!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择超时工单!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="overtimeId" nzPlaceHolder="请选择超时工单">
 				      <ng-container *ngFor="let option of overtimeList">
 				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 				      </ng-container>
 				    </nz-select>
 				  </nz-form-control>
-				</nz-form-item>
+				</nz-form-item> -->
 				
-				<nz-form-item [hidden]="!fieldConfig.config.abnormal">
+			<!-- 	<nz-form-item [hidden]="!fieldConfig.config.abnormal">
 				  <nz-form-label [nzSpan]="6" nzFor="abnormalId">异常工单</nz-form-label>
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择异常工单!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择异常工单!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="abnormalId" nzPlaceHolder="请选择异常工单">
 				      <ng-container *ngFor="let option of abnormalList">
 				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 				      </ng-container>
 				    </nz-select>
 				  </nz-form-control>
-				</nz-form-item>
+				</nz-form-item> -->
 				
 				<nz-form-item [hidden]="!fieldConfig.config.evaluate">
 				  <nz-form-label [nzSpan]="6" nzFor="evaluateId">评<span style="visibility: hidden;">囧囧</span>价</nz-form-label>
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择评价!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择评价!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="evaluateId" nzPlaceHolder="请选择评价">
 				      <ng-container *ngFor="let option of evaluateList">
 				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -177,7 +177,7 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.executeUser">
 				  <nz-form-label [nzSpan]="6" nzFor="executeUserId">执行人</nz-form-label>
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择人员!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择人员!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeExecuteUserInp($event)" formControlName="executeUserId" nzPlaceHolder="请选择人员" (nzOpenChange)="openChangeExecuteUser($event)" (ngModelChange)="setIsSelecting(true)">
 				      <ng-container *ngFor="let option of executeUserList">
 				        <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -191,7 +191,7 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.timeFrame">
 				  <nz-form-label [nzSpan]="6" nzFor="timeFrameId">时<span style="visibility: hidden;">囧囧</span>段</nz-form-label>
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择人员!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择人员!">
 				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear nzShowSearch formControlName="timeFrameId" nzPlaceHolder="请选择时段">
 				      <ng-container *ngFor="let option of timeFrameList">
 				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
@@ -202,7 +202,7 @@
 				
 				<nz-form-item [hidden]="!fieldConfig.config.code">
 				  <nz-form-label [nzSpan]="6" nzFor="codeNum">单<span style="visibility: hidden;">囧囧</span>号</nz-form-label>
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请输入单号!">
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请输入单号!">
 				    <input class="width-200" type="text" placeHolder="请输入单号" nz-input formControlName="codeNum" />
 				  </nz-form-control>
 				</nz-form-item>

src/app/views/new-statistics/components/distribution-search-more/distribution-search-more.component.ts

@@ -252,8 +252,8 @@ export class DistributionSearchMoreComponent implements OnInit {
 
   changeGroup(id){
     this.setIsSelecting(true);
-    this.userList = [];
-    this.validateForm.controls.userId.setValue(null);
+    // this.userList = [];
+    // this.validateForm.controls.userId.setValue(null);
     this.getUserList();
   }
 
@@ -267,24 +267,31 @@ export class DistributionSearchMoreComponent implements OnInit {
   // 获取人员列表
   userList:any[] = [];
   getUserList(keyword = ''){
-    if(!this.validateForm.value.groupId){
-      this.isLoading = false;
-      this.userList = [];
-      return;
-    }
+    // if(!this.validateForm.value.groupId){
+    //   this.isLoading = false;
+    //   this.userList = [];
+    //   return;
+    // }
     let postData: any = {
       idx: 0,
       sum: 20,
       user: {
         name: keyword,
         simpleQuery: true,
-        groupdata: { id: this.validateForm.value.groupId },
+				statisticalHosId: this.getHosId,
+        // groupdata: { id: this.validateForm.value.groupId },
       },
     };
     this.isLoading = true;
     this.mainService.getFetchDataList("simple/data", "user", postData).subscribe(result => {
       this.isLoading = false;
       if(result.status == 200){
+				if(!result.list.find(i=> i.id == -1)){
+					result.list.push({
+						name:'未知',
+						id:-1
+					})
+				}
         this.userList = result.list || [];
       }else{
         this.userList = [];
@@ -488,10 +495,11 @@ export class DistributionSearchMoreComponent implements OnInit {
 	// 获取时段列表
 	timeFrameList:any[] = [];
 	getTimeFrameList(){
+		this.timeFrameList = [];
 	  for(let i=0; i<24; i++){
 			this.timeFrameList.push({
-				name: i,
-				id: i
+				name: i < 10 ? '0'+i.toString() : i.toString(),
+				id: i < 10 ? '0'+i.toString() : i.toString(),
 			})
 		}
 	}

src/app/views/new-statistics/distribution-inspection-statistics/business-classify-statistics/business-classify-statistics.component.ts

@@ -352,7 +352,9 @@ export class BusinessClassifyStatisticsComponent implements OnInit, AfterViewIni
     this.dateRange = []
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, deptId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

src/app/views/new-statistics/distribution-inspection-statistics/date-business-statistics/date-business-statistics.component.ts

@@ -106,7 +106,7 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
-				statisticsTypeId: Number(data[sublevel.value + 'StatisticsTypeId']) || undefined,
+				statisticsTypeId: data[sublevel.value + 'StatisticsTypeId'] ? Number(data[sublevel.value + 'StatisticsTypeId']) : -1,
 				searchQuery:{
 					statusValue: 'close',
 					deptDTO: this.fieldConfig.fields.deptDTO,
@@ -130,7 +130,7 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
 			query = {
 				startDate: data.date + ' ' + '00:00:00' || undefined,
 				endDate: data.date + ' ' + '23:59:59' || undefined,
-				statisticsTypeId: Number(data[sublevel.value + 'StatisticsTypeId']) || undefined,
+				statisticsTypeId: data[sublevel.value + 'StatisticsTypeId'] ? Number(data[sublevel.value + 'StatisticsTypeId']) : -1,
 				searchQuery:{
 					statusValue: 'close',
 					deptDTO: this.fieldConfig.fields.deptDTO,
@@ -211,13 +211,16 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
   dictionaryList: any[] = [];
   getList(num?: number, field?: string, sort?: string) {
     this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
-      let dictionaryList = data || [];
-      dictionaryList = cloneDeep(dictionaryList);
-      let flag = dictionaryList.some((item) => item.value === 'dateOther');
-      !flag && dictionaryList.push({id: 0, name: '未知', value: 'dateOther'});
-      this.dictionaryList = dictionaryList;
+      this.dictionaryList = data || [];
+      // this.dictionaryList = cloneDeep(dictionaryList);
+      let flag = this.dictionaryList.some((item) => item.value === 'dateOther');
+			// if(!dictionaryList.find(i=> i.id == -1)){
+			// 	dictionaryList.push({id: -1, name: '未知', value: 'dateOther'});
+			// }
+      !flag && this.dictionaryList.push({id: -1, name: '未知', value: 'dateOther'});
+      // this.dictionaryList = dictionaryList;
       this.widthConfig = new Array(this.dictionaryList.length * 3 + 3).fill('100px');
-      if (num !== undefined) {
+			if (num !== undefined) {
         this.pageIndex = num;
       }
       let postData:any = {
@@ -316,7 +319,9 @@ export class DateBusinessStatisticsComponent implements OnInit, AfterViewInit {
     this.dateRange = []
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, deptId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

src/app/views/new-statistics/distribution-inspection-statistics/date-quality-control-statistics/date-quality-control-statistics.component.ts

@@ -392,7 +392,9 @@ export class DateQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.statisticsTypeId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, deptId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

src/app/views/new-statistics/distribution-inspection-statistics/department-business-statistics/department-business-statistics.component.ts

@@ -143,7 +143,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 			query = {
 				startDate: this.customChangeDateComponent.startDate || undefined,
 				endDate: this.customChangeDateComponent.endDate || undefined,
-				statisticsTypeId: Number(data[sublevel.value + 'StatisticsTypeId']) || undefined,
+				statisticsTypeId: data[sublevel.value + 'StatisticsTypeId'] ? Number(data[sublevel.value + 'StatisticsTypeId']) : -1,
 				searchQuery:{
 					statusValue: 'close',
 					deptDTO: item,
@@ -178,7 +178,7 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 				query = {
 					startDate: this.customChangeDateComponent.startDate || undefined,
 					endDate: this.customChangeDateComponent.endDate || undefined,
-					statisticsTypeId: Number(data[sublevel.value + 'StatisticsTypeId']) || undefined,
+					statisticsTypeId: data[sublevel.value + 'StatisticsTypeId'] ? Number(data[sublevel.value + 'StatisticsTypeId']) : -1,
 					searchQuery:{
 						statusValue: 'close',
 						deptDTO: item,
@@ -263,11 +263,14 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
 	widthValue:any;
   getList(num?: number, field?: string, sort?: string) {
     this.mainService.getDictionary('list', 'statistics_date_type').subscribe((data) => {
-      let dictionaryList = data || [];
-      dictionaryList = cloneDeep(dictionaryList);
-      let flag = dictionaryList.some((item) => item.value === 'dateOther');
-      !flag && dictionaryList.push({id: 0, name: '未知', value: 'dateOther'});
-      this.dictionaryList = dictionaryList;
+     this.dictionaryList = data || [];
+     // this.dictionaryList = cloneDeep(dictionaryList);
+     let flag = this.dictionaryList.some((item) => item.value === 'dateOther');
+     // if(!dictionaryList.find(i=> i.id == -1)){
+     // 	dictionaryList.push({id: -1, name: '未知', value: 'dateOther'});
+     // }
+     !flag && this.dictionaryList.push({id: -1, name: '未知', value: 'dateOther'});
+     // this.dictionaryList = dictionaryList;
       this.widthConfig = new Array(this.dictionaryList.length * 3 + 3).fill('100px').map((v, i) => { return (i == 0 || i == 1 && this.parent==1) || (i == 0 && this.parent==0) ? '150px' : '100px' });
       if(this.parent==1){
 				this.widthValue = this.widthConfig.length * 100 + 300 * 1 + 20
@@ -374,7 +377,9 @@ export class DepartmentBusinessStatisticsComponent implements OnInit, AfterViewI
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 楼栋搜索

src/app/views/new-statistics/distribution-inspection-statistics/department-quality-control-statistics/department-quality-control-statistics.component.ts

@@ -152,7 +152,7 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 				searchQuery:{
 					statusValue: 'close',
 					deptDTO: item || undefined,
-					deptId: data.deptId || undefined,
+					deptId: this.deptId || undefined,
 					taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
 					taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
 					groupId: this.fieldConfig.fields.groupId || undefined,
@@ -192,10 +192,10 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
 							searchQuery:{
 								statusValue: 'close',
-								deptDTO: this.fieldConfig.fields.deptDTO || undefined,
-								deptId: this.fieldConfig.fields.deptId || undefined,
-								taskTypeId: data.taskTypeId || undefined,
-								taskTypeDTO: item,
+								deptDTO: item || undefined,
+								deptId: data.deptId || undefined,
+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
 								groupId: this.fieldConfig.fields.groupId || undefined,
 								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 								userId: this.fieldConfig.fields.userId || undefined,
@@ -465,7 +465,9 @@ export class DepartmentQualityControlStatisticsComponent implements OnInit, Afte
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 楼栋搜索

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-evaluate-statistics/distribution-department-evaluate-statistics.component.ts

@@ -196,10 +196,10 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
 							statisticsTypeId: this.fieldConfig.fields.statisticsTypeId,
 							searchQuery:{
 								statusValue: 'close',
-								deptDTO: this.fieldConfig.fields.deptDTO || undefined,
-								deptId: this.fieldConfig.fields.deptId || undefined,
-								taskTypeId: data.taskTypeId || undefined,
-								taskTypeDTO: item,
+								deptDTO: item || undefined,
+								deptId: data.deptId || undefined,
+								taskTypeId: this.fieldConfig.fields.taskTypeId || undefined,
+								taskTypeDTO: this.fieldConfig.fields.taskTypeDTO,
 								groupId: this.fieldConfig.fields.groupId || undefined,
 								groupDTO: this.fieldConfig.fields.groupDTO || undefined,
 								userId: this.fieldConfig.fields.userId || undefined,
@@ -765,7 +765,9 @@ export class DistributionDepartmentEvaluateStatisticsComponent implements OnInit
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 楼栋搜索

src/app/views/new-statistics/distribution-inspection-statistics/distribution-department-source-statistics/distribution-department-source-statistics.component.ts

@@ -566,7 +566,9 @@ export class DistributionDepartmentSourceStatisticsComponent implements OnInit,
 		this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, statisticsTypeId: undefined, taskTypeId: undefined, buildingId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 楼栋搜索

src/app/views/new-statistics/distribution-inspection-statistics/distribution-inspection-statistics-routing.module.ts

@@ -135,12 +135,12 @@ const routes: Routes = [
 			  }
 			},
 			{
-			  // 故障工单列表
+			  // 工单列表
 			  path: 'incidentList',
 			  loadChildren: () => import('./incident-list/incident-list.module').then(m => m.IncidentListModule),
 			  data: {
 			    reuse: true,
-			    title: '配-故障工单列表'
+			    title: '配-工单列表'
 			  }
 			},
     ]

src/app/views/new-statistics/distribution-inspection-statistics/distribution-synthesize-statistics/distribution-synthesize-statistics.component.ts

@@ -68,7 +68,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 	// 汇总
 	viewDetail1(){
 		let query = {
-			
+			isGdId: true,
 		}
 		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
 		let flag = this.tabService.tabs.some(v => v.path === path);
@@ -82,6 +82,7 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 	// 差评
 	viewDetail4(){
 		let query = {
+			isGdId: true,
 			startDate: this.customChangeDateComponent.startDate,
 			endDate: this.customChangeDateComponent.endDate,
 			searchQuery:{
@@ -144,11 +145,11 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 			endDate: this.customChangeDateComponent.endDate,
 			searchQuery:{
 				statusValue: 'close',
-				executeUserDTO: {
+				userDTO: {
 					name: data.userName,
-					id: data.userId
+					id: data.userId?data.userId:-1
 				},
-				executeUserId: data.userId
+				userId: data.userId?data.userId:-1
 			}
 		}
 		let path = '/newStatistics/distributionInspectionStatistics/incidentList'
@@ -574,7 +575,9 @@ export class DistributionSynthesizeStatisticsComponent implements OnInit, AfterV
 		this.activeIndex = 'day';
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('distributionData');
-		this.search();
+		setTimeout(_=>{
+			this.search();
+		})
 	}
 
   // 搜索

src/app/views/new-statistics/distribution-inspection-statistics/distribution-user-evaluate-statistics/distribution-user-evaluate-statistics.component.ts

@@ -214,7 +214,9 @@ export class DistributionUserEvaluateStatisticsComponent implements OnInit, Afte
     this.userId = undefined;
     this.fieldConfig.fields = {groupId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined, statisticsTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 人员搜索

src/app/views/new-statistics/distribution-inspection-statistics/hour-quality-control-statistics/hour-quality-control-statistics.component.ts

@@ -387,7 +387,9 @@ export class HourQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.statisticsTypeId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined, taskTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

src/app/views/new-statistics/distribution-inspection-statistics/incident-list/incident-list.component.html

@@ -3,7 +3,7 @@
     <app-custom-change-date #customChangeDate [isShowType]="false"></app-custom-change-date>
     <div class="searchDataItem">
       <span class="label">统计分类</span>：
-      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择统计分类" [(ngModel)]="statisticsTypeId" (nzOpenChange)="openChangeStatisticsType($event)">
+      <nz-select class="selectItem" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择统计分类" [(ngModel)]="statisticsTypeId" (nzOpenChange)="openChangeStatisticsType()">
         <ng-container *ngFor="let option of statisticsTypeList">
           <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
         </ng-container>
@@ -20,7 +20,7 @@
     <button nz-button class="btn default ml8" (click)="excelExport()" [nzLoading]="excelExportLoading">导出</button>
   </div>
 </div>
-<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.deptDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.minuteDTO || fieldConfig.fields.specialDTO || fieldConfig.fields.overtimeIdDTO || fieldConfig.fields.abnormalDTO || fieldConfig.fields.evaluateDTO || fieldConfig.fields.codeNumDTO || fieldConfig.fields.timeFrameDTO">
+<div class="moreFilter" *ngIf="fieldConfig.fields.groupDTO || fieldConfig.fields.userDTO || fieldConfig.fields.deptDTO || fieldConfig.fields.buildingDTO || fieldConfig.fields.taskTypeDTO || fieldConfig.fields.sourceDTO || fieldConfig.fields.minuteDTO || fieldConfig.fields.specialDTO || fieldConfig.fields.overtimeDTO || fieldConfig.fields.overtimeIdDTO || fieldConfig.fields.evaluateDTO || fieldConfig.fields.codeNumDTO || fieldConfig.fields.timeFrameDTO">
 	<span>{{fieldConfig.fields.groupDTO?.groupName}}</span>
 	<span>{{fieldConfig.fields.userDTO?.name}}</span>
 	<span>{{fieldConfig.fields.taskTypeDTO?.taskName}}</span>
@@ -30,15 +30,16 @@
 	<span>{{fieldConfig.fields.minuteDTO}}</span>
 	<span>{{fieldConfig.fields.specialDTO?.name}}</span>
 	<span>{{fieldConfig.fields.overtimeDTO?.name}}</span>
-	<span>{{fieldConfig.fields.abnormalDTO?.name}}</span>
+	<!-- <span>{{fieldConfig.fields.abnormalDTO?.name}}</span> -->
 	<span>{{fieldConfig.fields.evaluateDTO?.name}}</span>
 	<span>{{fieldConfig.fields.codeNumDTO}}</span>
 	<span>{{fieldConfig.fields.timeFrameDTO?.name}}</span>
 </div>
-<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1500px'}">
+<nz-table class="table" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1" [nzScroll]="{ y: tableHeight + 'px', x: '1600px'}">
   <thead>
     <tr>
       <th nzWidth="150px">序号|单号</th>
+			<th nzWidth="100px">申请科室</th>
       <th nzWidth="200px">起点|终点科室</th>
       <th nzWidth="150px">统计|任务类型</th>
       <th nzWidth="200px">时间过程</th>
@@ -55,6 +56,7 @@
 				<div>{{index+(pageIndex-1) * pageSize + 1}}</div>
 				<div class="text-style">{{data.gdcode}}</div>
 			</td>
+			<td>{{ data.createDept }}</td>
       <td>
 				<div>{{ data.startDept }}</div>
 				<div>{{ data.endDept }}</div>
@@ -85,8 +87,8 @@
 				<div>{{ data.evaluationName }}</div>
 			</td>
       <td>
-      	<div>{{ data.totalGrade }}{{data.totalGrade?'元':''}}</div>
-      	<div>{{ data.scorePrice }}{{data.scorePrice?'分':''}}</div>
+      	<div>{{ data.scorePrice }}{{data.scorePrice ? '元' : ''}}</div>
+      	<div>{{ data.totalGrade }}{{data.totalGrade ? '分' : ''}}</div>
       </td>
 			<td>{{data.workerName}}</td>
     </tr>

src/app/views/new-statistics/distribution-inspection-statistics/incident-list/incident-list.component.ts

@@ -42,6 +42,8 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 	
 	ngOnDestroy(){
+		console.log(12122121)
+		this.fieldConfig.fields = {}
 		sessionStorage.removeItem('distributionData')
 	}
 	
@@ -60,6 +62,7 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
   }
 	
 	goingType:boolean = false;
+	gdStateId:any = null;
 	getRouteQuery(){
 		let data = sessionStorage.getItem('distributionData')
 		let query = null
@@ -81,27 +84,40 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 					this.goingType = false
 					this.fieldConfig.fields = {}
 				}
-				
-				this.getQueryParams();
+				if(!query.isGdId){
+					this.gdStateId = '73,74'
+				}else{
+					this.gdStateId = undefined;
+				}
+				this.getQueryParams(query);
 			},50)
 		}else{
+			this.gdStateId = undefined;
 			setTimeout(_=>{
-				this.getQueryParams();
+				this.getQueryParams('');
 			},50)
 		}
 	}
 	
-  getQueryParams(){
+  getQueryParams(query){
     let queryParams = this.tabService.getQueryParams();
-    this.tabService.clearQueryParams();
+		console.log(43434343,queryParams)
     if(queryParams.dateRange){
+			console.log(555555)
       this.dateRange = queryParams.dateRange;
       this.customChangeDateComponent.initByDate(this.dateRange, queryParams.defRange);
-    }
-    setTimeout(_=>{
-    	this.search();
-    	this.onResize(37);
-    },50)
+		}else{
+			this.tabService.clearQueryParams();
+			console.log(666666)
+			if(query){
+				this.dateRange = [query.startDate, query.endDate];
+				this.customChangeDateComponent.initByDate(this.dateRange, queryParams.defRange);
+			}
+		}
+		setTimeout(_=>{
+			this.search();
+			this.onResize(37);
+		},100)
   }
 
   get getMoreFilter(){
@@ -173,12 +189,13 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 			buildingId: this.fieldConfig.fields.buildingId || undefined,
 			sourceId: this.fieldConfig.fields.sourceId || undefined,
 			minutesClose: this.fieldConfig.fields.minuteClose || undefined,
-			specialCloseFlag: this.fieldConfig.fields.specialId || undefined,
-			timeout: this.fieldConfig.fields.overtimeId || undefined,
-			abnormityType: this.fieldConfig.fields.abnormalId || undefined,
+			specialCloseFlag: this.fieldConfig.fields.specialId,
+			// timeout: this.fieldConfig.fields.overtimeId,
+			// abnormityType: this.fieldConfig.fields.abnormalId,
 			workOrderEvaluationId: this.fieldConfig.fields.evaluateId || undefined,
-			hour: this.fieldConfig.fields.timeFrameId || undefined,
-			gdCode: this.fieldConfig.fields.codeNum || undefined
+			hour: this.fieldConfig.fields.timeFrameId != null ? this.fieldConfig.fields.timeFrameId : undefined,
+			gdCode: this.fieldConfig.fields.codeNum || undefined,
+			gdStateId: this.gdStateId
     };
 
     this.loading1 = true;
@@ -230,12 +247,13 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 			buildingId: this.fieldConfig.fields.buildingId || undefined,
     	sourceId: this.fieldConfig.fields.sourceId || undefined,
     	minutesClose: this.fieldConfig.fields.minuteClose || undefined,
-    	specialCloseFlag: this.fieldConfig.fields.specialId || undefined,
-    	timeout: this.fieldConfig.fields.overtimeId || undefined,
-    	abnormityType: this.fieldConfig.fields.abnormalId || undefined,
+    	specialCloseFlag: this.fieldConfig.fields.specialId,
+    	// timeout: this.fieldConfig.fields.overtimeId,
+    	// abnormityType: this.fieldConfig.fields.abnormalId,
     	workOrderEvaluationId: this.fieldConfig.fields.evaluateId || undefined,
-    	hour: this.fieldConfig.fields.timeFrameId || undefined,
-    	gdCode: this.fieldConfig.fields.codeNum || undefined
+    	hour: this.fieldConfig.fields.timeFrameId != null ? this.fieldConfig.fields.timeFrameId : undefined,
+    	gdCode: this.fieldConfig.fields.codeNum || undefined,
+			gdStateId: this.gdStateId
     };
     this.mainService
       .postExportCustom("itsm/export", "workOrderList", postData)
@@ -267,11 +285,14 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 		this.sortCurrent = {};
     this.dateRange = []
     this.statisticsTypeId = undefined;
+		this.gdStateId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('distributionData');
-    this.search();
-		this.onResize(0);
+		setTimeout(_=>{
+			this.search();
+			this.onResize(0);
+		})
   }
 
   // 防抖
@@ -297,18 +318,25 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
 	  this.getList();
 	}
 
-  openChangeStatisticsType(flag){
-    flag && this.getStatisticsTypeList();
+  openChangeStatisticsType(){
+    this.getStatisticsTypeList();
   }
 
   // 获取统计分类列表
   statisticsTypeList:any[] = [];
-  getStatisticsTypeList(keyword?) {
+  getStatisticsTypeList() {
     this.isLoading = true;
     this.mainService
       .getDictionary("list", "statistics_date_type")
       .subscribe((data) => {
+				this.statisticsTypeList = []
         this.isLoading = false;
+				if(!data.find(i=> i.id == -1)){
+					data.push({
+						name:'未知',
+						id:-1
+					})
+				}
         this.statisticsTypeList = data;
       });
   }

src/app/views/new-statistics/distribution-inspection-statistics/source-statistics/source-statistics.component.ts

@@ -212,7 +212,9 @@ export class SourceStatisticsComponent implements OnInit, AfterViewInit {
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, taskTypeId: undefined, buildingId: undefined, statisticsTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 科室搜索

src/app/views/new-statistics/distribution-inspection-statistics/taskType-quality-control-statistics/taskType-quality-control-statistics.component.ts

@@ -452,7 +452,9 @@ export class TaskTypeQualityControlStatisticsComponent implements OnInit, AfterV
     this.taskTypeId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, deptId: undefined, buildingId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 任务类型搜索

src/app/views/new-statistics/distribution-inspection-statistics/user-business-statistics/user-business-statistics.component.ts

@@ -219,7 +219,9 @@ export class UserBusinessStatisticsComponent implements OnInit, AfterViewInit {
     this.userId = undefined;
     this.fieldConfig.fields = {buildingId: undefined, deptId: undefined, groupId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 人员搜索

src/app/views/new-statistics/distribution-inspection-statistics/user-quality-control-statistics/user-quality-control-statistics.component.ts

@@ -208,7 +208,9 @@ export class UserQualityControlStatisticsComponent implements OnInit, AfterViewI
     this.userId = undefined;
     this.fieldConfig.fields = {buildingId: undefined, deptId: undefined, groupId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 人员搜索

src/app/views/new-statistics/maintenance-statistics/building-statistics/building-statistics.component.ts

@@ -196,7 +196,9 @@ export class BuildingStatisticsComponent implements OnInit, AfterViewInit {
     this.dateRange = []
     this.fieldConfig.fields = {category123: true};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

src/app/views/new-statistics/maintenance-statistics/category-one-statistics/category-one-statistics.component.ts

@@ -515,7 +515,9 @@ export class CategoryOneStatisticsComponent implements OnInit, AfterViewInit {
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('maintenanceData');
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

src/app/views/new-statistics/maintenance-statistics/category-source-statistics/category-source-statistics.component.ts

@@ -204,7 +204,9 @@ export class CategorySourceStatisticsComponent implements OnInit, AfterViewInit
     this.dateRange = []
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

src/app/views/new-statistics/maintenance-statistics/category-three-statistics/category-three-statistics.component.ts

@@ -981,7 +981,9 @@ export class CategoryThreeStatisticsComponent implements OnInit, AfterViewInit {
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('maintenanceData');
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

src/app/views/new-statistics/maintenance-statistics/category-two-statistics/category-two-statistics.component.ts

@@ -749,7 +749,9 @@ export class CategoryTwoStatisticsComponent implements OnInit, AfterViewInit {
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('maintenanceData');
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 一级分类搜索

src/app/views/new-statistics/maintenance-statistics/consumable-statistics/consumable-statistics.component.ts

@@ -221,7 +221,9 @@ export class ConsumableStatisticsComponent implements OnInit, AfterViewInit {
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('maintenanceData');
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 科室搜索

src/app/views/new-statistics/maintenance-statistics/department-evaluate-statistics/department-evaluate-statistics.component.ts

@@ -700,7 +700,9 @@ export class DepartmentEvaluateStatisticsComponent implements OnInit, AfterViewI
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('maintenanceData');
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
 	// 防抖

src/app/views/new-statistics/maintenance-statistics/department-incident-statistics/department-incident-statistics.component.ts

@@ -539,7 +539,9 @@ export class DepartmentIncidentStatisticsComponent implements OnInit, AfterViewI
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('maintenanceData');
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

src/app/views/new-statistics/maintenance-statistics/department-source-statistics/department-source-statistics.component.ts

@@ -229,7 +229,9 @@ export class DepartmentSourceStatisticsComponent implements OnInit, AfterViewIni
     this.deptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, deptTypeId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

src/app/views/new-statistics/maintenance-statistics/floor-statistics/floor-statistics.component.ts

@@ -210,7 +210,9 @@ export class FloorStatisticsComponent implements OnInit, AfterViewInit {
     this.buildingId = undefined;
     this.fieldConfig.fields = {categoryId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 楼栋搜索

src/app/views/new-statistics/maintenance-statistics/group-statistics/group-statistics.component.ts

@@ -461,7 +461,9 @@ export class GroupStatisticsComponent implements OnInit, AfterViewInit {
     this.dateRange = []
     this.fieldConfig.fields = {categoryId: undefined, buildingId: undefined, floorId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 防抖

src/app/views/new-statistics/maintenance-statistics/incident-list/incident-list.component.ts

@@ -308,8 +308,10 @@ export class IncidentListComponent implements OnInit, AfterViewInit, OnDestroy {
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('maintenanceData');
-    this.search();
-		this.onResize(0);
+		setTimeout(_=>{
+			this.search();
+			this.onResize(0);
+		})
   }
 
   // 科室搜索

src/app/views/new-statistics/maintenance-statistics/incident-statistics/incident-statistics.component.ts

@@ -500,7 +500,9 @@ export class IncidentStatisticsComponent implements OnInit, AfterViewInit {
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, sourceId: undefined, hierarchy: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('maintenanceData');
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 科室搜索

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.ts

@@ -516,7 +516,9 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
     this.fieldConfig.fields = {categoryId: undefined, buildingId: undefined, floorId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('maintenanceData');
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 科室搜索

src/app/views/new-statistics/maintenance-statistics/user-evaluate-statistics/user-evaluate-statistics.component.ts

@@ -713,7 +713,9 @@ export class UserEvaluateStatisticsComponent implements OnInit, AfterViewInit {
     this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined, repairDeptId: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('maintenanceData');
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 维修人员搜索

src/app/views/new-statistics/maintenance-statistics/user-statistics/user-statistics.component.ts

@@ -514,7 +514,9 @@ export class UserStatisticsComponent implements OnInit, AfterViewInit {
     this.fieldConfig.fields = {buildingId: undefined, floorId: undefined, categoryId: undefined, groupId: undefined};
     this.customChangeDateComponent.resetByDate();
 		sessionStorage.removeItem('maintenanceData');
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 维修人员搜索

src/app/views/new-statistics/maintenance-statistics/work-hour-big-statistics/work-hour-big-statistics.component.ts

@@ -222,7 +222,9 @@ export class WorkHourBigStatisticsComponent implements OnInit, AfterViewInit {
     this.repairDeptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 科室搜索

src/app/views/new-statistics/maintenance-statistics/work-hour-small-statistics/work-hour-small-statistics.component.ts

@@ -224,7 +224,9 @@ export class WorkHourSmallStatisticsComponent implements OnInit, AfterViewInit {
     this.repairDeptId = undefined;
     this.fieldConfig.fields = {groupId: undefined, userId: undefined, categoryId: undefined, buildingId: undefined, floorId: undefined, companyId: undefined, workHourParentId: undefined};
     this.customChangeDateComponent.resetByDate();
-    this.search();
+    setTimeout(_=>{
+    	this.search();
+    })
   }
 
   // 科室搜索

src/app/views/operation-notice/operation-notice.component.html

@@ -20,6 +20,13 @@
     <div class="list" *ngIf="!taskTypeLoading && allTaskType.length">
       <ng-container *ngFor="let tab of tabs">
         <div *ngIf="tabModalName == tab.role">
+					<div class="tabContent" *ngIf="currentChoice.id != 1">
+					  <label class="tabContent_checkbox label">发送时间</label>
+					  <div class="tabContent_textarea">
+							<nz-time-picker [(ngModel)]="tab.sendTime" nzFormat="HH:mm" nzPlaceHolder="发送时间"></nz-time-picker>
+					  </div>
+					</div>
+					
           <div class="tabContent">
             <label class="tabContent_checkbox" nz-checkbox [(ngModel)]="tab.phoneFlag">短信通知内容</label>
             <div class="tabContent_textarea">
@@ -55,13 +62,6 @@
 					    <p>字段：[$变量名称$]可添加<span *ngFor="let item of variableNames; let last = last;" (click)="writeIn(tab, item, $event, 'outsideContent')"><strong>{{item}}</strong><em *ngIf="!last">、</em><em *ngIf="last">。</em></span></p>
 					  </div>
 					</div>
-					
-					<div class="tabContent" *ngIf="currentChoice.id != 1">
-					  <label class="tabContent_checkbox label">发送时间</label>
-					  <div class="tabContent_textarea">
-							<nz-time-picker [(ngModel)]="tab.sendTime" nzFormat="HH:mm" nzPlaceHolder="发送时间"></nz-time-picker>
-					  </div>
-					</div>
         </div>
       </ng-container>
 

src/app/views/operation-notice/operation-notice.component.less

@@ -187,7 +187,7 @@
         display: flex;
 				
 				.label{
-					width: 116px !important;
+					margin-left:0 !important;
 					display: flex;
 					align-items: center;
 				}

src/app/views/operation-search/operation-search.component.html

@@ -42,7 +42,7 @@
 				    nzShowSearch
 				    nzAllowClear
 				    nzPlaceHolder="请选择手术室"
-				    [(ngModel)]="searchCriteria.department"
+				    [(ngModel)]="searchCriteria.departmentRoom"
 				    (nzOnSearch)="changeOperatingRoomInp($event, 'search')"
 				    (nzOpenChange)="changeSearch2($event)"
 				  >
@@ -75,7 +75,7 @@
               <nz-option
                 *ngIf="!isLoading1"
                 nzLabel="{{ data.name }}"
-                nzValue="{{ data.id }}"
+                nzValue="{{ data.value }}"
               ></nz-option>
             </ng-container>
             <nz-option *ngIf="isLoading1" nzDisabled nzCustomContent>
@@ -90,12 +90,12 @@
 				</div>
       </div>
       <div nz-col nzXl="6" class="list-template__btns">
+				<button nz-button class="btn default ml8" (click)="getList(1)">
+				  搜索
+				</button>
         <button nz-button class="btn default ml8" (click)="reset()">
           重置
         </button>
-        <button nz-button class="btn default ml8" (click)="getList(1)">
-          搜索
-        </button>
       </div>
     </div>
     <div class="list-template__bottom">
@@ -107,40 +107,28 @@
         [nzShowPagination]="false"
         [nzLoading]="loading1"
       >
-        <thead (nzSortChange)="sort($event)" nzSingleSort>
+        <thead (nzSortChange)="sort($event)">
           <tr class="thead">
-            <th nzWidth="4%">序号</th>
-            <th nzWidth="8%">申请科室</th>
-            <th nzWidth="7%">患者姓名</th>
-            <th nzWidth="5%">标本编码</th>
-            <th nzWidth="8%">检验项目</th>
-            <th nzWidth="8%">标本类型</th>
-            <th nzWidth="5%">状态</th>
-            <th nzWidth="8%" nzShowSort nzSortKey="arrive_time" [(nzSort)]="sortCurrent.arrive_time">收取时间</th>
-            <th nzWidth="8%">收取人</th>
-            <th nzWidth="8%">中转时间</th>
-            <th nzWidth="8%">送达时间</th>
-            <th nzWidth="8%">送达人</th>
-            <th nzWidth="8%">终点科室</th>
-            <th nzWidth="7%"></th>
+            <th>序号</th>
+            <th>患者信息</th>
+            <th>手术时间</th>
+            <th>申请科室</th>
+            <th>手术室</th>
+            <th>手术名称</th>
+            <th>状态</th>
+            <th>是否首台</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData; let i = index">
             <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
-            <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
-            <td>{{ data.scode || "-" }}</td>
-            <td>{{ data.specimenDesc || "-" }}</td>
-            <td>{{ data.stype ? data.stype.name : "-" }}</td>
-            <td>{{ data.speState ? data.speState.name : "-" }}</td>
-            <td>{{ data.arriveTime || "-" }}</td>
-            <td>{{ data.receiverName || "-" }}</td>
-            <td>{{ data.transTime || '-' }}</td>
-            <td>{{ data.sendTime || '-' }}</td>
-            <td>{{ data.delivererName || "-" }}</td>
-            <td>{{ data.checkDept ? data.checkDept.dept : "-" }}</td>
-            <td><button (click)="viewSpecimenHistory(data)">查看</button></td>
+            <td>{{ data.patientName }} <span *ngIf="data.patientDTO && data.patientDTO.bedNum">({{data.patientDTO.bedNum}} 床)</span> | {{data.patientDTO ? data.patientDTO.residenceNo : '无'}}</td>
+						<td>{{ data.printDate | date:"yyyy-MM-dd HH:mm:ss"  }}</td>
+            <td>{{ data.areaDeptDTO ? data.areaDeptDTO.dept : '-' }}</td>
+            <td>{{ data.surgeryDeptDTO ? data.surgeryDeptDTO.dept : '-' }}</td>
+            <td>{{ data.surgeryName }}</td>
+            <td>{{ data.state ? data.state.name : "-" }}</td>
+            <td>{{ data.firstOperation==1 ? '是' : '否'}}</td>
           </tr>
         </tbody>
       </nz-table>
@@ -157,21 +145,6 @@
     </div>
   </div>
 </div>
-<!-- 清空标本模态框 -->
-<app-dialog-delete
-  [delModal]="delModal"
-  (hideDelModalEvent)="hideDelModal()"
-  [btnLoading]="btnLoading"
-  (confirmDelEvent)="confirmDel()"
-  [content]="tipsMsg1"
-></app-dialog-delete>
-<!-- 标本历史记录查看 -->
-<app-history-prompt-modal
-  *ngIf="historyPromptModalShow"
-  [show]="historyPromptModalShow"
-  [scode]="scode"
-  (closeModelHs)="closeModelHistory($event)"
-></app-history-prompt-modal>
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal
   *ngIf="promptModalShow"

src/app/views/operation-search/operation-search.component.ts

@@ -16,14 +16,11 @@ export class OperationSearchComponent implements OnInit {
   searchCriteria = {
     //搜索条件
 		firstOperation:false,
-    scode: "",
-    parent: "",
     hospital: null,
     department: null,
     speState: null,
-    receiverName: null,
     dateRange: [],
-    checkDept: null,
+    departmentRoom: null,
   };
   types = []; // 类型列表(搜索框)
   departmentSearch = []; // 院区下的科室列表(搜索框)
@@ -126,41 +123,22 @@ export class OperationSearchComponent implements OnInit {
       this.startDate = this.endDate = "";
       return;
     }
-    this.startDate =
-      result[0].getFullYear() +
-      "-" +
-      (result[0].getMonth() + 1) +
-      "-" +
-      result[0].getDate() +
-      " " +
-      "00:00:00";
-    this.endDate =
-      result[1].getFullYear() +
-      "-" +
-      (result[1].getMonth() + 1) +
-      "-" +
-      result[1].getDate() +
-      " " +
-      "23:59:59";
+		this.startDate = format(result[0], "yyyy-MM-dd ") + "00:00:00";
+		this.endDate = format(result[1], "yyyy-MM-dd ") + "23:59:59";
   }
   // 重置
   reset() {
     this.searchCriteria = {
       //搜索条件
-      scode: "",
-      parent: "",
       hospital: this.allHospital[0] ? this.allHospital[0]["id"] + "" : null,
-      department: null,
-      speState: null,
-      receiverName: null,
-      dateRange: [],
-      checkDept: null,
-    };
-    this.sortCurrentKey = "";
-    this.sortCurrentValue = "";
-    this.sortCurrent = {
-      arrive_time: null,
+			firstOperation:false,
+			department: null,
+			speState: null,
+			dateRange: [],
+			departmentRoom: null,
     };
+		this.startDate = null;
+		this.endDate = null;
     this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
   }
   // 选择院区
@@ -325,47 +303,28 @@ export class OperationSearchComponent implements OnInit {
   // 表格数据
   loading1 = false;
   getList(type, field?: string, sort?: string) {
-    console.log(this.searchCriteria.dateRange);
     if (type == 1) {
       this.pageIndex = 1;
     }
     let postData: any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      specimen: {
-        firstOperation: this.searchCriteria.firstOperation ? 1 : 0,
+      surgery: {
+				applyDateStart: this.startDate,
+				applyDateEnd: this.endDate,
+        firstOperation: this.searchCriteria.firstOperation ? 1 : undefined,
         hosId: this.searchCriteria.hospital,
-        dept: this.searchCriteria.checkDept
-          ? {
-              id: this.searchCriteria.checkDept,
-            }
-          : undefined,
-        receiverName: this.searchCriteria.receiverName
-          ? this.searchCriteria.receiverName
-          : undefined,
-        scode: !this.searchCriteria.scode
-          ? undefined
-          : this.searchCriteria.scode,
-        keyWord: !this.searchCriteria.parent
-          ? undefined
-          : this.searchCriteria.parent,
-        speState: this.searchCriteria.speState
-          ? { id: this.searchCriteria.speState }
+        areaDept: this.searchCriteria.department ? this.searchCriteria.department :undefined,
+				surgeryDept: this.searchCriteria.departmentRoom ? this.searchCriteria.departmentRoom : undefined,
+        state: this.searchCriteria.speState
+          ? { value: this.searchCriteria.speState }
           : undefined,
       },
     };
-    if (field && sort) {
-      postData.specimen.orderBy = sort === "ascend" ? field : `${field} desc`;
-    }
-    if (this.searchCriteria.dateRange.length) {
-      postData.specimen.startArriveTime =
-        format(this.searchCriteria.dateRange[0], "yyyy-MM-dd ") + "00:00:00";
-      postData.specimen.endArriveTime =
-        format(this.searchCriteria.dateRange[1], "yyyy-MM-dd ") + "23:59:59";
-    }
+
     this.loading1 = true;
     this.mainService
-      .getFetchDataList("simple/data", "specimen", postData)
+      .getFetchDataList("simple/data", "surgery", postData)
       .subscribe((data) => {
         this.loading1 = false;
         if (data.status == 200) {