瀏覽代碼

标本配置添加

maotao 2 周之前
父節點
當前提交
014194af06

+ 7 - 3
src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.html

@@ -89,7 +89,7 @@
89 89
 								<!-- 是否开通收取限制 -->
90 90
 								<div class="display_flex align-items_center mb8">
91 91
 								  <nz-form-label class="label">是否开通收取限制</nz-form-label>
92
-								  <nz-checkbox-group [(ngModel)]="speCollectLimit"></nz-checkbox-group>
92
+								  <nz-checkbox-group [(ngModel)]="speCollectLimit" (ngModelChange)="changeSpeCollect($event)"></nz-checkbox-group>
93 93
 								</div>
94 94
 								
95 95
 								<!-- 是否支持非起点科室收取 -->
@@ -135,13 +135,17 @@
135 135
 								<!-- 是否限制重复收取标本 -->
136 136
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
137 137
 								  <nz-form-label class="label">是否限制重复收取标本</nz-form-label>
138
-								  <nz-checkbox-group [(ngModel)]="speCollectLimitRepeat"></nz-checkbox-group>
138
+									<nz-checkbox-group [(ngModel)]="speCollectLimitRepeat"></nz-checkbox-group>
139 139
 								</div>
140 140
 								
141 141
 								<!-- 是否限制试管类型收取标本 -->
142 142
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
143 143
 								  <nz-form-label class="label">是否限制试管类型收取标本</nz-form-label>
144
-								  <nz-checkbox-group [(ngModel)]="speCollectLimitTubeType"></nz-checkbox-group>
144
+									<nz-select class="formItem" nzMode="multiple" [nzDropdownMatchSelectWidth]="false" nzAllowClear nzPlaceHolder="请选择是否限制重复收取标本" [(ngModel)]="speCollectLimitTubeType">
145
+										<ng-container *ngFor="let option of repetitionData">
146
+											<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
147
+										</ng-container>
148
+									</nz-select>
145 149
 								</div>
146 150
 								
147 151
 								<!-- 是否开始收取前进入配置页 -->

+ 44 - 17
src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.ts

