src/app/services/main.service.ts

@@ -38,7 +38,7 @@ export class MainService {
     let data:any = {
       username: name,
       password: pwd,
-			captcha: captcha, 
+			captcha: captcha,
 			captchaId: captchaId,
       type: "PC",
     };
@@ -325,10 +325,10 @@ export class MainService {
     });
   }
   //服务台新建工单—调度台建单获取起点科室或者终点科室列表
-  getdeptList(taskTypeId, patientCode?, startTime?, endTime?) {
+  getdeptList(taskTypeId, applyDeptId?, patientCode?, startTime?, endTime?) {
     return this.http.post(
       host.host + "/ser/getdeptList",
-      { taskTypeId, patientCode: patientCode || undefined, startTime, endTime },
+      { taskTypeId, patientDeptId: applyDeptId || undefined,  patientCode: patientCode || undefined, startTime, endTime },
       { headers: this.headers }
     );
   }
@@ -1272,19 +1272,19 @@ export class MainService {
 		  headers: this.headers,
 		});
 	}
-	
+
 	// 故障工单-告警信息-建单
 	addAlarmIncident(data){
 		return this.http.post(host.host + `/flow/incident/task/createAlarmIncident`, data, {
 		  headers: this.headers,
 		});
 	}
-	
+
 	// 获取登录验证码
 	getLoginCode(data){
 		return this.http.get(host.host + "/auth/captcha", {});
 	}
-	
+
 	// 根据包号查看标本
 	getInfoPack(packageId, data){
 		return this.http.post(host.host + `/nurse/specimen/getInfo/${packageId}`, data);

src/app/share/add-inspect-info/add-inspect-info.component.html

@@ -3,6 +3,23 @@
     <div class="title">新增检查信息<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     <div class="content">
       <div class="tableWrap">
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red"></i>申请科室：</div>
+            <div class="value">
+              <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="inspectData.applyDeptId" nzShowSearch nzPlaceHolder="请选择申请科室" nzServerSearch (nzOnSearch)="searchApplyDept($event)" (nzOpenChange)="openApplyDept($event)" (ngModelChange)="changeApplyDept($event)">
+                <ng-container *ngFor="let data of applyDeptList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id">
+                  </nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </div>
+          </div>
+        </div>
+
         <div class="row">
           <div class="formItem flex_1">
             <div class="name"><i class="icon_transport transport-required red"></i>患者信息：</div>

src/app/share/add-inspect-info/add-inspect-info.component.ts

@@ -33,6 +33,7 @@ export class AddInspectInfoComponent implements OnInit {
   }; //检查项目
   changeInspectSubject = new Subject(); //防抖
   changePatientSubject = new Subject(); //防抖
+  changeApplyDeptSubject = new Subject(); //防抖
 
   ngOnInit() {
     //防抖
@@ -42,6 +43,9 @@ export class AddInspectInfoComponent implements OnInit {
     this.changePatientSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.getPatientList(v[0]);
     });
+    this.changeApplyDeptSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getApplyDeptList(v[0]);
+    });
     this.hosId = this.tool.getCurrentHospital().id;
     this.currentDept = this.tool.getCurrentUserDept();
   }
@@ -75,6 +79,10 @@ export class AddInspectInfoComponent implements OnInit {
     this.patientDTO = this.patientList.find(v => v.id == this.inspectData.patientId) || {};
   }
 
+  changeApplyDept(e){
+    this.inspectData.patientId = undefined;
+  }
+
   // 关闭弹窗
   hideModal() {
     this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
@@ -139,9 +147,46 @@ export class AddInspectInfoComponent implements OnInit {
     }
   }
 
+  // =========================申请科室=====================
+  applyDeptList: Array<any>; //申请科室列表
+  // 获取申请科室
+  getApplyDeptList(keyword = '') {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      department:{
+	  		hospital: {
+					id: this.hosId
+				},
+				dept: keyword
+	  	}
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department",postData)
+      .subscribe((data:any) => {
+        this.isLoading = false;
+        this.applyDeptList = data.list || [];
+      });
+  }
+
+  // 边输边搜节流阀
+  searchApplyDept(e) {
+    this.isLoading = true;
+    this.changeApplyDeptSubject.next([e]);
+  }
+
+  // 打开
+  openApplyDept(e){
+    if(e){
+      this.getApplyDeptList();
+    }
+  }
+  // =========================申请科室=====================
+
   // =========================患者=====================
