合并代码

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.4.105",
+		"target": "http://192.168.3.108",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/services/main.service.ts

@@ -811,4 +811,10 @@ export class MainService {
       headers: this.headers,
     });
   }
+	// 验证工单问卷二维码是否过期
+	verifyPastApi(data): any {
+	  return this.http.post(host.host + "/questionnaire/check", data, {
+	    headers: this.headers,
+	  });
+	}
 }

src/app/share/dialog-surgery/dialog-surgery.component.html

@@ -6,7 +6,8 @@
       <div class="defeat" [innerHTML]="content | htmlTransform"></div>
       <ul class="list">
         <li *ngIf="dataObj.doctorNameFlag"><span>主刀医生：</span><span>{{ dataObj.doctorName }}</span></li>
-        <li *ngIf="dataObj.anesthetistNameFlag"><span>麻醉医师：</span><span>{{ dataObj.anesthetistName }}</span></li>
+        <!-- <li *ngIf="dataObj.anesthetistNameFlag"><span>麻醉医师：</span><span>{{ dataObj.anesthetistName }}</span></li> -->
+        <li *ngIf="dataObj.anesthetistNameFlag"><span>临床：</span><span>通知临床</span></li>
         <li *ngIf="dataObj.docAssistantInfosFlag"><span>助理医生：</span><span>{{ dataObj.docAssistantInfos }}</span></li>
         <li *ngIf="dataObj.patientNameFlag"><span>手术患者：</span><span>{{ dataObj.patientDTO ? dataObj.patientDTO.patientName : '' }}</span></li>
       </ul>

src/app/views/acc-examine-set/acc-examine-set-routing.module.ts

