Merge branch 'lmm' into develop

src/app/views/fuwutai/fuwutai.component.ts

@@ -1080,12 +1080,15 @@ export class FuwutaiComponent implements OnInit {
     let postData = {
       idx: 0,
       sum: 1,
-      systemConfiguration: {
-        keyconfig: "rebackPatientTypeId",
+      hospitalConfig: {
+        hosId: this.checkedHos,
+        key: "transDeptTypeId",
       },
     };
     this.getConfigTasktypeLoading = true;
-    return this.mainService.systemConfiguration(postData).toPromise();
+    return this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .toPromise();
   }
   // 获取配置文件写死的任务类型ID(转科，给转出院记录用6)
   patientLogTasktypeLoading: boolean = false;
@@ -1108,7 +1111,7 @@ export class FuwutaiComponent implements OnInit {
     let deathTasktypeResult: any = await this.getConfigTasktype();
     this.getConfigTasktypeLoading = false;
     if (deathTasktypeResult.status == 200) {
-      this.deathTasktypeId = deathTasktypeResult.list[0].valueconfig;
+      this.deathTasktypeId = deathTasktypeResult.list[0].value;
     } else {
       return;
     }

src/app/views/hospital-config/hospital-config.component.html

@@ -55,8 +55,34 @@
               </div>
             </nz-form-control>
           </ng-container>
+          <ng-container *ngIf="config.key === 'rebackPatientTypeId'">
+            <nz-form-label [nzSpan]="24" [nzFor]="config.key" nzRequired class="label">{{config.desc}}</nz-form-label>
+            <nz-form-control [nzSpan]="24" [nzErrorTip]="'请选择'+config.desc+'!'">
+              <nz-select [formControlName]="config.key" [nzPlaceHolder]="'请选择'+config.desc" nzShowSearch nzServerSearch>
+                <ng-container *ngFor="let o of taskTypeList">
+                  <nz-option *ngIf="true" [nzValue]="o.id" [nzLabel]="o.taskName"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="false" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 正在加载中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </ng-container>
+          <ng-container *ngIf="config.key === 'transDeptTypeId'">
+            <nz-form-label [nzSpan]="24" [nzFor]="config.key" nzRequired class="label">{{config.desc}}</nz-form-label>
+            <nz-form-control [nzSpan]="24" [nzErrorTip]="'请选择'+config.desc+'!'">
+              <nz-select [formControlName]="config.key" [nzPlaceHolder]="'请选择'+config.desc" nzShowSearch nzServerSearch>
+                <ng-container *ngFor="let o of taskTypeList">
+                  <nz-option *ngIf="true" [nzValue]="o.id" [nzLabel]="o.taskName"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="false" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 正在加载中...
+                </nz-option>
+              </nz-select>
+            </nz-form-control>
+          </ng-container>
           <ng-container
-            *ngIf="(config.key !== 'autoCreateUserRoleId'&&config.key !== 'autoCreateUserDeptId'&&config.key !== 'autoCreateUserGroupId'&&config.key !== 'phone_num_port'&&config.key !== 'phone_num_port1'&&config.key !== 'phone_num_port2'&&config.key !== 'phone_num_port3')">
+            *ngIf="(config.key !== 'autoCreateUserRoleId'&&config.key !== 'autoCreateUserDeptId'&&config.key !== 'autoCreateUserGroupId'&&config.key !== 'phone_num_port'&&config.key !== 'phone_num_port1'&&config.key !== 'phone_num_port2'&&config.key !== 'phone_num_port3'&&config.key !== 'rebackPatientTypeId'&&config.key !== 'transDeptTypeId')">
             <nz-form-label [nzSpan]="24" [nzFor]="config.key" [nzRequired]="config.required" class="label">
               {{config.desc}}</nz-form-label>
             <nz-form-control [nzSpan]="24" [nzErrorTip]="'请选择'+config.desc+'!'">

src/app/views/hospital-config/hospital-config.component.ts

@@ -20,6 +20,7 @@ export class HospitalConfigComponent implements OnInit {
   searchLoading: boolean = false;
   hospitalConfigList = []; //院区系统配置列表
   roleList = []; //角色列表
+  taskTypeList = []; //任务类型列表
   deptList = []; //科室列表
   groupList = []; //组列表
   onSearchSubject = new Subject(); //搜索防抖
@@ -56,6 +57,7 @@ export class HospitalConfigComponent implements OnInit {
       this.getRoleList(),
       this.getDeptList(this.hosId),
       this.getGroupList(this.hosId),
+      this.getTaskTypeList(),
     ])
       .then((result) => {
         if (result[0].status == 200) {
@@ -67,6 +69,9 @@ export class HospitalConfigComponent implements OnInit {
         if (result[2].status == 200) {
           this.groupList = result[2].list;
         }
+        if (result[3].status == 200) {
+          this.taskTypeList = result[3].list;
+        }
         this.getHospitalConfigList(this.hosId).subscribe((res) => {
           if (res.status == 200) {
             this.hospitalConfigList = res.list;
@@ -85,8 +90,13 @@ export class HospitalConfigComponent implements OnInit {
             this.validateForm = this.fb.group(fbGroup);
             //赋值
             this.hospitalConfigList.forEach((config) => {
-              //默认角色
-              if (config.key === "autoCreateUserRoleId") {
+              //默认角色,默认组
+              if (
+                config.key === "autoCreateUserRoleId" ||
+                config.key === "rebackPatientTypeId" ||
+                config.key === "transDeptTypeId" ||
+                config.key === "autoCreateUserGroupId"
+              ) {
                 this.validateForm.controls[config.key].setValue(
                   config.value - 0
                 );
@@ -112,11 +122,6 @@ export class HospitalConfigComponent implements OnInit {
                 this.validateForm.controls[config.key].setValue(
                   config.value - 0
                 );
-              } else if (config.key === "autoCreateUserGroupId") {
-                //默认组
-                this.validateForm.controls[config.key].setValue(
-                  config.value - 0
-                );
               } else {
                 this.validateForm.controls[config.key].setValue(config.value);
               }
@@ -146,6 +151,21 @@ export class HospitalConfigComponent implements OnInit {
       .getFetchDataList("user/data", "role", postData)
       .toPromise();
   }
+  // 获取任务类型列表(患者其他服务)
+  getTaskTypeList() {
+    let postData = {
+      idx: 0,
+      sum: 999,
+      taskType: {
+        hosIds: this.hosId,
+        simpleQuery: true,
+        associationType: { id: 255 },
+      },
+    };
+    return this.mainService
+      .getFetchDataList("configuration", "taskType", postData)
+      .toPromise();
+  }
   /**
    * 获取科室列表
    * @param hosId 院区id
@@ -188,6 +208,7 @@ export class HospitalConfigComponent implements OnInit {
       this.validateForm.controls[i].markAsDirty();
       this.validateForm.controls[i].updateValueAndValidity();
     }
+    if (this.validateForm.invalid) return;
     let hospitalConfigList = JSON.parse(
       JSON.stringify(this.hospitalConfigList)
     );

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

@@ -165,7 +165,7 @@
         </div>
         <div class="mb8 w100" *ngIf="isRemand == '1'">
           <nz-form-label class="label" nzRequired>选择自动送回的任务类型</nz-form-label>
-          <nz-select [ngClass]="{remandTypeId:!remandTypeId}" style="width:146px;" [nzDropdownMatchSelectWidth]="false"
+          <nz-select (nzOpenChange)="openSearchTaskList($event)" [ngClass]="{remandTypeId:!remandTypeId}" style="width:146px;" [nzDropdownMatchSelectWidth]="false"
             nzServerSearch nzShowSearch (nzOnSearch)="changeSearchTaskList($event)" nzPlaceHolder="请选择任务类型"
             [(ngModel)]="remandTypeId">
             <ng-container *ngFor="let option of searchTaskList">

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

@@ -578,6 +578,12 @@ export class TaskTypeManagementComponent implements OnInit {
       ];
     }
   }
+  // 选择自动送回的任务类型
+  openSearchTaskList(flag) {
+    if (flag) {
+      this.getSearchTaskList();
+    }
+  }
   //选择类型
   currentChoice;
   itemChoice(data, index) {
@@ -703,6 +709,8 @@ export class TaskTypeManagementComponent implements OnInit {
           taskName: data.remandTypeId.taskName,
         });
       }
+    } else {
+      this.remandTypeId = null;
     }
     if (data.defaultNullDeptId) {
       this.defaultNullDeptId = `${data.defaultNullDeptId.id}__${data.defaultNullDeptId.dept}`;
@@ -1798,7 +1806,11 @@ export class TaskTypeManagementComponent implements OnInit {
       .subscribe((result) => {
         this.searchTaskLoading = false;
         if (result.status == 200) {
-          this.searchTaskList = result.list;
+          if (this.currentChoice) {
+            this.searchTaskList = result.list.filter(
+              (item) => item.id != this.currentChoice.id
+            );
+          }
           this.searchTaskList.forEach((item) => {
             item.id = `${item.id}__${item.taskName}`;
           });
@@ -2275,7 +2287,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.promptModalShow = false;
     this.promptContent = con;
     this.ifSuccess = success;
-    if (errorInfo) {
+    if (errorInfo !== undefined) {
       this.errorInfo = errorInfo;
     }
     setTimeout(() => {