-  patientList: Array<any>; //检查项目列表
-  // 获取检查项目
+  patientList: Array<any>; //患者列表
+  // 获取患者
   getPatientList(keyword = '') {
     let postData = {
       idx: 0,
@@ -149,6 +194,7 @@ export class AddInspectInfoComponent implements OnInit {
       hosId: this.hosId,
       patientName: keyword || undefined,
       hasBedNum: 1,//有床号
+      department: this.inspectData.applyDeptId,
     };
     this.isLoading = true;
     this.mainService

src/app/share/edit-inspect-info2/edit-inspect-info2.component.html

@@ -0,0 +1,87 @@
+<div class="save add display_flex align-items_center justify-content_flex-center">
+  <div class="modalBody">
+    <div class="title">修改检查信息<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+    </div>
+    <div class="content">
+      <div class="addForm">
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red"></i>申请科室：</div>
+            <div class="value">
+              <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="inspectData.applyDeptId" nzPlaceHolder="请选择申请科室" nzShowSearch nzServerSearch (nzOnSearch)="searchApplyDept($event)" (nzOpenChange)="openApplyDept($event)" (ngModelChange)="changeApplyDept($event)">
+                <ng-container *ngFor="let data of applyDeptList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id">
+                  </nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red"></i>患者信息：</div>
+            <div class="value">
+              <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="inspectData.patientId" nzPlaceHolder="请选择患者信息" nzShowSearch nzServerSearch (nzOnSearch)="searchPatient($event)" (nzOpenChange)="openPatient($event)" (ngModelChange)="changePatient($event)">
+                <ng-container *ngFor="let data of patientList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.patientName + '(' + (data.bedNum || '') + ')' + '-' + data.residenceNo" [nzValue]="data.id">
+                  </nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red"></i>检查科室：</div>
+            <div class="value">
+              <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" [(ngModel)]="deptId" nzPlaceHolder="请选择检查科室">
+                <ng-container *ngFor="let data of deptList">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="data.dept" [nzValue]="data.id">
+                  </nz-option>
+                </ng-container>
+                <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+                </nz-option>
+              </nz-select>
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red"></i>预约时间：</div>
+            <div class="value">
+              <nz-date-picker [(ngModel)]="yyDate" [nzShowToday]="false"></nz-date-picker>
+              <nz-time-picker [nzDisabled]="!yyDate" class="ml8" nzFormat="HH:mm" [(ngModel)]="yyTime" [nzAllowEmpty]="false">
+              </nz-time-picker>
+              <button [disabled]="!yyDate" nz-button nzType="primary" class="ml8 mt0" (click)="nextDay()">
+                下一日
+              </button>
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>医生备注：</div>
+            <div class="value">
+              <input class="w100" nz-input placeholder="请填写医生备注" [(ngModel)]="remark" />
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button nzType="primary" nz-button (click)="submitForm()">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/share/edit-inspect-info2/edit-inspect-info2.component.less

@@ -0,0 +1,160 @@
+.yyTimeError {
+  ::ng-deep .ant-time-picker-input,
+  ::ng-deep .ant-calendar-picker-input {
+    border: 1px solid red !important;
+  }
+}
+.transport-required{
+  font-size: 10px;
+  margin-right: 4px;
+  position: relative;
+  bottom: 2px;
+}
+.row{
+  display: flex;
+  align-items: center;
+  text-align: left;
+  margin-top: 32px;
+  &:first-of-type{
+    margin-top: 0;
+  }
+  .formItem{
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-right: 24px;
+    &:last-of-type{
+      margin-right: 0;
+    }
+    .name{}
+    .value{
+      flex: 1;
+    }
+  }
+}
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      .tips{
+        margin-bottom: 19px;
+      }
+
+      div {
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 16px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 560px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 32px 16px;
+        max-height: 500px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button:nth-child(1) {
+        margin-right: 20px;
+      }
+    }
+  }
+}

src/app/share/edit-inspect-info2/edit-inspect-info2.component.ts

