陪检优化

src/app/services/main.service.ts

@@ -1155,4 +1155,11 @@ export class MainService {
 		});
 	}
 
+  // 护士端-批量陪检图标下两个数字
+	getPatientInspectCount(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/getPatientInspectCount`, data, {
+		  headers: this.headers,
+		});
+	}
+
 }

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

@@ -65,21 +65,17 @@ export class AddInspectModalComponent implements OnInit {
   }
 
   refreshData1Status(): void {
-    this.isAllDisplayData1Checked = this.listOfDisplayData1.every(
+    this.isAllDisplayData1Checked = this.listOfDisplayData1.length ? this.listOfDisplayData1.every(
       (item) => this.mapOfCheckedData1Id[item.id]
-    );
-    this.isIndeterminateData1 =
-      this.listOfDisplayData1.some((item) => this.mapOfCheckedData1Id[item.id]) &&
-      !this.isAllDisplayData1Checked;
+    ) : false;
+    this.isIndeterminateData1 = this.listOfDisplayData1.some((item) => this.mapOfCheckedData1Id[item.id]) && !this.isAllDisplayData1Checked;
   }
 
   refreshData2Status(): void {
-    this.isAllDisplayData2Checked = this.listOfDisplayData2.every(
+    this.isAllDisplayData2Checked = this.listOfDisplayData2.length ? this.listOfDisplayData2.every(
       (item) => this.mapOfCheckedData2Id[item.id]
-    );
-    this.isIndeterminateData2 =
-      this.listOfDisplayData2.some((item) => this.mapOfCheckedData2Id[item.id]) &&
-      !this.isAllDisplayData2Checked;
+    ) : false;
+    this.isIndeterminateData2 = this.listOfDisplayData2.some((item) => this.mapOfCheckedData2Id[item.id]) && !this.isAllDisplayData2Checked;
   }
 
   // 开通科室选择整行

src/app/share/select-date-yytime/select-date-yytime.component.html

@@ -3,6 +3,7 @@
     <div class="title">修改预约时间<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
     </div>
     <div class="content">
+      <div class="tips">是否需要预约执行，如需预约请您选择时间</div>
       <div class="addForm">
         <div class="display_flex align-items_center">
           <div>

src/app/share/select-date-yytime/select-date-yytime.component.ts

@@ -23,6 +23,8 @@ export class SelectDateYytimeComponent implements OnInit {
     if(this.date){
       this.yyDate = new Date(this.date);
       this.yyTime = new Date(this.date);
+    }else{
+      this.yyDate = new Date();
     }
   }
 

src/app/views/batch-inspection/batch-inspection.component.ts

@@ -365,15 +365,15 @@ export class BatchInspectionComponent implements OnInit {
   // 批量发起陪检
   isShowSelectDateYytime:boolean = false;
   addYytime(){
-    let obj1 = this.listOfData.find(v => v.tripType);
-    if(!obj1){
-      this.message.warning(`【${obj1.patientName}】请填写出行方式！`)
+    let obj1 = this.listOfData.find(v => !v.tripType);
+    if(obj1){
+      this.message.warning(`${obj1.patientName}患者没有选择出行方式，请调整后提交申请！`)
       return;
     }
 
-    let obj2 = this.listOfData.find(v => v.tripType);
-    if(!obj2){
-      this.message.warning(`【${obj2.patientName}】请追加项目！`)
+    let obj2 = this.listOfData.find(v => !v.inspectList || v.inspectList.length == 0);
+    if(obj2){
+      this.message.warning(`${obj2.patientName}患者没有检验项目，请调整后提交申请！`)
       return;
     }
     this.isShowSelectDateYytime = true;

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

@@ -358,8 +358,8 @@
                           <span *ngIf="item.ordinaryFlag" (click)="changeSpeDetail($event, 0)">普:{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.noUrgent : 0 }}</span>
                         </div>
                         <div class="navSpecimen" *ngIf="item.bussType.value === 'inspect'">
-                          <span>预:0</span>
-                          <span>检:0</span>
+                          <span (click)="changeInspectClosedLoopView($event, '2')">预:{{patientInspectCountMsg.data ? patientInspectCountMsg.data[0].yyCount : 0}}</span>
+                          <span (click)="changeInspectClosedLoopView($event, '3,4')">检:{{patientInspectCountMsg.data ? patientInspectCountMsg.data[0].workingCount : 0}}</span>
                         </div>
                       </div>
                     </div>
@@ -968,7 +968,7 @@
                       </thead>
                       <tbody>
                         <tr *ngFor="let item of outpatientHelpAppointmentList;let i = index">
-                          <td>{{ item.patientName }}<br>{{ item.sex?.name }}<ng-container *ngIf="item.age !== undefined"> {{item.age}}岁</ng-container></td>
+                          <td>{{ item.patientName }}<br>{{ item.sex?.name }}<ng-container *ngIf="item && item.age !== undefined"> {{item.age}}岁</ng-container></td>
                           <td>{{ item.applyType?.name }}<br>{{ item.equipment?.name }}</td>
                           <td>患者：{{ item.patientPhone }}<br>代表：{{ item.agent_phone }}</td>
                           <td>{{ item.escortTime | date:'yyyy-MM-dd HH:mm' }}<br>{{ item.status?.name }}</td>

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

@@ -1241,6 +1241,7 @@ export class HushijiandanComponent implements OnInit {
   refreshSpecimenWorkOrderMsg() {
     this.msgTimerId = setInterval(() => {
       this.getSpecimenWorkOrderMsg();
+      this.getPatientInspectCountMsg();
     }, 60000);
   }
 
@@ -1270,6 +1271,23 @@ export class HushijiandanComponent implements OnInit {
       });
   }
 
+  // 护士端-批量陪检图标下两个数字
+  patientInspectCountMsg: any = {};
+  getPatientInspectCountMsg() {
+    if(this.currentDept.typeValue == 'surgery' && !this.tabSearchCont){
+      return;
+    }
+    let that = this;
+
+    that.mainService
+      .getPatientInspectCount({
+        deptId: JSON.parse(localStorage.getItem("user")).user.dept.id,
+      })
+      .subscribe((data) => {
+        that.patientInspectCountMsg = data;
+      });
+  }
+
   // 手术提示信息
   surgeryLoading = false;
 	now:any = new Date();
@@ -1744,6 +1762,7 @@ export class HushijiandanComponent implements OnInit {
             that.deptTaskTypeRules.openInspection ||
             that.deptTaskTypeRules.openPatientTransport
           ) {
+            this.getPatientInspectCountMsg();
             // 陪检权限或转科权限
             if (this.tabFlag) {
               this.tabFlag = false;
@@ -4469,6 +4488,16 @@ export class HushijiandanComponent implements OnInit {
         }
       });
   }
+
+  // 跳转患者陪检闭环视图
+  changeInspectClosedLoopView(e, stateValue){
+    e.stopPropagation();
+    let queryParams = {
+      department: { id: this.currentDept.id, dept: this.currentDept.dept },
+      stateValue,
+    }
+    this.router.navigateByUrl(`/inspectClosedLoopView?queryParams=${JSON.stringify(queryParams)}`);
+  }
   // 隐藏查看标本详情弹层
   hideSpeDetailModel() {
     this.detailModel = false;

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view.component.less

@@ -8,15 +8,15 @@
   display: flex;
   flex-direction: column;
   .header{
-    height: 64px;
     background-color: #fff;
     display: flex;
     align-items: center;
     justify-content: space-between;
-    padding: 0 24px;
+    padding: 16px 24px 0;
     font-size: 16px;
     .dept{
-      margin-right: 48px;
+      margin-right: 24px;
+      margin-bottom: 16px;
       i{
         font-size: 24px;
         color: #8A8A8A;
@@ -24,18 +24,25 @@
       }
     }
     .patient{
-      margin-left: 24px;
+      margin-right: 16px;
+      display: flex;
+      align-items: center;
+      margin-bottom: 16px;
     }
     .label{
       padding-right: 16px;
       font-size: 14px;
+      flex-shrink: 0;
     }
     .formItem{
-      width: 173px;
+      min-width: 120px;
     }
     .info{
       margin-left: 48px;
     }
+    .btn{
+      margin-bottom: 16px;
+    }
   }
   .table{
     flex: 1;

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, OnDestroy } from '@angular/core';
 import { ToolService } from 'src/app/services/tool.service';
 import { MainService } from 'src/app/services/main.service';
 import { NzMessageService } from 'ng-zorro-antd';
@@ -7,18 +7,20 @@ import { Subject } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import { Location } from '@angular/common';
 import cloneDeep from 'lodash-es/cloneDeep'
+import { ActivatedRoute } from '@angular/router';
 @Component({
   selector: 'app-inspect-closed-loop-view',
   templateUrl: './inspect-closed-loop-view.component.html',
   styleUrls: ['./inspect-closed-loop-view.component.less']
 })
-export class InspectClosedLoopViewComponent implements OnInit {
+export class InspectClosedLoopViewComponent implements OnInit, OnDestroy {
 
   constructor(
     private mainService: MainService,
     private tool: ToolService,
     private message: NzMessageService,
     private _location: Location,
+    private route: ActivatedRoute,
   ) { }
 
   hosId:any = this.tool.getCurrentHospital().id; //当前院区
@@ -28,6 +30,13 @@ export class InspectClosedLoopViewComponent implements OnInit {
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
   searchDto: any = {};
+  autoRefresh:boolean = false;
+  autoRefreshSecond: number = 15;
+
+  dateRange: any = []; //预约时间
+
+  formatterPercent = (value: number) => `${value} 秒`;
+  parserPercent = (value: string) => value.replace(' 秒', '');
 
 
   searchTimerSubject = new Subject(); //防抖
@@ -42,6 +51,38 @@ export class InspectClosedLoopViewComponent implements OnInit {
     this.init();
   }
 
+  ngOnDestroy() {
+    clearInterval(this.timer);
+  }
+
+  // 日期选择
+  onCalendarChangeDate(dateArr){
+    if(dateArr.length == 2){
+      this.dateRange = [startOfDay(dateArr[0]), endOfDay(dateArr[1])];
+    }
+  }
+
+  // 修改自动刷新时间
+  timer;
+  time: number = 15;
+  changeAutoRefresh(flag){
+    if(flag){
+      this.time = this.autoRefreshSecond;
+      console.log('this.time:', this.time)
+      clearInterval(this.timer);
+      this.timer = setInterval(() => {
+        this.time--;
+        console.log('this.time:', this.time)
+        if(this.time === 0){
+          this.time = this.autoRefreshSecond;
+          this.search();
+        }
+      }, 1000);
+    }else{
+      clearInterval(this.timer);
+    }
+  }
+
   // 搜索
   search() {
     this.getList(1);
@@ -49,11 +90,30 @@ export class InspectClosedLoopViewComponent implements OnInit {
 
   // 重置
   reset() {
-    this.searchDto = {};
+    if(this.disableDept){
+      this.searchDto = { deptId: this.searchDto.deptId };
+    }else{
+      this.searchDto = {};
+    }
+    this.dateRange = [];
     this.getList(1);
   }
 
+  disableDept:boolean = false;
   init(){
+    const queryParams = this.route.snapshot.queryParams.queryParams ? JSON.parse(this.route.snapshot.queryParams.queryParams) : undefined;
+    if(queryParams){
+      if(queryParams.department){
+        this.searchDto.deptId = queryParams.department.id;
+        this.departmentList = [queryParams.department];
+        this.disableDept = true;
+      }
+
+      if(queryParams.stateValue){
+        this.searchDto.stateValue = queryParams.stateValue.split(',');
+      }
+    }
+    this.getStatusList();
     this.search();
   }
 
@@ -135,11 +195,6 @@ export class InspectClosedLoopViewComponent implements OnInit {
       });
   }
 
-  openChangeStatus(flag){
-    flag && this.setIsSelecting(false);
-    flag && this.getStatusList();
-  }
-
   // 获取状态
   statusList: any = [];
   getStatusList() {
@@ -151,7 +206,6 @@ export class InspectClosedLoopViewComponent implements OnInit {
   loading1:boolean = false;
 
   // 表格数据
-  searchDto: any = {};
   getList(type) {
     if (type == 1) {
       this.pageIndex = 1;
@@ -160,10 +214,12 @@ export class InspectClosedLoopViewComponent implements OnInit {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       patientInspectLog: {
-        hosId: this.currentHospital.id,
+        startTime: this.dateRange.length ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        endTime: this.dateRange.length ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        hosId: this.hosId,
         deptId: this.searchDto.deptId || undefined,
-        batchId: this.searchDto.patientId || undefined,
-        state: this.searchDto.stateId ? { id: this.searchDto.stateId } : undefined,
+        patientId: this.searchDto.patientId || undefined,
+        state: this.searchDto.stateValue ? { value: this.searchDto.stateValue.toString() } : undefined,
       },
     };
     this.loading1 = true;
@@ -172,7 +228,11 @@ export class InspectClosedLoopViewComponent implements OnInit {
       .subscribe((data) => {
         this.loading1 = false;
         if (data.status == 200) {
-          this.listOfData = data.list;
+          let list = data.list || [];
+          list.forEach(v => {
+            v.inspectNames = v.inspectList ? v.inspectList.map(v => v.inspectName).join('，') : '';
+          })
+          this.listOfData = list;
           this.listLength = data.totalNum;
         }else{
           this.message.error(data.msg || "请求数据失败");

src/app/views/patient-inspect-log-detail/patient-inspect-log-detail.component.ts

@@ -3,6 +3,7 @@ import { MainService } from "../../services/main.service";
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { NzMessageService } from "ng-zorro-antd";
 import { ActivatedRoute, Router } from '@angular/router';
+import { ToolService } from 'src/app/services/tool.service';
 @Component({
   selector: "app-patient-inspect-log-detail",
   templateUrl: "./patient-inspect-log-detail.component.html",
@@ -34,60 +35,117 @@ export class PatientInspectLogDetailComponent implements OnInit {
     private mainService: MainService,
     private route: ActivatedRoute,
     private router: Router,
+    private tool: ToolService,
   ) {}
   maskFlag: any = false;
   id: number; //工单id
-  orderInfo: any; //工单详情信息
+  orderInfo: any; //详情信息
   promptContent: string; //操作提示框提示信息
   ifSuccess: boolean; //操作成功/失败
   promptInfo: string; //操作结果提示信息
   promptModalShow: boolean; //是否展示提示框
 
+  loading1:boolean = false;
+
   ngOnInit() {
     this.id = +this.route.snapshot.paramMap.get("id");
     this.checkTab(1);
   }
 
-  // 获取工单详情
-  getInfo() {
-    this.maskFlag = this.message.loading("正在加载中..", {
-      nzDuration: 0,
-    }).messageId;
+  // 获取详情
+  getInfo(isInit = false) {
+    if(isInit){
+      this.maskFlag = this.message.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+    }
     this.mainService
-      .getFetchData("simple/data", "workOrder", this.id)
+      .getFetchData("simple/data", "patientInspectLog", this.id)
       .subscribe((data) => {
-        this.message.remove(this.maskFlag);
-        this.maskFlag = false;
+        if(isInit){
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+        }
         this.orderInfo = data.data;
       });
   }
 
-  // 获取历史记录
-  workOrderRecord: any = [];
+  // 获取日志
+  logList: any = [];
   getWorkOrderRecord() {
-    this.maskFlag = this.message.loading("正在加载中..", {
-      nzDuration: 0,
-    }).messageId;
-    this.mainService.getWorkOrderRecord({ gdid: this.id }).subscribe((res) => {
-      this.message.remove(this.maskFlag);
-        this.maskFlag = false;
-      if (res.status == 200) {
-        this.workOrderRecord = res.data || [];
-      }
-    })
+    this.loading1 = true;
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      patientInspectLogLog: {
+        pilId: this.id,
+      },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "patientInspectLogLog", postData)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.logList = data.list || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+  // 获取检查项目
+  inspectList: any = [];
+  getInspectList() {
+    this.loading1 = true;
+    let postData = {
+      pilId: this.id,
+    };
+    this.mainService
+      .getPatientInspectList(postData)
+      .subscribe((data:any) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.inspectList = data.list || [];
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
+  }
+
+  // 获取工单
+  orderList: any = [];
+  getOrderList() {
+    this.loading1 = true;
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      workOrder: {
+        pilId: this.id,
+        simpleQuery: true,
+      },
+    };
+    this.mainService
+      .getFetchDataList("data", "workOrder", postData)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.orderList = data.list.map(v => ({...v, endDeptsName: v.endDepts ? v.endDepts.map(v => v.dept).toString() : ''}));
+        }else{
+          this.message.error(data.msg || "请求数据失败");
+        }
+      });
   }
   // 切换tab栏
   tabType: number = 1; //tab栏
-  checkTab(type) {
+  checkTab(type, isInit = false) {
     this.tabType = type;
     if(type == 1){
-      this.getInfo();
+      this.getInfo(isInit);
     }else if(type == 2){
       this.getWorkOrderRecord();
     }else if(type == 3){
-      this.getWorkOrderRecord();
+      this.getInspectList();
     }else if(type == 4){
-      this.getWorkOrderRecord();
+      this.getOrderList();
     }
   }
 
@@ -109,7 +167,6 @@ export class PatientInspectLogDetailComponent implements OnInit {
 
   // 查看
   detail(e, id) {
-    id = 2803260;
     e.stopPropagation();
     this.router.navigateByUrl(`/main/patientInspectLog/patientInspectLogDetail/${this.id}/orderDetail/${id}`);
   }