拉取代码

src/app/components/build-quick-confirm/build-quick-confirm.component.html

@@ -37,7 +37,7 @@
                       <nz-form-item nz-row>
                         <nz-form-label [nzSpan]="6" nzRequired nzFor="originOffice">起点科室</nz-form-label>
                         <nz-form-control [nzSpan]="14" nzErrorTip="请选择起点科室!">
-                          <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
+                          <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" nzPlaceHolder="请选择起点科室">
                             <ng-container *ngFor="let option of buildMsg.start.start.list">
                               <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                               </nz-option>
@@ -71,7 +71,7 @@
                       <nz-form-item nz-row>
                         <nz-form-label [nzSpan]="6" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
                         <nz-form-control [nzSpan]="14" nzErrorTip="请选择目标科室!">
-                          <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', buildMsg, $event)" nzAllowClear nzPlaceHolder="请选择目标科室">
+                          <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" nzAllowClear nzPlaceHolder="请选择目标科室">
                             <ng-container *ngFor="let option of buildMsg.end.end.list">
                               <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                               </nz-option>
@@ -93,7 +93,7 @@
                       <nz-form-item nz-row>
                         <nz-form-label [nzSpan]="6" nzRequired nzFor="originOffice">起点科室</nz-form-label>
                         <nz-form-control [nzSpan]="14" nzErrorTip="请选择起点科室!">
-                          <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
+                          <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" nzPlaceHolder="请选择起点科室">
                             <ng-container *ngFor="let option of buildMsg.start.start.list">
                               <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                               </nz-option>
@@ -108,7 +108,7 @@
                       <nz-form-item nz-row>
                         <nz-form-label [nzSpan]="6" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
                         <nz-form-control [nzSpan]="14" nzErrorTip="请选择目标科室!">
-                          <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', buildMsg, $event)" nzPlaceHolder="请选择目标科室">
+                          <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" nzPlaceHolder="请选择目标科室">
                             <ng-container *ngFor="let option of buildMsg.end.end.list">
                               <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                               </nz-option>

src/app/components/build-quick-confirm/build-quick-confirm.component.ts

