Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/share/add-inspect-info/add-inspect-info.component.html

@@ -37,6 +37,15 @@
           </div>
         </div>
 
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>医生备注：</div>
+            <div class="value">
+              <input class="w100" nz-input placeholder="请填写医生备注" [(ngModel)]="inspectData.remark" />
+            </div>
+          </div>
+        </div>
+
         <div class="row">
           <div class="formItem flex_2">
             <div class="name"><i class="icon_transport transport-required red"></i>检查科室：</div>

src/app/share/detail-patients/detail-patients.component.html

@@ -166,6 +166,12 @@
                   <span>{{item.arriveTime?'是':'否'}}</span>
                 </p>
               </div>
+              <div nz-col nzSpan="24">
+                <p>
+                  <span class="label">医生备注：</span>
+                  <span>{{item.remark}}</span>
+                </p>
+              </div>
             </div>
           </div>
         </ng-container>

src/app/share/edit-inspect-info/edit-inspect-info.component.html

@@ -34,6 +34,15 @@
             </div>
           </div>
         </div>
+
+        <div class="row">
+          <div class="formItem flex_1">
+            <div class="name"><i class="icon_transport transport-required red" style="visibility: hidden;"></i>医生备注：</div>
+            <div class="value">
+              <input class="w100" nz-input placeholder="请填写医生备注" [(ngModel)]="remark" />
+            </div>
+          </div>
+        </div>
       </div>
     </div>
     <div class="display_flex justify-content_flex-center">

src/app/share/edit-inspect-info/edit-inspect-info.component.ts

