注意事项

src/app/share/detail-patients/detail-patients.component.html

@@ -37,7 +37,7 @@
           <div nz-col nzSpan="8" *ngIf="orderInfo.inspectUsersNum">
             陪检人数：{{orderInfo.inspectUsersNum}}</div>
           <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">
-            备注信息：{{orderInfo.workOrderRemark}}</div>
+            注意事项：{{orderInfo.workOrderRemark}}</div>
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
             特殊情况关闭原因：{{orderInfo.specialCloseReason}}
           </div>

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

@@ -1039,26 +1039,14 @@
               </div>
             </div>
             <div class="tabs__operate" *ngIf="workTypesFlag && applyDept">
-              <i
-                class="tabs__Icon--right icon_transport transport-xiangzuo"
-                (click)="toLeft()"
-              ></i>
-              <i
-                class="tabs__Icon--left icon_transport transport-xiangzuo"
-                (click)="toRight()"
-              ></i>
+              <i class="tabs__Icon--right icon_transport transport-xiangzuo" (click)="toLeft()"></i>
+              <i class="tabs__Icon--left icon_transport transport-xiangzuo" (click)="toRight()"></i>
             </div>
           </div>
           <!-- 底部tab页 -->
           <div class="bottomWrap">
             <ng-container *ngFor="let item of workTypesArrange;let index = index;">
               <ng-container *ngIf="applyDept">
-                <!-- 标本配送 -->
-                <!-- <div class="bottom" *ngIf="currentTabIndex == item.key && item.key == '物品配送' && !newLoading">
-                  <div class="bottom380256">
-                    起点科室默认为申请科室，终点科室为检验科室，确定后即可新建工单！
-                  </div>
-                </div> -->
                 <!-- 患者转运 -->
                 <overlay-scrollbars #osComponentRef9 *ngIf="currentTabIndex == item.key && item.key  == '患者转运' && !newLoading" class="bottom">
                   <div class="bottom255">
@@ -1066,20 +1054,8 @@
                       <div nz-row [nzGutter]="24">
                         <div nz-col [nzSpan]="24" style="height: 310px">
                           <nz-form-item>
-                            <nz-form-label
-                              class="label"
-                              [nzSm]="24"
-                              [nzXs]="24"
-                              nzRequired
-                              nzFor="taskType"
-                              >类型
-                            </nz-form-label>
-                            <nz-form-control
-                              class="control"
-                              [nzSm]="24"
-                              [nzXs]="24"
-                              nzErrorTip="请选择类型！"
-                            >
+                            <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="taskType">类型</nz-form-label>
+                            <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)">
@@ -1092,129 +1068,32 @@
                             </nz-form-control>
                           </nz-form-item>
                         </div>