@@ -0,0 +1,13 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { AccExamineSetComponent } from './acc-examine-set.component';
+
+const routes: Routes = [
+  { path: '', component: AccExamineSetComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class AccExamineSetRoutingModule { }

src/app/views/acc-examine-set/acc-examine-set.component.html

@@ -0,0 +1,64 @@
+<div class="TaskTypeManagement">
+  <div class="taskTypeInfo">
+    <div class="top">
+      <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
+        陪检问卷配置
+      </div>
+    </div>
+    <div class="list" *ngIf="!loading">
+      <!-- 特性配置 -->
+      <div *ngIf="tabModalName=='characteristics'">
+        <!-- 调查问卷 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label" nzRequired>调查问卷</nz-form-label>
+          <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changequestionnaire($event, 1)" nzPlaceHolder="请选择调查问卷" [(ngModel)]="questionnaireIds">
+            <ng-container *ngFor="let option of questionnaireManagementData">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.title" [nzValue]="option.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 class="display_flex align-items_center mb8">
+          <nz-form-label class="label" nzRequired>任务类型</nz-form-label>
+          <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch [nzMode]="'multiple'"
+            (nzOnSearch)="changeTasktype($event)" nzPlaceHolder="请选择任务类型" [(ngModel)]="taskTypeIds">
+            <ng-container *ngFor="let option of taskTypes1">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.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 class="display_flex align-items_center mb8">
+					<nz-form-label class="label" nzRequired>间隔时间</nz-form-label>
+          <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false"
+             nzPlaceHolder="请选择间隔时间" [(ngModel)]="intervalTime">
+            <ng-container *ngFor="let option of timeData">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.label" [nzValue]="option.value"></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 class="bottom">
+        <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>
+      </div>
+    </div>
+    <div class="list" *ngIf="loading">
+      <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+        <div class="loadingFullInner">
+          <img src="../../../assets/images/loading.gif" alt="">
+          <div>加载中...</div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

src/app/views/acc-examine-set/acc-examine-set.component.ts

@@ -0,0 +1,345 @@
+import { Component, OnInit } from "@angular/core";
+import { MainService } from 'src/app/services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { NzMessageService } from 'ng-zorro-antd';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
+import { format, startOfMinute } from 'date-fns';
+
+@Component({
+  selector: "app-acc-examine-set",
+  templateUrl: "./acc-examine-set.component.html",
+  styleUrls: ["./acc-examine-set.component.less"],
+})
+export class AccExamineSetComponent implements OnInit {
+  loading:boolean = false; //页面加载的loading
+  btnLoading:boolean = false; //提交按钮的loading
+  tabModalName:string = 'characteristics'; //当前选中的tab
+  surgeryField = null; //手术关联业务
+  hosId = this.tool.getCurrentHospital().id; //当前院区
+  // 接手术关联任务类型
+  tasktypeId:any;
+  taskTypes1:any[] = [];
+  taskTypes2:any[] = [];
+  // 苏醒室科室
+  recoveryDeptId:any;
+  recoveryDepts:any[] = [];
+  // 自动建单
+  autoCreateOrders:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 是否开通送回病房
+  autoSendWard:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 是否开通送回苏醒室
+  autoSendAwakeningRoom:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 是否开通关联手术清洁建单
+  autoRemandClean:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 是否开启手术即将开始通知
+  surgeryBegin:any[] = [
+    {label:'是否开启',value: 0}
+  ];
+  // 建单时间
+  autoTime:Date | null = null;
+  tasktype1Id:any;
+  tasktype2Id:any;
+  cleanTypeId:any;
+	associationTypeIds:any;
+	questionnaireManagementData:any; //调查问卷数据
+	questionnaireIds:Number; //问卷参数
+	intervalTime:string = ''; //间隔时间参数
+	taskTypeIds:any = []; //任务类型参数
+	editId:'';
+	targetData:any = [];
+	stateData:any = [];
+	// 间隔时间数据
+	timeData:any[] = [
+	  {label:'10',value: 10},
+		{label:'15',value: 15},
+		{label:'30',value: 30},
+		{label:'60',value: 60}
+	];
+  // 配置
+  configs:any = {};
+  searchTimerSubject = new Subject();
+  constructor(private mainService: MainService,private tool: ToolService,private msg: NzMessageService) {}
+
+  ngOnInit():void {
+    // todo
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1], v[2], v[3]);
+    });
+    // this.getTaskTypes('', true, 1);
+    // this.getTaskTypes('', false, 2);
+		this.getRelevanceType()
+  }
+
+  // 切换tab
+  tabModal(tabModalName:string){
+    this.tabModalName = tabModalName;
+  }
+  // 修改是否自动建单
+  changeAutoCreateOrders(e){
+    console.log(e);
+    if(!e[0].checked){
+      // todo
+      this.autoTime = null;
+    }
+  }
+
+  // 修改是否开通送回病房
+  changeAutoSendWard(e){
+    console.log(e);
+    if(!e[0].checked){
+      // todo
+      this.tasktype1Id = null;
+    }
+  }
+
+  // 修改是否开通送回苏醒室
+  changeAutoSendAwakeningRoom(e){
+    console.log(e);
+    if(!e[0].checked){
+      // todo
+      this.tasktype2Id = null;
+    }
+  }
+
+  // 修改是否开通关联手术清洁建单
+  changeAutoRemandClean(e){
+    console.log(e);
+    if(!e[0].checked){
+      // todo
+      this.cleanTypeId = null;
+    }
+  }
+
+  // 保存
+  submitForm() {
+    if(!this.questionnaireIds){
+      this.msg.create("warning", "请选择调查问卷！");
+      return;
+    }
+    if(this.taskTypeIds.length==0){
+      this.msg.create("warning", "请选择任务类型！");
+      return;
+    }
+    if(this.intervalTime==''){
+      this.msg.create("warning", "请选择间隔时间！");
+      return;
+    }
+		let taskArr = JSON.parse(JSON.stringify(this.taskTypeIds))
+    let editData = {
+			// questionnaireConfig:{
+				id:'',
+				hosId: this.hosId,
+				questionnaireIds:this.questionnaireIds,//问卷参数
+				intervalTime:this.intervalTime, //间隔时间参数
+				taskTypeIds:taskArr.join(',') //任务类型参数
+			// }
+    };
+		if(this.editId){
+			editData.id = this.editId
+		}else{
+			delete editData.id 
+		}
+    this.btnLoading = true;
+    this.mainService
+      .simplePost("addData", "questionnaireConfig", editData)
+      .subscribe((result) => {
+        this.btnLoading = false;
+        if (result.status == 200) {
+          this.getConfig();
+        }
+      });
+  }
+	
+	// 调查问卷搜索
+	changequestionnaire(e) {
+		this.searchTimer(this.getOneQuestionnaireManagement, e, false)
+	}
+	
+  // 用户输入搜索任务类型
+  isLoading: boolean = false;
+  changeTasktype(e) {
+    this.searchTimer(this.getTaskTypes, e, false);
+  }
+
+  changeRecoveryDepts(e) {
+    this.searchTimer(this.getRecoveryDepts, e, false);
+  }
+
+  // 边输入边搜索节流阀
+  searchTimer(fun, e, isFirst, type?) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e, isFirst, type]);
+  }
+	
+	// 获取关联任务类型
+	getRelevanceType(){
+		this.associationTypeIds=[]
+		this.mainService.getDictionary("list", "association_types").subscribe((data) => {
+			for( let t of data){
+				if(t.value=='patientTransport' || 
+				t.value=='other' || t.value=='inspect'){
+					this.associationTypeIds.push(t)
+				}
+			}
+			this.getTaskTypes('', true, 1)
+			this.getState()
+		});
+	}
+	
+	// 获取问卷状态
+	getState(){
+		this.mainService.getDictionary("list", "survey_state").subscribe((data) => {
+			this.stateData = data
+			this.getQuestionnaireTarget()
+		});
+	}
+	
+	// 获取问卷调查目标
+	getQuestionnaireTarget(){
+		this.mainService.getDictionary("list", "survey_target").subscribe((data) => {
+			this.targetData = data
+			this.getOneQuestionnaireManagement()
+		});
+	}
+	
+	// 获取问卷数据
+	getOneQuestionnaireManagement(e:string = '', isFirst:boolean = false,){
+		let targetId = this.targetData.find(i=>i.value==4)
+		let stateId = this.stateData.find(i=>i.value==2)
+		let query = {
+			idx: 0,
+			questionnaireManagement: {
+				title:e,
+				hosId: this.hosId,
+				surveyTarget:{ //问卷调查目标
+					id:targetId.id
+				},
+				state:{ //问卷状态
+					id:stateId.id
+				}
+			},
+			hosId: this.hosId,
+			sum: 10
+		}
+		isFirst && (this.loading = true);
+		this.isLoading = true;
+	  this.mainService.getFetchDataList('api', "questionnaireManagement", query).subscribe(res=>{
+	    if(res.status == 200){
+				this.isLoading = false;
+	      this.questionnaireManagementData = res.list;
+	    }
+	  })
+	}
+	
+  //获取接手术关联任务类型
+  // 1 患者其他服务
+  // 2 其他临床服务
+  getTaskTypes(e:string = '', isFirst:boolean = false, type:number = 1) {
+		let ids = []
+		for(let i of this.associationTypeIds){
+			ids.push(i.id)
+		}
+    isFirst && (this.loading = true);
+    let postData:any = {
+      idx: 0,
+      sum: 9999,
+      taskType: {
+        taskName: e,
+        simpleQuery: true,
+				associationTypeIds:ids.join(','),
+        hosId: {
+          id: this.hosId
+        }
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "taskType", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.taskTypes1 = result.list || [];
+          isFirst && this.getConfig();
+        }
+      });
+  }
+
+  //获取所有科室类型
+  allDeptTypes:any[] = [];
+  getDeptType(isFirst:boolean = false) {
+    isFirst && (this.loading = true);
+    this.mainService
+      .getDictionary("list", "dept_type")
+      .subscribe((result) => {
+        this.allDeptTypes = result;
+        isFirst && this.getRecoveryDepts('', true);
+      });
+  }
+
+  //获取所有科室
+  getRecoveryDepts(e:string = '', isFirst:boolean = false) {
+    isFirst && (this.loading = true);
+    let recovery = this.allDeptTypes.find(v => v.value === 'recovery');
+    let postData = {
+      idx: 0,
+      sum: 10,
+      department: {
+        dept: e,
+        hospital: {
+          id: this.hosId
+        },
+        type: recovery || undefined
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "department", postData)
+      .subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.recoveryDepts = result.list || [];
+          isFirst && this.getConfig();
+        }
+      });
+  }
+  // 获取配置
+  getConfig() {
+    this.loading = true;
+    let postData = {
+      idx: 0,
+      sum: 10,
+      questionnaireConfig: {
+        hosId: this.hosId,
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "questionnaireConfig", postData)
+      .subscribe((result) => {
+        this.loading = false;
+        if (result.status == 200) {
+    			let data = result.list[0] || {};
+					this.editId = data.id
+					let questionData = data.questionnaireDTOS.map(i=>{
+						return i.id
+					})
+    			this.questionnaireIds = Number(questionData.join(',')) //调查问卷
+    			this.intervalTime = data.intervalTime //间隔时间
+    			this.taskTypeIds = data.taskTypeDTOS.map(i=>{ //任务类型
+						return i.id
+					}) 
+        }
+      });
+  }
+}
+
+

