调度台患者陪检建单

src/app/services/main.service.ts

@@ -305,10 +305,10 @@ export class MainService {
     });
   }
   //服务台新建工单—调度台建单获取起点科室或者终点科室列表
-  getdeptList(taskTypeId) {
+  getdeptList(taskTypeId, patientCode = undefined) {
     return this.http.post(
       host.host + "/ser/getdeptList",
-      { taskTypeId },
+      { taskTypeId, patientCode: patientCode || undefined },
       { headers: this.headers }
     );
   }

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

@@ -324,7 +324,7 @@
                 <span>{{orderInfo.workOrderObj.patient.residenceNo}}</span>
               </p>
               <p>
-                <span class="label">携带物品</span>
+                <span class="label">携带设备</span>
                 <span>{{orderInfo.workOrderObj.goods}}</span>
               </p>
               <p *ngIf="orderInfo.workOrderObj.taskType.associationType.value=='inspect'">

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

@@ -112,7 +112,7 @@
 							  <span>{{orderInfo.patient.identityCardNo}}</span>
 							</p>
               <p>
-                <span class="label">携带物品</span>
+                <span class="label">携带设备</span>
                 <span>{{orderInfo.goods||'暂无'}}</span>
               </p>
               <p *ngIf="orderInfo.patient.illnessState">

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

@@ -788,7 +788,7 @@
 								  }}</span>
 								</p>
                 <p>
-                  <span class="label">携带物品</span>
+                  <span class="label">携带设备</span>
                   <span>{{ orderInfo.goods || "暂无" }}</span>
                 </p>
               </div>

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

@@ -969,7 +969,11 @@
               </nz-option>
             </nz-select>
           </div>
-          <div class="newTopItem">
+          <div class="newTopItem" *ngIf="isShowResidenceNo">
+            <span class="grayFont">住院号：</span>
+            <input style="width: 146px" nz-input placeholder="请输入住院号" [(ngModel)]="residenceNo" (ngModelChange)="changeResidenceNo($event)" />
+          </div>
+          <div class="newTopItem" *ngIf="callNumber">
             <span class="grayFont">来电电话：{{callNumber}}</span>
           </div>
         </div>
@@ -1052,13 +1056,37 @@
                   <div class="bottom255">
                     <form nz-form [formGroup]="validateFormZy">
                       <div nz-row [nzGutter]="24">
-                        <div nz-col [nzSpan]="24" style="height: 310px">
+                        <div nz-col [nzSpan]="24">
+                          <div class="control-flex">
+                            <nz-form-item nz-row class="patient-control">
+                              <nz-form-label style="line-height: 40px;" class="label" [nzSpan]="8" nzRequired nzFor="patient">患者信息</nz-form-label>
+                              <nz-form-control class="control" [nzSpan]="16" nzErrorTip="请选择患者信息！">
+                                <nz-select style="width: 160px" 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>
+                                </nz-select>
+                              </nz-form-control>
+                            </nz-form-item>
+                            <nz-form-item class="ml8" class="goods-control">
+                              <nz-form-label style="line-height: 40px;" class="label" nzFor="goods" *ngIf="goodsNow.length">携带设备</nz-form-label>
+                              <nz-form-control class="control" 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" style="max-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)">
+                                  <nz-radio-group formControlName="taskType" nz-row [(ngModel)]="radioValueZy" (ngModelChange)="radioChangeZy(radioValueZy, 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>
@@ -1068,7 +1096,27 @@
                             </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]="24" *ngIf="isTaskTypeInspect">
+                          <!-- 检查 -->
+                          <nz-form-item>
+                            <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck" style="text-align: left;">关联的检查</nz-form-label>
+                            <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
+                              <nz-checkbox-wrapper nz-row class="linkCheckCheck w100" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)">
+                                <div nz-row nz-col nzSpan="12" *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>
+                              </nz-checkbox-wrapper>
+                              <div class="red" style="line-height: normal; font-weight: bold" *ngIf="currentTasktype.isMoreDept === 0 && isInspects">
+                                您选择的检查包含了多个科室，请您只包含一个科室。
+                              </div>
+                            </nz-form-control>
+                            <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'}">
                           <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="请选择起点科室！">
@@ -1084,7 +1132,7 @@
                             </nz-form-control>
                           </nz-form-item>
                         </div>
