拉取代码

src/app/views/hushijiandan/hushijiandan.component.less

@@ -2668,7 +2668,7 @@
 }
 .patient{
   .modalBody{
-    width: 80%;
+    width: 70%;
     border-radius: 16px;
     padding: 16px 24px;
     .title{

src/app/views/task-type-management/task-type-management.component.html

@@ -1244,8 +1244,8 @@
         <div>
           <nz-form-label class="label" nzRequired>固定科室</nz-form-label>
           <nz-select class="mb8 w100" [nzMode]="'multiple'" [nzDropdownMatchSelectWidth]="false" nzShowSearch
-            nzAllowClear nzPlaceHolder="请选择固定科室" nzServerSearch (nzOnSearch)="changeInp($event)"
-            (nzOpenChange)="changeFormEnd($event)" [(ngModel)]="departments">
+            nzAllowClear nzPlaceHolder="请选择固定科室" nzShowSearch  
+             [(ngModel)]="departments">
             <ng-container *ngFor="let data of courseListDataAll">
               <nz-option *ngIf="!loading1" [nzLabel]="data.dept" [nzValue]="data"></nz-option>
             </ng-container>

src/app/views/task-type-management/task-type-management.component.ts

@@ -334,6 +334,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.getSearchTaskList(); //任务类型列表,可搜索
     this.getSearchDeptList(); //标本配送，空单默认科室列表
     this.getReserveType(); //获取是否限制业务发起时间-字典
+		this.changeInp("")
   }
   // 搜索科室
   optionList = [];
@@ -1110,7 +1111,7 @@ export class TaskTypeManagementComponent implements OnInit {
   //打开
   changeFormEnd(flag) {
     if (flag) {
-      this.changeInp("");
+      // this.changeInp("");
     }
   }
   // 获取院区下所有的科室
@@ -1118,7 +1119,7 @@ export class TaskTypeManagementComponent implements OnInit {
   getAllDepartment(id, e) {
     let postData = {
       idx: 0,
-      sum: 10,
+      sum: 9999,
       department: {
         dept: e,
         cascadeHosId: id
@@ -1130,6 +1131,7 @@ export class TaskTypeManagementComponent implements OnInit {
         this.loading1 = false;
         if (data.status == 200) {
           this.courseListDataAll = data.list;
+					
         }
       });
   }
@@ -1649,6 +1651,7 @@ export class TaskTypeManagementComponent implements OnInit {
       this.getCourseList(this.pageSize);
     } else if (name == "ysgc") {
       this.patient_level();
+			// this.changeInp("");
       this.getDepartment().subscribe((res) => {
         this.departmentData = res;
         this.getcheckout();
@@ -1873,7 +1876,11 @@ export class TaskTypeManagementComponent implements OnInit {
     this.departmenShow = true;
     console.log(this.carryingCourses, this.indexs);
     let d = this.carryingCourses[this.indexs].departmentDTOS || [];
-    this.departments = d;
+    this.departments = d
+		// .map(i=>{
+		// 	return i.id
+		// });
+		console.log(111,this.departments);
   }
   //默认科室获取
   getDepartment() {
@@ -2102,10 +2109,26 @@ export class TaskTypeManagementComponent implements OnInit {
       this.checkoutMethod.id = null;
     }
     if (data.departmentIds) {
-      this.courseListDataAll = [
+      let arr = [
         ...data.departmentDTOS,
         ...this.courseListDataAll,
       ];
+			const result = [];
+			for (let i = 0; i < arr.length; i++) {
+				let isUnique = true;
+				for (let j = 0; j < result.length; j++) {
+					if (arr[i].id === result[j].id) {
+						isUnique = false;
+						break;
+					}
+				}
+				if (isUnique) {
+					result.push(arr[i]);
+				}
+			}
+			console.log(1234,arr)
+			console.log(89898,result)
+			this.courseListDataAll = result
       this.departmentIds = data.departmentIds;
     } else {
       this.departmentIds = null;