拉取代码

src/app/components/configurationCenter/configuration-custom-business/configuration-custom-business.component.ts

@@ -92,13 +92,14 @@ export class ConfigurationCustomBusinessComponent implements OnInit {
 	  	idx: 0,
 	  	sum: 99999,
 			taskType:{
+				simpleQuery:true,
 				hosIds: this.validatePriorityForm.value.hosId
 			}
 	  };
 	  this.mainService
 	  	.getFetchDataList("configuration", "taskType", query)
 	  	.subscribe((data) => {
-	  		this.taskTypeList = data.list || [];
+	  		this.taskTypeList = data.list.filter(i=>i.associationType.value == 'other');
 				if(type=='edit'){
 					this.validatePriorityForm.controls.taskType.setValue(obj.taskType);
 				}
@@ -127,6 +128,13 @@ export class ConfigurationCustomBusinessComponent implements OnInit {
 				this.isLoading = false;
 	  		this.deptData = data.list || [];
 				if(type == 'edit'){
+					let item = this.deptData.find(i=>i.id == obj.associationDeptDTO.id)
+					if(!item){
+						this.deptData.push({
+							dept: obj.associationDeptDTO.dept,
+							id: obj.associationDeptDTO.id
+						})
+					}
 					this.validatePriorityForm.controls.associationDept.setValue(obj.associationDeptDTO.id);
 				}
 	  	});
@@ -255,9 +263,9 @@ export class ConfigurationCustomBusinessComponent implements OnInit {
     let data = {
 			idx: 0,
 			sum: 99999,
-			businessHandoverConfig: {
-				hosId: this.hosId
-			},
+			// businessHandoverConfig: {
+			// 	hosId: this.hosId
+			// },
 		};
 		this.loading1 = true;
 		this.mainService

src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.component.ts

@@ -346,6 +346,7 @@ export class ConfigurationDictionaryComponent implements OnInit {
 	  	idx: 0,
 	  	sum: 99999,
 			taskType:{
+				simpleQuery:true,
 				hosIds: this.validatePriorityForm.value.hosId
 			}
 	  };
@@ -464,9 +465,9 @@ export class ConfigurationDictionaryComponent implements OnInit {
 	  let data = {
 			idx: 0,
 			sum: 99999,
-			businessTaskType: {
-				hosId: this.hosId
-			},
+			// businessTaskType: {
+			// 	hosId: this.hosId
+			// },
 		};
 		this.loading1 = true;
 		this.mainService
@@ -483,8 +484,9 @@ export class ConfigurationDictionaryComponent implements OnInit {
 	}
 	
 	// 删除业务类型
-	showBusinessModal(){
-		 this.delBusinessModal = true;
+	showBusinessModal(data){
+		this.coopData = data
+		this.delBusinessModal = true;
 	}
 	
 	// 隐藏删除框

src/app/views/common-info/common-info.component.html

@@ -39,31 +39,37 @@
         [nzLoading]="loading1">
         <thead>
           <tr class="thead">
-            <th nzWidth="10%">业务类型</th>
+            <th nzWidth="9%">业务类型</th>
             <th nzWidth="10%">创建时间|单号</th>
-            <th nzWidth="15%">申请科室|终点科室</th>
-            <th nzWidth="10%">收取信息</th>
-            <th nzWidth="15%">中转信息</th>
-            <th nzWidth="15%">送达信息</th>
-            <th nzWidth="10%">交接数量</th>
+            <th nzWidth="13%">申请科室|终点科室</th>
+            <th nzWidth="13%">收取信息</th>
+            <th nzWidth="13%">中转信息</th>
+            <th nzWidth="13%">送达信息</th>
+            <th nzWidth="9%">交接数量</th>
+						<th nzWidth="8%">业务状态</th>
             <th nzWidth="15%">工单信息</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{data.businessTaskTypeDTO?.name}}</td>
-            <td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm:ss'}}<br>{{ data.businessNo }}</td>
-            <td>{{ data.applyDeptDT0?.dept }}<br>{{ data.endDeptDT0?.dept }}</td>
+            <td>{{data.businessTaskTypeDTO?.businessName}}</td>
+            <td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}<br>{{ data.businessNo }}</td>
+            <td>{{ data.applyDeptDTO?.dept }}<br>{{ data.endDeptDTO?.dept }}</td>
             <td>
-							<div>{{data.collectionUserDTO?.name}} {{data.collectionHandoverUserDTO?.name}}</div>
-							<div>{{data.collectionTime | date: 'yyyy-MM-dd HH:mm:ss'}}</div>
+							<div>{{data.collectionUserDTO?.name}} <span *ngIf="data.collectionUserDTO && data.collectionHandoverUserDTO">|</span> {{data.collectionHandoverUserDTO?.name}}</div>
+							<div>{{data.collectionTime | date: 'yyyy-MM-dd HH:mm'}}</div>
 						</td>
-            <td>{{ data.transferTime | date: 'yyyy-MM-dd HH:mm:ss'}}<br>{{ data.transferUserDTO?.name }}</td>
-            <td>{{ data.deliveryUserDTO?.name }}|{{ data.deliveryHandoverUserDTO?.name }}<br>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
+            <td>
+							{{ data.transferTime | date: 'yyyy-MM-dd HH:mm' }}<br>
+							{{ data.transferStartTime | date: 'yyyy-MM-dd HH:mm' }}<br>
+							{{ data.transferUserDTO?.name }}
+						</td>
+            <td>{{ data.deliveryUserDTO?.name }} <span *ngIf="data.deliveryUserDTO && data.deliveryHandoverUserDTO">|</span>	 {{ data.deliveryHandoverUserDTO?.name }}<br>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
 						<td>{{ data.handoverNum1}}</td>
+						<td>{{ data.businessStatus?.name}}</td>
             <td>
-							<div>收：<span class="clickable" (click)="detail($event, data.gdid)">{{ data.gdCode }}</span></div>
-							<div>中转：<span class="clickable" (click)="detail($event, data.gdid)">{{ data.transferGdCode }}</span></div>
+							<div *ngIf="data.gdCode">收：<span class="clickable" (click)="detail($event, data.gdId)">{{ data.gdCode }}</span></div>
+							<div *ngIf="data.transferGdCode">中转：<span class="clickable" (click)="detail($event, data.transferGdId)">{{ data.transferGdCode }}</span></div>
 						</td>
           </tr>
         </tbody>

src/app/views/common-info/common-info.component.ts

@@ -225,6 +225,6 @@ export class CommonInfoComponent implements OnInit {
   // 查看
   detail(e, id) {
     e.stopPropagation();
-    this.router.navigateByUrl(`/main/specimenPackage/orderDetail/${id}`);
+    this.router.navigateByUrl(`/main/commonInfo/orderDetail/${id}`);
   }
 }

src/app/views/incident-config/incident-config.component.ts

@@ -32,7 +32,6 @@ export class IncidentConfigComponent implements OnInit, AfterViewInit {
     { id: 6, name: '维修记录', key: "repair_type"},
     { id: 7, name: '满意度评价', key: "incident_degree"},
 		{ id: 8, name: '告警紧急度', key: "alarm_urgency"},
-		{ id: 9, name: '业务类型', key: "business_type"},
   ]
 
   // 院区配置

src/app/views/nurse-config/nurse-config.component.ts

@@ -19,6 +19,7 @@ export class NurseConfigComponent implements OnInit, AfterViewInit {
   // 数据字典
   dictionaryKeyList:any[] = [
     { id: 1, name: '携带设备', key: "goods"},
+		{ id: 2, name: '业务类型', key: "business_type"},
   ]
 
   // 院区配置

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

@@ -38,6 +38,7 @@
 						<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 *ngIf="data.data">{{data.data.userName}}</td>
 						<td *ngFor="let item of data">
 							{{ item.answer }}
 						</td>

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

@@ -156,6 +156,7 @@ export class QuestionnaireAnswerComponent implements OnInit {
 							{describe:'患者姓名'},
 							{describe:'住院号'},
 							{describe:'工单编号/任务类型'},
+							{describe:'执行人员'},
 						]
 						for(let i in this.listBaseInfos){
 							this.listOfData[i].data = this.listBaseInfos[i]

src/app/views/shortcut-build-orders/shortcut-build-orders.component.ts

@@ -194,6 +194,11 @@ export class ShortcutBuildOrdersComponent implements OnInit {
       idx: 0,
       sum: 20,
     };
+		if(this.deptDicId){
+			delete data2.department.type
+		}else{
+			data2.department.type.id = 282
+		}
     this.mainService
       .getFetchDataList("data", "department", data2)
       .subscribe((data) => {
@@ -278,8 +283,13 @@ export class ShortcutBuildOrdersComponent implements OnInit {
     }
     // 终点科室的科室类型为检验科
     if (type === "formEnd") {
-			delete data.department.deptHandoverType
-      data.department.type.id = 282;
+			if(this.deptDicId){
+				delete data.department.deptHandoverType
+				delete data.department.type
+			}else{
+				data.department.type.id = 282
+				delete data.department.deptHandoverType
+			}
       if(this.validateForm.value.endDepartmentHospital){
         data.department.hospital.id = this.validateForm.value.endDepartmentHospital;
       }else{
@@ -369,6 +379,11 @@ export class ShortcutBuildOrdersComponent implements OnInit {
 	// 选择任务类型
 	isOrther:any = 'multiple';
 	changeType(e){
+		this.validateForm.controls.startDepartmentHospital.setValue(null);
+		this.validateForm.controls.startDepartment.setValue(null);
+		this.validateForm.controls.endDepartmentHospital.setValue(null);
+		this.department1 = [];
+		this.validateForm.controls.endDepartment.setValue(null);
 		let item = this.roundRobinTypes.find(i=>i.id == e)
 		if(item){
 			if(item.associationType.value == 'other'){
@@ -390,9 +405,17 @@ export class ShortcutBuildOrdersComponent implements OnInit {
 			this.isOrther = 'multiple'
 			this.deptDicId = null
 		}
+		
+		setTimeout(_=>{
+			this.validateForm.controls.startDepartmentHospital.setValue(null);
+			this.validateForm.controls.startDepartment.setValue(null);
+			this.validateForm.controls.endDepartmentHospital.setValue(null);
+			this.department1 = [];
+			this.validateForm.controls.endDepartment.setValue(null);
+		},100)
 	}
 	
-	deptDicId:any;;
+	deptDicId:any;
   // 新增/编辑弹框
   addModal() {
     this.add = true; //新增