-                        <div
-                          nz-col
-                          [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24"
-                          style="height: 83px"
-                          [ngStyle]="{
-                            display:
-                              deptZyList['startStatus'] != 201 ? 'block' : 'none'
-                          }"
-                        >
+                        <div nz-col [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24" style="height: 83px" [ngStyle]="{ display: deptZyList['startStatus'] != 201 ? '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="请选择起点科室！"
-                            >
-                              <nz-select
-                                formControlName="startDept"
-                                [nzDisabled]="
-                                  deptZyList.startStatus == 201 ||
-                                  deptZyList.startStatus == 203 ||
-                                  deptZyList.startStatus == 206
-                                "
-                                [nzDropdownMatchSelectWidth]="false"
-                                nzServerSearch
-                                nzShowSearch
-                                (nzOnSearch)="
-                                  searchHosDepartment(checkedHos, 'start', $event)
-                                "
-                                nzAllowClear
-                                nzPlaceHolder="请选择起点科室"
-                                [(ngModel)]="startDeptZy"
-                              >
-                                <ng-container
-                                  *ngFor="let option of deptZyList.startDept"
-                                >
-                                  <nz-option
-                                    *ngIf="!isLoading"
-                                    [nzLabel]="option.dept"
-                                    [nzValue]="option.id"
-                                  ></nz-option>
+                            <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="请选择起点科室！">
+                              <nz-select formControlName="startDept" [nzDisabled]="deptZyList.startStatus == 201 || deptZyList.startStatus == 203 || deptZyList.startStatus == 206" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchHosDepartment(checkedHos, 'start', $event)" nzAllowClear nzPlaceHolder="请选择起点科室" [(ngModel)]="startDeptZy">
+                                <ng-container *ngFor="let option of deptZyList.startDept">
+                                  <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
                                 </ng-container>
-                                <nz-option
-                                  *ngIf="isLoading"
-                                  nzDisabled
-                                  nzCustomContent
-                                >
-                                  <i
-                                    nz-icon
-                                    nzType="loading"
-                                    class="loading-icon"
-                                  ></i>
+                                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                                  <i nz-icon nzType="loading" class="loading-icon"></i>
                                   搜索中...
                                 </nz-option>
                               </nz-select>
                             </nz-form-control>
                           </nz-form-item>
                         </div>
-                        <div
-                          nz-col
-                          [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24"
-                          style="height: 83px"
-                        >
+                        <div nz-col [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24" style="height: 83px">
                           <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()"
-                              >
-                                <ng-container
-                                  *ngFor="let option of deptZyList.endDept"
-                                >
-                                  <nz-option
-                                    *ngIf="!isLoading"
-                                    [nzLabel]="option.dept"
-                                    [nzValue]="option.id"
-                                  ></nz-option>
+                            <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()">
+                                <ng-container *ngFor="let option of deptZyList.endDept">
+                                  <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
                                 </ng-container>
-                                <nz-option
-                                  *ngIf="isLoading"
-                                  nzDisabled
-                                  nzCustomContent
-                                >
-                                  <i
-                                    nz-icon
-                                    nzType="loading"
-                                    class="loading-icon"
-                                  ></i>
+                                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                                  <i nz-icon nzType="loading" class="loading-icon"></i>
                                   搜索中...
                                 </nz-option>
                               </nz-select>
@@ -1224,149 +1103,57 @@
                         <div nz-col [nzSpan]="24" style="height: 83px">
                           <div class="control-flex">
                             <nz-form-item class="control-flex__5">
-                              <nz-form-label
-                                class="label"
-                                [nzSm]="24"
-                                [nzXs]="24"
-                                nzRequired
-                                nzFor="patient"
-                                >患者信息
-                              </nz-form-label>
-                              <nz-form-control
-                                class="control"
-                                style="width: 160px"
-                                [nzSm]="24"
-                                [nzXs]="24"
-                                nzErrorTip="请选择患者信息！"
-                              >
-                                <nz-select
-                                  formControlName="patient"
-                                  [nzDropdownMatchSelectWidth]="false"
-                                  nzServerSearch
-                                  nzShowSearch
-                                  (nzOnSearch)="
-                                    searchPatientList(
-                                      radioValueZy == deathTasktypeId && endDeptZy !== null
-                                        ? endDeptZy
-                                        : applyDept,
-                                      $event
-                                    )
-                                  "
-                                  nzAllowClear
-                                  nzPlaceHolder="请选择患者信息"
-                                  [(ngModel)]="patientZy"
-                                >
-                                  <ng-container
-                                    *ngFor="let option of patientList"
-                                  >
-                                    <nz-option
-                                      *ngIf="!isLoadingPatient"
-                                      [nzLabel]="
-                                        option.bednum +
-                                        '床 ' +
-                                        option.patientname +
-                                        ' ' +
-                                        option.residenceNo
-                                      "
-                                      [nzValue]="option.patientCode"
-                                    ></nz-option>
+                              <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="patient">患者信息</nz-form-label>
+                              <nz-form-control class="control" style="width: 160px" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择患者信息！">
+                                <nz-select formControlName="patient" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchPatientList(radioValueZy == deathTasktypeId && endDeptZy !== null ? endDeptZy : applyDept, $event)" nzAllowClear nzPlaceHolder="请选择患者信息" [(ngModel)]="patientZy" (ngModelChange)="selectPatientZy($event)">
+                                  <ng-container *ngFor="let option of patientList">
+                                    <nz-option *ngIf="!isLoadingPatient" [nzLabel]="option.bednum + '床 ' + option.patientname + ' ' + option.residenceNo"[nzValue]="option.patientCode"></nz-option>
                                   </ng-container>
-                                  <nz-option
-                                    *ngIf="isLoadingPatient"
-                                    nzDisabled
-                                    nzCustomContent
-                                  >
-                                    <i
-                                      nz-icon
-                                      nzType="loading"
-                                      class="loading-icon"
-                                    ></i>
+                                  <nz-option *ngIf="isLoadingPatient" nzDisabled nzCustomContent>
+                                    <i nz-icon nzType="loading" class="loading-icon"></i>
                                     搜索中...
                                   </nz-option>
                                 </nz-select>
                               </nz-form-control>
                             </nz-form-item>
                             <nz-form-item class="control-flex__7">
-                              <nz-form-label
-                                class="label"
-                                [nzSm]="24"
-                                [nzXs]="24"
-                                nzFor="goods"
-                                *ngIf="goodsNow.length"
-                              >
+                              <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzFor="goods" *ngIf="goodsNow.length">
                                 携带物品
                               </nz-form-label>
-                              <nz-form-control
-                                class="control"
-                                [nzSm]="24"
-                                [nzXs]="24"
-                                nzErrorTip="请选择携带物品！"
-                              >
-                                <nz-checkbox-group
-                                  [(ngModel)]="goodsNow"
-                                  formControlName="goods"
-                                  (ngModelChange)="changeGoods($event)"
-                                ></nz-checkbox-group>
+                              <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择携带物品！">
+                                <nz-checkbox-group [(ngModel)]="goodsNow" formControlName="goods" (ngModelChange)="changeGoods($event)"></nz-checkbox-group>
                               </nz-form-control>
                             </nz-form-item>
                           </div>
                         </div>
+                        <div nz-col [nzSpan]="24" *ngIf="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="请填写注意事项！">
+                              <textarea formControlName="workOrderRemarkZy" nz-input [placeholder]="deptZyList.taskType.remarksPrompts" [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100" [(ngModel)]="workOrderRemarkZy"></textarea>
+                            </nz-form-control>
+                          </nz-form-item>
+                        </div>
                         <!-- 预约建单时间-患者其他服务--start -->
                         <div nz-col [nzSpan]="24" style="height: 83px" class="pos">
                           <!-- 需要预约检查 -->
                           <nz-form-item class="pos-item">
                             <nz-form-control>
-                              <label
-                                nz-checkbox
-                                [(ngModel)]="isYyInspect"
-                                (ngModelChange)="yyInspectChange($event)"
-                                [ngModelOptions]="{ standalone: true }"
-                                style="font-weight: bold"
-                                >需要预约检查</label
-                              >
+                              <label nz-checkbox [(ngModel)]="isYyInspect" (ngModelChange)="yyInspectChange($event)" [ngModelOptions]="{ standalone: true }" style="font-weight: bold">需要预约检查</label>
                             </nz-form-control>
                           </nz-form-item>
                           <!-- 预约建单时间-患者其他服务 -->
                           <nz-form-item class="yyTime" [ngClass]="{yyTimeError: (!yyTimeZy || !yyDateZy) && clickYYZyFlag}">
                             <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
                             <nz-form-control [nzSm]="24" [nzXs]="24">
-                              <nz-date-picker
-                                [nzDisabled]="!isYyInspect"
-                                [(ngModel)]="yyDateZy"
-                                (ngModelChange)="yyDateChange($event)"
-                                [ngModelOptions]="{ standalone: true }"
-                                [nzAllowClear]="false"
-                                [nzDisabledDate]="disabledyyDateZy"
-                                [nzShowToday]="false"
-                              ></nz-date-picker>
-                              <nz-time-picker
-                                [nzDisabled]="!isYyInspect || !yyDateZy"
-                                class="ml8"
-                                nzFormat="HH:mm"
-                                [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod"
-                                [nzSecondStep]="60"
-                                [(ngModel)]="yyTimeZy"
-                                (ngModelChange)="yyTimeZyChange($event)"
-                                [ngModelOptions]="{ standalone: true }"
-                                [nzDisabledHours]="disabledHours"
-                                [nzDisabledMinutes]="disabledMinutes"
-                                [nzAllowEmpty]="false"
-                              >
+                              <nz-date-picker [nzDisabled]="!isYyInspect" [(ngModel)]="yyDateZy" (ngModelChange)="yyDateChange($event)" [ngModelOptions]="{ standalone: true }" [nzAllowClear]="false" [nzDisabledDate]="disabledyyDateZy" [nzShowToday]="false"></nz-date-picker>
+                              <nz-time-picker [nzDisabled]="!isYyInspect || !yyDateZy" class="ml8" nzFormat="HH:mm" [nzMinuteStep]="inspectAndPatientTransportConfig.timeMod" [nzSecondStep]="60" [(ngModel)]="yyTimeZy" (ngModelChange)="yyTimeZyChange($event)" [ngModelOptions]="{ standalone: true }" [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes" [nzAllowEmpty]="false">
                               </nz-time-picker>
-                              <button
-                                [disabled]="!isYyInspect || (isYyInspect && !yyDateZy)"
-                                nz-button
-                                nzType="primary"
-                                class="ml8"
-                                (click)="nextDayZy()"
-                              >
+                              <button [disabled]="!isYyInspect || (isYyInspect && !yyDateZy)" nz-button nzType="primary" class="ml8" (click)="nextDayZy()">
                                 下一日
                               </button>
                             </nz-form-control>
-                            <div
-                              class="red w100"
-                              *ngIf="(!yyTimeZy || !yyDateZy) && clickYYZyFlag"
-                            >
+                            <div class="red w100" *ngIf="(!yyTimeZy || !yyDateZy) && clickYYZyFlag">
                               请填写预约建单时间!
                             </div>
                           </nz-form-item>

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

@@ -146,6 +146,7 @@ export class FuwutaiComponent implements OnInit {
   startDeptQt = ""; //其他->选中起点科室
   endDeptQt = ""; //其他->选中终点科室
   workOrderRemark = ""; //工单备注
+  workOrderRemarkZy = ""; //工单备注
   // 新建工单弹框
   newOrderShow = false; //展示/隐藏新建工单弹框
   newOrderShowOpen = false; //展示/隐藏新建工单弹框(辅助项)
@@ -426,6 +427,7 @@ export class FuwutaiComponent implements OnInit {
             patientCode: this.validateFormZy.controls.patient.value,
           },
           goods: goods,
+          workOrderRemark: this.validateFormZy.controls.workOrderRemarkZy.value,
         },
       };
       if (!this.noWorkerPhone) {
@@ -749,6 +751,7 @@ export class FuwutaiComponent implements OnInit {
       patient: [null, [Validators.required]], //患者信息
       // patient: [null],//患者信息ca
       goods: [null], //携带物品
+      workOrderRemarkZy: [null], //工单备注
     });
     //其他
     this.validateFormQt = this.fb.group({
@@ -2548,6 +2551,7 @@ export class FuwutaiComponent implements OnInit {
     this.patientZy = null;
     this.goodsNow = [];
     this.workOrderRemark = "";
+    this.workOrderRemarkZy = "";
     this.deptZyList["startDept"] = [];
     this.deptZyList["endDept"] = [];
     this.deptZyList["startStatus"] = 0;
@@ -3446,6 +3450,7 @@ export class FuwutaiComponent implements OnInit {
     this.goodsNow = [];
     this.patientList = [];
     this.workOrderRemark = "";
+    this.workOrderRemarkZy = "";
     this.deptZyList["startDept"] = [];
     this.deptZyList["endDept"] = [];
     this.deptZyList["startStatus"] = 0;
@@ -4481,6 +4486,7 @@ export class FuwutaiComponent implements OnInit {
     this.goodsNow = [];
     this.patientList = [];
     this.workOrderRemark = "";
+    this.workOrderRemarkZy = "";
     this.deptZyList["startDept"] = [];
     this.deptZyList["endDept"] = [];
     this.deptZyList["startStatus"] = 0;
@@ -5404,4 +5410,14 @@ export class FuwutaiComponent implements OnInit {
       }
     });
   }
+
+  // 选择患者
+  selectPatientZy(e){
+    let patient = this.patientList.find(v => v.patientCode === e);
+    if(patient){
+      this.workOrderRemarkZy = patient.remark || '';
+    }else{
+      this.workOrderRemarkZy = '';
+    }
+  }
 }

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1589,14 +1589,11 @@
                 <textarea rows="4" placeholder="请输入加急原因" nz-input [(ngModel)]="urgentReason" formControlName="urgentReason"></textarea>
               </nz-form-control>
             </nz-form-item>
-            <!-- 工单备注 -->
+            <!-- 注意事项 -->
             <ng-container *ngIf="isRemarks">
               <nz-form-item>
                 <div class="display_flex align-items_center">
-                  <nz-form-label nzFor="workOrderRemark2" class="mt8 mb8">工单备注</nz-form-label>
-                  <div *ngIf="customRemarks2.length" style="word-break: break-all;">
-                    <span class="addRemarks" *ngFor="let item of customRemarks2" (click)="addRemarks2(item)">【{{ item }}】</span>
-                  </div>
+                  <nz-form-label nzFor="workOrderRemark2" class="mt8 mb8">注意事项</nz-form-label>
                 </div>
                 <nz-form-control>
                   <textarea nz-input [placeholder]="workOrderRemarkTips2" [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100" formControlName="workOrderRemark2" [(ngModel)]="workOrderRemark2" #remarksEle2></textarea>

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -2927,7 +2927,6 @@ export class HushijiandanComponent implements OnInit {
   cLoading = false;
   historyCustomRemarks2 = [];
   changeCheckedType() {
-    this.workOrderRemark2 = "";
     this.customRemarks2 = [];
     this.historyCustomRemarks2 = [];
     this.isYyInspect = false;
@@ -2937,6 +2936,12 @@ export class HushijiandanComponent implements OnInit {
     this.currentTasktype = this.checkTypeLis.find(
       (item) => item.id == this.patientForm.controls.checkedType.value
     );
+    // 是否回显注意事项
+    if(this.currentTasktype.remarksSwitch === 1){
+      this.workOrderRemark2 = this.patientMsg.remark || "";
+    }else{
+      this.workOrderRemark2 = '';
+    }
     // 获取患者其他服务，护士端是否预约建单
     let appointmentZyBuildFlag = this.checkTypeLis.filter(
       (item) =>

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

@@ -31,25 +31,32 @@ export class QRCodeConfigurationService {
   // 列表-增
   add({name, deptId, placeCode, phones, hosId}) {
     let data = {
-      name,
-      deptId,
-      placeCode,
-      phones,
-      hosId,
+      qrCode: {
+        name,
+        deptId,
+        placeCode,
+        phones,
+        hosId,
+      }
     };
 
-    return this.mainService.simplePost("addData", "qrCode", data);
+    return this.mainService.coopData("addData", "qrCode", data);
   }
 
   // 列表-改
   update({name, deptId, placeCode, phones, coopData}) {
-    let data = {
+    let data:any = {
       name,
       deptId,
       placeCode,
       phones,
     };
-    data = {...coopData, ...data};
+    data = {
+      qrCode: {
+        ...coopData,
+        ...data,
+      }
+    };
     return this.mainService.simplePost("addData", "qrCode", data);
   }
 

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

@@ -150,10 +150,10 @@
           </nz-radio-group>
         </div>
         <div class="mb8 display_flex align-items_center" *ngIf="isRemarks == 1">
-          <nz-form-label class="label">备注信息提示用语</nz-form-label>
+          <nz-form-label class="label">{{(association.value == 'inspect' || association.value == 'patientTransport') ? '注意事项提示用语' : '备注信息提示用语'}}</nz-form-label>
           <input nz-input class="flex_1" [(ngModel)]="remarks" placeholder="请填写备注信息提示用语" nzSize="default" />
         </div>
-        <div class="mb8 w100" *ngIf="isRemarks == 1">
+        <div class="mb8 w100" *ngIf="!(association.value == 'inspect' || association.value == 'patientTransport') && isRemarks == 1">
           <nz-form-label class="label">备注快捷输入</nz-form-label>
           <button nz-button nzType="dashed" (click)="addQuickRemarks()" *ngIf="!quickRemarks">
             <i nz-icon nzType="plus"></i>
@@ -279,7 +279,7 @@
         </div> -->
         <div nz-row *ngIf="association.value == 'inspect' || association.value == 'patientTransport'">
           <nz-form-label class="label">携带设备</nz-form-label>
-          <nz-checkbox-group class="handlerType" [nzDisabled]="isRemarks == 1" [(ngModel)]="carryEquipmentIds"></nz-checkbox-group>
+          <nz-checkbox-group class="handlerType" [(ngModel)]="carryEquipmentIds"></nz-checkbox-group>
         </div>
         <div nz-row class="mb8 display_flex align-items_center">
           <nz-form-label class="label">急单权重</nz-form-label>