@@ -0,0 +1,203 @@
+import { Component, OnInit, Output, Input } from '@angular/core';
+import { EventEmitter } from '@angular/core';
+import { NzMessageService } from 'ng-zorro-antd';
+import { addDays, startOfMinute, format } from 'date-fns';
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { ToolService } from 'src/app/services/tool.service';
+import { MainService } from '../../services/main.service';
+
+@Component({
+  selector: 'app-edit-inspect-info2',
+  templateUrl: './edit-inspect-info2.component.html',
+  styleUrls: ['./edit-inspect-info2.component.less']
+})
+
+export class EditInspectInfo2Component implements OnInit {
+  @Input() date:any;
+  @Input() execDeptId:any;
+  @Input() remarkText:any;
+  @Input() applyDept:any = {};
+  @Input() patient:any = {};
+  @Input() execDeptList:any[] = [];
+  @Output() submitFormHand = new EventEmitter();
+  @Output() cancelFlagHand = new EventEmitter();
+  yyDate = null; //预约日期-患者其他服务
+  yyTime = null; //预约时间-患者其他服务
+  deptId = null;
+  remark = '';
+  deptList:any[] = [];
+  isLoading:boolean = false;
+  hosId;
+
+  changePatientSubject = new Subject(); //防抖
+  changeApplyDeptSubject = new Subject(); //防抖
+
+  constructor(
+    private message: NzMessageService,
+    private tool: ToolService,
+    private mainService: MainService,
+  ) { }
+
+  ngOnInit() {
+    this.changePatientSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getPatientList(v[0]);
+    });
+    this.changeApplyDeptSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.getApplyDeptList(v[0]);
+    });
+
+    this.hosId = this.tool.getCurrentHospital().id;
+
+    if(this.applyDept){
+      this.inspectData.applyDeptId = this.applyDept.id;
+      this.applyDeptList = [this.applyDept];
+    }
+
+    if(this.patient){
+      this.inspectData.patientId = this.patient.id;
+      this.patientList = [this.patient];
+    }
+
+    if(this.date){
+      this.yyDate = new Date(this.date);
+      this.yyTime = new Date(this.date);
+    }
+
+    if(this.execDeptList){
+      this.deptList = this.execDeptList;
+    }
+
+    console.log('this.remarkText:', this.remarkText)
+    if(this.remarkText){
+      this.remark = this.remarkText;
+    }
+
+    if(this.execDeptId){
+      let flag = this.deptList.some(v => v.id == this.execDeptId);
+      if(flag){
+        this.deptId = this.execDeptId;
+      }
+    }
+  }
+
+  patientDTO:any = {};
+  inspectData:any = {}; //检查项目
+  changePatient(e){
+    this.patientDTO = this.patientList.find(v => v.id == this.inspectData.patientId) || {};
+  }
+
+  changeApplyDept(e){
+    this.inspectData.patientId = undefined;
+  }
+
+  // =========================申请科室=====================
+  applyDeptList: Array<any>; //申请科室列表
+  // 获取申请科室
+  getApplyDeptList(keyword = '') {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      department:{
+	  		hospital: {
+					id: this.hosId
+				},
+				dept: keyword
+	  	}
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department",postData)
+      .subscribe((data:any) => {
+        this.isLoading = false;
+        this.applyDeptList = data.list || [];
+      });
+  }
+
+  // 边输边搜节流阀
+  searchApplyDept(e) {
+    this.isLoading = true;
+    this.changeApplyDeptSubject.next([e]);
+  }
+
+  // 打开
+  openApplyDept(e){
+    if(e){
+      this.getApplyDeptList();
+    }
+  }
+  // =========================申请科室=====================
+
+  // =========================患者=====================
+  patientList: Array<any>; //患者列表
+  // 获取患者
+  getPatientList(keyword = '') {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      hosId: this.hosId,
+      patientName: keyword || undefined,
+      hasBedNum: 1,//有床号
+      department: this.inspectData.applyDeptId,
+    };
+    this.isLoading = true;
+    this.mainService
+      .listMsgByMain('listPatient',postData)
+      .subscribe((data:any) => {
+        this.isLoading = false;
+        this.patientList = data.list || [];
+      });
+  }
+
+  // 边输边搜节流阀
+  searchPatient(e) {
+    this.isLoading = true;
+    this.changePatientSubject.next([e]);
+  }
+
+  // 打开
+  openPatient(e){
+    if(e){
+      this.getPatientList();
+    }
+  }
+  // =========================患者=====================
+
+  // 下一日(患者其他服务)
+  nextDay() {
+    this.yyDate = addDays(this.yyDate, 1);
+  }
+
+  // 隐藏模态框
+  hideModal() {
+    this.cancelFlagHand.emit(false)
+  }
+
+  // 表单提交
+  submitForm(): void {
+    if(!this.inspectData.applyDeptId) {
+      this.message.warning('请选择申请科室！');
+      return;
+    }
+    if(!this.inspectData.patientId) {
+      this.message.warning('请选择患者信息！');
+      return;
+    }
+    if(!this.deptId) {
+      this.message.warning('请选择检查科室！');
+      return;
+    }
+    if(!this.yyDate || !this.yyTime) {
+      this.message.warning('请选择完整预约时间！');
+      return;
+    }
+    this.submitFormHand.emit({
+      applyDeptId: this.inspectData.applyDeptId,
+      patientDTO: this.patientList.find(v => v.id == this.inspectData.patientId),
+      deptId: this.deptId,
+      remark: this.remark,
+      date: format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'),
+    });
+  }
+}
+

