bugfix

src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.html

@@ -177,17 +177,8 @@
         <!-- 是否自动清空患者标记 -->
         <div class="display_flex align-items_center mb8">
           <nz-form-label class="label">是否自动清空患者标记</nz-form-label>
-          <!-- <nz-checkbox-group [(ngModel)]="accurateTimeFilling" (ngModelChange)="changeAccurateTimeFilling($event)"></nz-checkbox-group> -->
           <nz-checkbox-group [(ngModel)]="batchInspectAutoClear" (ngModelChange)="changeBatchInspectAutoClear($event)"></nz-checkbox-group>
           <nz-time-picker *ngIf="batchInspectAutoClear[0].checked" [(ngModel)]="batchInspectAutoClearTime" nzFormat="HH:mm"></nz-time-picker>
-          <!-- <nz-select *ngIf="accurateTimeFilling[0].checked" class="w320px" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择精确时间模式" [(ngModel)]="timeMod">
-            <ng-container *ngFor="let option of timeModes">
-              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
-            </ng-container>
-            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-            </nz-option>
-          </nz-select> -->
         </div>
         <!-- 检查预约不进行工单合并 -->
         <!-- <div class="display_flex align-items_center mb8">

src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.ts

@@ -197,7 +197,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
     console.log(e);
     if(!e[0].checked){
       // todo
-      this.batchInspectAutoClearTime = null;
+      this.batchInspectAutoClearTime = undefined;
     }
   }
   // 修改是否允许追加服务
@@ -450,7 +450,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
           this.accurateTimeFilling[0].checked = this.configs.accurateTimeFilling == 1;
           this.batchInspectAutoClear[0].checked = this.configs.batchInspectAutoClear == 1;
           this.timeMod = this.configs.timeMod || null;
-          this.batchInspectAutoClearTime = this.configs.batchInspectAutoClearTime || null;
+          this.batchInspectAutoClearTime = this.configs.batchInspectAutoClearTime ? new Date(this.configs.batchInspectAutoClearTime) : undefined;
           this.queuingInformation[0].checked = this.configs.queuingInformation == 1;
 
           this.startShowAnotherService[0].checked = this.configs.startShowAnotherService == 1;

src/app/views/inspect-info-config/inspect-info-config.component.html

@@ -7,7 +7,7 @@
     </div>
     <div class="patient">
       <span class="label">患者：</span>
-      <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择患者" [(ngModel)]="searchData.id" nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)">
+      <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择患者" [(ngModel)]="searchData.id" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)">
         <ng-container *ngFor="let option of patientList">
           <nz-option *ngIf="!isLoading" [nzLabel]="option.patientName + '(' + (option.bedNum || '') + ')' + '-' + option.residenceNo" [nzValue]="option.id"></nz-option>
         </ng-container>

src/common.less

@@ -237,10 +237,10 @@ textarea{
   &.default {
     color: @primary-color;
     background: #fff;
-    // height: @default-btn-height;
-    // line-height: @default-btn-height;
-    // padding: 0 8px 24px;
-    // min-width: 80px;
+    height: @default-btn-height;
+    line-height: @default-btn-height;
+    padding: 0 8px 24px;
+    min-width: 80px;
     font-size: 14px;
   }
   &.ghost {