src/app/views/acc-examine-set/acc-examine-set.module.ts

@@ -0,0 +1,17 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { AccExamineSetRoutingModule } from './acc-examine-set-routing.module';
+import { AccExamineSetComponent } from './acc-examine-set.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [AccExamineSetComponent],
+  imports: [
+    CommonModule,
+    AccExamineSetRoutingModule,
+    ShareModule
+  ]
+})
+export class AccExamineSetModule { }

src/app/views/blood-products-config/blood-products-config.component.html

@@ -60,6 +60,11 @@
           <nz-checkbox-group [(ngModel)]="cancelBloods" (ngModelChange)="changeCancelBloods($event)"></nz-checkbox-group>
           <nz-checkbox-group [(ngModel)]="cancelBloodHandovers" *ngIf="cancelBloods[0].checked"></nz-checkbox-group>
         </div>
+				<!-- 待送达合并工单 -->
+				<div class="display_flex align-items_center mb8">
+				  <nz-form-label class="label">待送达合并工单</nz-form-label>
+				  <nz-checkbox-group class="w320px" [(ngModel)]="sendingMergeOrder"></nz-checkbox-group>
+				</div>
       </div>
       <!-- 自动建单配置 -->
       <div *ngIf="tabModalName=='automaticOrderCreation'">

