拉取最新代码

proxy.conf.json

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

src/app/services/main.service.ts

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

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

@@ -2,61 +2,30 @@
   <div class="taskTypeInfo">
     <div class="top">
       <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
-        特性配置
-      </div>
-      <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
-        自动建单配置
+        陪检问卷配置
       </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-form-label class="label" nzRequired>调查问卷</nz-form-label>
           <nz-select class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeTasktype($event, 1)" nzPlaceHolder="请选择接手术关联任务类型" [(ngModel)]="tasktypeId">
-            <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" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeRecoveryDepts($event)" nzPlaceHolder="请选择接苏醒室科室" [(ngModel)]="recoveryDeptId">
-            <ng-container *ngFor="let option of recoveryDepts">
-              <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [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">是否开通送回病房</nz-form-label>
-          <nz-checkbox-group [(ngModel)]="autoSendWard" (ngModelChange)="changeAutoSendWard($event)"></nz-checkbox-group>
-          <nz-select *ngIf="autoSendWard[0].checked" class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeTasktype($event, 1)" nzPlaceHolder="请选择送回病房任务类型" [(ngModel)]="tasktype1Id">
-            <ng-container *ngFor="let option of taskTypes1">
-              <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.id"></nz-option>
+            (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">是否开通送回苏醒室</nz-form-label>
-          <nz-checkbox-group [(ngModel)]="autoSendAwakeningRoom" (ngModelChange)="changeAutoSendAwakeningRoom($event)"></nz-checkbox-group>
-          <nz-select *ngIf="autoSendAwakeningRoom[0].checked" class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeTasktype($event, 1)" nzPlaceHolder="请选择送回苏醒室任务类型" [(ngModel)]="tasktype2Id">
+          <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>
@@ -65,34 +34,19 @@
             </nz-option>
           </nz-select>
         </div>
-        <!-- 关联手术清洁 -->
+        <!-- 间隔时间 -->
         <div class="display_flex align-items_center mb8">
-          <nz-form-label class="label">是否开通关联手术清洁建单</nz-form-label>
-          <nz-checkbox-group [(ngModel)]="autoRemandClean" (ngModelChange)="changeAutoRemandClean($event)"></nz-checkbox-group>
-          <nz-select *ngIf="autoRemandClean[0].checked" class="w320px" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
-            (nzOnSearch)="changeTasktype($event, 2)" nzPlaceHolder="请选择送回苏醒室任务类型" [(ngModel)]="cleanTypeId">
-            <ng-container *ngFor="let option of taskTypes2">
-              <nz-option *ngIf="!isLoading" [nzLabel]="option.taskName" [nzValue]="option.id"></nz-option>
+					<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 class="display_flex align-items_center mb8">
-          <nz-form-label class="label">是否开启手术即将开始通知</nz-form-label>
-          <nz-checkbox-group [(ngModel)]="surgeryBegin"></nz-checkbox-group>
-        </div>
-      </div>
-      <!-- 自动建单配置 -->
-      <div *ngIf="tabModalName=='automaticOrderCreation'">
-        <!-- 自动建单 -->
-        <div class="display_flex align-items_center mb8">
-          <nz-form-label class="label">自动建单</nz-form-label>
-          <nz-checkbox-group [(ngModel)]="autoCreateOrders" (ngModelChange)="changeAutoCreateOrders($event)"></nz-checkbox-group>
-          <nz-time-picker [(ngModel)]="autoTime" nzFormat="HH:mm" *ngIf="autoCreateOrders[0].checked"></nz-time-picker>
-        </div>
       </div>
       <div class="bottom">
         <button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitForm()">保存</button>

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

@@ -49,6 +49,21 @@ export class AccExamineSetComponent implements OnInit {
   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();
@@ -60,8 +75,9 @@ export class AccExamineSetComponent implements OnInit {
       let fun = v[0];
       fun.call(this, v[1], v[2], v[3]);
     });
-    this.getTaskTypes('', true, 1);
-    this.getTaskTypes('', false, 2);
+    // this.getTaskTypes('', true, 1);
+    // this.getTaskTypes('', false, 2);
+		this.getRelevanceType()
   }
 
   // 切换tab
@@ -106,50 +122,36 @@ export class AccExamineSetComponent implements OnInit {
 
   // 保存
   submitForm() {
-    if(!this.tasktypeId){
-      this.msg.create("warning", "请选择接手术关联任务类型！");
+    if(!this.questionnaireIds){
+      this.msg.create("warning", "请选择调查问卷！");
       return;
     }
-    if(!this.recoveryDeptId){
-      this.msg.create("warning", "请选择苏醒室科室！");
+    if(this.taskTypeIds.length==0){
+      this.msg.create("warning", "请选择任务类型！");
       return;
     }
-    if(this.autoCreateOrders[0].checked && !this.autoTime){
-      this.msg.create("warning", "请选择建单时间！");
+    if(this.intervalTime==''){
+      this.msg.create("warning", "请选择间隔时间！");
       return;
     }
-    if(this.autoSendWard[0].checked && !this.tasktype1Id){
-      this.msg.create("warning", "请选择送回病房任务类型！");
-      return;
-    }
-    if(this.autoSendAwakeningRoom[0].checked && !this.tasktype2Id){
-      this.msg.create("warning", "请选择送回苏醒室任务类型！");
-      return;
-    }
-    if(this.autoRemandClean[0].checked && !this.cleanTypeId){
-      this.msg.create("warning", "请选择手术清洁任务类型！");
-      return;
-    }
-    let editData:any = {
-      hosId: this.hosId,
-      taskType: this.tasktypeId || undefined,
-      recoveryDeptId: this.recoveryDeptId || undefined,
-      ordinaryField: this.surgeryField,
-      autoCreate: this.autoCreateOrders[0].checked ? 1 : 0,
-      createTime: this.autoTime ? format(startOfMinute(this.autoTime), "yyyy-MM-dd HH:mm:ss") : undefined,
-      remandClinical: this.autoSendWard[0].checked ? 1 : 0,
-      clinicalTypeId: this.tasktype1Id || undefined,
-      remandRecovery: this.autoSendAwakeningRoom[0].checked ? 1 : 0,
-      recoveryTypeId: this.tasktype2Id || undefined,
-      remandClean: this.autoRemandClean[0].checked ? 1 : 0,
-      surgeryBegin: this.surgeryBegin[0].checked ? 1 : 0,
-      cleanTypeId: this.cleanTypeId || undefined,
+		let taskArr = JSON.parse(JSON.stringify(this.taskTypeIds))
+    let editData = {
+			// questionnaireConfig:{
+				id:'',
+				hosId: this.hosId,
+				questionnaireIds:this.questionnaireIds,//问卷参数
+				intervalTime:this.intervalTime, //间隔时间参数
+				taskTypeIds:taskArr.join(',') //任务类型参数
+			// }
     };
-    let postData = Object.assign({}, this.configs, editData);
-    console.log(postData);
+		if(this.editId){
+			editData.id = this.editId
+		}else{
+			delete editData.id 
+		}
     this.btnLoading = true;
     this.mainService
-      .simplePost("addData", "taskTypeConfig", postData)
+      .simplePost("addData", "questionnaireConfig", editData)
       .subscribe((result) => {
         this.btnLoading = false;
         if (result.status == 200) {
@@ -157,11 +159,16 @@ export class AccExamineSetComponent implements OnInit {
         }
       });
   }
-
+	
+	// 调查问卷搜索
+	changequestionnaire(e) {
+		this.searchTimer(this.getOneQuestionnaireManagement, e, false)
+	}
+	
   // 用户输入搜索任务类型
   isLoading: boolean = false;
-  changeTasktype(e, type) {
-    this.searchTimer(this.getTaskTypes, e, false, type);
+  changeTasktype(e) {
+    this.searchTimer(this.getTaskTypes, e, false);
   }
 
   changeRecoveryDepts(e) {
@@ -173,46 +180,96 @@ export class AccExamineSetComponent implements OnInit {
     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: 1,
+				surveyTarget:{ //问卷调查目标
+					id:targetId.id
+				},
+				state:{ //问卷状态
+					id:stateId.id
+				}
+			},
+			hosId: 1,
+			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: 10,
+      sum: 9999,
       taskType: {
         taskName: e,
         simpleQuery: true,
+				associationTypeIds:ids.join(','),
         hosId: {
           id: this.hosId
         }
       }
     };
-    if(type === 1){
-      postData.taskType.associationType = {
-        key: 'association_types',
-        value: 'patientTransport'
-      }
-    }else if(type === 2){
-      postData.taskType.associationType = {
-        key: 'association_types',
-        value: 'other'
-      }
-    }
     this.isLoading = true;
     this.mainService
       .getFetchDataList("simple/data", "taskType", postData)
       .subscribe((result) => {
         this.isLoading = false;
         if (result.status == 200) {
-          if(type === 1){
-            this.taskTypes1 = result.list || [];
-          }else if(type === 2){
-            this.taskTypes2 = result.list || [];
-          }
-          isFirst && this.getDeptType(true);
+          this.taskTypes1 = result.list || [];
+          isFirst && this.getConfig();
         }
       });
   }
@@ -258,83 +315,28 @@ export class AccExamineSetComponent implements OnInit {
   // 获取配置
   getConfig() {
     this.loading = true;
+    let postData = {
+      idx: 0,
+      sum: 10,
+      questionnaireConfig: {
+        hosId: this.hosId,
+      }
+    };
     this.mainService
-      .getDictionary("list", "ordinary_field")
-      .subscribe((data) => {
-        this.surgeryField = data.find(v => v.value == 'surgery');
-        if(this.surgeryField){
-          let postData = {
-            idx: 0,
-            sum: 10,
-            taskTypeConfig: {
-              hosId: this.hosId,
-              ordinaryField: this.surgeryField
-            }
-          };
-          this.mainService
-            .getFetchDataList("simple/data", "taskTypeConfig", postData)
-            .subscribe((result) => {
-              this.loading = false;
-              if (result.status == 200) {
-                this.configs = result.list[0] || {};
-
-                // 接手术关联任务类型
-                this.tasktypeId = this.configs.taskTypeDTO ? this.configs.taskTypeDTO.id : null;
-                if(this.tasktypeId && this.configs.taskTypeDTO){
-                  let isInArr = this.taskTypes1.some(v => v.id == this.tasktypeId);
-                  if(!isInArr){
-                    this.taskTypes1.unshift(this.configs.taskTypeDTO);
-                  }
-                }
-
-                // 苏醒室科室
-                this.recoveryDeptId = this.configs.recoveryDeptId || null;
-                if(this.recoveryDeptId && this.configs.recoveryDeptDTO){
-                  let isInArr = this.recoveryDepts.some(v => v.id == this.recoveryDeptId);
-                  if(!isInArr){
-                    this.recoveryDepts.unshift(this.configs.recoveryDeptDTO);
-                  }
-                }
-
-                this.autoCreateOrders[0].checked = this.configs.autoCreate == 1;
-                this.autoTime = this.configs.createTime ? new Date(this.configs.createTime) : null;
-                this.autoSendWard[0].checked = this.configs.remandClinical == 1;
-
-                // 送回病房科室
-                this.tasktype1Id = this.configs.clinicalTypeId || null;
-                if(this.tasktype1Id && this.configs.clinicalTypeDTO){
-                  let isInArr = this.taskTypes1.some(v => v.id == this.tasktype1Id);
-                  if(!isInArr){
-                    this.taskTypes1.unshift(this.configs.clinicalTypeDTO);
-                  }
-                }
-                this.autoSendAwakeningRoom[0].checked = this.configs.remandRecovery == 1;
-
-                // 送回苏醒室科室
-                this.tasktype2Id = this.configs.recoveryTypeId || null;
-                if(this.tasktype2Id && this.configs.recoveryType){
-                  let isInArr = this.taskTypes1.some(v => v.id == this.tasktype2Id);
-                  if(!isInArr){
-                    this.taskTypes1.unshift(this.configs.recoveryType);
-                  }
-                }
-
-                this.autoRemandClean[0].checked = this.configs.remandClean == 1;
-
-                // 关联手术清洁
-                this.cleanTypeId = this.configs.cleanTypeId || null;
-                if(this.cleanTypeId && this.configs.cleanType){
-                  let isInArr = this.taskTypes2.some(v => v.id == this.cleanTypeId);
-                  if(!isInArr){
-                    this.taskTypes2.unshift(this.configs.cleanType);
-                  }
-                }
-
-                this.surgeryBegin[0].checked = this.configs.surgeryBegin == 1;
-              }
-            });
-        }else{
-          this.loading = false;
+      .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/preview/preview.component.html

@@ -4,7 +4,7 @@
       <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">
@@ -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 nzType="primary" [nzLoading]="loading" (click)="submitForm()">提交</button>
+              <button nz-button [disabled]="pastStatus" nzType="primary" [nzLoading]="loading" (click)="submitForm()">提交</button>
             </nz-form-control>
           </nz-form-item>
         </form>

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

@@ -17,7 +17,8 @@ export class PreviewComponent implements OnInit {
   listOfData:any[] = [];
   success:boolean = false;
   isM:boolean = false;
-
+	pastStatus:boolean = false;
+	
   constructor(
     private route: ActivatedRoute,
     private mainService:MainService,
@@ -33,6 +34,10 @@ export class PreviewComponent implements OnInit {
     }else{
       document.documentElement.style.fontSize = '100px';
     }
+		let gdid = this.route.snapshot.queryParams.gdid;
+		if(gdid){
+			this.verifyPast(gdid)
+		}
     this.getList();
   }
   // 初始化Form
@@ -74,6 +79,19 @@ 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
+		}).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;