标本配置添加

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

@@ -89,7 +89,7 @@
 								<!-- 是否开通收取限制 -->
 								<div class="display_flex align-items_center mb8">
 								  <nz-form-label class="label">是否开通收取限制</nz-form-label>
-								  <nz-checkbox-group [(ngModel)]="speCollectLimit"></nz-checkbox-group>
+								  <nz-checkbox-group [(ngModel)]="speCollectLimit" (ngModelChange)="changeSpeCollect($event)"></nz-checkbox-group>
 								</div>
 								
 								<!-- 是否支持非起点科室收取 -->
@@ -135,13 +135,17 @@
 								<!-- 是否限制重复收取标本 -->
 								<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>
+									<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>
+									<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择是否限制重复收取标本" [(ngModel)]="speCollectLimitTubeType">
+										<ng-container *ngFor="let option of repetitionData">
+											<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+										</ng-container>
+									</nz-select>
 								</div>
 								
 								<!-- 是否开始收取前进入配置页 -->

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

@@ -107,14 +107,12 @@ export class ConfigurationSpecimenComponent implements OnInit {
 	speCollectLimitUrgent:any = [];
 	
 	// 是否限制重复收取标本
-	speCollectLimitRepeat:any[] = [
+	speCollectLimitRepeat:any[]= [
 	  {label:'是否开启',value: 0}
 	];
 	
 	// 是否限制试管类型收取标本
-	speCollectLimitTubeType:any[] = [
-	  {label:'是否开启',value: 0}
-	];
+	speCollectLimitTubeType:any[];
 	
 	// 是否开始收取前进入配置页
 	speStartCollectShowConfig:any[] = [
@@ -136,6 +134,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
   tasktype:any = {};
 	specimenStateData:any = [];
 	endDeptData:any = [];
+	repetitionData:any = [];
 	astrictData:any = [
 		{name:'普通',id:'0'},
 		{name:'紧急',id:'1'},
@@ -155,18 +154,22 @@ export class ConfigurationSpecimenComponent implements OnInit {
   }
 	
 	// 获取科室类型
+	deptItem:any;
 	getDeptDic(e:string = ''){
 		this.mainService.getDictionary("list", "speState").subscribe((res) => {
 			this.specimenStateData = res
 		})
+		this.mainService.getDictionary("list", "specimen_tube_type").subscribe((res) => {
+			this.repetitionData = res
+		})
 		this.mainService.getDictionary("list", "dept_type").subscribe((res2) => {
-			let item = res2.find(i=>i.name=='检验科室')
+			this.deptItem = res2.find(i=>i.name=='检验科室')
 			let data1 = {
 			  idx: 0,
 			  sum: 9999,
 			  department: {
 			    hospital: { id: this.hosId || "" },
-			    type: { id: item.id || "" },
+			    type: { id: this.deptItem.id || "" },
 					dept: e,
 			  },
 			};
@@ -178,9 +181,27 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		})
 	}
 	
+	getEndDeptData(e){
+		let data1 = {
+		  idx: 0,
+		  sum: 9999,
+		  department: {
+		    hospital: { id: this.hosId || "" },
+		    type: { id: this.deptItem.id || "" },
+				dept: e,
+		  },
+		};
+		this.mainService
+		  .getFetchDataList("data", "department", data1)
+		  .subscribe((res) => {
+				 this.isLoading = false;
+		    this.endDeptData = res.list;
+		  });
+	}
+	
 	// 搜索起点科室
 	changeEndDept(e){
-		this.searchTimer(this.getDeptDic, e);
+		this.searchTimer(this.getEndDeptData, e);
 	}
 	
 	// 点击数据字典key
@@ -196,6 +217,12 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		}
 	}
 	
+	changeSpeCollect(e){
+		if(!e[0].checked){
+		  
+		}
+	}
+	
   // 扫描时指定科室不提醒勾选项
   changeDeptNotAlert(e){
     console.log(e);
@@ -307,7 +334,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
       bigScanArriveNotOwner: this.bigScanArriveNotOwner[0].checked ? 1 : 0,
       bigScanShowCreateBtn: this.bigScanShowCreateBtn[0].checked ? 1 : 0,
       defaultScanSpe: this.defaultScanSpe[0].checked ? 1 : 0,
-      deptNotAlertIds: this.deptNotAlertIds.length ? this.deptNotAlertIds.toString() : undefined,
+      deptNotAlertIds: this.deptNotAlertIds && this.deptNotAlertIds.length>0 ? this.deptNotAlertIds.toString() : undefined,
 			speCollectLimit: this.speCollectLimit[0].checked ? 1 : 0,
 			speCollectSupportNotStartDept: null,
 			speCollectLimitRepeat: null,
@@ -320,11 +347,11 @@ export class ConfigurationSpecimenComponent implements OnInit {
 		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.speCollectLimitTubeType = this.speCollectLimitTubeType && this.speCollectLimitTubeType.length>0 ? this.speCollectLimitTubeType.toString() : undefined;
 			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;
+			postData.speCollectLimitState = this.speCollectLimitState && this.speCollectLimitState.length>0 ? this.speCollectLimitState.toString() : undefined;
+			postData.speCollectLimitEndDept = this.speCollectLimitEndDept && this.speCollectLimitEndDept.length>0 ? this.speCollectLimitEndDept.toString() : undefined;
+			postData.speCollectLimitUrgent = this.speCollectLimitUrgent && this.speCollectLimitUrgent.length>0 ? this.speCollectLimitUrgent.toString() : undefined;
 		}else{
 			postData.speCollectSupportNotStartDept = undefined;
 			postData.speCollectLimitRepeat = undefined;
@@ -441,12 +468,12 @@ export class ConfigurationSpecimenComponent implements OnInit {
 						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.speCollectLimitRepeat[0].checked  = this.configs.speCollectLimitRepeat == 1; 
+							this.speCollectLimitTubeType = this.configs.speCollectLimitTubeType ? this.configs.speCollectLimitTubeType.split(',').map(v => +v) : [];
 							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) : [];
+							this.speCollectLimitUrgent = this.configs.speCollectLimitUrgent ? this.configs.speCollectLimitUrgent.split(',').map(v => v) : [];
 						}
 					}else{
 						// 病理标本
@@ -456,8 +483,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
 						this.pathologyBarCode = this.configs.pathologyBarCode;
 						this.pathologyFrozenSpecimenNum = this.configs.pathologyFrozenSpecimenNum;
 						this.prompt = this.configs.prompt || '';
-						this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
-						this.surgeryPathologyLabelSize = this.configs.surgeryPathologyLabelSize.id //手术病理标签样式
+						this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize && this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
+						this.surgeryPathologyLabelSize = this.configs.surgeryPathologyLabelSize && this.configs.surgeryPathologyLabelSize.id //手术病理标签样式
 					}
         }
       });

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

@@ -129,9 +129,9 @@
 				</nz-form-item>
 				
 				<nz-form-item [hidden]="!fieldConfig.config.special">
-				  <nz-form-label [nzSpan]="7" nzFor="specialId">特殊情况关闭</nz-form-label>
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择特殊情况关闭!">
-				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="specialId" nzPlaceHolder="请选择特殊情况关闭">
+				  <nz-form-label [nzSpan]="6" nzFor="specialId">特殊关闭</nz-form-label>
+				  <nz-form-control [nzSpan]="17" 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>
 				      </ng-container>