@@ -12,12 +12,14 @@ import { addDays, startOfMinute, format } from 'date-fns';
 export class EditInspectInfoComponent implements OnInit {
   @Input() date:any;
   @Input() execDeptId:any;
+  @Input() remarkText:any;
   @Input() execDeptList:any[] = [];
   @Output() submitFormHand = new EventEmitter();
   @Output() cancelFlagHand = new EventEmitter();
   yyDate = null; //预约日期-患者其他服务
   yyTime = null; //预约时间-患者其他服务
   deptId = null;
+  remark = '';
   deptList:any[] = [];
   isLoading:boolean = false;
   constructor(
@@ -34,6 +36,11 @@ export class EditInspectInfoComponent implements OnInit {
       this.deptList = this.execDeptList;
     }
 
+    console.log('this.remarkText:', this.remarkText)
+    if(this.remarkText){
+      this.remark = this.remarkText;
+    }
+
     if(this.execDeptId){
       let flag = this.deptList.some(v => v.id == this.execDeptId);
       if(flag){
@@ -64,6 +71,7 @@ export class EditInspectInfoComponent implements OnInit {
     }
     this.submitFormHand.emit({
       deptId: this.deptId,
+      remark: this.remark,
       date: format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'),
     });
   }

src/app/share/order-detail/order-detail.component.html

@@ -849,6 +849,12 @@
                     <span>{{ item.arriveTime ? "是" : "否" }}</span>
                   </p>
                 </div>
+                <div nz-col nzSpan="24">
+                  <p>
+                    <span class="label">医生备注：</span>
+                    <span>{{ item.remark }}</span>
+                  </p>
+                </div>
               </div>
             </div>
           </ng-container>

src/app/views/fuwutai/fuwutai.component.html

@@ -1211,7 +1211,8 @@
                                 <nz-checkbox-wrapper nz-row class="linkCheckCheck w100" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)">
                                   <div nz-row nz-col nzSpan="12" *ngFor="let item of linkCheckLis">
                                     <div nz-col nzSpan="24">
-                                      <label nz-checkbox [nzValue]="item">{{ item.label}}</label>
+                                      <label nz-checkbox [nzValue]="item" [title]="item.remark" *ngIf="item.remark"><i class="icon_transport transport-chaoshi"></i>{{ item.label}}</label>
+                                      <label nz-checkbox [nzValue]="item" *ngIf="!item.remark">{{ item.label}}</label>
                                       <i class="icon_transport transport-zu1468 priority" *ngIf="item.priority === 1 || item.priority === '1'"></i>
                                     </div>
                                   </div>
@@ -1538,7 +1539,7 @@
 												</nz-option>
 											</nz-select>
 										</div>
-																			
+
                     <div class="col">
                       <span class="name required">故障现象：</span>
                       <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="changeCommonInp('category', $event)" nzPlaceHolder="请选择故障现象" [(ngModel)]="incidentModel.category" (ngModelChange)="changeApplyCategory($event)" (nzOpenChange)="openChangeApplyCategory($event)">
@@ -2052,7 +2053,7 @@
 	  cancelTxt="否"
 	  (cancelDelEvent)="hideRepeatModal()"
 	></app-dialog-delete>
-	
+
 	<!-- 是否限制业务发起时间模态框 -->
 	<app-dialog-delete [delModal]="limitTimeModal" (hideDelModalEvent)="hideLimitTimeModal()" [btnLoading]="limitTimeLoading"
 	(confirmDelEvent)="confirmLimitTime()" [content]="limitTimeInfo" confirmTxt="继续建单" [isShowConfirm]="isShowConfirm" [isShowConfirmInfo]="isShowConfirmInfo"></app-dialog-delete>
@@ -2151,4 +2152,4 @@
 	<div class="del-modal">
 		<input nz-input type="text" placeholder="请输入删除原因" [(ngModel)]="delReason" />
 	</div>
-</nz-modal>
+</nz-modal>

src/app/views/fuwutai/fuwutai.component.less

@@ -14,6 +14,12 @@
 	color: #000;
 }
 
+.transport-chaoshi{
+  font-size: 14px;
+  margin-right: 4px;
+  color: orange;
+}
+
 .thumbList{
   display: flex;
   align-items: center;
@@ -2824,7 +2830,7 @@
 .zw-content {
 	width: 100%;
 	padding: 20px;
-	
+
 	.item{
 		width: 100%;
 		margin-bottom: 20px;

src/app/views/fuwutai/fuwutai.component.ts

@@ -185,7 +185,7 @@ export class FuwutaiComponent implements OnInit {
   // 初始化增删改按钮
   coopBtns: any = {};
 	validateZwForm: FormGroup; //新增政务值班表单
-	
+
   // 获取院区配置配置，是否核酸打印
   isShowNucleicAcidPrinting = false;
   getHospitalConfigList(key) {
@@ -473,7 +473,7 @@ export class FuwutaiComponent implements OnInit {
             }
             this.showPromptModal("建单", true, "", "close");
           }
-        } 
+        }
 				else if(data["status"] == 1000033){
 					this.newOrderShow = false; //关闭弹窗
 					if (go === "&go&") {
@@ -591,7 +591,7 @@ export class FuwutaiComponent implements OnInit {
 					}else{
 						this.showPromptModal("建单", false, data["msg"]);
 					}
-        } 
+        }
 				else if(data["status"] == 1000033){
 					this.newOrderShow = false; //关闭弹窗
 					if (go === "&go&") {
@@ -604,7 +604,7 @@ export class FuwutaiComponent implements OnInit {
 					}
 					//重复建单那策略
 					this.repeatMsg = data["msg"];
-					this.showRepeatModal(postData, "inspection", go);					
+					this.showRepeatModal(postData, "inspection", go);
 				}else if (data["status"] == 100043){
 					this.showPromptModal("建单", true, data["msg"]);
 				}
@@ -733,7 +733,7 @@ export class FuwutaiComponent implements OnInit {
           }
           this.showPromptModal("建单", true, "", "close");
         }
-      } 
+      }
 			else if(data["status"] == 1000033){
 				this.newOrderShow = false; //关闭弹窗
 				if (go === "&go&") {
@@ -747,7 +747,7 @@ export class FuwutaiComponent implements OnInit {
 				//重复建单那策略
 				this.repeatMsg = data["msg"];
 				this.showRepeatModal(postData, "other", go);
-				
+
 			}else if (data["status"] == 100043){
 				this.showPromptModal("建单", true, data["msg"]);
 			}
@@ -809,7 +809,7 @@ export class FuwutaiComponent implements OnInit {
           }
           this.showPromptModal("建单", true, "", "close");
         }
-      } 
+      }
 			else if(data["status"] == 1000033){
 				this.newOrderShow = false; //关闭弹窗
 				if (go === "&go&") {
@@ -2044,7 +2044,7 @@ export class FuwutaiComponent implements OnInit {
         }
       });
   }
-	
+
 	// 获取政务值班近期记录
 	itsmZwOrders:any=[];
 	getZwOrders(){
@@ -2416,8 +2416,8 @@ export class FuwutaiComponent implements OnInit {
 					keyWord: keyWords
         }
 				postData.incidentQuery.incident.showReassign = this.user.user.scope.showReassign==0 || !this.user.user.scope.showReassign ? undefined : this.user.user.scope.showReassign
-				postData.incidentQuery.incident.showGovDuty = 
-				this.user.user.scope.showGovDuty==0 || 
+				postData.incidentQuery.incident.showGovDuty =
+				this.user.user.scope.showGovDuty==0 ||
 				!this.user.user.scope.showGovDuty ? undefined : this.user.user.scope.showGovDuty
 			}else if(stateId == 2){
         postData.incidentQuery.incident = {
@@ -2701,7 +2701,7 @@ export class FuwutaiComponent implements OnInit {
 			    gzgd = true;
 			  }
 			});