-                        <div nz-col [nzSpan]="deptZyList['startStatus'] != 201 ? 12 : 24" style="height: 83px">
+                        <div *ngIf="!isTaskTypeInspect" 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="请选择终点科室！">
@@ -1100,32 +1148,7 @@
                             </nz-form-control>
                           </nz-form-item>
                         </div>
-                        <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" (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>
-                                </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>
-                              <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>
@@ -1148,11 +1171,12 @@
                           </nz-form-item>
                         </div>
                         <!-- 预约建单时间-患者其他服务--start -->
-                        <div nz-col [nzSpan]="24" style="height: 83px" class="pos">
+                        <div nz-col [nzSpan]="24" 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>
+                              <span class="red pos-red">请您填写实际预约检查时间，系统会根据时间安排人员进行陪检!</span>
                             </nz-form-control>
                           </nz-form-item>
                           <!-- 预约建单时间-患者其他服务 -->
@@ -1181,14 +1205,14 @@
                   <div class="bottom255">
                     <form nz-form [formGroup]="validateFormQt">
                       <div nz-row [nzGutter]="24">
-                        <div nz-col [nzSpan]="24" style="height: 268px">
+                        <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]="2" [nzXs]="2" 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>
-                            <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择类型！">
-                              <div class="radios" style="height: 225px" *ngIf="!searchTaskLoading">
+                            <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择任务类型！">
+                              <div class="radios" style="max-height: 225px" *ngIf="!searchTaskLoading">
                                 <overlay-scrollbars #osComponentRef11 [ngStyle]="{ height: '100%' }">
                                   <nz-radio-group formControlName="taskTypeQt" nz-row [(ngModel)]="radioValueQt" (ngModelChange)="radioChangeQt(radioValueQt)">
                                     <div nz-row>
@@ -1197,13 +1221,13 @@
                                   </nz-radio-group>
                                 </overlay-scrollbars>
                               </div>
-                              <div class="radios display_flex justify-content_flex-center align-items_center" style="height: 225px" *ngIf="searchTaskLoading">
+                              <div class="radios display_flex justify-content_flex-center align-items_center" style="max-height: 225px" *ngIf="searchTaskLoading">
                                 <nz-spin nzSimple></nz-spin>
                               </div>
                             </nz-form-control>
                           </nz-form-item>
                         </div>
-                        <div *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value !== 'specimen'" nz-col [nzSpan]="12" style="height: 83px" [ngStyle]="{ display: deptQtList['startStatus'] != 201 ? 'block' : 'none' }">
+                        <div *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value !== 'specimen'" nz-col [nzSpan]="12" [ngStyle]="{ display: deptQtList['startStatus'] != 201 ? 'block' : 'none' }">
                           <nz-form-item>
                             <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="startDeptQt">起点科室</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择起点科室！">
@@ -1219,7 +1243,7 @@
                             </nz-form-control>
                           </nz-form-item>
                         </div>
-                        <div *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value !== 'specimen'" nz-col [nzSpan]="12" style="height: 83px">
+                        <div *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value !== 'specimen'" nz-col [nzSpan]="12">
                           <nz-form-item>
                             <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="endDeptsQt">终点科室</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择终点科室！">
@@ -1241,7 +1265,7 @@
                         </div>
                         <div nz-col [nzSpan]="24" *ngIf="deptQtList.taskType && deptQtList.taskType.remarksSwitch == 1">
                           <nz-form-item>