src/app/views/blood-products-config/blood-products-config.component.ts

@@ -54,6 +54,10 @@ export class BloodProductsConfigComponent implements OnInit {
   delivery:any[] = [
     {label:'是否开启',value: 0}
   ];
+	// 待送达合并工单
+	sendingMergeOrder:any[] = [
+	  {label:'是否开启',value: 0}
+	];
   // 选择起点科室
   limitDeptIds:any = [];
   // 配置
@@ -184,6 +188,11 @@ export class BloodProductsConfigComponent implements OnInit {
       cancelBlood: this.cancelBloods[0].checked ? 1 : 0,
       cancelBloodHandover: this.cancelBloodHandovers[0].checked ? 1 : 0,
     };
+		if(this.sendingMergeOrder[0].checked){
+			postData.sendingMergeOrder = 1
+		}else{
+			delete postData.sendingMergeOrder
+		}
     console.log(postData);
     this.btnLoading = true;
     this.mainService
@@ -287,6 +296,9 @@ export class BloodProductsConfigComponent implements OnInit {
           this.radioCheckModesValue = this.configs.checkType.id;
           this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
           this.delivery[0].checked = this.configs.delivery == 1;
+					if(this.configs.sendingMergeOrder){
+						this.sendingMergeOrder[0].checked = this.configs.sendingMergeOrder == 1
+					}
           this.autoSendUsers[0].checked = this.configs.autoSendUser == 1;
           this.autoDepts[0].checked = this.configs.autoDept == 1;
           this.autoDeptLimits[0].checked = this.configs.autoDeptLimit == 1;

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

@@ -65,7 +65,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.applyCode || '无'}}</td>
             <td>{{ data.bloodCode || '无'}}</td>
             <td>{{ data.state?.name }}</td>

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

@@ -84,7 +84,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.launch?.dept}}</td>
             <td>{{ data.target?.dept }}</td>
             <td>{{ data.deliveryUser?.name }}</td>

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

