添加问卷调查配置

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

@@ -220,7 +220,7 @@ export class AccExamineSetComponent implements OnInit {
 			idx: 0,
 			questionnaireManagement: {
 				title:e,
-				hosId: 1,
+				hosId: this.hosId,
 				surveyTarget:{ //问卷调查目标
 					id:targetId.id
 				},
@@ -228,7 +228,7 @@ export class AccExamineSetComponent implements OnInit {
 					id:stateId.id
 				}
 			},
-			hosId: 1,
+			hosId: this.hosId,
 			sum: 10
 		}
 		isFirst && (this.loading = true);

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

@@ -1,5 +1,5 @@
 <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>
@@ -32,7 +32,7 @@
           </ng-container>
           <nz-form-item nz-row class="submit" *ngIf="listOfData.length && qm.state.value == 2">
             <nz-form-control>
-              <button nz-button [disabled]="pastStatus" nzType="primary" [nzLoading]="loading" (click)="submitForm()">提交</button>
+              <button nz-button nzType="primary" [nzLoading]="loading" (click)="submitForm()">提交</button>
             </nz-form-control>
           </nz-form-item>
         </form>
@@ -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

@@ -18,7 +18,8 @@ export class PreviewComponent implements OnInit {
   success:boolean = false;
   isM:boolean = false;
 	pastStatus:boolean = false;
-	
+	gdid:string = '';
+	qrCodeIndex:string = '';
   constructor(
     private route: ActivatedRoute,
     private mainService:MainService,
@@ -34,9 +35,11 @@ export class PreviewComponent implements OnInit {
     }else{
       document.documentElement.style.fontSize = '100px';
     }
-		let gdid = this.route.snapshot.queryParams.gdid;
-		if(gdid){
-			this.verifyPast(gdid)
+		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();
   }
@@ -63,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);
@@ -82,13 +90,14 @@ export class PreviewComponent implements OnInit {
 	// 验证工单问卷调查二维码是否过期
 	verifyPast(gdid){
 		this.mainService.verifyPastApi({
-			gdId:gdid
+			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 });
+		    // this.message.create('error',res.info,{ nzDuration: 5000 });
 		  }
 		})
 	}

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;
         }
       });