护士端建单加急BUG修复

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

@@ -659,7 +659,8 @@
                             </div>
                             <div *ngIf="item.showCreateTime" nz-col nzSpan="12" class="col txtR">{{item.showCreateTime}}
                             </div>
-                            <div *ngIf="item.yyjdTime" nz-col nzSpan="12" class="col txtR">{{item.yyjdTime|date:'MM-dd
+                            <div *ngIf="item.yyjdTime&&item.gdState.value == 11" nz-col nzSpan="12" class="col txtR">
+                              {{item.yyjdTime|date:'MM-dd
                               HH:mm'}}
                             </div>
                           </div>
@@ -778,129 +779,140 @@
               </nz-radio-group>
             </nz-form-control>
           </nz-form-item>
-          <!-- 检查 -->
-          <nz-form-item *ngIf="checkedShowMsg.status==200">
-            <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
-            <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
-              <nz-checkbox-wrapper class="linkCheckCheck" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)" [ngModel]="linkCheckLis">
-                <div nz-row *ngFor="let item of linkCheckLis">
-                  <div nz-col nzSpan="24">
-                    <label nz-checkbox [nzValue]="item">{{item.label}}</label>
-                    <i class="icon_transport transport-zu1468 priority" *ngIf="item.priority === 1||item.priority==='1'"></i>
+          <ng-container *ngIf="cLoading">
+            <div style="text-align: center;">
+              <img src="../../../assets/images/loading.gif" alt="">
+              <div>加载中...</div>
+            </div>
+          </ng-container>
+          <ng-container *ngIf="!cLoading">
+            <!-- 检查 -->
+            <nz-form-item *ngIf="checkedShowMsg.status==200">
+              <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
+              <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
+                <nz-checkbox-wrapper class="linkCheckCheck" ngDefaultControl formControlName="linkCheck"
+                  (nzOnChange)="linkCheckLisChange($event)" [ngModel]="linkCheckLis">
+                  <div nz-row *ngFor="let item of linkCheckLis">
+                    <div nz-col nzSpan="24">
+                      <label nz-checkbox [nzValue]="item">{{item.label}}</label>
+                      <i class="icon_transport transport-zu1468 priority"
+                        *ngIf="item.priority === 1||item.priority==='1'"></i>
+                    </div>
                   </div>
-                </div>
-              </nz-checkbox-wrapper>
-            </nz-form-control>
-            <div *ngIf="!linkCheckLis.length">暂无关联的检查</div>
-          </nz-form-item>
-          <!-- 预约建单时间-患者其他服务 -->
-          <nz-form-item class="yyTime" [ngClass]="{yyTimeError:!yyTimeZy&&clickYYZyFlag}"
-            *ngIf="appointmentZyBuildFlag === '1'&&allowUrgent==0">
-            <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
-            <nz-form-control [nzSm]="24" [nzXs]="24">
-              <nz-time-picker nzFormat="HH:mm" [nzMinuteStep]="30" [nzSecondStep]="60" [(ngModel)]="yyTimeZy"
-                (ngModelChange)="yyTimeZyChange($event)" [ngModelOptions]="{standalone: true}"
-                [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes"></nz-time-picker>
-              <label *ngIf="yyTimeZy" nz-checkbox [(ngModel)]="nextDayZy" (ngModelChange)="nextDayZyChange($event)"
-                class="ml8" [ngModelOptions]="{standalone: true}">次日</label>
-            </nz-form-control>
-            <div class="red w100" *ngIf="!yyTimeZy&&clickYYZyFlag">请填写预约建单时间!</div>
-            <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!</div>
-          </nz-form-item>
-          <!-- 预约建单时间 -->
-          <nz-form-item class="yyTime" [ngClass]="{yyTimeError:!yyTime&&clickYYFlag}"
-            *ngIf="linkCheckLis.length&&linkCheckLisTrue&&hasTime&&lessTime&&appointmentBuildFlag === '1'&&allowUrgent==0">
-            <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
-            <nz-form-control [nzSm]="24" [nzXs]="24">
-              <nz-time-picker nzFormat="HH:mm" [nzMinuteStep]="30" [nzSecondStep]="60" [(ngModel)]="yyTime"
-                (ngModelChange)="yyTimeChange($event)" [ngModelOptions]="{standalone: true}"
-                [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes"></nz-time-picker>
-              <label *ngIf="yyTime" nz-checkbox [(ngModel)]="nextDay" (ngModelChange)="nextDayChange($event)"
-                class="ml8" [ngModelOptions]="{standalone: true}">次日</label>
-            </nz-form-control>
-            <div class="red w100" *ngIf="!yyTime&&clickYYFlag">请填写预约建单时间!</div>
-            <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!</div>
-          </nz-form-item>
-          <!-- 100009 科室任务类型状态码未配置 -->
-          <nz-form-item *ngIf="(checkedShowMsg.status!=200)&&(checkedShowMsg.status==100009)">
-            <div class="txtC">{{checkedShowMsg.msg}}</div>
-          </nz-form-item>
-          <!-- 100015 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
-          <nz-form-item
-            *ngIf="(checkedShowMsg.status!=200)&&(checkedShowMsg.status==100015||checkedShowMsg.status==100013)">
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室</nz-form-label>
-            <nz-form-control nzErrorTip="请选择起点科室!">
-              <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch
-                nzShowSearch (nzOnSearch)="searchDept('start',checkedShowMsg,$event)" nzPlaceHolder="请选择起点科室">
-                <ng-container *ngFor="let option of checkedShowMsg.start.start.list">
-                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id"></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>
-          </nz-form-item>
-          <!-- 100014 （护士端一键建单展示策略）取终点科室和msg 值展示 -->
-          <nz-form-item
-            *ngIf="(checkedShowMsg.status!=200)&&(checkedShowMsg.status==100014||checkedShowMsg.status==100015)">
-            <!-- <nz-form-item> -->
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
-            <nz-form-control nzErrorTip="请选择目标科室!">
-              <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch
-                nzShowSearch (nzOnSearch)="searchDept('target',checkedShowMsg,$event)" nzPlaceHolder="请选择目标科室">
-                <ng-container *ngFor="let option of checkedShowMsg.end.end.list">
-                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id"></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>
-          </nz-form-item>
-          <!-- 自动送回 -->
-          <nz-form-item *ngIf="checkedShowMsg.status!=200&&checkedShowMsg.isRemand == 1">
-            <nz-form-control>
-              <label nz-checkbox [(ngModel)]="isRemand" [ngModelOptions]="{standalone: true}">自动送回</label>
-            </nz-form-control>
-          </nz-form-item>
-          <!-- 携带设备 -->
-          <nz-form-item *ngIf="goodsLis.length">
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="goods" class="goods">携带设备</nz-form-label>
-            <nz-form-control>
-              <nz-checkbox-group formControlName="goods" [(ngModel)]="goodsLis">
-              </nz-checkbox-group>
-            </nz-form-control>
-          </nz-form-item>
-          <!-- 是否加急 -->
-          <nz-form-item *ngIf="current_allowUrgent">
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="allowUrgent" class="goods">是否加急</nz-form-label>
-            <nz-form-control>
-              <nz-radio-group [(ngModel)]="allowUrgent" formControlName="allowUrgent">
-                <label nz-radio nzValue="1">是</label>
-                <label nz-radio nzValue="0">否</label>
-              </nz-radio-group>
-            </nz-form-control>
-          </nz-form-item>
-          <!-- 加急原因 -->
-          <nz-form-item *ngIf="current_allowUrgent&&allowUrgent == 1">
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="urgentReason" class="goods">加急原因</nz-form-label>
-            <nz-form-control>
-              <textarea rows="4" placeholder="请输入加急原因" nz-input [(ngModel)]="urgentReason"
-                formControlName="urgentReason"></textarea>
-            </nz-form-control>
-          </nz-form-item>
+                </nz-checkbox-wrapper>
+              </nz-form-control>
+              <div *ngIf="!linkCheckLis.length">暂无关联的检查</div>
+            </nz-form-item>
+            <!-- 预约建单时间-患者其他服务 -->
+            <nz-form-item class="yyTime" [ngClass]="{yyTimeError:!yyTimeZy&&clickYYZyFlag}"
+              *ngIf="appointmentZyBuildFlag === '1'&&allowUrgent==0">
+              <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
+              <nz-form-control [nzSm]="24" [nzXs]="24">
+                <nz-time-picker nzFormat="HH:mm" [nzMinuteStep]="30" [nzSecondStep]="60" [(ngModel)]="yyTimeZy"
+                  (ngModelChange)="yyTimeZyChange($event)" [ngModelOptions]="{standalone: true}"
+                  [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes"></nz-time-picker>
+                <label *ngIf="yyTimeZy" nz-checkbox [(ngModel)]="nextDayZy" (ngModelChange)="nextDayZyChange($event)"
+                  class="ml8" [ngModelOptions]="{standalone: true}">次日</label>
+              </nz-form-control>
+              <div class="red w100" *ngIf="!yyTimeZy&&clickYYZyFlag">请填写预约建单时间!</div>
+              <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!</div>
+            </nz-form-item>
+            <!-- 预约建单时间 -->
+            <nz-form-item class="yyTime" [ngClass]="{yyTimeError:!yyTime&&clickYYFlag}"
+              *ngIf="linkCheckLisTrue&&hasTime&&lessTime&&appointmentBuildFlag === '1'&&allowUrgent==0">
+              <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
+              <nz-form-control [nzSm]="24" [nzXs]="24">
+                <nz-time-picker nzFormat="HH:mm" [nzMinuteStep]="30" [nzSecondStep]="60" [(ngModel)]="yyTime"
+                  (ngModelChange)="yyTimeChange($event)" [ngModelOptions]="{standalone: true}"
+                  [nzDisabledHours]="disabledHours" [nzDisabledMinutes]="disabledMinutes"></nz-time-picker>
+                <label *ngIf="yyTime" nz-checkbox [(ngModel)]="nextDay" (ngModelChange)="nextDayChange($event)"
+                  class="ml8" [ngModelOptions]="{standalone: true}">次日</label>
+              </nz-form-control>
+              <div class="red w100" *ngIf="!yyTime&&clickYYFlag">请填写预约建单时间!</div>
+              <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!</div>
+            </nz-form-item>
+            <!-- 100009 科室任务类型状态码未配置 -->
+            <nz-form-item *ngIf="(checkedShowMsg.status!=200)&&(checkedShowMsg.status==100009)">
+              <div class="txtC">{{checkedShowMsg.msg}}</div>
+            </nz-form-item>
+            <!-- 100015 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
+            <nz-form-item
+              *ngIf="(checkedShowMsg.status!=200)&&(checkedShowMsg.status==100015||checkedShowMsg.status==100013)">
+              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室</nz-form-label>
+              <nz-form-control nzErrorTip="请选择起点科室!">
+                <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false"
+                  nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start',checkedShowMsg,$event)"
+                  nzPlaceHolder="请选择起点科室">
+                  <ng-container *ngFor="let option of checkedShowMsg.start.start.list">
+                    <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id"></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>
+            </nz-form-item>
+            <!-- 100014 （护士端一键建单展示策略）取终点科室和msg 值展示 -->
+            <nz-form-item
+              *ngIf="(checkedShowMsg.status!=200)&&(checkedShowMsg.status==100014||checkedShowMsg.status==100015)">
+              <!-- <nz-form-item> -->
+              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
+              <nz-form-control nzErrorTip="请选择目标科室!">
+                <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false"
+                  nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target',checkedShowMsg,$event)"
+                  nzPlaceHolder="请选择目标科室">
+                  <ng-container *ngFor="let option of checkedShowMsg.end.end.list">
+                    <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id"></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>
+            </nz-form-item>
+            <!-- 自动送回 -->
+            <nz-form-item *ngIf="checkedShowMsg.status!=200&&checkedShowMsg.isRemand == 1">
+              <nz-form-control>
+                <label nz-checkbox [(ngModel)]="isRemand" [ngModelOptions]="{standalone: true}">自动送回</label>
+              </nz-form-control>
+            </nz-form-item>
+            <!-- 携带设备 -->
+            <nz-form-item *ngIf="goodsLis.length">
+              <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="goods" class="goods">携带设备</nz-form-label>
+              <nz-form-control>
+                <nz-checkbox-group formControlName="goods" [(ngModel)]="goodsLis">
+                </nz-checkbox-group>
+              </nz-form-control>
+            </nz-form-item>
+            <!-- 是否加急 -->
+            <nz-form-item *ngIf="current_allowUrgent">
+              <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="allowUrgent" class="goods">是否加急</nz-form-label>
+              <nz-form-control>
+                <nz-radio-group [(ngModel)]="allowUrgent" formControlName="allowUrgent">
+                  <label nz-radio nzValue="1">是</label>
+                  <label nz-radio nzValue="0">否</label>
+                </nz-radio-group>
+              </nz-form-control>
+            </nz-form-item>
+            <!-- 加急原因 -->
+            <nz-form-item *ngIf="current_allowUrgent&&allowUrgent == 1">
+              <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="urgentReason" class="goods">加急原因</nz-form-label>
+              <nz-form-control>
+                <textarea rows="4" placeholder="请输入加急原因" nz-input [(ngModel)]="urgentReason"
+                  formControlName="urgentReason"></textarea>
+              </nz-form-control>
+            </nz-form-item>
+          </ng-container>
         </form>
       </div>
     </overlay-scrollbars>
     <div class="btns display_flex justify-content_flex-center">
-      <button
-        *ngIf="linkCheckLis.length&&linkCheckLisTrue&&hasTime&&lessTime&&appointmentBuildFlag === '1'&&allowUrgent==0"
-        nz-button nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-yuyue')">预约建单</button>
+      <button *ngIf="linkCheckLisTrue&&hasTime&&lessTime&&appointmentBuildFlag === '1'&&allowUrgent==0" nz-button
+        nzType="primary" [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-yuyue')">预约建单</button>
       <button *ngIf="appointmentZyBuildFlag === '1'&&allowUrgent==0" nz-button nzType="primary"
         [nzLoading]="btnLoading1" (click)="confirmPatient1('patient-zy-yuyue')">预约建单</button>
       <button
-        *ngIf="!(checkedShowMsg.status==200&&!linkCheckLis.length)&&linkCheckLisTrue&&((allowUrgent == 1 && urgentReason.trim() !== '')||allowUrgent == 0)"
+        *ngIf="((checkedShowMsg.data&&linkCheckLisTrue)||(!checkedShowMsg.data&&!linkCheckLisTrue))&&((allowUrgent == 1 && urgentReason.trim() !== '')||allowUrgent == 0)"
         nz-button nzType="default" [nzLoading]="btnLoading" (click)="confirmPatient()" class="orderThis">直接建单</button>
       <button class="btn cancel" nz-button nzType="default" (click)="hidePatientOrder()">取消</button>
     </div>

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

@@ -1058,11 +1058,13 @@ export class HushijiandanComponent implements OnInit {
       goods = goods.slice(0, goods.length - 1);
     }
     postData.workOrder["goods"] = goods;
-    if (!yuyue && that.current_allowUrgent) {
+    if (!yuyue && that.current_allowUrgent && this.allowUrgent == 1) {
       postData.workOrder["urgentDetails"] = {
         checkStatus: { id: 329 },
         urgentReason: that.urgentReason,
       };
+    } else {
+      delete postData.workOrder["urgentDetails"];
     }
     if (
       yy &&
@@ -1119,6 +1121,9 @@ export class HushijiandanComponent implements OnInit {
         }
       }
       postData.workOrder.isAccompany = 0; //是否需要医护陪同检查
+      if (!yuyue) {
+        postData.workOrder.platform = 2;
+      }
       that.mainService
         .postCustom("api", yuyue ? "appointmentOrder" : "startOrder", postData)
         .subscribe((data) => {
@@ -1259,7 +1264,9 @@ export class HushijiandanComponent implements OnInit {
   checkedShowMsg: any = {}; //患者送检检查项目对应展示信息
   current_allowUrgent = false; //当前任务类型是否允许加急
   currentTasktype; //当前选中的任务类型对象
+  cLoading = false;
   changeCheckedType() {
+    this.linkCheckLisTrue = false;
     this.clickYYFlag = false;
     this.clickYYZyFlag = false;
     this.nextDay = false;
@@ -1289,14 +1296,15 @@ export class HushijiandanComponent implements OnInit {
     // 判断这个任务类型是否允许加急 start
     // 判断这个任务类型是否允许加急 end
     let that = this;
-    this.linkCheckLisTrue = true;
     let postData = {
       taskTypeId: that.patientForm.controls.checkedType.value,
       patientCode: that.patientMsg.patientCode,
     };
+    this.cLoading = true;
     that.mainService
       .postCustom("nurse", "workOrder/buildTrip", postData)
       .subscribe((data) => {
+        this.cLoading = false;
         this.message.remove(this.maskFlag);
         this.maskFlag = false;
         this.patientModal = true;
@@ -1338,7 +1346,8 @@ export class HushijiandanComponent implements OnInit {
       });
   }
   // 患者送检检查项目-选择检查项目
-  linkCheckLisTrue = true; //是否有已选择(患者)
+  linkCheckLisTrue = false; //是否有已选择(患者)
+  isInspectPriority = false; //选择的检查是否紧急(患者)
   hasTime = false; //是否有已选择,并且是否有预约时间(患者)
   lessTime = false; //预约时间列表中预约时间少于生效时长，则是false
   linkCheckLisChange(e) {
@@ -1349,9 +1358,7 @@ export class HushijiandanComponent implements OnInit {
         if (v.priority == 1) {
           flag = true;
         }
-        if (v.value == item.value) {
-          item.checked = true;
-        }
+        item.checked = v.value == item.value;
       });
     });
     if (flag) {
@@ -1378,7 +1385,8 @@ export class HushijiandanComponent implements OnInit {
         .sort();
       this.yyTime = new Date(timeList[0] - this.leadTime * 60 * 1000);
     }
-    this.linkCheckLisTrue = this.linkCheckLis.some((item) => item.checked);
+    this.linkCheckLisTrue = e.length > 0;
+    this.isInspectPriority = e.some((item) => item.priority == 1);
     if (!this.linkCheckLisTrue) {
       this.hasTime = false;
     } else {
@@ -1386,6 +1394,15 @@ export class HushijiandanComponent implements OnInit {
         (item) => Boolean(item.yyTime) && item.checked
       );
     }
+    console.log(
+      this.linkCheckLisTrue,
+      this.hasTime,
+      this.lessTime,
+      this.appointmentBuildFlag,
+      this.allowUrgent,
+      this.isInspectPriority,
+      this.checkedShowMsg
+    );
   }
   // 禁用小时
   disabledHours(): number[] {