-			
+
 			if(!gglb && !gzgd && !sy){
 				this.msg.error("暂无权限进入系统！", {
 				  nzDuration: 2000,
@@ -2802,11 +2802,11 @@ export class FuwutaiComponent implements OnInit {
       }
     });
   }
-	
+
 	changeAsset(e){
 		this.changeAssetInpSubject.next(e);
 	}
-	
+
 	// 获取资产列表
 	assetData:any = [];
 	getAssetData(name?){
@@ -2819,7 +2819,7 @@ export class FuwutaiComponent implements OnInit {
 		    name: name
 		  },
 		};
-		
+
 		this.mainService
 		  .getFetchDataList("simple/data", "asset", data)
 		  .subscribe((data) => {
@@ -2828,7 +2828,7 @@ export class FuwutaiComponent implements OnInit {
 		    }
 		  });
 	}
-	
+
   // 重置新建工单数据
   resetOrderData(){
     this.applicationRequesterList = [];
@@ -2848,7 +2848,7 @@ export class FuwutaiComponent implements OnInit {
       this.isRelatedDepartment = false;
     }
   }
-	
+
 	// 获取系统配置
 	initConfig:any;
 	config:any;
@@ -2892,7 +2892,7 @@ export class FuwutaiComponent implements OnInit {
 											this.incidentModel.hosId = this.tool.getCurrentHospital().id
 										}
 									}
-									break;	
+									break;
 								case "applicantMustFillIn":
 									this.applicantMustFillIn = c[1]
 									break;
@@ -2902,7 +2902,7 @@ export class FuwutaiComponent implements OnInit {
 									}else{
 										this.cmdbRepair = false
 									}
-									break;	
+									break;
 							}
 							if(type==1){
 								if(this.publicRepair && !this.deptRepair){
@@ -2924,7 +2924,7 @@ export class FuwutaiComponent implements OnInit {
 				}
 			});
 	 }
-	 
+
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房
   deathTasktypeIdPatient; //获取这个写死的任务类型的id,转出院记录
@@ -3141,7 +3141,7 @@ export class FuwutaiComponent implements OnInit {
     //     this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, this.incidentModel.department);
     //   }
     // }else
-		 
+
 		 if(this.currentTabIndex === '故障报修'){
 				// this.incidentModel.department = null;
 				this.rightTitle_tab = [
@@ -3149,7 +3149,7 @@ export class FuwutaiComponent implements OnInit {
 					{ id: 3, name: '知识库' },
 				]
 				this.rightTitleHandler(this.rightTitle_tab[0].id);
-			
+
 
       let deptObj = this.applicationDepartmentList.find(v => v.id == this.applyDept);
 
@@ -3171,7 +3171,7 @@ export class FuwutaiComponent implements OnInit {
 			this.rightTitleHandler(this.rightTitle_tab[0].id);
 		}
   }
-	
+
 	// 获取省市区
 	priorityData:any = [];
 	nzOptions:any = [];
@@ -3182,14 +3182,14 @@ export class FuwutaiComponent implements OnInit {
 			this.nzOptions = this.tool.tranListToTreeDataLeaf(list, undefined, "parentId");
 		});
 	}
-	
+
 	// 选择省市区
 	selectProvince:boolean = false
 	onProvinceChanges	(values: any): void {
 		this.selectProvince = true;
 		this.getZwOrders();
 	}
-	
+
 	// 初始化政务值班form
 	sketch:any = null;
 	record:any = null;
@@ -3207,7 +3207,7 @@ export class FuwutaiComponent implements OnInit {
 		this.complainant = null;
 		this.detailedAddress = null;
 	}
-	
+
 	// 保存政务值班
 	zwLoading:boolean = false;
 	saveZwOrder(): void{
@@ -3288,7 +3288,7 @@ export class FuwutaiComponent implements OnInit {
 				}
 			});
 	}
-	
+
   // 获取患者信息
   searchPatientList(id, searchWords) {
 		this.patientObj = null;
@@ -3425,7 +3425,7 @@ export class FuwutaiComponent implements OnInit {
         }
       });
   }
-	
+
 	// 患者转运-任务类型-院区切换
 	changeTypeHospital(e, type){
 		console.log(111,e)
@@ -3436,7 +3436,7 @@ export class FuwutaiComponent implements OnInit {
 		}
 		this.getStartDept(type)
 	}
-	
+
 	// 患者转运-任务类型-搜索起点科室
 	getStartDept(type){
 		let dataObj = {
@@ -3468,7 +3468,7 @@ export class FuwutaiComponent implements OnInit {
 		    }
 		  });
 	}