@@ -1571,7 +1571,7 @@
                       </thead>
                       <tbody>
                         <tr *ngFor="let data of adviceList; let i = index">
-                          <td>{{ i + 1 }}</td>
+                          <td>{{i+(advicePageIndex-1) * advicePageSize + 1}}</td>
                           <td>{{ data.createTime.slice(0, 16) }}</td>
                           <td>
                             <span
@@ -1651,7 +1651,7 @@
                       </thead>
                       <tbody>
                         <tr *ngFor="let item of surgeryList;let i = index">
-                          <td>{{ i + 1 }}</td>
+                          <td>{{i+(surgeryPageIndex-1) * surgeryPageSize + 1}}</td>
                           <td>{{ item.patientDTO ? item.patientDTO.patientName : '' }}({{ item.patientDTO ? item.patientDTO.bedNum : '' }})<br>{{ item.patientDTO ? item.patientDTO.residenceNo : '' }}</td>
                           <td>{{ item.applyDate | date:'MM-dd HH:mm' }}</td>
                           <td>{{ item.areaDeptDTO ? (deptDisplay == 2 ? item.areaDeptDTO.deptalias : item.areaDeptDTO.dept) : '' }}</td>
@@ -1754,7 +1754,7 @@
                             let i = index
                           "
                         >
-                          <td>{{ i + 1 }}</td>
+                          <td>{{i+(historySpecimenPageIndex-1) * historySpecimenPageSize + 1}}</td>
                           <td>{{ data.stype ? data.stype.name : "-" }}</td>
                           <td>
                             {{ data.speState ? data.speState.name : "-" }}
@@ -1856,7 +1856,7 @@
                             let i = index
                           "
                         >