src/app/share/share.module.ts

@@ -62,6 +62,7 @@ import { StringToFirstValuePipe } from '../pipes/string-to-first-name.pipe';
 import { BusinessDataDetailInfoModalComponent } from './businessData-detail-info-modal/businessData-detail-info-modal.component';
 import { SelectDateComponent } from './select-date/select-date.component';
 import { EditInspectInfoComponent } from './edit-inspect-info/edit-inspect-info.component';
+import { EditInspectInfo2Component } from './edit-inspect-info2/edit-inspect-info2.component';
 import { AddInspectInfoComponent } from './add-inspect-info/add-inspect-info.component';
 import { SelectRemarkComponent } from './select-remark/select-remark.component';
 import { AddInspectModalComponent } from './add-inspect-modal/add-inspect-modal.component';
@@ -140,6 +141,7 @@ import { ViewSpecimenComponent } from './view-specimen/view-specimen.component';
     MedicalWasteLogPromptModalComponent,
     SelectDateComponent,
     EditInspectInfoComponent,
+    EditInspectInfo2Component,
     AddInspectInfoComponent,
     SelectRemarkComponent,
     AddInspectModalComponent,
@@ -226,6 +228,7 @@ import { ViewSpecimenComponent } from './view-specimen/view-specimen.component';
     MedicalWasteLogPromptModalComponent,
     SelectDateComponent,
     EditInspectInfoComponent,
+    EditInspectInfo2Component,
     AddInspectInfoComponent,
     SelectRemarkComponent,
     AddInspectModalComponent,

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

