BUGFIX

src/app/views/fuwutai/fuwutai.component.html

@@ -1086,7 +1086,7 @@
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择任务类型！">
                               <div class="radios">
                                 <overlay-scrollbars #osComponentRef10 [ngStyle]="{ height: '100%' }">
-                                  <nz-radio-group formControlName="taskType" nz-row [(ngModel)]="radioValueZy" (ngModelChange)="radioChangeZy(radioValueZy, index)">
+                                  <nz-radio-group formControlName="taskType" nz-row [ngModel]="radioValueZy" (ngModelChange)="radioChangeZy($event, index)">
                                     <div nz-row>
                                       <label [title]="item1.taskTypeName" nz-col nz-radio [nzValue]="item1.id" *ngFor="let item1 of workTypesArrange[index].value">{{ item1.taskTypeName }}</label>
                                     </div>
@@ -1096,7 +1096,7 @@
                             </nz-form-control>
                           </nz-form-item>
                         </div>
-                        <div nz-col [nzSpan]="24" *ngIf="isTaskTypeInspect">
+                        <div nz-col [nzSpan]="24" *ngIf="isTaskTypeInspect && radioValueZy">
                           <!-- 检查 -->
                           <nz-form-item>
                             <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck" style="text-align: left;">关联的检查</nz-form-label>
@@ -1116,7 +1116,7 @@
                             <div class="noInspect" *ngIf="!linkCheckLis.length">暂无关联的检查</div>
                           </nz-form-item>
                         </div>