@@ -56,6 +56,8 @@ export class BuildQuickConfirmComponent implements OnInit {
   historyCustomRemarks = []; //历史快捷输入
   workOrderRemarkTips = ""; //备注提示
   nLoading = false;
+	isEndFixedType: boolean = false;
+	isStartFixedType: boolean = false;
   newShortcutOrder(data, type) {
     this.workOrderRemark = "";
     this.customRemarks = [];
@@ -76,6 +78,20 @@ export class BuildQuickConfirmComponent implements OnInit {
       .postCustom("nurse", "workOrder/buildTrip", postData)
       .subscribe((result) => {
         this.buildMsg = result;
+				if(result.end){
+					if(result.end.end.departmentStrategy==202){
+						this.isEndFixedType = true
+					}else{
+						this.isEndFixedType = false
+					}
+				}
+				if(result.start){
+					if(result.start.start.departmentStrategy==202){
+						this.isStartFixedType = true
+					}else{
+						this.isStartFixedType = false
+					}
+				}
         if (result.remarksSwitch == 1) {
           if (result.customRemarks === null || result.customRemarks === "") {
             this.customRemarks = [];

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

@@ -1219,12 +1219,14 @@
                 <td>{{ item.username || "-" }}</td>
                 <td>{{ item.handoverUserid ? item.handoverUserid.name : "-" }}</td>
                 <td>
-                  <button
+               <!--   <button
                     *ngIf="item.attachments"
                     (click)="previewImageHandler(item.attachments[0])"
                   >
                     查看图片</button
-                  ><span *ngIf="!item.attachments">无</span>
+                  > -->
+									<img *ngIf="item.attachments" (click)="previewImageHandler(item.attachments[0])" width="50" height="50" [src]="imgUrl + item.attachments[0].relativeFilePath" alt="">
+									<span *ngIf="!item.attachments">无</span>
                 </td>
                 <td>
                   {{

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

@@ -1,4 +1,9 @@
 @import "../../../../src/theme.less";
+
+img{
+	cursor: pointer;
+}
+
 :host {
   width: 100%;
   height: 100%;

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

@@ -72,7 +72,7 @@ export class OrderDetailComponent implements OnInit {
   orderInfo: any; //工单详情信息
   endDepts = ""; //工单详情目标科室
   showCoop: boolean = true; //是否展示详情页操作按钮
-
+	imgUrl:any = location.origin + '/file'; //图片路径前缀
   promptContent: string; //操作提示框提示信息
   ifSuccess: boolean; //操作成功/失败
   promptInfo: string; //操作结果提示信息

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

@@ -1136,7 +1136,7 @@
                           <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">
+                              <nz-select formControlName="startDept" [nzDisabled]="deptZyList.startStatus == 201 || deptZyList.startStatus == 203 || deptZyList.startStatus == 206" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" 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>
@@ -1152,7 +1152,7 @@
                           <nz-form-item>
                             <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="endDepts">终点科室</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择终点科室！">
-                              <nz-select formControlName="endDepts" [nzDisabled]="deptZyList.endStatus == 201 || deptZyList.endStatus == 203 || deptZyList.endStatus == 206" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchHosDepartment(checkedHos, 'end', $event)" nzAllowClear nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptZy" (ngModelChange)="endDeptZyChange()">
+                              <nz-select formControlName="endDepts" [nzDisabled]="deptZyList.endStatus == 201 || deptZyList.endStatus == 203 || deptZyList.endStatus == 206" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" 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>
@@ -1247,7 +1247,7 @@
                           <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="请选择起点科室！">
-                              <nz-select formControlName="startDeptQt" [nzDisabled]="deptQtList.startStatus == 201 || deptQtList.startStatus == 203" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchHosDepartmentQt(checkedHos, 'start', $event)" nzAllowClear nzPlaceHolder="请选择起点科室" [(ngModel)]="startDeptQt">
+                              <nz-select formControlName="startDeptQt" [nzDisabled]="deptQtList.startStatus == 201 || deptQtList.startStatus == 203" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" nzAllowClear nzPlaceHolder="请选择起点科室" [(ngModel)]="startDeptQt">
                                 <ng-container *ngFor="let option of deptQtList.startDept">
                                   <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
                                 </ng-container>
@@ -1263,7 +1263,7 @@
                           <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="请选择终点科室！">
-                              <nz-select formControlName="endDeptsQt" [nzDisabled]="deptQtList.endStatus == 201 || deptQtList.endStatus == 203" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchHosDepartmentQt(checkedHos, 'end', $event)"
+                              <nz-select formControlName="endDeptsQt" [nzDisabled]="deptQtList.endStatus == 201 || deptQtList.endStatus == 203" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType"
                                 nzAllowClear nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptQt">
                                 <ng-container *ngFor="let option of deptQtList.endDept">
                                   <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>

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

@@ -4535,6 +4535,8 @@ export class FuwutaiComponent implements OnInit {
   isTaskTypeInspect:boolean = false;//是否是患者陪检
   linkCheckLis:any[] = [];//检查列表
   tabIndex;
+	isStartFixedType:boolean = false;
+	isEndFixedType:boolean = false;
   radioChangeZy(value, index) {
     this.radioValueZyPre = this.radioValueZy;
     this.radioValueZy = value;
@@ -4570,6 +4572,17 @@ export class FuwutaiComponent implements OnInit {
     // 返回值的status是206 则是默认患者所在科室，把患者所在科室作为值
     this.mainService.getdeptList(value, patientCode, (taskType.associationTypeValue === 'inspect' ? format(startOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss') : undefined), (taskType.associationTypeValue === 'inspect' ? format(endOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss') : undefined)).subscribe((data:any) => {
       this.deptZyList = data;
+			if(data.startStatus==202){
+				this.isStartFixedType = true
+			}else{
+				this.isStartFixedType = false
+			}
+			if(data.endStatus==202){
+				this.isEndFixedType = true
+			}else{
+				this.isEndFixedType = false
+			}
+			
       // 预约start
       this.currentTasktype = data.taskType;
       this.isYyInspect = false;
@@ -4672,6 +4685,16 @@ export class FuwutaiComponent implements OnInit {
     // 返回值的status是205 则是固定科室类型，会返回科室列表
     this.mainService.getdeptList(value).subscribe((data:any) => {
       this.deptQtList = data;
+			if(data.startStatus==202){
+				this.isStartFixedType = true
+			}else{
+				this.isStartFixedType = false
+			}
+			if(data.endStatus==202){
+				this.isEndFixedType = true
+			}else{
+				this.isEndFixedType = false
+			}
       // 预约start
       this.currentTasktype = data.taskType;
       this.isYyInspect = false;

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

@@ -585,7 +585,7 @@
                                             <nz-form-item>
                                               <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', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
+                                                <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" nzPlaceHolder="请选择起点科室">
                                                   <ng-container *ngFor="let option of buildMsg.start.start.list">
                                                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                                                     </nz-option>
@@ -607,7 +607,7 @@
                                             <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', buildMsg, $event)" nzAllowClear nzPlaceHolder="请选择目标科室">
+                                                <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" nzAllowClear nzPlaceHolder="请选择目标科室">
                                                   <ng-container *ngFor="let option of buildMsg.end.end.list">
                                                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                                                     </nz-option>
@@ -629,7 +629,7 @@
                                             <nz-form-item>
                                               <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', buildMsg, $event)" nzPlaceHolder="请选择起点科室">
+                                                <nz-select class="w100" formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" nzPlaceHolder="请选择起点科室">
                                                   <ng-container *ngFor="let option of buildMsg.start.start.list">
                                                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                                                     </nz-option>
@@ -644,7 +644,7 @@
                                             <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', buildMsg, $event)" nzPlaceHolder="请选择目标科室">
+                                                <nz-select class="w100" formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType" nzPlaceHolder="请选择目标科室">
                                                   <ng-container *ngFor="let option of buildMsg.end.end.list">
                                                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id">
                                                     </nz-option>
@@ -1499,7 +1499,7 @@
               <!-- 需要预约检查 -->
               <nz-form-item class="pos-item">
                 <nz-form-control>
-                  <label class="mt13" nz-checkbox [nzDisabled]="(!linkCheckLisTrue && currentTasktype.associationType.value === 'inspect') || (linkCheckLisTrue && allowUrgent == 1 && currentTasktype.associationType.value === 'inspect') || (allowUrgent == 1 && currentTasktype.associationType.value === 'patientTransport')" [(ngModel)]="isYyInspect" (ngModelChange)="yyInspectChange($event)" [ngModelOptions]="{ standalone: true }" style="font-weight: bold">需要预约检查</label>
+                  <label class="mt13" nz-checkbox [nzDisabled]="(!linkCheckLisTrue && currentTasktype.associationType.value === 'inspect') || (linkCheckLisTrue && allowUrgent == 1 && currentTasktype.associationType.value === 'inspect') || (allowUrgent == 1 && currentTasktype.associationType.value === 'patientTransport')" [(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>
@@ -1543,7 +1543,7 @@
             <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.status == 100015 || checkedShowMsg.status == 100013">
               <nz-form-label [nzSpan]="3" nzRequired nzFor="originOffice">起点科室</nz-form-label>
               <nz-form-control [nzSpan]="21" nzErrorTip="请选择起点科室!">
-                <nz-select formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('start', checkedShowMsg, $event)" nzPlaceHolder="请选择起点科室">
+                <nz-select formControlName="originOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isStartFixedType" nzPlaceHolder="请选择起点科室">
                   <ng-container *ngFor="let option of checkedShowMsg.start.start.list">
                     <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
                   </ng-container>
@@ -1571,14 +1571,14 @@
             <nz-form-item class="top16bottom0" nz-row *ngIf="checkedShowMsg.status == 100014 || checkedShowMsg.status == 100015">
               <nz-form-label [nzSpan]="3" nzRequired nzFor="targetOffice">目标科室</nz-form-label>
               <nz-form-control [nzSpan]="21" nzErrorTip="请选择目标科室!">
-                <nz-select formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchDept('target', checkedShowMsg, $event)" nzPlaceHolder="请选择目标科室">
+                <nz-select formControlName="targetOffice" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="isEndFixedType"  nzPlaceHolder="请选择目标科室">
                   <ng-container *ngFor="let option of checkedShowMsg.end.end.list">
-                    <nz-option *ngIf="true" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
+                    <nz-option [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>
                   </ng-container>
-                  <nz-option *ngIf="false" nzDisabled nzCustomContent>
+                <!--  <nz-option *ngIf="false" nzDisabled nzCustomContent>
                     <i nz-icon nzType="loading" class="loading-icon"></i>
                     搜索中...
-                  </nz-option>
+                  </nz-option> -->
                 </nz-select>
               </nz-form-control>
             </nz-form-item>
@@ -2384,6 +2384,29 @@
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
+				<nz-form-item>
+					<nz-form-label [nzSm]="4" [nzXs]="4" nzFor="description">图片上传</nz-form-label>
+					<nz-form-control style="display: inline-block;" *ngIf="repairImgs.length === 0">
+					  <nz-upload nzListType="picture-card" [(nzFileList)]="fileList" 
+						[nzShowUploadList]="showUploadList" [nzPreview]="handlePreview" 
+						nzFileType="image/jpeg,image/png" nzAccept="image/jpeg,image/png" 
+						[nzShowButton]="fileList.length < 3" 
+						[nzBeforeUpload]="beforeUpload" [nzAction]="temporarilyUrl" 
+						[nzSize]="10240">
+					    <i nz-icon nzType="plus"></i>
+					    <div class="ant-upload-text">上传照片</div>
+					  </nz-upload>
+					  <nz-modal [nzVisible]="previewVisible" [nzContent]="modalContent" [nzFooter]="null" (nzOnCancel)="previewVisible = false">
+					    <ng-template #modalContent>
+					      <img [src]="previewImage" [ngStyle]="{ width: '100%' }" />
+					    </ng-template>
+					  </nz-modal>
+					  <div class="tips">只支持.jpg.png.jpg 格式，最多上传3 张图片。</div>
+					</nz-form-control>
+					<div class="thumbList" *ngIf="repairImgs.length > 0">
+					  <div class="thumb" *ngFor="let item of repairImgs;let index = index;" (click)="previewImageHandler(repairImgs, index)"><img [src]="item.thumbFilePath" alt=""></div>
+					</div>
+				</nz-form-item>
         <nz-form-item>
           <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="contacts">联系人</nz-form-label>
           <nz-form-control style="display: inline-block;">

src/app/views/hushijiandan/hushijiandan.component.less

@@ -2641,7 +2641,7 @@
   font-size: 18px;
   margin-top: 8px;
   &.col6{
-    width: 16.666%;
+    width: 20%;
   }
   &.mt13{
     margin-top: 13px;
@@ -2695,7 +2695,7 @@
         }
       }
       .patientForm{
-        padding: 16px 24px;
+        padding: 16px 15px;
         .noInspect{
           font-size: 18px;
         }

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

@@ -17,12 +17,13 @@ import http from "../../../assets/js/http";
 import { MainService } from "../../services/main.service";
 import { WebsocketNurseService } from "../../services/websocket-nurse.service";
 
-import { NzMessageService } from "ng-zorro-antd";
+import { NzMessageService, UploadFile } from "ng-zorro-antd";
 import { NzNotificationService } from "ng-zorro-antd/notification";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
-import { debounceTime } from "rxjs/operators";
+import { debounceTime, filter } from "rxjs/operators";
+import { HttpRequest, HttpResponse, HttpClient } from '@angular/common/http';
 import {
   format,
   getMinutes,
@@ -127,7 +128,9 @@ export class HushijiandanComponent implements OnInit {
     private mainService: MainService,
     private notification: NzNotificationService,
     private webs: WebsocketNurseService,
-    public tool: ToolService
+    public tool: ToolService,
+		public http: HttpClient
+		
   ) {
     this.othersListOptions = {
       onUpdate: (event: any) => {
@@ -310,7 +313,78 @@ export class HushijiandanComponent implements OnInit {
     this.coopBtns = coopBtns;
     console.log(this.coopBtns);
   }
-
+	
+	// 预览图片
+	imgs = [];
+	isPreview = false;
+	initialViewIndex:number = 0;
+	previewImageHandler(data = [], index = 0) {
+	  this.initialViewIndex = index;
+	  console.log(index)
+	  this.isPreview = false;
+	  data = data || [];
+	  this.imgs = data.map((v) => location.origin + '/file' + v.relativeFilePath);
+	  setTimeout(() => {
+	    this.isPreview = true;
+	  }, 0)
+	}
+	
+	// 图片相关
+	showUploadList = {
+	  showPreviewIcon: true,
+	  showRemoveIcon: true,
+	  hidePreviewIconInNonImage: true
+	};
+	fileList = [
+	  // {
+	  //   uid: -1,
+	  //   name: 'xxx.png',
+	  //   status: '1',
+	  //   url: 'https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png'
+	  // }
+	];
+	previewImage: string | undefined = '';
+	previewVisible = false;
+	repairImgs:any[] = [];//报修图片
+	handlePreview = (file: UploadFile) => {
+		console.log('file1:', file)
+	  this.previewImage = file.url || file.thumbUrl;
+	  this.previewVisible = true;
+	};
+	
+	beforeUpload = (file: UploadFile): boolean => {
+		console.log('file2:', file)
+	  this.fileList = [...this.fileList, file];
+	  setTimeout(async () => {
+	    file.url = await this.getBase64(file);
+	  }, 0);
+	  console.log('this.fileList:', this.fileList)
+	  return true;
+	};
+	
+	getBase64(file: any): Promise<any> {
+	  return new Promise((resolve, reject) => {
+	    const reader = new FileReader();
+	    reader.readAsDataURL(file);
+	    reader.onload = () => resolve(reader.result);
+	    reader.onerror = error => reject(error);
+	  });
+	}
+	
+	// 临时上传图片
+	temporarilyUrl = this.mainService.returnUploadUrl('wechatRequesterIncident', 0);
+	
+	// 图片上传
+	uploadImages(file, id){
+	  const formData = new FormData();
+	  formData.append('file', file);
+	  formData.append('fileName', file.name);
+	  const req = new HttpRequest('Post', this.mainService.returnUploadUrl('wechatRequesterIncident', id), formData, {
+	    reportProgress: true
+	  });
+	  return this.http.request(req).pipe(filter(e => e instanceof HttpResponse)).toPromise();
+	}
+	
 	// 获取任务类型（病理标本）
 	taskTypeData:any;
 	getTaskTypesId() {
@@ -1489,11 +1563,13 @@ export class HushijiandanComponent implements OnInit {
     }).messageId;
     this.bxModal = true;
     this.coopBx = data || {};
+		this.fileList = [];
     this.initBxForm(this.coopBx.content);
   }
   // 隐藏模态框
   hideBxModal() {
     this.bxModal = false;
+		this.fileList = [];
   }
   // 确认
   confirmBx() {
@@ -1554,7 +1630,7 @@ export class HushijiandanComponent implements OnInit {
     }
     this.mainService.getDictionary("list", "incident_source").subscribe((source:any) => {
       let incidentSourceList = source || [];
-      let im = incidentSourceList.find(v => v.value === 'im');
+      let pc = incidentSourceList.find(v => v.value === 'pc');
       this.mainService.getDictionary("list", "repair_incident_type").subscribe((result) => {
         let repairIncidentTypeList = result || [];
         let repairIncidentType = repairIncidentTypeList.find(v => v.value === 'dept');
@@ -1569,7 +1645,7 @@ export class HushijiandanComponent implements OnInit {
               contacts: this.validateBxForm.value.contacts,
               contactsInformation: this.validateBxForm.value.contactsInformation,
               hosId: this.deptDto.hospital.id,
-              source: im,
+              source: pc,
               fromWx: true,
               requester: this.loginUser,
               acceptUser: this.loginUser,
@@ -1587,6 +1663,13 @@ export class HushijiandanComponent implements OnInit {
             this.bxModal = false;
             this.hideReqModal();
             if ((res as any).state == 200) {
+							// 图片上传
+							if(this.fileList.length){
+								console.log(this.fileList.map(v => v.originFileObj));
+								this.fileList.map(v => v.originFileObj).forEach(async file => {
+									await this.uploadImages(file, res.data.id);
+								})
+							}
               this.showPromptModal("提交", true, "");
               this.checkTable("bxlb");
             } else {
@@ -2975,6 +3058,8 @@ export class HushijiandanComponent implements OnInit {
   currentTasktype; //当前选中的任务类型对象
   cLoading = false;
   historyCustomRemarks2 = [];
+	isStartFixedType:boolean = false;
+	isEndFixedType:boolean = false;
   changeCheckedType(isInit = false) {
     isInit && (this.inspectToday = new Date());
     this.customRemarks2 = [];
@@ -3038,6 +3123,20 @@ export class HushijiandanComponent implements OnInit {
         this.maskFlag = false;
         this.patientModal = true;
         that.checkedShowMsg = data;
+				if(data.end){
+					if(data.end.end.departmentStrategy==202){
+						this.isEndFixedType = true
+					}else{
+						this.isEndFixedType = false
+					}
+				}
+				if(data.start){
+					if(data.start.start.departmentStrategy==202){
+						this.isStartFixedType = true
+					}else{
+						this.isStartFixedType = false
+					}
+				}
         if (that.checkedShowMsg.status != 200) {
           that.isRemand = data.isRemand == 1 ? true : false;
         }
@@ -3305,6 +3404,20 @@ export class HushijiandanComponent implements OnInit {
       .subscribe((result) => {
         this.buildMsg = result;
         if (result.remarksSwitch == 1) {
+					if(result.end){
+						if(result.end.end.departmentStrategy==202){
+							this.isEndFixedType = true
+						}else{
+							this.isEndFixedType = false
+						}
+					}
+					if(result.start){
+						if(result.start.start.departmentStrategy==202){
+							this.isStartFixedType = true
+						}else{
+							this.isStartFixedType = false
+						}
+					}
           if (result.customRemarks === null || result.customRemarks === "") {
             this.customRemarks = [];
           } else {