-                            <nz-form-label class="label" [nzSm]="3" [nzXs]="3" nzFor="workOrderRemark">工单备注</nz-form-label>
+                            <nz-form-label class="label" [nzSm]="2" [nzXs]="2" nzFor="workOrderRemark">工单备注</nz-form-label>
                             <span class="customRemarks" *ngFor="let item of deptQtList.taskType.customRemarks" (click)="addRemarks(item)">【{{ item }}】</span>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请填写工单备注！">
                               <textarea formControlName="workOrderRemark" nz-input [placeholder]="deptQtList.taskType.remarksPrompts" [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100" [(ngModel)]="workOrderRemark" #remarksEle></textarea>
@@ -1249,7 +1273,7 @@
                           </nz-form-item>
                         </div>
                         <!-- 预约建单时间-其他临床服务--start -->
-                        <div nz-col [nzSpan]="24" style="height: 83px" class="pos" *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value === 'other'">
+                        <div nz-col [nzSpan]="24" class="pos" *ngIf="deptQtList.taskType && deptQtList.taskType.associationType.value === 'other'">
                           <!-- 需要预约检查 -->
                           <nz-form-item class="pos-item">
                             <nz-form-control>
@@ -1676,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">
+          <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>
-          <button nz-button class="btn" nzType="primary" (click)="newOrderOk()" [nzLoading]="isOkLoading">
+          <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')">
             {{isYyInspect ? '预约建单' :'直接建单'}}
           </button>
         </ng-container>

src/app/views/fuwutai/fuwutai.component.less

@@ -6,9 +6,6 @@
   padding: 16px;
   display: flex;
   flex-direction: column;
-  ::ng-deep .bottomWrap .bottom .ant-form-item-label {
-    line-height: 24px;
-  }
 }
 
 .thumbList{
@@ -117,7 +114,6 @@
     .pos-item {
       position: absolute;
       left: 110px;
-      top: -10px;
       z-index: 9;
     }
     .ant-form-item-label{
@@ -148,8 +144,8 @@
     color: @primary-color;
     cursor: pointer;
     display: inline-block;
-    height: 24px;
-    line-height: 24px;
+    height: 40px;
+    line-height: 40px;
     word-break: keep-all;
     &.countRemark{
       text-decoration: underline;
@@ -2354,7 +2350,7 @@
                 }
               }
               .bottom {
-                padding: 0 36px;
+                padding: 0 16px;
                 // height: 310px;
                 height: 567px;
                 overflow-y: auto;
@@ -2365,14 +2361,19 @@
                   }
                 }
                 .control-flex {
+                  margin-top: 16px;
+                  overflow: hidden;
                   display: flex;
                   justify-content: space-between;
                   align-items: center;
-                  .control-flex__5 {
-                    flex: 5;
+                  .patient-control{
+                    flex-shrink: 0;
                   }
-                  .control-flex__7 {
-                    flex: 7;
+                  .goods-control{
+                    display: flex;
+                    flex-shrink: 0;
+                    margin-left: 16px;
+                    align-items: center;
                   }
                 }
                 .goods-wrap {
@@ -2413,7 +2414,7 @@
 
                 .radios {
                   // height: 96px;
-                  height: 267px;
+                  max-height: 267px;
                   width: 100%;
                   overflow-y: auto;
                   padding: 8px;

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

@@ -154,6 +154,7 @@ export class FuwutaiComponent implements OnInit {
   applyDept; //申请科室
   applyDeptMiddle; //申请科室(中间传递)
   taskBuild; //任务类型选择
+  residenceNo; //住院号
   targetDept; //目标科室
   noArrives = []; //未到达列表
   newLoading = false; //loading
@@ -382,8 +383,8 @@ export class FuwutaiComponent implements OnInit {
       this.validateFormZy.controls[i].markAsDirty();
       this.validateFormZy.controls[i].updateValueAndValidity();
       if (this.validateFormZy.controls[i].valid === false && i !== "goods") {
-        //携带物品非必填ca
-        // if (this.validateFormZy.controls[i].valid === false && i !== 'goods' && i !== 'patient') {//携带物品非必填
+        //携带设备非必填
+        // if (this.validateFormZy.controls[i].valid === false && i !== 'goods' && i !== 'patient') {//携带设备非必填
         newOrderShowFlag = false;
       }
       if (!this.validateFormZy.controls[i].valid) {
@@ -456,6 +457,92 @@ export class FuwutaiComponent implements OnInit {
       });
     }
   }
+  // 患者陪检表单提交
+  submitFormInspect(go?): void {
+    let newOrderShowFlag = true; //是否可以关闭弹窗
+    for (const i in this.validateFormZy.controls) {
+      this.validateFormZy.controls[i].markAsDirty();
+      this.validateFormZy.controls[i].updateValueAndValidity();
+      if (this.validateFormZy.controls[i].valid === false && i !== "goods") {
+        //携带设备非必填
+        // if (this.validateFormZy.controls[i].valid === false && i !== 'goods' && i !== 'patient') {//携带设备非必填
+        newOrderShowFlag = false;
+      }
+      if (!this.validateFormZy.controls[i].valid) {
+        this.isOkLoading = false;
+        this.isGoLoading = false;
+      }
+    }
+    if (newOrderShowFlag) {
+      let goods = this.validateFormZy.controls.goods.value ? this.validateFormZy.controls.goods.value.filter((item) => item.checked === true) : [];
+      goods = goods.map((current) => current.value).join();
+
+      // 预约日期
+      let yyTime1;
+      if(this.isYyInspect && this.currentTabIndex == '患者转运'){
+        let yyDateZy = (typeof this.yyDateZy === 'object') ? new Date(this.yyDateZy) : parse(this.yyDateZy, 'yyyy-MM-dd HH:mm:ss', new Date());
+        let yyTimeZy = (typeof this.yyTimeZy === 'object') ? new Date(this.yyTimeZy) : parse(this.yyTimeZy, 'yyyy-MM-dd HH:mm:ss', new Date());
+        yyTime1 = format(yyDateZy, "yyyy-MM-dd") + " " + format(yyTimeZy, "HH:mm") + ":00";
+      }
+
+      let postData: any = {
+        workOrder: {
+          yyTime: yyTime1,
+          sourceId: SourceId.fuwutai,
+          taskType: { id: this.validateFormZy.controls.taskType.value },
+          startDept: { id: this.deptZyList.data.startDept },
+          endDepts: [{ id: this.deptZyList.data.endDept }],
+          createDept: this.applyDept,
+          patient: {
+            patientCode: this.validateFormZy.controls.patient.value,
+          },
+          goods,
+          workOrderRemark: this.validateFormZy.controls.workOrderRemarkZy.value,
+        },
+      };
+      postData.workOrder.taskType.isHalfInspect = this.currentTasktype.isHalfInspect === 1 ? 1 : 0; //半程陪检
+
+      let checkedArr = [];
+      if (this.linkCheckLis && this.linkCheckLis.length) {
+        this.linkCheckLis.forEach((e) => {
+          if (e.checked) {
+            checkedArr.push({ id: e.value });
+          }
+        });
+      }
+
+      postData.workOrder["checkList"] = checkedArr;
+      postData.workOrder.isAccompany = 0; //是否需要医护陪同检查
+
+      if (!this.noWorkerPhone) {
+        postData.workOrder["workOrderPhone"] = this.callNumber;
+      }
+      this.mainService.buildOrder(postData).subscribe((data) => {
+        console.log(data);
+        this.isOkLoading = false;
+        this.isGoLoading = false;
+        if (data["status"] == 200) {
+          this.newOrderShow = false; //关闭弹窗
+          if (go === "&go&") {
+            this.applyDept = data["startDept"].id;
+            this.applyStartDept = data["startDept"];
+            this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
+            this.showPromptModal("建单", true, "", "closeGo");
+          } else {
+            if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+              this.jry_shixian();
+            }
+            this.showPromptModal("建单", true, "", "close");
+          }
+        } else if(data["status"] == 100042){
+          this.newOrderShow = false; //关闭弹窗
+          this.showPromptModal("建单", false, data["msg"]);
+        } else {
+          this.showPromptModal("建单", false, data["msg"]);
+        }
+      });
+    }
+  }
   // 标本配送表单提交
   submitFormBbps(go?) {
     let postData = {
@@ -729,6 +816,8 @@ export class FuwutaiComponent implements OnInit {
         this.searchApplicationGroup(v[1]);
       }else if(v[0] === 'user'){
         this.searchApplicationUser(v[1]);
+      }else if(v[0] === 'patient'){
+        this.getPatientByResidenceNo(v[1]);
       }
     });
     this.onSearchTaskBuildSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -746,11 +835,12 @@ export class FuwutaiComponent implements OnInit {
     //患者转运
     this.validateFormZy = this.fb.group({
       taskType: [null, [Validators.required]], //类型
+      linkCheck: [null, []],
       startDept: [null, [Validators.required]], //起点科室
       endDepts: [null, [Validators.required]], //终点科室
       patient: [null, [Validators.required]], //患者信息
       // patient: [null],//患者信息ca
-      goods: [null], //携带物品
+      goods: [null], //携带设备
       workOrderRemarkZy: [null], //工单备注
     });
     //其他
@@ -796,6 +886,17 @@ export class FuwutaiComponent implements OnInit {
     document.addEventListener("keydown", this.quickShowNewOrder.bind(this));
   }
 
+  requiredConfigChange(form: string, name: string, required: boolean): void {
+    if (!required) {
+      this[form].get(name)!.clearValidators();
+      this[form].get(name)!.markAsPristine();
+    } else {
+      this[form].get(name)!.setValidators(Validators.required);
+      this[form].get(name)!.markAsDirty();
+    }
+    this[form].get(name)!.updateValueAndValidity();
+  }
+
   // 初始化呼叫中心方法
   initCallCenter(){
     let _this = this;
@@ -2425,6 +2526,7 @@ export class FuwutaiComponent implements OnInit {
       isInit && this.incidentModel.area && this.searchApplicationFloor();
       if(!this.hsmsData.hsmsSwitch){
         this.taskBuild = null;
+        this.residenceNo = null;
         this.newOrderShow = true;
         this.newOrderShowOpen = true;
         this.fixedTab = "newOrder";
@@ -2467,6 +2569,7 @@ export class FuwutaiComponent implements OnInit {
     }
 
     this.taskBuild = null;
+    this.residenceNo = null;
     this.newOrderShow = true;
     this.newOrderShowOpen = true;
     this.fixedTab = "newOrder";
@@ -2613,6 +2716,34 @@ export class FuwutaiComponent implements OnInit {
     });
   }
 
+  // 根据住院号获取患者信息
+  getPatientByResidenceNo(residenceNo) {
+    let postData = {
+      residenceNo,
+      hosId: this.checkedHos,
+      idx: 0,
+      sum: 2,
+    };
+    this.mainService.listMsgByMain('listPatient',postData).subscribe((result) => {
+      if (result["status"] == 200) {
+        let patientList = result["list"];
+        if (patientList.length) {
+          patientList = patientList.filter((item) => !!item.bedNum);
+        }
+        if(patientList.length === 1){
+          let patient = patientList[0];
+          patient.bednum = patient.bedNum;
+          patient.patientname = patient.patientName;
+          patient.department && (this.applicationDepartmentList = [patient.department]);
+          patient.department && (this.applyDept = patient.department.id);
+          patient.department && this.tabClick('患者转运');
+          patient.department && (this.patientList = [patient]);
+          patient.department && (this.patientZy = patient.patientCode);
+        }
+      }
+    });
+  }
+
   // tab任务类型向左移动
   toLeft() {
     let maxStep = this.workTypesArrange.length - 5;
@@ -3273,7 +3404,7 @@ export class FuwutaiComponent implements OnInit {
             deptId && this.changeApply(deptId);
             if (e === undefined) {
               //初始化
-              this.changeApplicationDepartment("");
+              this.changeApplicationDepartment();
             } else if (e === "&ks&") {
               //绑定了科室
               // 配送--start
@@ -3902,17 +4033,19 @@ export class FuwutaiComponent implements OnInit {
         // this.workTypesArrange[index].value = result.data || [];
         this.workTypes = result['data'] || [];
         // 整理后的任务类型
+        this.isShowResidenceNo = false;
         for (const value of this.workTypesArrange) {
           value.value = [];
         }
         this.workTypes.forEach((item) => {
-          if(item.associationTypeValue === 'patientTransport'){
+          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;
             }
           }else if(item.associationTypeValue === 'other' || item.associationTypeValue === 'specimen' || item.associationTypeValue === 'ordinary'){
             // 物品配送
@@ -3934,6 +4067,7 @@ export class FuwutaiComponent implements OnInit {
 
   // 新建工单->获取新建类型
   countRemarkList:any[] = [];
+  isShowResidenceNo = false;
   getAutoWorkTypes(isFirst, isInit) {
     this.workTypesArrange = [];
     // 运维
@@ -3959,14 +4093,16 @@ export class FuwutaiComponent implements OnInit {
         if (data["status"] == 200) {
           this.workTypes = data["data"];
           // 整理后的任务类型
+          this.isShowResidenceNo = false;
           this.workTypes.forEach((item) => {
-            if(item.associationTypeValue === 'patientTransport'){
+            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;
               }
             }else if(item.associationTypeValue === 'other' || item.associationTypeValue === 'specimen' || item.associationTypeValue === 'ordinary'){
               // 物品配送
@@ -4269,7 +4405,94 @@ export class FuwutaiComponent implements OnInit {
       //患者其他服务
       this.yyTimeZy = null;
       this.yyDateZy = new Date();
+    }else if (this.currentTasktype.associationType.value === "inspect") {
+      //陪检
+      let obj = this.filterLinkCheckLis.find((item) => {
+        return (parse(item.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date()).getTime() - new Date().getTime() > 0);
+      });
+      if (obj) {
+        this.showDateTime();
+      } else {
+        this.yyTimeZy = null;
+        this.yyDateZy = new Date();
+        console.log(this.isYyInspect);
+      }
+    }
+  }
+  //回显时间日期
+  showDateTime() {
+    //当前时间要大于生效时间
+    let isYyInspect = this.filterLinkCheckLis.every((item) => {
+      return (parse(item.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date()).getTime() - new Date().getTime() > 0);
+    });
+    //如果勾选需要预约检查
+    if (isYyInspect) {
+      //筛选离当前时间最近的
+      let timeList = this.filterLinkCheckLis
+        .map((item) => parse(item.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date()).getTime())
+        .sort();
+      this.yyTimeZy = new Date(timeList[0] - 0); //回显预约时间,需要减去生效时间
+      this.yyDateZy = new Date(timeList[0] - 0); //回显预约日期,需要减去生效时间
+      this.yyDateChange(this.yyTimeZy);
+    } else {
+      this.yyTimeZy = null;
+      this.yyDateZy = null;
+    }
+  }
+  // 患者送检检查项目-选择检查项目
+  linkCheckLisTrue = false; //是否有已选择(患者)
+  filterLinkCheckLis = []; //有预约时间并且选中的
+  isInspects = false; //勾选检车的时候是否多个检查多个检查科室
+  linkCheckLisChange(e) {
+    let flag = false; //检查是否紧急
+    let arr = []; //选中的索引
+    // 是否检查生成工单允许多个科室，1是，0否
+    if (this.currentTasktype.isMoreDept === 0) {
+      let arr = e.map((item) => item.execDeptId);
+      arr = Array.from(new Set(arr));
+      this.isInspects = arr.length > 1;
+    }
+    this.linkCheckLis.forEach((item, index) => {
+      if (e.length) {
+        //有选中的检查
+        e.forEach((v) => {
+          //检查是否有紧急度
+          if (v.priority == 1) {
+            flag = true;
+          }
+          //选中的检查设置checked
+          if (v.value == item.value) {
+            arr.push(index);
+          }
+        });
+      } else {
+        item.checked = false;
+      }
+    });
+    this.linkCheckLis.forEach((item, index) => {
+      item.checked = arr.includes(index);
+    });
+    console.log(e, this.linkCheckLis);
+    this.clickYYFlag = false;
+    // 有预约时间并且选中的
+    this.filterLinkCheckLis = this.linkCheckLis.filter(
+      (item) => Boolean(item.yyTime) && item.checked
+    );
+    //有预约时间并且选中的检查数组不为空
+    if (this.filterLinkCheckLis.length) {
+      //当前时间要大于生效时间
+      this.isYyInspect = this.filterLinkCheckLis.every((item) => {
+        return (parse(item.yyTime, 'yyyy-MM-dd HH:mm:ss', new Date()).getTime() - new Date().getTime() > 0);
+      });
+      //不加急状态下，回显时间
+      this.showDateTime();
+    } else {
+      //有预约时间并且选中的检查数组为空
+      this.isYyInspect = false;
+      this.yyTimeZy = null;
+      this.yyDateZy = null;
     }
+    this.linkCheckLisTrue = e.length > 0;
   }
   // 转运类型选中类型（单选）触发
   goodsNow; //携带的物品列表
@@ -4282,21 +4505,40 @@ export class FuwutaiComponent implements OnInit {
   clickYYZyFlag = false; //是否点击预约建单-患者其他服务
   clickYYFlag = false; //是否点击预约建单-其他临床服务
   currentTasktype = null; //当前选中的任务类型对象
-  radioChangeZy(value) {
+  isTaskTypeInspect:boolean = false;//是否是患者陪检
+  linkCheckLis:any[] = [];//检查列表
+  tabIndex;
+  radioChangeZy(value, index) {
+    this.tabIndex = index;
     //任务类型id
     if (value === "" || value === null) {
       return;
     }
+    this.linkCheckLisTrue = false;
     this.startDeptZy = null;
     this.endDeptZy = null;
-    this.patientZy = null;
+    // 患者陪检-则参数增加patientCode
+    console.log(this.workTypesArrange[index].value);
+    let taskType = this.workTypesArrange[index].value.find(v => v.id == value);
+    let patientCode;
+    if(taskType.associationTypeValue === 'inspect'){
+      patientCode = this.patientZy;
+      this.requiredConfigChange('validateFormZy', 'startDept', false);
+      this.requiredConfigChange('validateFormZy', 'endDepts', false);
+      this.isTaskTypeInspect = true;
+    }else{
+      patientCode = undefined;
+      this.requiredConfigChange('validateFormZy', 'startDept', true);
+      this.requiredConfigChange('validateFormZy', 'endDepts', true);
+      this.isTaskTypeInspect = false;
+    }
     // 返回值的status是201 则是默认发起科室，把申请科室作为值
     // 返回值的status是202 则是固定科室范围，会返回科室列表
     // 返回值的status是203 则是固定科室，会返回单个科室
     // 返回值的status是204 则让前端自己调用科室搜索接口
     // 返回值的status是205 则是固定科室类型，会返回科室列表
     // 返回值的status是206 则是默认患者所在科室，把患者所在科室作为值
-    this.mainService.getdeptList(value).subscribe((data:any) => {
+    this.mainService.getdeptList(value, patientCode).subscribe((data:any) => {
       this.deptZyList = data;
       // 预约start
       this.currentTasktype = data.taskType;
@@ -4306,6 +4548,25 @@ export class FuwutaiComponent implements OnInit {
       this.yyTimeZy = null;
       // 预约end
       console.log(this.deptZyList);
+      // 如果是患者陪检，则没有起点科室，终点科室
+      if(taskType.associationTypeValue === 'inspect'){
+        this.linkCheckLis = [];
+        if (data.data && Array.isArray(data.data.data) && data.data.data.length) {
+          let arr = [];
+          data.data.data.forEach((e) => {
+            arr.push({
+              execDeptId: e.execDept.id,
+              yyTime: e.yyTime,
+              priority: e.priority,
+              label: (e.yyTime || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName || "检查"),
+              value: e["id"],
+              checked: false,
+            });
+          });
+          this.linkCheckLis = arr;
+        }
+        return;
+      }
       // 起点科室
       if (data["startStatus"] == 201 || data["startStatus"] == 206) {
         if (this.applyDept) {
@@ -4335,10 +4596,7 @@ export class FuwutaiComponent implements OnInit {
         this.getHosDepartment(this.checkedHos, "end", "");
       }
       // 终点科室患者信息列表,id是送病人回病房的任务类型
-      if (
-        (data["endStatus"] == 201 || data["endStatus"] == 203) &&
-        this.radioValueZy == this.deathTasktypeId
-      ) {
+      if ((data["endStatus"] == 201 || data["endStatus"] == 203) && this.radioValueZy == this.deathTasktypeId) {
         if (this.currentTabIndex == "患者转运") {
           //患者转运
           //获取患者信息
@@ -4346,7 +4604,7 @@ export class FuwutaiComponent implements OnInit {
         }
       }
     });
-    // 获取携带物品
+    // 获取携带设备
     let arrObj = this.workTypesArrange.find(v => v.key === this.currentTabIndex);
     let arr = arrObj.value;
     this.goodsNow = arr.filter(
@@ -4429,7 +4687,7 @@ export class FuwutaiComponent implements OnInit {
     } else {
       this.clickYYFlag = false;
     }
-    if (this.isYyInspect && objZy && objZy.associationTypeValue === 'patientTransport') {
+    if (this.isYyInspect && objZy && (objZy.associationTypeValue === 'patientTransport' || objZy.associationTypeValue === 'inspect')) {
       this.clickYYZyFlag = true;
     } else {
       this.clickYYZyFlag = false;
@@ -4437,7 +4695,7 @@ export class FuwutaiComponent implements OnInit {
 
     if (
       (!this.yyTime && objQt && objQt.associationTypeValue === 'other' && this.isYyInspect) ||
-      (!this.yyTimeZy && objZy && objZy.associationTypeValue === 'patientTransport' && this.isYyInspect)
+      (!this.yyTimeZy && objZy && (objZy.associationTypeValue === 'patientTransport' || objZy.associationTypeValue === 'inspect') && this.isYyInspect)
     ) {
       return;
     }
@@ -4450,6 +4708,9 @@ export class FuwutaiComponent implements OnInit {
     if (objZy && objZy.associationTypeValue === 'patientTransport') {
       //患者转运
       go === "&go&" ? this.submitFormZy(go) : this.submitFormZy();
+    }if (objZy && objZy.associationTypeValue === 'inspect') {
+      //患者陪检
+      go === "&go&" ? this.submitFormInspect(go) : this.submitFormInspect();
     } else if (objQt && objQt.associationTypeValue === 'specimen') {
       //标本配送
       go === "&go&" ? this.submitFormBbps(go) : this.submitFormBbps();
@@ -4497,7 +4758,7 @@ export class FuwutaiComponent implements OnInit {
     this.deptQtList["endStatus"] = 0;
   }
 
-  // 携带物品
+  // 携带设备
   changeGoods(value: object[]): void {
     console.log(value);
   }
@@ -4915,6 +5176,12 @@ export class FuwutaiComponent implements OnInit {
     }
   }
 
+  // 服务台建单输入住院号,查到有且仅有一个患者，则自动选中【患者转运】，自动带出【申请科室】，自动带出【患者信息】
+  changeResidenceNo(e){
+    console.log(e);
+    this.changeCommonInpSubject.next(['patient', e]);
+  }
+
   // 运维、配送工单切换
   filterOrderList(type, state){
     if(!this.itsmData.mdv2Switch && this.hsmsData.hsmsSwitch){
@@ -5414,6 +5681,36 @@ export class FuwutaiComponent implements OnInit {
     }else{
       this.workOrderRemarkZy = '';
     }
+
+    if(this.tabIndex !== undefined && this.currentTasktype && this.currentTasktype.associationType.value === 'inspect'){
+      let index = this.tabIndex;
+      let value = this.currentTasktype.id;
+      let taskType = this.workTypesArrange[index].value.find(v => v.id == value);
+      let patientCode;
+      if(taskType.associationTypeValue === 'inspect'){
+        patientCode = this.patientZy;
+      }else{
+        patientCode = undefined;
+      }
+
+      this.mainService.getdeptList(value, patientCode).subscribe((data:any) => {
+        this.linkCheckLis = [];
+        if(data.data && Array.isArray(data.data.data) && data.data.data.length) {
+          let arr = [];
+          data.data.data.forEach((e) => {
+            arr.push({
+              execDeptId: e.execDept.id,
+              yyTime: e.yyTime,
+              priority: e.priority,
+              label: (e.yyTime || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName || "检查"),
+              value: e["id"],
+              checked: false,
+            });
+          });
+          this.linkCheckLis = arr;
+        }
+      })
+    }
   }
 
   // 注意事项获取焦点

src/app/views/info-search/info-search.component.html

@@ -145,7 +145,7 @@
                     <th nzWidth="130px">异常状态</th>
                     <th nzWidth="130px">是否护士陪同</th>
                     <th nzWidth="130px">是否送回</th>
-                    <th nzWidth="130px">携带物品IDS</th>
+                    <th nzWidth="130px">携带设备IDS</th>
                     <th nzWidth="130px">预约建单时间
                       <!-- 35 -->
                     </th>

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

@@ -94,7 +94,7 @@
             <label nz-radio nzValue='0'>否</label>
           </nz-radio-group>
         </div>
-        <div class="mb8 w100" *ngIf="association.value == 'patientTransport'||association.value == 'specimen'||association.value == 'other'||association.value == 'ordinary'">
+        <div class="mb8 w100" *ngIf="association.value == 'inspect'||association.value == 'patientTransport'||association.value == 'specimen'||association.value == 'other'||association.value == 'ordinary'">
           <nz-form-label class="label" nzRequired>调度台是否可以新建工单</nz-form-label>
           <nz-radio-group class="handlerType" [(ngModel)]="autoFlag">
             <label nz-radio nzValue='1'>是</label>

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

@@ -2696,17 +2696,17 @@ export class TaskTypeManagementComponent implements OnInit {
   isHalfInspectChange(e) {
     this.isHalfInspect = e;
     //半陪检，则关联检查不允许多个科室
-    if (e === "1") {
-      this.isMoreDept = "0";
-    }
+    // if (e === "1") {
+    //   this.isMoreDept = "0";
+    // }
   }
   // 关联检查是否允许多个科室
   isMoreDeptChange(e) {
     this.isMoreDept = e;
     //关联检查允许多个科室,则不允许半陪检
-    if (e === "1") {
-      this.isHalfInspect = "0";
-    }
+    // if (e === "1") {
+    //   this.isHalfInspect = "0";
+    // }
   }
 
   // 展示信息提示框