-	
+
 	// 物品配送-任务类型-院区切换
 	changeTypeQtHospital(e, type){
 		if(type==1){
@@ -3478,7 +3478,7 @@ export class FuwutaiComponent implements OnInit {
 		}
 		this.getStartQtDept(type)
 	}
-	
+
 	// 物品配送-任务类型-搜索起点科室
 	getStartQtDept(type){
 		let dataObj = {
@@ -3510,13 +3510,13 @@ export class FuwutaiComponent implements OnInit {
 		    }
 		  });
 	}
-	
+
 	// 配送院区选择
 	changeInHospital(e){
 		this.applyDept = undefined;
 		this.searchApplicationDepartment('hsms');
 	}
-	
+
   // 选择院区
   changeApplyHospital(e){
     console.log(e);
@@ -3729,7 +3729,7 @@ export class FuwutaiComponent implements OnInit {
         this.incidentModel.description = this.applicationCategoryList.find(v => v.id == e).mutiCategory;
       }
     }
-		
+
     // 根据院区和故障现象带出责任部门，优先级，维修人/组
     if(this.incidentModel.hosId && e && this.buildType !== '编辑事件'){
       let postData = {
@@ -5640,6 +5640,7 @@ export class FuwutaiComponent implements OnInit {
               label: (e.yyTime || "") + " " + e.execDept.dept + " 进行 " + (e.inspectName || "检查"),
               value: e["id"],
               checked: false,
+              remark: e.remark,
             });
           });
           this.linkCheckLis = arr;
@@ -6062,7 +6063,7 @@ export class FuwutaiComponent implements OnInit {
   closeDelOrderModal() {
     this.delOrderShow = false;
   }
-	
+
 	// 打开删除模态框
 	delReason:any;
 	isDelVisible:boolean = false;
@@ -6090,13 +6091,13 @@ export class FuwutaiComponent implements OnInit {
 	    }
 	  });
 	}
-	
+
 	// 关闭模态框
 	delOrderModal() {
 	  this.isDelVisible = false;
 		this.delReason = null;
 	}
-	
+
   // 新建工单
   // 提交选择转入科室的模态框
   submitFormHand(id) {
@@ -6130,7 +6131,7 @@ export class FuwutaiComponent implements OnInit {
 			this.dataStatus = result["status"];
       if (result["status"] == 200) {
         this.showPromptModal("建单", true, "");
-      } 
+      }
 			else if(result["status"] == 1000033){
 				if (this.goType === "&go&") {
 					this.applyDept = result["createDept"].id;
@@ -6148,21 +6149,21 @@ export class FuwutaiComponent implements OnInit {
 			}
     });
   }
-	
+
 	limitTimeModal: boolean = false; //模态框
 	limitTimeInfo:string = '';
 	limitTimeItem: any = {};
 	hideLimitTimeModal() {
 	  this.limitTimeModal = false;
 	}
-	
+
 	// 建单判断时间-护士端建单通用方法
 	isShowConfirm:boolean = true;
 	isShowConfirmInfo:string = '';
 	newOrderTimeFun(order, fun1, fun2){
 	  fun2.call(this)
 	}
-	
+
 	repeatModal: boolean = false; //删除模态框
 	repeatMsg = "";
 	loadingRepeat = false;
@@ -6191,7 +6192,7 @@ export class FuwutaiComponent implements OnInit {
 			// this.showRepetitionModal("建单", true, "", "closeGo");
 		}
 	}
-	
+
 	confirmType:boolean = false;
 	confirmRepeat() {
 		this.confirmType = true;
@@ -6213,7 +6214,7 @@ export class FuwutaiComponent implements OnInit {
 			}else{
 			  this.confirmRepeatFun(data);
 			}
-	    
+
 	  });
 	}
 	confirmRepeatFun(data){
@@ -6324,7 +6325,7 @@ export class FuwutaiComponent implements OnInit {
 			}
 		}
 	}
-	
+
   // 隐藏选择转入科室的模态框
   deptFlagHand(e) {
     this.deptFlag = false;
@@ -6475,7 +6476,7 @@ export class FuwutaiComponent implements OnInit {
         }
       });
   }
-	
+
 	// 确认
 	jdFlagId;
 	limitTimeLoading:boolean = false;
@@ -6487,7 +6488,7 @@ export class FuwutaiComponent implements OnInit {
 	  }).messageId;
 	  this.limitTimeItem.fun2.call(this);
 	}
-	
+
   closeModel(e) {
 		console.log(99999,e)
     if (e === "close") {
@@ -6502,7 +6503,7 @@ export class FuwutaiComponent implements OnInit {
 			this.showNewOrder(1, "&go&");
 		}
   }
-	
+
 	// 重复建单提示框
 	showRepetitionModal(con, success, promptInfo?, back?){
 		this.promptModalShow = false;
@@ -6517,7 +6518,7 @@ export class FuwutaiComponent implements OnInit {
 			}
 		}, 100);
 	}