-                          <td>{{ i + 1 }}</td>
+                          <td>{{i+(historyDrugsbagPageIndex-1) * historyDrugsbagPageSize + 1}}</td>
                           <td>{{ data.packid || "-" }}</td>
                           <td>
                             {{
@@ -2139,7 +2139,7 @@
                       </thead>
                       <tbody>
                         <tr *ngFor="let data of bxlbList; let i = index">
-                          <td>{{ i + 1 }}</td>
+                          <td>{{i+(bxlbPageIndex-1) * bxlbPageSize + 1}}</td>
                           <td>{{ data.description || "无" }}</td>
                           <td>
                             {{ data.startDate | date: "yyyy-MM-dd HH:mm" }}
@@ -2161,8 +2161,8 @@
                         [(nzPageIndex)]="bxlbPageIndex"
                         [(nzTotal)]="bxlbListLength"
                         [(nzPageSize)]="bxlbPageSize"
-                        (nzPageIndexChange)="getBxlb(bxlbPageIndex)"
-                        (nzPageSizeChange)="getBxlb(bxlbPageIndex)"
+                        (nzPageIndexChange)="getBxlb(false)"
+                        (nzPageSizeChange)="getBxlb(false)"
                       >
                       </nz-pagination>
                     </div>

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

@@ -3567,11 +3567,11 @@ export class HushijiandanComponent implements OnInit {
     this.selectOtherId = null;
     this.otherSearch = '';
     if (type === "surgery") {
-      this.getSurgery();
+      this.getSurgery(true);
     } else if (type === "historySpecimen") {
-      this.getHistorySpecimen();
+      this.getHistorySpecimen(true);
     } else if (type === "historyDrugsbag") {
-      this.getHistoryDrugsbag();
+      this.getHistoryDrugsbag(true);
     } else if (type === "bxlb" && this.isShowBx && this.coopBtns.repairList) {
       this.getBxlb(this.bxlbPageIndex);
       // this.getIncidentState();
@@ -3650,10 +3650,13 @@ export class HushijiandanComponent implements OnInit {
   adviceListLength: number = 10; //表格总数据量
   adviceSearchInp: string = ""; //意见箱搜索
   adviceLoading = false;
-  getAdvice() {
+  getAdvice(idx?) {
     if(!this.coopBtns.suggestionBox){
       return;
     }
+    if(idx){
+      this.advicePageIndex = 1;
+    }
     let that = this;
     let postData = {
       advice: {
@@ -3665,7 +3668,7 @@ export class HushijiandanComponent implements OnInit {
           id: that.loginUser.id,
         },
       },
-      idx: that.advicePageIndex - 1 < 0 ? 0 : that.advicePageIndex - 1,
+      idx: that.advicePageIndex - 1,
       sum: that.advicePageSize,
     };
     this.adviceLoading = true;
@@ -3814,6 +3817,7 @@ export class HushijiandanComponent implements OnInit {
     // 获取事件状态
     let postData = { type: "list", key: "incident_status" };
     this.iLoading = true;
+    this.bxlbLoading = true;
     this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
       this.iLoading = false;
       if (data.status == 200) {
@@ -3830,7 +3834,6 @@ export class HushijiandanComponent implements OnInit {
           this.bxlbPageIndex = 1;
         }
         let current = JSON.parse(localStorage.getItem("user"));
-        this.bxlbLoading = true;
         this.mainService
           .listWxIncident({
             idx: this.bxlbPageIndex - 1,

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

@@ -74,7 +74,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.patientName||'-' }}</td>
             <td>{{ data.residenceNo||'-' }}</td>
             <td>{{ data.applyDept ? data.applyDept.dept : '-' }}</td>

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

@@ -77,7 +77,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.launch?.dept}}</td>
             <td>{{ data.target?.dept }}</td>
             <td>{{ data.creatTime }}</td>

src/app/views/main/main-routing.module.ts

@@ -413,6 +413,11 @@ const routes: Routes = [
         path: "questionnaireAnswer",
         loadChildren: () => import("../questionnaire-answer/questionnaire-answer.module").then((m) => m.QuestionnaireAnswerModule),
       },
+			// 陪检问卷配置
+			{
+			  path: "accExamineSet",
+			  loadChildren: () => import("../acc-examine-set/acc-examine-set.module").then((m) => m.AccExamineSetModule),
+			},
       // 条码预制
       {
         path: "barcodePrefabrication",

src/app/views/operation-notice/operation-notice.component.ts

@@ -59,7 +59,7 @@ export class OperationNoticeComponent implements OnInit {
   tabNames = {
     doctor: '主刀医生',
     docAssistant: '助理医生',
-    anesthetist: '麻醉医师',
+    anesthetist: '临床',
     patient: '手术患者',
   }
 

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

@@ -58,7 +58,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.patientName||'-' }}</td>
             <td>{{ data.residenceNo||'-' }}</td>
             <td>{{ data.bedNum||'-' }}</td>

src/app/views/preview/preview.component.html

@@ -1,10 +1,10 @@
 <div class="preview" [ngStyle]="{margin:isM?0:'',minHeight:isM?'100vh':''}">
-  <ng-container *ngIf="!success">
+  <ng-container *ngIf="!success && !pastStatus">
     <ng-container *ngIf="!failure">
       <div *ngIf="!loading">
         <h1>{{qm.title}}</h1>
         <p>{{qm.surveyDescribe}}</p>
-        <form nz-form [formGroup]="validateForm">
+        <form nz-form [formGroup]="validateForm" >
           <ng-container *ngFor="let item of listOfData;let i=index;">
             <!-- 单选 -->
             <nz-form-item *ngIf="item.answerMode && item.answerMode.value == 1">
@@ -48,4 +48,9 @@
   <div class="success" *ngIf="success">
     感谢您的参与！
   </div>
+	<div class="failure" *ngIf="pastStatus">
+	  调研码已过期，请知悉！<br>	
+		请退出重新扫码
+	</div>
+	
 </div>

src/app/views/preview/preview.component.ts

@@ -17,7 +17,9 @@ export class PreviewComponent implements OnInit {
   listOfData:any[] = [];
   success:boolean = false;
   isM:boolean = false;
-
+	pastStatus:boolean = false;
+	gdid:string = '';
+	qrCodeIndex:string = '';
   constructor(
     private route: ActivatedRoute,
     private mainService:MainService,
@@ -33,6 +35,12 @@ export class PreviewComponent implements OnInit {
     }else{
       document.documentElement.style.fontSize = '100px';
     }
+		console.log(234,this.route.snapshot.queryParams)
+		this.gdid = this.route.snapshot.queryParams.gdId;
+		this.qrCodeIndex = this.route.snapshot.queryParams.qrCodeIndex
+		if(this.gdid){
+			this.verifyPast(this.gdid)
+		}
     this.getList();
   }
   // 初始化Form
@@ -58,6 +66,11 @@ export class PreviewComponent implements OnInit {
         hosId: this.qm.hosId,
       }))
     };
+		if(this.gdid){
+			postData.gdId = this.gdid
+		}else{
+			delete postData.gdId
+		}
     const mid = this.message.loading('loading..', { nzDuration: 0 }).messageId;
     this.mainService.surveyCommit(postData).subscribe((res:any)=>{
       this.message.remove(mid);
@@ -74,6 +87,20 @@ export class PreviewComponent implements OnInit {
       const reg = /(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i;
       return reg.test(navigator.userAgent);
   }
+	// 验证工单问卷调查二维码是否过期
+	verifyPast(gdid){
+		this.mainService.verifyPastApi({
+			gdId:gdid,
+			qrCodeIndex:this.qrCodeIndex
+		}).subscribe((res:any)=>{
+		  if (res.status == 200) {
+		    this.pastStatus = false;
+		  }else{
+				this.pastStatus = true;
+		    // this.message.create('error',res.info,{ nzDuration: 5000 });
+		  }
+		})
+	}
   // 问卷数据
   getList() {
     let token = this.route.snapshot.queryParams.token;

src/app/views/questionnaire-answer/questionnaire-answer.component.html

@@ -17,13 +17,19 @@
         <thead>
           <tr class="thead">
             <th nzWidth="50px">序号</th>
+						<th *ngFor="let item of listBaseInfoTh">{{item.describe}}</th>
             <th *ngFor="let item of listOfDataTh">{{item.describe}}</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData; let i = index">
             <td>{{ i + 1 }}</td>
-            <td *ngFor="let item of data">{{ item.answer }}</td>
+						<td *ngIf="data.data">{{ data.data.patientName }}</td>
+						<td *ngIf="data.data">{{ data.data.residenceNo }}</td>
+						<td *ngIf="data.data">{{data.data.gdCode}}/{{data.data.taskTypeName}}</td>
+						<td *ngFor="let item of data">
+							{{ item.answer }}
+						</td>
           </tr>
         </tbody>
       </nz-table>

src/app/views/questionnaire-answer/questionnaire-answer.component.ts

@@ -25,7 +25,8 @@ export class QuestionnaireAnswerComponent implements OnInit {
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
   currentHospital; //当前院区
-
+	listBaseInfoTh: any[] = []; //陪检患者表格表头
+	listBaseInfos: any[] = []; //陪检患者表格数据
   ngOnInit() {
     this.currentHospital = this.tool.getCurrentHospital();
     this.getList(1);
@@ -82,10 +83,20 @@ export class QuestionnaireAnswerComponent implements OnInit {
         this.loading1 = false;
         if (data.status == 200) {
           this.listOfData = data.data?data.data.answers:[];
-          // if(data.data && data.data.answers){
-          //   data.data.answers
-          // }
           this.listOfDataTh = data.data?data.data.infos:[];
+					this.listBaseInfos = data.data?data.data.baseInfos:[];
+					if(this.listBaseInfos&&this.listBaseInfos.length>0){
+						this.listBaseInfoTh = [
+							{describe:'患者姓名'},
+							{describe:'住院号'},
+							{describe:'工单编号/任务类型'},
+						]
+						for(let i in this.listBaseInfos){
+							this.listOfData[i].data = this.listBaseInfos[i]
+						}
+					}else{
+						this.listBaseInfoTh = []
+					}	
           this.listLength = data.totalNum;
         }
       });

src/app/views/quilt-washing-search/quilt-washing-search.component.html

@@ -48,7 +48,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.relatedDeptDTO?.dept }}</td>
             <td>{{ data.batchCode }}</td>
             <td>{{ data.clothesType?.name }}</td>

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

@@ -175,7 +175,7 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData; let i = index">
-            <td>{{ i + 1 }}</td>
+            <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
             <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
             <td>{{ data.scode || "-" }}</td>