@@ -5094,7 +5094,7 @@ export class FuwutaiComponent implements OnInit {
     }
 		if (type === "start" && this.deptZyList["startStatus"] == 202) {
 		  //固定科室范围，禁止搜索
-			this.mainService.getdeptList(this.radioValueZy).subscribe((data:any) => {
+			this.mainService.getdeptList(this.radioValueZy, this.applyDept).subscribe((data:any) => {
 				if(data.startDept){
 					data.startDept.forEach(i=>{
 						if(i.inputcode){
@@ -5114,7 +5114,7 @@ export class FuwutaiComponent implements OnInit {
 		  return;
 		} else if (type === "end" && this.deptZyList["endStatus"] == 202) {
 		  //固定科室范围，禁止搜索
-			this.mainService.getdeptList(this.radioValueZy).subscribe((data:any) => {
+			this.mainService.getdeptList(this.radioValueZy, this.applyDept).subscribe((data:any) => {
 				if(data.endDept){
 					data.endDept.forEach(i=>{
 						if(i.inputcode){
@@ -5192,7 +5192,7 @@ export class FuwutaiComponent implements OnInit {
     }
     if (type === "start" && this.deptQtList["startStatus"] == 202) {
       //固定科室范围，禁止搜索
-			this.mainService.getdeptList(this.psValue).subscribe((data:any) => {
+			this.mainService.getdeptList(this.psValue, this.applyDept).subscribe((data:any) => {
 				if(data.startDept){
 					data.startDept.forEach(i=>{
 						if(i.inputcode){
@@ -5212,7 +5212,7 @@ export class FuwutaiComponent implements OnInit {
       return;
     } else if (type === "end" && this.deptQtList["endStatus"] == 202) {
       //固定科室范围，禁止搜索
-			this.mainService.getdeptList(this.psValue).subscribe((data:any) => {
+			this.mainService.getdeptList(this.psValue, this.applyDept).subscribe((data:any) => {
 				if(data.endDept){
 					data.endDept.forEach(i=>{
 						if(i.inputcode){
@@ -5557,7 +5557,7 @@ export class FuwutaiComponent implements OnInit {
     // 返回值的status是204 则让前端自己调用科室搜索接口-自主填写
     // 返回值的status是205 则是固定科室类型，会返回科室列表
     // 返回值的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.mainService.getdeptList(value, this.applyDept, 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) => {
 			if(data.startDept){
 				data.startDept.forEach(i=>{
 					if(i.inputcode){
@@ -5749,7 +5749,7 @@ export class FuwutaiComponent implements OnInit {
     // 返回值的status是203 则是固定科室，会返回单个科室
     // 返回值的status是204 则让前端自己调用科室搜索接口
     // 返回值的status是205 则是固定科室类型，会返回科室列表
-    this.mainService.getdeptList(value).subscribe((data:any) => {
+    this.mainService.getdeptList(value, this.applyDept).subscribe((data:any) => {
 			if(data.startDept){
 				data.startDept.forEach(i=>{
 					if(i.inputcode){
@@ -7268,7 +7268,7 @@ export class FuwutaiComponent implements OnInit {
         patientCode = undefined;
       }
 
-      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.mainService.getdeptList(value, this.applyDept, 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.linkCheckLis = [];
         if(data.data && Array.isArray(data.data.data) && data.data.data.length) {
           let arr = [];
@@ -7334,7 +7334,7 @@ export class FuwutaiComponent implements OnInit {
 
   refreshInspectList(){
     this.linkCheckLis = [];
-    this.mainService.getdeptList(this.radioValueZy, this.patientZy, format(startOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss')).subscribe((data:any) => {
+    this.mainService.getdeptList(this.radioValueZy, this.applyDept, this.patientZy, format(startOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss'), format(endOfDay(this.inspectToday), 'yyyy-MM-dd HH:mm:ss')).subscribe((data:any) => {
       if (data.data && Array.isArray(data.data.data) && data.data.data.length) {
         let arr = [];
         data.data.data.forEach((e) => {

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

@@ -100,7 +100,7 @@
 </app-prompt-modal>
 
 <!-- 修改检查 -->
-<app-edit-inspect-info [execDeptList]="coopData.inspectCheckType && coopData.inspectCheckType.deptList" [execDeptId]="coopData.execDept && coopData.execDept.id" [remarkText]="coopData.remark" [date]="coopData.yyTime" *ngIf="isShowSelectDate" (submitFormHand)="submitSelectDate($event)" (cancelFlagHand)="cancelSelectDate($event)"></app-edit-inspect-info>
+<app-edit-inspect-info2 [patient]="coopData.patientDTO" [applyDept]="coopData.applyDept" [execDeptList]="coopData.inspectCheckType && coopData.inspectCheckType.deptList" [execDeptId]="coopData.execDept && coopData.execDept.id" [remarkText]="coopData.remark" [date]="coopData.yyTime" *ngIf="isShowSelectDate" (submitFormHand)="submitSelectDate($event)" (cancelFlagHand)="cancelSelectDate($event)"></app-edit-inspect-info2>
 
 <!-- 新增检查 -->
 <app-add-inspect-info *ngIf="isShowAddInspect" (closeModelHs)="closeAddInspectModel($event)" (confirmModelHs)="confirmAddInspectModel($event)"></app-add-inspect-info>

src/app/views/inspect-search/inspect-search.component.ts

@@ -217,7 +217,7 @@ export class InspectSearchComponent implements OnInit {
         patientName: obj.patientDTO.patientName,
         barCode: obj.patientDTO.barCode,
         inspectCheckType: { id: obj.inspectData.id },
-        applyDeptId: this.tool.getCurrentUserDept().id,
+        applyDeptId: obj.inspectData.applyDeptId,
         execDeptId: obj.inspectData.execDeptId,
         bedNum: obj.patientDTO.bedNum,
         hosId: this.searchCriteria.hospital,
@@ -252,12 +252,17 @@ export class InspectSearchComponent implements OnInit {
 
   // 修改检查项目-确定
   maskFlag: any = false;
-  submitSelectDate({date, deptId, remark}){
+  submitSelectDate({date, deptId, remark, applyDeptId, patientDTO}){
     let postData = {
       id: this.coopData.id,
       yyTime: date || undefined,
       execDeptId: deptId,
       remark,
+      applyDeptId,
+      patientCode: patientDTO.patientCode,
+      patientName: patientDTO.patientName,
+      barCode: patientDTO.barCode,
+      bedNum: patientDTO.bedNum,
     }
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,

upload/production.js

@@ -1,11 +1,11 @@
 const shell = require('shelljs')
 const path = require('path');
 const config = {
-  ip: "47.113.226.223", // ssh地址
+  ip: "47.115.219.94", // ssh地址
   username: "root", // ssh 用户名
   port: 22,      //端口
   password: "DStech@123", // ssh 密码
-  path: '/home/itsm/project/html2/pc', // 上传地址,删除地址
+  path: '/home/itsm/project/front/pc', // 上传地址,删除地址
   buildPath: '../dist/pc' // 本地打包后文件地址
 }
 let Client = require('ssh2-sftp-client');