-	
+
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?, back?) {
     this.promptModalShow = false;
@@ -6630,7 +6631,7 @@ export class FuwutaiComponent implements OnInit {
 			      _y = h - fixedMenu.clientHeight;
 			    }
 			    fixedMenu.style.top = _y + "px";
-			
+
 			    var _x = ev.clientX - x > 0 ? ev.clientX - x : 0;
 			    var w = window.innerWidth;
 			    if (_x > w - fixedMenu.clientWidth) {
@@ -7250,8 +7251,10 @@ export class FuwutaiComponent implements OnInit {
     let patient = this.patientList.find(v => v.patientCode === e);
     if(patient){
       this.workOrderRemarkZy = patient.remark || '';
+      this.workOrderInspectScore = patient.tripType;
     }else{
       this.workOrderRemarkZy = '';
+      this.workOrderInspectScore = undefined;
     }
 
     if(this.tabIndex !== undefined && this.currentTasktype && this.currentTasktype.associationType.value === 'inspect'){

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

@@ -1502,7 +1502,8 @@
                   <nz-checkbox-wrapper nz-row class="linkCheckCheck w100" ngDefaultControl formControlName="linkCheck" (nzOnChange)="linkCheckLisChange($event)">
                     <div nz-row nz-col nzSpan="12" *ngFor="let item of linkCheckLis">
                       <div nz-col nzSpan="24">
-                        <label nz-checkbox [nzValue]="item">{{ item.label}}</label>
+                        <label nz-checkbox [nzValue]="item" [title]="item.remark" *ngIf="item.remark"><i class="icon_transport transport-chaoshi"></i>{{ item.label}}</label>
+                        <label nz-checkbox [nzValue]="item" *ngIf="!item.remark">{{ item.label}}</label>
                         <i class="icon_transport transport-shanchu1 cur" *ngIf="item.manualCreate == 1" (click)="delInspect(item.value)"></i>
                         <i class="icon_transport transport-zu1468 priority" *ngIf="item.priority === 1 || item.priority === '1'"></i>
                       </div>
@@ -2425,7 +2426,7 @@
             	</nz-option>
             </nz-select>
           </nz-form-control>
-        
+
     <!--      <nz-form-label nzFor="contactsInformation">故障现象</nz-form-label>
           <nz-form-control style="display: inline-block;">
             <nz-select style="width:185px;" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择故障现象" formControlName="category" (ngModelChange)="changeApplyCategory($event)">
@@ -2438,7 +2439,7 @@
             </nz-select>
           </nz-form-control> -->
         </nz-form-item>
-				
+
 				<nz-form-item>
           <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="description">故障描述</nz-form-label>
           <nz-form-control>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -5,6 +5,12 @@
   height: 100%;
   display: flex;
 
+  .transport-chaoshi{
+    font-size: 16px;
+    margin-right: 4px;
+    color: orange;
+  }
+
   .patientStyle{
     i {
       color: @primary-color;

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

@@ -2418,7 +2418,7 @@ export class HushijiandanComponent implements OnInit {
             this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.confirmPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
               this.showPromptModal("创建", true, "");
               this.goodsLis = [];
-              this.workOrderInspectScore = undefined;
+              // this.workOrderInspectScore = undefined;
               this.getOrderList();
               this.getDeptTaskType();
               this.getTodayNum();
@@ -2426,7 +2426,7 @@ export class HushijiandanComponent implements OnInit {
           }else{
             this.showPromptModal("创建", true, "");
             this.goodsLis = [];
-            this.workOrderInspectScore = undefined;
+            // this.workOrderInspectScore = undefined;
             this.getOrderList();
             this.getDeptTaskType();
             this.getTodayNum();
@@ -2773,6 +2773,8 @@ export class HushijiandanComponent implements OnInit {
     that.initForm();
     that.checkedShowMsg = {};
     that.patientMsg = msg;
+    this.workOrderInspectScore = msg.tripType;
+    this.workOrderRemark2 = msg.remark || '';
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
@@ -3071,7 +3073,7 @@ export class HushijiandanComponent implements OnInit {
                 this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: postData.workOrder.patient.patientCode}).subscribe((resultData) => {
                   this.showPromptModal("创建", true, "");
                   this.goodsLis = [];
-                  this.workOrderInspectScore = undefined;
+                  // this.workOrderInspectScore = undefined;
                   this.getOrderList();
                   this.getDeptTaskType();
                   this.getTodayNum();
@@ -3079,7 +3081,7 @@ export class HushijiandanComponent implements OnInit {
               }else{
                 this.showPromptModal("创建", true, "");
                 this.goodsLis = [];
-                this.workOrderInspectScore = undefined;
+                // this.workOrderInspectScore = undefined;
                 this.getOrderList();
                 this.getDeptTaskType();
                 this.getTodayNum();
@@ -3137,7 +3139,7 @@ export class HushijiandanComponent implements OnInit {
               this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
                 this.showPromptModal("创建", true, "");
                 this.goodsLis = [];
-                this.workOrderInspectScore = undefined;
+                // this.workOrderInspectScore = undefined;
                 this.getOrderList();
                 this.getDeptTaskType();
                 this.getTodayNum();
@@ -3145,7 +3147,7 @@ export class HushijiandanComponent implements OnInit {
             }else{
               this.showPromptModal("创建", true, "");
               this.goodsLis = [];
-              this.workOrderInspectScore = undefined;
+              // this.workOrderInspectScore = undefined;
               this.getOrderList();
               this.getDeptTaskType();
               this.getTodayNum();
@@ -3191,7 +3193,7 @@ export class HushijiandanComponent implements OnInit {
               this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
                 this.showPromptModal("创建", true, "");
                 this.goodsLis = [];
-                this.workOrderInspectScore = undefined;
+                // this.workOrderInspectScore = undefined;
                 this.getOrderList();
                 this.getDeptTaskType();
                 this.getTodayNum();
@@ -3199,7 +3201,7 @@ export class HushijiandanComponent implements OnInit {
             }else{
               this.showPromptModal("创建", true, "");
               this.goodsLis = [];
-              this.workOrderInspectScore = undefined;
+              // this.workOrderInspectScore = undefined;
               this.getOrderList();
               this.getDeptTaskType();
               this.getTodayNum();
@@ -3255,7 +3257,7 @@ export class HushijiandanComponent implements OnInit {
                 this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
                   this.showPromptModal("创建", true, "");
                   this.goodsLis = [];
-                  this.workOrderInspectScore = undefined;
+                  // this.workOrderInspectScore = undefined;
                   this.getOrderList();
                   this.getDeptTaskType();
                   this.getTodayNum();
@@ -3263,7 +3265,7 @@ export class HushijiandanComponent implements OnInit {
               }else{
                 this.showPromptModal("创建", true, "");
                 this.goodsLis = [];
-                this.workOrderInspectScore = undefined;
+                // this.workOrderInspectScore = undefined;
                 this.getOrderList();
                 this.getDeptTaskType();
                 this.getTodayNum();
@@ -3309,7 +3311,7 @@ export class HushijiandanComponent implements OnInit {
                 this.mainService.postCustom("api", "clearPatientRecoveryDept", {patientCode: this.accompanyPostData.workOrder.patient.patientCode}).subscribe((resultData) => {
                   this.showPromptModal("创建", true, "");
                   this.goodsLis = [];
-                  this.workOrderInspectScore = undefined;
+                  // this.workOrderInspectScore = undefined;
                   this.getOrderList();
                   this.getDeptTaskType();
                   this.getTodayNum();
@@ -3317,7 +3319,7 @@ export class HushijiandanComponent implements OnInit {
               }else{
                 this.showPromptModal("创建", true, "");
                 this.goodsLis = [];
-                this.workOrderInspectScore = undefined;
+                // this.workOrderInspectScore = undefined;
                 this.getOrderList();
                 this.getDeptTaskType();
                 this.getTodayNum();
@@ -3466,7 +3468,7 @@ export class HushijiandanComponent implements OnInit {
           that.isRemand = data.isRemand == 1 ? true : false;
         }
         that.goodsLis = [];
-        that.workOrderInspectScore = undefined;
+        // that.workOrderInspectScore = undefined;
         that.allowUrgent = "0"; //加急
         that.urgentReason = ""; //加急原因
 
@@ -3514,6 +3516,7 @@ export class HushijiandanComponent implements OnInit {
                 (e.inspectName || "检查"),
               value: e["id"],
               checked: false,
+              remark: e.remark,
             });
           });
           that.linkCheckLis = arr;
@@ -4213,7 +4216,7 @@ export class HushijiandanComponent implements OnInit {
       if (data.status == 200) {
         this.showPromptModal("创建", true, "");
         this.goodsLis = [];
-        this.workOrderInspectScore = undefined;
+        // this.workOrderInspectScore = undefined;
         this.getOrderList();
         this.getDeptTaskType();
         this.getTodayNum();
@@ -4228,7 +4231,7 @@ export class HushijiandanComponent implements OnInit {
       if (data.status == 200) {
         this.showPromptModal("创建", true, "");
         this.goodsLis = [];
-        this.workOrderInspectScore = undefined;
+        // this.workOrderInspectScore = undefined;
         this.getOrderList();
         this.getDeptTaskType();
         this.getTodayNum();
@@ -4243,7 +4246,7 @@ export class HushijiandanComponent implements OnInit {
       if (data.status == 200) {
         this.showPromptModal("创建", true, "");
         this.goodsLis = [];
-        this.workOrderInspectScore = undefined;
+        // this.workOrderInspectScore = undefined;
         this.getOrderList();
         this.getDeptTaskType();
         this.getTodayNum();
@@ -4258,7 +4261,7 @@ export class HushijiandanComponent implements OnInit {
       if (data.status == 200) {
         this.showPromptModal("创建", true, "");
         this.goodsLis = [];
-        this.workOrderInspectScore = undefined;
+        // this.workOrderInspectScore = undefined;
         this.getOrderList();
         this.getDeptTaskType();
         this.getTodayNum();
@@ -4273,7 +4276,7 @@ export class HushijiandanComponent implements OnInit {
       if (data.status == 200) {
         this.showPromptModal("创建", true, "");
         this.goodsLis = [];
-        this.workOrderInspectScore = undefined;
+        // this.workOrderInspectScore = undefined;
         this.getOrderList();
         this.getDeptTaskType();
         this.getTodayNum();
@@ -4288,7 +4291,7 @@ export class HushijiandanComponent implements OnInit {
       if (data.status == 200) {
         this.showPromptModal("创建", true, "");
         this.goodsLis = [];
-        this.workOrderInspectScore = undefined;
+        // this.workOrderInspectScore = undefined;
         this.getOrderList();
         this.getDeptTaskType();
         this.getTodayNum();
@@ -5699,6 +5702,7 @@ export class HushijiandanComponent implements OnInit {
                 (e.inspectName || "检查"),
               value: e["id"],
               checked: false,
+              remark: e.remark,
             });
           });
           this.linkCheckLis = arr;

src/app/views/inspect-info-config/inspect-info-config.component.html

@@ -106,7 +106,8 @@
                   <span class="circle red" title="无预约时间检查"></span>
                 </ng-container>
               </ng-template>
-              {{(inspect.yyTime || "") + " " + (inspect.execDept ? (deptDisplay == 2 ? inspect.execDept.deptalias : inspect.execDept.dept) : '') + " 进行 " + (inspect.inspectName || "检查")}} <span class="inspectState" *ngIf="inspect.gdId" (click)="detail($event, inspect.gdId)">{{inspect.inspectState?.name}}</span>
+              <span [title]="inspect.remark" *ngIf="inspect.remark"><i class="icon_transport transport-chaoshi"></i>{{(inspect.yyTime || "") + " " + (inspect.execDept ? (deptDisplay == 2 ? inspect.execDept.deptalias : inspect.execDept.dept) : '') + " 进行 " + (inspect.inspectName || "检查")}} <span class="inspectState" *ngIf="inspect.gdId" (click)="detail($event, inspect.gdId)">{{inspect.inspectState?.name}}</span></span>
+              <span *ngIf="!inspect.remark">{{(inspect.yyTime || "") + " " + (inspect.execDept ? (deptDisplay == 2 ? inspect.execDept.deptalias : inspect.execDept.dept) : '') + " 进行 " + (inspect.inspectName || "检查")}} <span class="inspectState" *ngIf="inspect.gdId" (click)="detail($event, inspect.gdId)">{{inspect.inspectState?.name}}</span></span>
             </span>
             <span *ngIf="!inspect.gdId" class="icon_transport transport-weibiaoti2010104" (click)="editInspect({data: data, inspect: inspect})"></span>
             <span *ngIf="!inspect.gdId" class="icon_transport transport-shanchu1" (click)="showDelModal({data: data, inspect: inspect}, '您确认要删除吗？','删除','delInspect')"></span>
@@ -136,7 +137,7 @@
 <app-mask *ngIf="maskFlag"></app-mask>
 
 <!-- 修改检查 -->
-<app-edit-inspect-info [execDeptList]="coopData.inspect && coopData.inspect.inspectCheckType && coopData.inspect.inspectCheckType.deptList" [execDeptId]="coopData.inspect && coopData.inspect.execDeptId" [date]="coopData.inspect && coopData.inspect.yyTime" *ngIf="isShowSelectDate" (submitFormHand)="submitSelectDate($event)" (cancelFlagHand)="cancelSelectDate($event)"></app-edit-inspect-info>
+<app-edit-inspect-info [execDeptList]="coopData.inspect && coopData.inspect.inspectCheckType && coopData.inspect.inspectCheckType.deptList" [execDeptId]="coopData.inspect && coopData.inspect.execDeptId" [remarkText]="coopData.inspect && coopData.inspect.remark" [date]="coopData.inspect && coopData.inspect.yyTime" *ngIf="isShowSelectDate" (submitFormHand)="submitSelectDate($event)" (cancelFlagHand)="cancelSelectDate($event)"></app-edit-inspect-info>
 
 <!-- 修改注意事项 -->
 <app-select-remark [inspect]="coopData.data" *ngIf="isShowSelectRemark" (submitFormHand)="submitSelectRemark($event)" (cancelFlagHand)="cancelSelectRemark($event)"></app-select-remark>

src/app/views/inspect-info-config/inspect-info-config.component.less

@@ -7,6 +7,11 @@
   background-color: #F0F2F5;
   display: flex;
   flex-direction: column;
+  .transport-chaoshi{
+    font-size: 14px;
+    margin-right: 4px;
+    color: orange;
+  }
   .remarkText{
     padding-right: 24px;
     .remarkTextInner{

src/app/views/inspect-info-config/inspect-info-config.component.ts

@@ -216,11 +216,12 @@ export class InspectInfoConfigComponent implements OnInit {
   }
 
   // 修改检查项目-确定
-  submitSelectDate({date, deptId}){
+  submitSelectDate({date, deptId, remark}){
     let postData = {
       id: this.coopData.inspect.id,
       yyTime: date || undefined,
       execDeptId: deptId,
+      remark,
     }
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,

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

@@ -55,7 +55,7 @@
           <tr class="thead">
             <th nzWidth="4%">序号</th>
             <th nzWidth="8%">患者姓名|住院号</th>
-            <th nzWidth="10%">申请科室</th>
+            <th nzWidth="10%">申请科室|医生备注</th>
             <th nzWidth="10%">检查科室</th>
             <th nzWidth="14%">检查单号|检查项目</th>
             <th nzWidth="14%">预约时间|入库时间</th>
@@ -69,7 +69,7 @@
           <tr *ngFor="let data of listOfData;let i = index">
             <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
             <td>{{ data.patientName }}({{ data.patientBedNum }})<br>{{ data.residenceNo }}</td>
-            <td>{{ data.applyDept?.dept }}</td>
+            <td>{{ data.applyDept?.dept }}<br>{{ data.remark }}</td>
             <td>{{ data.execDept?.dept }}</td>
             <td>{{ data.inspectCode }}<br>{{data.inspectName}}</td>
             <td>{{ data.yyTime }}<br>{{ data.createTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
@@ -100,7 +100,7 @@
 </app-prompt-modal>
 
 <!-- 修改检查 -->
-<app-edit-inspect-info [execDeptList]="coopData.inspectCheckType && coopData.inspectCheckType.deptList" [execDeptId]="coopData.execDept && coopData.execDept.id" [date]="coopData.yyTime" *ngIf="isShowSelectDate" (submitFormHand)="submitSelectDate($event)" (cancelFlagHand)="cancelSelectDate($event)"></app-edit-inspect-info>
+<app-edit-inspect-info [execDeptList]="coopData.inspectCheckType && coopData.inspectCheckType.deptList" [execDeptId]="coopData.execDept && coopData.execDept.id" [remarkText]="coopData.remark" [date]="coopData.yyTime" *ngIf="isShowSelectDate" (submitFormHand)="submitSelectDate($event)" (cancelFlagHand)="cancelSelectDate($event)"></app-edit-inspect-info>
 
 <!-- 新增检查 -->
 <app-add-inspect-info *ngIf="isShowAddInspect" (closeModelHs)="closeAddInspectModel($event)" (confirmModelHs)="confirmAddInspectModel($event)"></app-add-inspect-info>

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

@@ -212,6 +212,7 @@ export class InspectSearchComponent implements OnInit {
     let obj = JSON.parse(e);
     let postData:any = {
       inspectList: [{
+        remark: obj.inspectData.remark || undefined,
         patientCode: obj.patientDTO.patientCode,
         patientName: obj.patientDTO.patientName,
         barCode: obj.patientDTO.barCode,
@@ -251,11 +252,12 @@ export class InspectSearchComponent implements OnInit {
 
   // 修改检查项目-确定
   maskFlag: any = false;
-  submitSelectDate({date, deptId}){
+  submitSelectDate({date, deptId, remark}){
     let postData = {
       id: this.coopData.id,
       yyTime: date || undefined,
       execDeptId: deptId,
+      remark,
     }
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,

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

@@ -370,7 +370,10 @@ export class PatientSearchComponent implements OnInit {
     }else{
       this.validateForm.controls.patientType.setValue(null);
     }
-    this.validateForm.controls.tripType.setValue(data.tripType);
+    if(data.tripType){
+      this.validateForm.controls.tripType.setValue(data.tripType);
+      this.tripTypeList = [data.tripTypeDTO];
+    }
     this.validateForm.controls.remark.setValue(data.remark);
 
     this.modal = true;