-                        <div *ngIf="!isTaskTypeInspect" nz-col [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24" [ngStyle]="{ display: (deptZyList['startStatus'] != 201 && !isTaskTypeInspect) ? 'block' : 'none'}">
+                        <div *ngIf="!isTaskTypeInspect && radioValueZy" nz-col [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24" [ngStyle]="{ display: (deptZyList['startStatus'] != 201 && !isTaskTypeInspect) ? 'block' : 'none'}">
                           <nz-form-item>
                             <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="startDept">起点科室</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择起点科室！">
@@ -1132,11 +1132,11 @@
                             </nz-form-control>
                           </nz-form-item>
                         </div>
-                        <div *ngIf="!isTaskTypeInspect" nz-col [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24">
+                        <div *ngIf="!isTaskTypeInspect && radioValueZy" nz-col [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24">
                           <nz-form-item>
                             <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="endDepts">终点科室</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择终点科室！">
-                              <nz-select formControlName="endDepts" [nzDisabled]="deptZyList.endStatus == 201 || deptZyList.endStatus == 203 || deptZyList.endStatus == 206" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchHosDepartment(checkedHos, 'end', $event)" nzAllowClear nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptZy" (ngModelChange)="endDeptZyChange()">
+                              <nz-select formControlName="endDepts" [nzDisabled]="deptZyList.endStatus == 201 || deptZyList.endStatus == 203 || deptZyList.endStatus == 206" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchHosDepartment(checkedHos, 'end', $event)" nzAllowClear nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptZy" (ngModelChange)="endDeptZyChange(e)">
                                 <ng-container *ngFor="let option of deptZyList.endDept">
                                   <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
                                 </ng-container>
@@ -1149,7 +1149,7 @@
                           </nz-form-item>
                         </div>
 
-                        <div nz-col [nzSpan]="24" *ngIf="deptZyList.taskType && deptZyList.taskType.remarksSwitch == 1">
+                        <div nz-col [nzSpan]="24" *ngIf="radioValueZy && deptZyList.taskType && deptZyList.taskType.remarksSwitch == 1">
                           <nz-form-item>
                             <nz-form-label class="label" [nzSm]="3" [nzXs]="3" nzFor="workOrderRemarkZy">注意事项</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请填写注意事项！">
@@ -1207,7 +1207,7 @@
                       <div nz-row [nzGutter]="24">
                         <div nz-col [nzSpan]="24" style="max-height: 268px">
                           <nz-form-item>
-                            <nz-form-label class="label" [nzSm]="2" [nzXs]="2" nzRequired nzFor="taskTypeQt">任务类型</nz-form-label>
+                            <nz-form-label class="label" [nzSm]="3" [nzXs]="3" nzRequired nzFor="taskTypeQt">任务类型</nz-form-label>
                             <div class="ellipsis-oneline">
                               <span class="customRemarks mr8 countRemark" [ngClass]="{ active: countRemarkIndex == i }" (click)="addCountRemark(item, index, i)" *ngFor="let item of countRemarkList;let i = index;">{{ item }}</span>
                             </div>
@@ -1700,10 +1700,10 @@
       </div>
       <div class="btns display_flex justify-content_flex-center align-items_center">
         <ng-container *ngIf="applyDept && currentTabIndex !== '故障报修'">
-          <button nz-button class="btn" nzType="primary" (click)="newOrderOk('&go&')" [nzLoading]="isGoLoading" *ngIf="currentTasktype && currentTasktype.associationType && ((currentTasktype.associationType.value === 'inspect' && linkCheckLisTrue && !(currentTasktype.isMoreDept === 0 && isInspects)) || currentTasktype.associationType.value === 'patientTransport')">
+          <button nz-button class="btn" nzType="primary" (click)="newOrderOk('&go&')" [nzLoading]="isGoLoading" *ngIf="(radioValueQt || radioValueZy) && currentTasktype && currentTasktype.associationType && ((currentTasktype.associationType.value === 'inspect' && linkCheckLisTrue && !(currentTasktype.isMoreDept === 0 && isInspects)) || currentTasktype.associationType.value !== 'inspect')">
             继续建单
           </button>
-          <button nz-button class="btn" nzType="primary" (click)="newOrderOk()" [nzLoading]="isOkLoading" *ngIf="currentTasktype && currentTasktype.associationType && ((currentTasktype.associationType.value === 'inspect' && linkCheckLisTrue && !(currentTasktype.isMoreDept === 0 && isInspects)) || currentTasktype.associationType.value === 'patientTransport')">
+          <button nz-button class="btn" nzType="primary" (click)="newOrderOk()" [nzLoading]="isOkLoading" *ngIf="(radioValueQt || radioValueZy) && currentTasktype && currentTasktype.associationType && ((currentTasktype.associationType.value === 'inspect' && linkCheckLisTrue && !(currentTasktype.isMoreDept === 0 && isInspects)) || currentTasktype.associationType.value !== 'inspect')">
             {{isYyInspect ? '预约建单' :'直接建单'}}
           </button>
         </ng-container>

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

@@ -137,6 +137,7 @@ export class FuwutaiComponent implements OnInit {
   workTypesFlag = false; //任务类型是否显示操作项
   currentTabIndex = ""; //获取任务类型的key
   radioValueZy: any = ""; //转运->类型
+  radioValueZyPre: any = ""; //转运->类型
   deptZyList: any = {}; //转运->请求结果
   startDeptZy = ""; //转运->选中起点科室
   endDeptZy = ""; //转运->选中终点科室
@@ -2649,6 +2650,7 @@ export class FuwutaiComponent implements OnInit {
     this.startDeptQt = null;
     this.endDeptQt = null;
     this.radioValueZy = null;
+    this.radioValueZyPre = null;
     this.startDeptZy = null;
     this.endDeptZy = null;
     this.patientZy = null;
@@ -2739,6 +2741,8 @@ export class FuwutaiComponent implements OnInit {
           patient.department && this.tabClick('患者转运');
           patient.department && (this.patientList = [patient]);
           patient.department && (this.patientZy = patient.patientCode);
+        }else{
+          this.msg.warning('未查询到患者');
         }
       }
     });
@@ -3575,6 +3579,7 @@ export class FuwutaiComponent implements OnInit {
     this.startDeptQt = null;
     this.endDeptQt = null;
     this.radioValueZy = null;
+    this.radioValueZyPre = null;
     this.startDeptZy = null;
     this.endDeptZy = null;
     this.patientZy = null;
@@ -4030,23 +4035,23 @@ export class FuwutaiComponent implements OnInit {
     this.getSearchTaskList('', this.countRemarkIndex > -1 ? countRemark : '').subscribe((result) => {
       if (result.status == 200) {
         this.searchTaskLoading = false;
-        // this.workTypesArrange[index].value = result.data || [];
         this.workTypes = result['data'] || [];
         // 整理后的任务类型
         this.isShowResidenceNo = false;
-        for (const value of this.workTypesArrange) {
-          value.value = [];
-        }
+        this.workTypesArrange[index].value = [];
+        // for (const value of this.workTypesArrange) {
+        //   value.value = [];
+        // }
         this.workTypes.forEach((item) => {
           if(item.associationTypeValue === 'patientTransport' || item.associationTypeValue === 'inspect'){
-            // 患者其他服务
-            let obj = this.workTypesArrange.find(v => v.key === '患者转运');
-            if(obj){
-              obj.value.push(item);
-            }else{
-              this.workTypesArrange.unshift({ key: '患者转运', value: [item] });
-              this.isShowResidenceNo = true;
-            }
+            // // 患者其他服务
+            // let obj = this.workTypesArrange.find(v => v.key === '患者转运');
+            // if(obj){
+            //   obj.value.push(item);
+            // }else{
+            //   this.workTypesArrange.unshift({ key: '患者转运', value: [item] });
+            //   this.isShowResidenceNo = true;
+            // }
           }else if(item.associationTypeValue === 'other' || item.associationTypeValue === 'specimen' || item.associationTypeValue === 'ordinary'){
             // 物品配送
             let obj = this.workTypesArrange.find(v => v.key === '物品配送');
@@ -4143,21 +4148,11 @@ export class FuwutaiComponent implements OnInit {
     if (!this.applyDept || !this.endDeptZy) {
       return;
     }
-    // 终点科室患者信息列表,id是送病人回病房的任务类型，写死了
+    // 终点科室患者信息列表,id是送病人回病房的任务类型
     if (this.radioValueZy == this.deathTasktypeId) {
       //获取患者信息
       this.patientZy = null;
       this.getPatientList(this.endDeptZy, "");
-    } else {
-      //获取患者信息
-      console.log(this.deptZyList);
-      if (
-        this.deptZyList.startStatus != 206 &&
-        this.deptZyList.endStatus != 206
-      ) {
-        this.patientZy = null;
-      }
-      this.getPatientList(this.applyDept, "");
     }
   }
   //搜索院区下面的科室(患者转运)
@@ -4509,6 +4504,9 @@ export class FuwutaiComponent implements OnInit {
   linkCheckLis:any[] = [];//检查列表
   tabIndex;
   radioChangeZy(value, index) {
+    this.radioValueZyPre = this.radioValueZy;
+    this.radioValueZy = value;
+
     this.tabIndex = index;
     //任务类型id
     if (value === "" || value === null) {
@@ -4595,12 +4593,16 @@ export class FuwutaiComponent implements OnInit {
       } else if (data["endStatus"] == 204 || data["endStatus"] == 205) {
         this.getHosDepartment(this.checkedHos, "end", "");
       }
-      // 终点科室患者信息列表,id是送病人回病房的任务类型
-      if ((data["endStatus"] == 201 || data["endStatus"] == 203) && this.radioValueZy == this.deathTasktypeId) {
-        if (this.currentTabIndex == "患者转运") {
-          //患者转运
+      if (this.currentTabIndex == "患者转运") {
+        // 终点科室患者信息列表,id是送病人回病房的任务类型
+        if (this.endDeptZy && this.radioValueZy == this.deathTasktypeId) {
           //获取患者信息
+          this.patientZy = null;
           this.getPatientList(this.endDeptZy, "");
+        } else if(this.applyDept && this.radioValueZyPre == this.deathTasktypeId) {
+          //获取患者信息
+          this.patientZy = null;
+          this.getPatientList(this.applyDept, "");
         }
       }
     });
@@ -4741,6 +4743,7 @@ export class FuwutaiComponent implements OnInit {
     this.startDeptQt = null;
     this.endDeptQt = null;
     this.radioValueZy = null;
+    this.radioValueZyPre = null;
     this.startDeptZy = null;
     this.endDeptZy = null;
     this.patientZy = null;

src/app/views/qrcode-configuration/qrcode-configuration.service.ts

@@ -57,7 +57,7 @@ export class QRCodeConfigurationService {
         ...data,
       }
     };
-    return this.mainService.simplePost("addData", "qrCode", data);
+    return this.mainService.coopData("addData", "qrCode", data);
   }
 
   // 查询科室