@@ -107,14 +107,12 @@ export class ConfigurationSpecimenComponent implements OnInit {
107 107
 	speCollectLimitUrgent:any = [];
108 108
 	
109 109
 	// 是否限制重复收取标本
110
-	speCollectLimitRepeat:any[] = [
110
+	speCollectLimitRepeat:any[]= [
111 111
 	  {label:'是否开启',value: 0}
112 112
 	];
113 113
 	
114 114
 	// 是否限制试管类型收取标本
115
-	speCollectLimitTubeType:any[] = [
116
-	  {label:'是否开启',value: 0}
117
-	];
115
+	speCollectLimitTubeType:any[];
118 116
 	
119 117
 	// 是否开始收取前进入配置页
120 118
 	speStartCollectShowConfig:any[] = [
@@ -136,6 +134,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
136 134
   tasktype:any = {};
137 135
 	specimenStateData:any = [];
138 136
 	endDeptData:any = [];
137
+	repetitionData:any = [];
139 138
 	astrictData:any = [
140 139
 		{name:'普通',id:'0'},
141 140
 		{name:'紧急',id:'1'},
@@ -155,18 +154,22 @@ export class ConfigurationSpecimenComponent implements OnInit {
155 154
   }
156 155
 	
157 156
 	// 获取科室类型
157
+	deptItem:any;
158 158
 	getDeptDic(e:string = ''){
159 159
 		this.mainService.getDictionary("list", "speState").subscribe((res) => {
160 160
 			this.specimenStateData = res
161 161
 		})
162
+		this.mainService.getDictionary("list", "specimen_tube_type").subscribe((res) => {
163
+			this.repetitionData = res
164
+		})
162 165
 		this.mainService.getDictionary("list", "dept_type").subscribe((res2) => {
163
-			let item = res2.find(i=>i.name=='检验科室')
166
+			this.deptItem = res2.find(i=>i.name=='检验科室')
164 167
 			let data1 = {
165 168
 			  idx: 0,
166 169
 			  sum: 9999,
167 170
 			  department: {
168 171
 			    hospital: { id: this.hosId || "" },
169
-			    type: { id: item.id || "" },
172
+			    type: { id: this.deptItem.id || "" },
170 173
 					dept: e,
171 174
 			  },
172 175
 			};
@@ -178,9 +181,27 @@ export class ConfigurationSpecimenComponent implements OnInit {
178 181
 		})
179 182
 	}
180 183
 	
184
+	getEndDeptData(e){
185
+		let data1 = {
186
+		  idx: 0,
187
+		  sum: 9999,
188
+		  department: {
189
+		    hospital: { id: this.hosId || "" },
190
+		    type: { id: this.deptItem.id || "" },
191
+				dept: e,
192
+		  },
193
+		};
194
+		this.mainService
195
+		  .getFetchDataList("data", "department", data1)
196
+		  .subscribe((res) => {
197
+				 this.isLoading = false;
198
+		    this.endDeptData = res.list;
199
+		  });
200
+	}
201
+	
181 202
 	// 搜索起点科室
182 203
 	changeEndDept(e){
183
-		this.searchTimer(this.getDeptDic, e);
204
+		this.searchTimer(this.getEndDeptData, e);
184 205
 	}
185 206
 	
186 207
 	// 点击数据字典key
@@ -196,6 +217,12 @@ export class ConfigurationSpecimenComponent implements OnInit {
196 217
 		}
197 218
 	}
198 219
 	
220
+	changeSpeCollect(e){
221
+		if(!e[0].checked){
222
+		  
223
+		}
224
+	}
225
+	
199 226
   // 扫描时指定科室不提醒勾选项
200 227
   changeDeptNotAlert(e){
201 228
     console.log(e);
@@ -307,7 +334,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
307 334
       bigScanArriveNotOwner: this.bigScanArriveNotOwner[0].checked ? 1 : 0,
308 335
       bigScanShowCreateBtn: this.bigScanShowCreateBtn[0].checked ? 1 : 0,
309 336
       defaultScanSpe: this.defaultScanSpe[0].checked ? 1 : 0,
310
-      deptNotAlertIds: this.deptNotAlertIds.length ? this.deptNotAlertIds.toString() : undefined,
337
+      deptNotAlertIds: this.deptNotAlertIds && this.deptNotAlertIds.length>0 ? this.deptNotAlertIds.toString() : undefined,
311 338
 			speCollectLimit: this.speCollectLimit[0].checked ? 1 : 0,
312 339
 			speCollectSupportNotStartDept: null,
313 340
 			speCollectLimitRepeat: null,
@@ -320,11 +347,11 @@ export class ConfigurationSpecimenComponent implements OnInit {
320 347
 		if(this.speCollectLimit[0].checked){
321 348
 			postData.speCollectSupportNotStartDept = this.speCollectSupportNotStartDept[0].checked ? 1 : 0;
322 349
 			postData.speCollectLimitRepeat = this.speCollectLimitRepeat[0].checked ? 1 : 0;
323
-			postData.speCollectLimitTubeType = this.speCollectLimitTubeType[0].checked ? 1 : 0;
350
+			postData.speCollectLimitTubeType = this.speCollectLimitTubeType && this.speCollectLimitTubeType.length>0 ? this.speCollectLimitTubeType.toString() : undefined;
324 351
 			postData.speStartCollectShowConfig = this.speStartCollectShowConfig[0].checked ? 1 : 0;
325
-			postData.speCollectLimitState = this.speCollectLimitState.length ? this.speCollectLimitState.toString() : undefined;
326
-			postData.speCollectLimitEndDept = this.speCollectLimitEndDept.length ? this.speCollectLimitEndDept.toString() : undefined;
327
-			postData.speCollectLimitUrgent = this.speCollectLimitUrgent.length ? this.speCollectLimitUrgent.toString() : undefined;
352
+			postData.speCollectLimitState = this.speCollectLimitState && this.speCollectLimitState.length>0 ? this.speCollectLimitState.toString() : undefined;
353
+			postData.speCollectLimitEndDept = this.speCollectLimitEndDept && this.speCollectLimitEndDept.length>0 ? this.speCollectLimitEndDept.toString() : undefined;
354
+			postData.speCollectLimitUrgent = this.speCollectLimitUrgent && this.speCollectLimitUrgent.length>0 ? this.speCollectLimitUrgent.toString() : undefined;
328 355
 		}else{
329 356
 			postData.speCollectSupportNotStartDept = undefined;
330 357
 			postData.speCollectLimitRepeat = undefined;
@@ -441,12 +468,12 @@ export class ConfigurationSpecimenComponent implements OnInit {
441 468
 						this.speCollectLimit[0].checked = this.configs.speCollectLimit == 1;
442 469
 						if(this.configs.speCollectLimit == 1){
443 470
 							this.speCollectSupportNotStartDept[0].checked = this.configs.speCollectSupportNotStartDept == 1;
444
-							this.speCollectLimitRepeat[0].checked = this.configs.speCollectLimitRepeat == 1;
445
-							this.speCollectLimitTubeType[0].checked = this.configs.speCollectLimitTubeType == 1;
471
+							this.speCollectLimitRepeat[0].checked  = this.configs.speCollectLimitRepeat == 1; 
472
+							this.speCollectLimitTubeType = this.configs.speCollectLimitTubeType ? this.configs.speCollectLimitTubeType.split(',').map(v => +v) : [];
446 473
 							this.speStartCollectShowConfig[0].checked = this.configs.speStartCollectShowConfig == 1;
447 474
 							this.speCollectLimitState = this.configs.speCollectLimitState ? this.configs.speCollectLimitState.split(',').map(v => +v) : [];
448 475
 							this.speCollectLimitEndDept = this.configs.speCollectLimitEndDept ? this.configs.speCollectLimitEndDept.split(',').map(v => +v) : [];
449
-							this.speCollectLimitUrgent = this.configs.speCollectLimitUrgent ? this.configs.speCollectLimitUrgent.split(',').map(v => +v) : [];
476
+							this.speCollectLimitUrgent = this.configs.speCollectLimitUrgent ? this.configs.speCollectLimitUrgent.split(',').map(v => v) : [];
450 477
 						}
451 478
 					}else{
452 479
 						// 病理标本
@@ -456,8 +483,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
456 483
 						this.pathologyBarCode = this.configs.pathologyBarCode;
457 484
 						this.pathologyFrozenSpecimenNum = this.configs.pathologyFrozenSpecimenNum;
458 485
 						this.prompt = this.configs.prompt || '';
459
-						this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
460
-						this.surgeryPathologyLabelSize = this.configs.surgeryPathologyLabelSize.id //手术病理标签样式
486
+						this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize && this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
487
+						this.surgeryPathologyLabelSize = this.configs.surgeryPathologyLabelSize && this.configs.surgeryPathologyLabelSize.id //手术病理标签样式
461 488
 					}
462 489
         }
463 490
       });

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

@@ -129,9 +129,9 @@
129 129
 				</nz-form-item>
130 130
 				
131 131
 				<nz-form-item [hidden]="!fieldConfig.config.special">
132
-				  <nz-form-label [nzSpan]="7" nzFor="specialId">特殊情况关闭</nz-form-label>
133
-				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择特殊情况关闭!">
134
-				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="specialId" nzPlaceHolder="请选择特殊情况关闭">
132
+				  <nz-form-label [nzSpan]="6" nzFor="specialId">特殊关闭</nz-form-label>
133
+				  <nz-form-control [nzSpan]="17" nzErrorTip="请选择特殊关闭!">
134
+				    <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="specialId" nzPlaceHolder="请选择特殊关闭">
135 135
 				      <ng-container *ngFor="let option of specialList">
136 136
 				        <nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
137 137
 				      </ng-container>