Merge branch 'master' into develop

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

@@ -129,7 +129,6 @@ export class ConfigurationMessageComponent implements OnInit {
         "[$患者信息$]",
         "[$建单人$]",
       ];
-
       if(data.noticeCode === 'pil_sign_user'){
         // 驻点人员
         this.varArr = [
@@ -160,7 +159,30 @@ export class ConfigurationMessageComponent implements OnInit {
           "[$签到科室$]",
           "[$签到时间$]",
         ];
-      }
+      }else if(data.noticeCode === 'inspect_trans_receiver' || data.noticeCode ==='inspect_trans_transUser'){
+				this.varArr = [
+				  "[$患者信息$]",
+				  "[$患者联系电话$]",
+				  "[$工单单号$]",
+				  "[$转派人$]",
+				  "[$接收人$]",
+				  "[$任务类型$]",
+				  "[$发起时间$]",
+				  "[$申请科室$]",
+				  "[$起点科室$]",
+				  "[$终点科室$]",
+				];
+			}else if(data.noticeCode === 'work_order_remind' || data.noticeCode ==='work_order_remind_freedom'){
+				this.varArr = [
+				  "[$任务类型$]",
+				  "[$工单单号$]",
+					"[$申请科室$]",
+					"[$起点科室$]",
+					"[$终点科室$]",
+					"[$发起时间$]",
+				  "[$是否紧急$]"
+				];
+			}
 
       this.currentIndex = 1;
     }else if(this.wechatConfigTypeValue === 'mdv2_handle'){

src/app/components/display-form/display-form.component.html

@@ -97,6 +97,14 @@
 				    </nz-radio-group>
 				  </div>
 				</div>
+				<div nz-row>
+				  <div nz-col nzSpan="4">查询时间范围：</div>
+				  <div nz-col nzSpan="4">
+				    <nz-input-group nzAddOnAfter="天">
+				      <nz-input-number class="w100" [(ngModel)]="searchDay" [nzStep]="1" [nzMin]="1" [nzMax]="15" placeholder="请输入查询天数"></nz-input-number>
+				    </nz-input-group>
+				  </div>
+				</div>
       </div>
       <div class="conditions display_flex align-items_center justify-content_flex-center" *ngIf="isLoading">
         <nz-spin nzSimple></nz-spin>

src/app/components/display-form/display-form.component.ts

@@ -32,6 +32,7 @@ export class DisplayFormComponent implements OnInit {
 	leftMenuLocation: any = 2; //左侧菜单
 	rightMenuLocation: any = 2; //右侧菜单
 	showSource: any = 2; //是否展示来源
+	searchDay: any = 1; //查询时间范围
   ngOnInit() {
 		console.log(778778, this.hsmsData)
     this.initControlView();
@@ -73,10 +74,10 @@ export class DisplayFormComponent implements OnInit {
 				this.leftMenuLocation = data.list[0].leftMenuLocation || 2;
 				this.rightMenuLocation = data.list[0].rightMenuLocation || 2;
 				this.showSource = data.list[0].showSource || 2;
-				
+				this.searchDay = data.list[0].searchDay || 1;
       });
   }
-
+	
   // 保存展示形式
   saveLoading: boolean = false; //保存按钮loading状态
   saveOrderScope() {
@@ -88,6 +89,10 @@ export class DisplayFormComponent implements OnInit {
       this.message.warning('工单刷新时间必填！')
       return;
     }
+		if(this.searchDay % 1 !== 0){
+			this.message.warning('查询时间范围必须是整数！')
+			return
+		}
     this.saveLoading = true;
     let wn;
     switch (this.patientCareCol) {
@@ -114,6 +119,7 @@ export class DisplayFormComponent implements OnInit {
 				leftMenuLocation: this.leftMenuLocation,
 				rightMenuLocation: this.rightMenuLocation,
 				showSource: this.showSource,
+				searchDay: this.searchDay
       },
     };
     if (this.controlView["id"]) {

src/app/services/main.service.ts

@@ -531,8 +531,8 @@ export class MainService {
     });
   }
   // 护士端定时预约工单立即执行
-  executeNow(id) {
-    return this.http.get(host.host + "/api/directStartOrder/" + id, {
+  executeNow(id, data) {
+    return this.http.post(host.host + "/api/directStartOrder/" + id, data, {
       headers: this.headers,
     });
   }
@@ -1294,4 +1294,9 @@ export class MainService {
 	autoMake(model, count, data){
 		return this.http.post(host.host + `/testData/make/${model}/${count}`, data);
 	}
+	
+	// 调度台一键派单
+	oneClickAssignOrders(data){
+		return this.http.post(host.host + `/ser/oneClickAssignOrders`, data);
+	}
 }

src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -143,18 +143,19 @@
         <thead>
           <tr class="thead">
             <th nzWidth="4%">序号</th>
-            <th nzWidth="8%">申请科室</th>
-            <th nzWidth="8%">患者姓名</th>
-            <th nzWidth="8%">标本编码</th>
-            <th nzWidth="8%">检验项目</th>
-            <th nzWidth="8%">标本类型</th>
-            <th nzWidth="8%">状态</th>
-            <th nzWidth="8%">收取时间</th>
-            <th nzWidth="8%">收取人</th>
-            <th nzWidth="8%">中转时间</th>
-            <th nzWidth="8%">送达时间</th>
-            <th nzWidth="8%">送达人</th>
-            <th nzWidth="8%">终点科室</th>
+            <th >申请科室</th>
+            <th >患者姓名</th>
+            <th >标本编码</th>
+            <th >检验项目</th>
+						<th >核收信息</th>
+            <th >标本类型</th>
+            <th >状态</th>
+            <th >收取时间</th>
+            <th >收取人</th>
+            <th >中转时间</th>
+            <th >送达时间</th>
+            <th >送达人</th>
+            <th >终点科室</th>
           </tr>
         </thead>
         <tbody>
@@ -166,6 +167,10 @@
             <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo || data.patientNo}}</td>
             <td class="underline" (click)="viewSpecimenHistory(data)">{{ data.scode || "-" }}</td>
             <td>{{ data.specimenDesc || "-" }}</td>
+						<td>
+							<div>{{ data.checkCollectUserDTO ? data.checkCollectUserDTO.name : "" }}</div>
+							<div>{{ data.checkCollectTime|date:'yyyy-MM-dd HH:mm:ss' || "" }}</div>
+						</td>
             <td>{{ data.stype ? data.stype.name : "-" }}<span *ngIf="data.tubeType">,</span>{{data.tubeType && data.tubeType.name}}</td>
             <td>{{ data.speState ? data.speState.name : "-" }}</td>
             <td>{{ data.arriveTime || "-" }}</td>

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

@@ -67,6 +67,11 @@
       </div>
     </div>
   </div>
+	<div *ngIf="hurseInfoHiding==1 && unassignedList.length && !loading1">
+		<button nz-button nzType="primary" (click)="allSendOrders()">
+		  一键派单
+		</button>
+	</div>
   <!-- 状态工单 -->
   <div class="lists_box" [ngClass]="{ top185: hurseInfoHiding != 1 }">
     <!-- 未分派/未受理 -->
@@ -2053,7 +2058,16 @@
 	  cancelTxt="否"
 	  (cancelDelEvent)="hideRepeatModal()"
 	></app-dialog-delete>
-
+	
+	<!-- 一键派单 -->
+	<app-dialog-delete
+	  [delModal]="sendModal"
+	  (hideDelModalEvent)="closeSecdModal()"
+	  [btnLoading]="btnLoading"
+	  (confirmDelEvent)="confirmSecd()"
+	  content="您确认一键派单吗？系统会根据工作分配方案自动派单给指定人员"
+	></app-dialog-delete>
+	
 	<!-- 是否限制业务发起时间模态框 -->
 	<app-dialog-delete [delModal]="limitTimeModal" (hideDelModalEvent)="hideLimitTimeModal()" [btnLoading]="limitTimeLoading"
 	(confirmDelEvent)="confirmLimitTime()" [content]="limitTimeInfo" confirmTxt="继续建单" [isShowConfirm]="isShowConfirm" [isShowConfirmInfo]="isShowConfirmInfo"></app-dialog-delete>

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

@@ -185,7 +185,54 @@ export class FuwutaiComponent implements OnInit {
   // 初始化增删改按钮
   coopBtns: any = {};
 	validateZwForm: FormGroup; //新增政务值班表单
-
+	
+	// 一键派单
+	sendModal:boolean = false;
+	allSendOrders(){
+		this.sendModal = true;
+	}
+	
+	//  一键派单取消
+	closeSecdModal(){
+		this.sendModal = false;
+	}
+	
+	// 一键派单提交
+	confirmSecd(){
+		let types = "";
+		this.user.user.scope.typeIds.forEach((e) => {
+		  types += e.id + ",";
+		});
+		types = types.slice(0, types.length - 1);
+		
+		let postData = {
+			workOrder: {
+				serTaskTypes: types || undefined,
+				serGdState: 1,
+				range: this.orderScopeRadio,
+				platform: 3,
+				searchDays: this.searchDay || 1,
+			},
+			hosId: this.checkedHos,
+			idx: 0,
+			sum: 1
+		}
+		if (this.unassignedBuilding.length) {
+		  postData.workOrder["deptIds"] = this.unassignedBuilding.toString();
+		}
+		
+		this.btnLoading = true
+		this.mainService.oneClickAssignOrders(postData).subscribe((result:any) =>{
+		  if(result.status == 200){
+				this.btnLoading = false
+		    this.closeSecdModal();
+		    this.showPromptModal("派单", true, "");
+		  }else{
+				this.showPromptModal('派单', false, result.msg);
+			}
+		});
+	}
+	
   // 获取院区配置配置，是否核酸打印
   isShowNucleicAcidPrinting = false;
   getHospitalConfigList(key) {
@@ -252,7 +299,7 @@ export class FuwutaiComponent implements OnInit {
         serGdState: 1,
         range: this.orderScopeRadio,
         platform: 3,
-        searchDays: 1,
+        searchDays: this.searchDay,
         keyWord: "",
       },
       idx: 0,
@@ -1976,7 +2023,7 @@ export class FuwutaiComponent implements OnInit {
         // serGdState: 4,
         range: "0",
         platform: 3,
-        searchDays: 100,
+        searchDays: this.searchDay,
 				createDept: this.applyDept
         // startDept: {
         //   id: id,
@@ -2378,7 +2425,7 @@ export class FuwutaiComponent implements OnInit {
             serGdState: stateId,
             range: this.orderScopeRadio,
             platform: 3,
-            searchDays: 1,
+            searchDays: this.searchDay,
             keyWord: keyWords
           },
           idx: 0,
@@ -5634,13 +5681,18 @@ export class FuwutaiComponent implements OnInit {
         if (data.data && Array.isArray(data.data.data) && data.data.data.length>0) {
           let arr = [];
           data.data.data.forEach((e) => {
-						e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
-						if(e.endCheckTime){
-							e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
-							e.yyEndTime = e.newTime + '--' + e.newTime2
+						if(e.yyTime){
+							e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
+							if(e.endCheckTime){
+								e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
+								e.yyEndTime = e.newTime + '--' + e.newTime2
+							}else{
+								e.yyEndTime = e.newTime
+							}
 						}else{
-							e.yyEndTime = e.newTime
+							e.yyEndTime = null
 						}
+
             arr.push({
               execDeptId: e.execDept.id,
               yyTime: e.yyTime,
@@ -6354,6 +6406,7 @@ export class FuwutaiComponent implements OnInit {
 	showSource:any = 0;
 	leftStyle:any;
 	rightStyle:any;
+	searchDay:any = 1;
   initControlView() {
     let postData = {
       controlView: {},
@@ -6369,6 +6422,7 @@ export class FuwutaiComponent implements OnInit {
           workerInfoTime: 60,
           unsendOrderVoice: true,
           orderType: 'priority',
+					searchDay: 1
         };
 
         this.patientCareCol = 7;
@@ -6381,6 +6435,7 @@ export class FuwutaiComponent implements OnInit {
 				this.leftMenuLocation = this.controlView.leftMenuLocation || 2
 				this.rightMenuLocation = this.controlView.rightMenuLocation || 2
 				this.showSource = this.controlView.showSource || 0
+				this.searchDay = this.controlView.searchDay || 1
 				if(this.leftMenuLocation==1){
 					this.leftStyle = {
 						'position': 'fixed',
@@ -7281,14 +7336,18 @@ export class FuwutaiComponent implements OnInit {
         if(data.data && Array.isArray(data.data.data) && data.data.data.length>0) {
           let arr = [];
           data.data.data.forEach((e) => {
-						e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
-						if(e.endCheckTime){
-							e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
-							e.yyEndTime = e.newTime + '--' + e.newTime2
+						if(e.yyTime){
+							e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
+							if(e.endCheckTime){
+								e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
+								e.yyEndTime = e.newTime + '--' + e.newTime2
+							}else{
+								e.yyEndTime = e.newTime
+							}
 						}else{
-							e.yyEndTime = e.newTime
+							e.yyEndTime = null
 						}
-
+		
             arr.push({
               execDeptId: e.execDept.id,
               yyTime: e.yyTime,
@@ -7354,13 +7413,18 @@ export class FuwutaiComponent implements OnInit {
       if (data.data && Array.isArray(data.data.data) && data.data.data.length>0) {
         let arr = [];
         data.data.data.forEach((e) => {
-					e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
-					if(e.endCheckTime){
-						e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
-						e.yyEndTime = e.newTime + '--' + e.newTime2
+					if(e.yyTime){
+						e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
+						if(e.endCheckTime){
+							e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
+							e.yyEndTime = e.newTime + '--' + e.newTime2
+						}else{
+							e.yyEndTime = e.newTime
+						}
 					}else{
-						e.yyEndTime = e.newTime
+						e.yyEndTime = null
 					}
+
           arr.push({
             execDeptId: e.execDept.id,
             yyTime: e.yyTime,

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

@@ -1051,16 +1051,15 @@
                       <thead>
                         <tr class="thead">
                           <th nzWidth="7%">序号</th>
-                          <th nzWidth="8%">标本类型</th>
-                          <th nzWidth="8%">状态</th>
-                          <th nzWidth="10%">标本编码</th>
-                          <th nzWidth="8%">患者姓名</th>
-                          <th nzWidth="8%">床号</th>
-                          <th nzWidth="12%">收取扫描时间</th>
-                          <th nzWidth="8%">收取人</th>
-                          <th nzWidth="10%">送达目标科室</th>
-                          <th nzWidth="12%">送达到达时间</th>
-                          <th nzWidth="9%"></th>
+                          <th nzWidth="10%">患者信息</th>
+                          <th nzWidth="11%">标本信息</th>
+                          <th nzWidth="11%">标本类型</th>
+                          <th nzWidth="10%">状态</th>
+                          <th nzWidth="11%">采集信息</th>
+                          <th nzWidth="11%">收取信息</th>
+                          <th nzWidth="10%">中转时间</th>
+                          <th nzWidth="10%">送达时间</th>
+                          <th nzWidth="9%">操作</th>
                         </tr>
                       </thead>
                       <tbody>
@@ -1071,25 +1070,30 @@
                           "
                         >
                           <td>{{i+(historySpecimenPageIndex-1) * historySpecimenPageSize + 1}}</td>
-                          <td>{{ data.stype ? data.stype.name : "-" }}</td>
                           <td>
-                            {{ data.speState ? data.speState.name : "-" }}
+                          	<div>{{data.residenceNo || data.patientNo}}</div>
+                          	<div>
+                          		{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span>
+                          	</div>
                           </td>
-                          <td>{{ data.scode || "-" }}</td>
-                          <td>{{ data.patientName || "-" }}</td>
-                          <td>{{ data.bedNum || "-" }}</td>
-                          <td>{{ data.arriveTime || "-" }}</td>
-                          <td>{{ data.receiverName || "-" }}</td>
                           <td>
-                            {{
-                              data.checkDept
-                                ? deptDisplay == 2
-                                  ? data.checkDept.deptalias
-                                  : data.checkDept.dept
-                                : "-"
-                            }}
+                          	<div>{{ data.scode || "-" }}</div>
+                          	<div>{{ data.specimenDesc || "-" }}</div>
+                          </td>
+													<td>{{ data.stype ? data.stype.name : "-" }}<span *ngIf="data.tubeType">,</span>{{data.tubeType && data.tubeType.name}}</td>
+													<td>{{ data.speState ? data.speState.name : "-" }}</td>
+                          <td>
+                          	<div>{{ data.collectNurseName || "-" }}</div>
+                          	<div>{{ data.printDate || "-" }}</div>
+                          </td>
+                          <td>
+                          	<div>{{ data.receiverName }}<ng-container *ngIf="data.packageId">-<span class="underline" (click)="viewSpe(data.packageId)">包</span></ng-container></div>
+                          	<div>{{ data.arriveTime || "-" }}</div>
+                          </td>
+                          <td>{{ data.transTime || '-' }}</td>
+                          <td>
+                          	{{ data.sendTime || '-' }}
                           </td>
-                          <td>{{ data.sendTime || "-" }}</td>
                           <td>
                             <button class="btn1 mr8 mb8 mt8" (click)="viewSpecimenHistory(data)">查看</button>
                           </td>
@@ -1157,12 +1161,13 @@
                       <thead>
                         <tr class="thead">
                           <th nzWidth="7%">序号</th>
-                          <th nzWidth="15%">药单单号</th>
-                          <th nzWidth="18%">发药科室</th>
-                          <th nzWidth="15%">申请时间</th>
-                          <th nzWidth="15%">记账时间</th>
-                          <th nzWidth="15%">状态</th>
-                          <th nzWidth="15%">查看过程</th>
+                          <th nzWidth="13%">请领单号</th>
+                          <th nzWidth="13%">发药科室</th>
+                          <th nzWidth="10%">状态</th>
+													<th nzWidth="15%">收取信息</th>
+													<th nzWidth="15%">送达信息</th>
+													<th nzWidth="13%">送达交接人</th>
+                          <th nzWidth="15%">操作</th>
                         </tr>
                       </thead>
                       <tbody>
@@ -1174,20 +1179,19 @@
                         >
                           <td>{{i+(historyDrugsbagPageIndex-1) * historyDrugsbagPageSize + 1}}</td>
                           <td>{{ data.packid || "-" }}</td>
-                          <td>
-                            {{
-                              data.launch
-                                ? deptDisplay == 2
-                                  ? data.launch.deptalias
-                                  : data.launch.dept
-                                : "-"
-                            }}
-                          </td>
-                          <td>{{ data.creatTime || "-" }}</td>
-                          <td>{{ data.bagTime || "-" }}</td>
-                          <td>
-                            {{ data.drugsState ? data.drugsState.name : "-" }}
-                          </td>
+													<td>{{ data.launch?.dept}}</td>
+													<td>
+													  {{ data.drugsState ? data.drugsState.name : "-" }}
+													</td>
+													<td>
+														<div>{{ data.deliveryUser?.name }}</div>
+														<div>{{ data.packTime }}</div>
+													</td>
+													<td>
+														<div>{{ data.sendUserDTO?.name }}</div>
+														<div>{{ data.signtime }}</div>
+													</td>
+                          <td>{{ data.sendHandoverUserDTO?.name }}</td>
                           <td>
                             <button class="btn1 mr8 mb8 mt8" (click)="viewDrugsbagHistory(data)">查看过程</button>
                           </td>

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

@@ -181,9 +181,12 @@ export class HushijiandanComponent implements OnInit {
 	surgeryDataId: any; //手术id
 	patientDataId: any; //病人id
 	smartShow:boolean = false; //智能客服弹框
+	userId:any;
+	
   ngOnInit() {
     this.getCoopBtns();
     this.currentHospital = this.tool.getCurrentHospital();
+		this.userId = this.tool.getCurrentUserId();
     this.tool.getDeptDisplay().subscribe((result) => {
       if (result.status == 200) {
         this.deptDisplay = result.list[0].valueconfig;
@@ -786,7 +789,7 @@ export class HushijiandanComponent implements OnInit {
   // 确认立即执行
   confirmExec() {
     this.btnLoading = true;
-    this.mainService.executeNow(this.coopItem.id).subscribe((result: any) => {
+    this.mainService.executeNow(this.coopItem.id, {userId: this.userId}).subscribe((result: any) => {
       this.closeExecModal();
       if (result.status == 200) {
         this.showPromptModal("立即执行", true, "");
@@ -3512,15 +3515,19 @@ export class HushijiandanComponent implements OnInit {
         if (data.status == 200 && data.data && data.data.length) {
           let arr = [];
           data.data.forEach((e) => {
-						e.yyEndTime = e.yyTime
-						e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
-						if(e.endCheckTime){
-							e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
-							e.yyEndTime = e.newTime + '--' + e.newTime2
+						if(e.yyTime){
+							e.yyEndTime = e.yyTime
+							e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
+							if(e.endCheckTime){
+								e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
+								e.yyEndTime = e.newTime + '--' + e.newTime2
+							}else{
+								e.yyEndTime = e.newTime
+							}
 						}else{
-							e.yyEndTime = e.newTime
-							// e.newTime2 = format(addMinutes(new Date(e.yyTime), this.inspectAndPatientTransportConfig.yytimeGapMinute), 'HH:mm')
+							e.yyEndTime = null
 						}
+
 						arr.push({
 						  execDeptId: e.execDept.id,
 						  yyTime: e.yyTime,
@@ -5707,14 +5714,18 @@ export class HushijiandanComponent implements OnInit {
         if (data.status == 200 && data.data && data.data.length) {
           let arr = [];
           data.data.forEach((e) => {
-						e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
-						if(e.endCheckTime){
-							e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
-							e.yyEndTime = e.newTime + '--' + e.newTime2
+						if(e.yyTime){
+							e.newTime = format(new Date(e.yyTime), 'MM-dd HH:mm')
+							if(e.endCheckTime){
+								e.newTime2 = format(new Date(e.endCheckTime), 'HH:mm')
+								e.yyEndTime = e.newTime + '--' + e.newTime2
+							}else{
+								e.yyEndTime = e.newTime
+							}
 						}else{
-							// e.newTime2 = format(addMinutes(new Date(e.yyTime), this.inspectAndPatientTransportConfig.yytimeGapMinute), 'HH:mm')
-							e.yyEndTime = e.newTime
+							e.yyEndTime = null
 						}
+
             arr.push({
               execDeptId: e.execDept.id,
               yyTime: e.yyTime,

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

@@ -7,6 +7,15 @@
   background-color: #F0F2F5;
   display: flex;
   flex-direction: column;
+	
+	.red-sign{
+		position: absolute;
+		left: -12px;
+		top: -3px;
+		font-size: 22px;
+		color: red;
+	}
+	
   .transport-chaoshi{
     font-size: 14px;
     margin-right: 4px;

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

@@ -72,7 +72,7 @@
             <td>{{ data.applyDept?.dept }}<br>{{ data.remark }}</td>
             <td>{{ data.execDept?.dept }}</td>
             <td>{{ data.inspectCode }}<br>{{data.inspectName}}</td>
-            <td>{{ data.yyEndTime }}<br>{{ data.createTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
+            <td class="po-re"><span *ngIf="data.upAppointmentTime!= undefined && data.upAppointmentTime==1" class="red-sign">*</span>{{ data.yyEndTime }}<br>{{ data.createTime | date:'yyyy-MM-dd HH:mm:ss' }}</td>
             <td>{{ data.inspectState?.name}}</td>
             <td>{{ data.workerName }}</td>
             <td>{{ data.patientDTO?.tripTypeDTO?.inspectMode }}<br>{{ data.patientDTO?.remark }}</td>

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

@@ -1,4 +1,14 @@
 @import "../../../../src/theme.less";
+.po-re{
+	position: relative;
+	.red-sign{
+		position: absolute;
+		left: 9px;
+		top: 9px;
+		font-size: 22px;
+		color: red;
+	}
+}
 
 .save {
   position: fixed;
@@ -8,7 +18,7 @@
   height: 100%;
   background: rgba(0, 0, 0, 0.4);
   z-index: 99;
-
+	
   .modalBody {
     width: 350px;
     height: 220px;

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

@@ -74,12 +74,12 @@
         <thead>
           <tr class="thead">
             <th nzWidth="8%">患者类别</th>
-            <th nzWidth="10%">患者姓名(床号)</th>
+            <th nzWidth="15%">患者姓名(床号)|联系电话</th>
             <th nzWidth="10%">患者标识</th>
             <th nzWidth="10%">住院号|条码号</th>
-            <th nzWidth="10%">院区|当前科室</th>
-            <th nzWidth="10%">护理等级</th>
-            <th nzWidth="8%">病情级别</th>
+            <th nzWidth="11%">院区|当前科室</th>
+            <th nzWidth="12%">护理等级|病情级别</th>
+            <!-- <th nzWidth="8%">病情级别</th> -->
             <th nzWidth="8%">性别、年龄</th>
             <th nzWidth="12%">陪检方式|注意事项</th>
             <th nzWidth="14%">操作</th>
@@ -88,12 +88,11 @@
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
             <td>{{ data.patientType?.name }}</td>
-            <td>{{ data.patientName }}({{ data.bedNum }})</td>
+            <td>{{ data.patientName }}({{ data.bedNum }})<br>{{data.patientPhone}}</td>
             <td>{{ data.patientCode }}</td>
             <td>{{ data.residenceNo }}<br>{{ data.barCode }}</td>
             <td>{{ data.hospitalDTO?.hosName }}<br>{{ data.department?.dept }}</td>
-            <td>{{ data.careLevel?.name }}</td>
-            <td>{{ data.illnessState?.name }}</td>
+            <td>{{ data.careLevel?.name }}<br>{{ data.illnessState?.name }}</td>
             <td>{{ data.gender?.name }}、{{ data.age }}</td>
             <td>{{ data.tripTypeDTO?.inspectMode }}<br>{{ data.remark }}</td>
             <td>
@@ -178,6 +177,14 @@
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
+				<nz-form-item>
+				  <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="patientPhone">联系电话</nz-form-label>
+				  <nz-form-control nzErrorTip="请填写联系电话!">
+				    <nz-input-group>
+				      <input type="text" nz-input formControlName="patientPhone" placeholder="请填写联系电话" />
+				    </nz-input-group>
+				  </nz-form-control>
+				</nz-form-item>
         <nz-form-item>
           <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="hosId">院区</nz-form-label>
           <nz-form-control nzErrorTip="请选择院区!">

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

@@ -223,6 +223,7 @@ export class PatientSearchComponent implements OnInit {
 			residenceNo: ['', [Validators.required]],
 			barCode: ['', [Validators.required]],
 			bedNum: [''],
+			patientPhone: [''],
       hosId: [null, [Validators.required]],
       department: [null, [Validators.required]],
       careLevel: [null, [Validators.required]],
@@ -255,6 +256,7 @@ export class PatientSearchComponent implements OnInit {
           residenceNo: this.validateForm.value.residenceNo,
           barCode: this.validateForm.value.barCode,
           bedNum: this.validateForm.value.bedNum,
+					patientPhone: this.validateForm.value.patientPhone || undefined,
           department: {
             id: this.validateForm.value.department,
           },
@@ -285,6 +287,7 @@ export class PatientSearchComponent implements OnInit {
           residenceNo: this.validateForm.value.residenceNo,
           barCode: this.validateForm.value.barCode,
           bedNum: this.validateForm.value.bedNum,
+					patientPhone: this.validateForm.value.patientPhone || undefined,
           department: {
             id: this.validateForm.value.department,
           },
@@ -349,6 +352,12 @@ export class PatientSearchComponent implements OnInit {
     this.validateForm.controls.residenceNo.setValue(data.residenceNo);
     this.validateForm.controls.barCode.setValue(data.barCode);
     this.validateForm.controls.bedNum.setValue(data.bedNum);
+		
+		if(data.patientPhone){
+		  this.validateForm.controls.patientPhone.setValue(data.patientPhone);
+		}else{
+		  this.validateForm.controls.patientPhone.setValue(null);
+		}
     if(data.department){
       this.deptList = [data.department];
       this.validateForm.controls.department.setValue(data.department.id);

src/app/views/quick-combination/quick-combination.component.html

@@ -46,7 +46,8 @@
             <th nzWidth="10%" *ngIf="queryParamsType==1">科室</th>
             <th nzWidth="8%" *ngIf="queryParamsType==1">分配人员/组</th>
             <th nzWidth="8%" *ngIf="queryParamsType==2">分配组</th>
-            <th nzWidth="33%">操作</th>
+						<th nzWidth="8%">是否发送抢单提醒</th>
+            <th nzWidth="25%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -75,6 +76,11 @@
               <div class="orderPlanTimeShow2" nz-tooltip nzTooltipTitle="{{data.allName?data.allName.join('、'):''}}">
                 {{data.allName?data.allName.join('、'):''}}</div>
             </td>
+						<td>
+							<div *ngIf="data.sendOrderRemind != undefined">
+								{{data.sendOrderRemind==1 ? '是' : '否'}}
+							</div>
+						</td>
             <td>
               <div class="coop">
                 <span (click)="addPersonModal($event,data)" *ngIf="data.ruleType == 3&&queryParamsType==1">分配人员</span>
@@ -157,6 +163,15 @@
               </nz-radio-group>
             </nz-form-control>
           </nz-form-item>
+					<nz-form-item>
+					  <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="sendOrderRemind">是否发送抢单提醒</nz-form-label>
+					  <nz-form-control nzErrorTip="请选择是否发送抢单提醒!">
+					    <nz-radio-group formControlName="sendOrderRemind">
+					      <label nz-radio nzValue="1">是</label>
+					      <label nz-radio nzValue="0">否</label>
+					    </nz-radio-group>
+					  </nz-form-control>
+					</nz-form-item>
           <nz-form-item *ngIf="queryParamsType == 2 && quickCombinationModel == 3">
             <nz-form-label [nzSm]="6" [nzXs]="24" [nzRequired]="requireDeptType" nzFor="deptTypeIds">选择科室类型
             </nz-form-label>

src/app/views/quick-combination/quick-combination.component.ts

@@ -526,6 +526,11 @@ export class QuickCombinationComponent implements OnInit {
     }else{
       this.validateForm.controls.quickCombinationDispatchWeight.setValue(this.info.maxWeight);
     }
+		if(this.add){
+		  this.validateForm.controls.sendOrderRemind.setValue(null);
+		}else{
+		  this.validateForm.controls.sendOrderRemind.setValue(this.info.sendOrderRemind != undefined ? this.info.sendOrderRemind +"" : null);
+		}
   }
   //获取派单方式
   dispatchMethods:any[] = [];
@@ -1064,6 +1069,7 @@ export class QuickCombinationComponent implements OnInit {
       quickCombinationDispatchMethod: [null],
       quickCombinationDispatchType: [null],
       quickCombinationDispatchWeight: [null],
+			sendOrderRemind: ['0', [Validators.required]],
     });
   }
   // 初始化新增form表单
@@ -1136,7 +1142,8 @@ export class QuickCombinationComponent implements OnInit {
         dispatchMethod: this.dispatchMethods.find(v => v.value == this.validateForm.value.quickCombinationDispatchMethod),
         dispatchType: this.validateForm.value.quickCombinationDispatchMethod == 2 ? (this.dispatchTypes.find(v => v.value == this.validateForm.value.quickCombinationDispatchType)) : undefined,
         maxWeight: (this.validateForm.value.quickCombinationDispatchMethod == 2 && this.validateForm.value.quickCombinationDispatchType == 1) ? this.validateForm.value.quickCombinationDispatchWeight : undefined,
-      },
+				sendOrderRemind: this.validateForm.value.sendOrderRemind
+			},
     };
     console.log(this.validateForm.value.deptTypeIds);
     //添加科室类型字段

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

@@ -168,6 +168,7 @@
             <th nzWidth="7%">患者信息</th>
             <th>标本信息</th>
             <th>采集信息</th>
+						<th>核收信息</th>
             <th nzWidth="8%">标本类型</th>
             <th nzWidth="7%">状态</th>
             <th nzShowSort nzSortKey="arrive_time" [(nzSort)]="sortCurrent.arrive_time">收取信息</th>
@@ -197,6 +198,10 @@
 							<div>{{ data.collectNurseName || "-" }}</div>
 							<div>{{ data.printDate || "-" }}</div>
 						</td>
+						<td> 
+							<div>{{ data.checkCollectUserDTO ? data.checkCollectUserDTO.name : "" }}</div>
+							<div>{{ data.checkCollectTime|date:'yyyy-MM-dd HH:mm:ss' || "" }}</div>
+						</td>
             <td>{{ data.stype ? data.stype.name : "-" }}<span *ngIf="data.tubeType">,</span>{{data.tubeType && data.tubeType.name}}</td>
             <td>{{ data.speState ? data.speState.name : "-" }}</td>
             <td>