药品和标本优化

src/app/components/configurationCenter/configuration-drug/configuration-drug.component.html

@@ -103,6 +103,11 @@
 									  <nz-form-label class="label">是否支持查看药品详情信息</nz-form-label>
 									  <nz-checkbox-group [(ngModel)]="item.postData.showDrugsBagDetails"></nz-checkbox-group>
 									</div>
+                  <!-- 待送达合并工单 -->
+									<div class="display_flex align-items_center mb8">
+									  <nz-form-label class="label">待送达合并工单</nz-form-label>
+									  <nz-checkbox-group [(ngModel)]="item.postData.drugsBagSendMergeOrder"></nz-checkbox-group>
+									</div>
                 </div>
                 <!-- 自动建单配置 -->
                 <div *ngIf="tabModalName=='automaticOrderCreation'">

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

@@ -64,6 +64,7 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
 				showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+				drugsBagSendMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -86,6 +87,7 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+				drugsBagSendMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -108,6 +110,7 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+				drugsBagSendMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -130,6 +133,7 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+				drugsBagSendMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -152,13 +156,14 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+				drugsBagSendMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
     },
   ];
-	
-	
+
+
 	// 获取药品状态
 	drugStateData:any = []
 	getDrugState(){
@@ -166,7 +171,7 @@ export class ConfigurationDrugComponent implements OnInit {
 			this.drugStateData = data
 		});
 	}
-	
+
   // 点击数据字典key
   activeDictionary:any;
   clickDictionaryKey(item){
@@ -238,6 +243,7 @@ export class ConfigurationDrugComponent implements OnInit {
 			showPatientInfo: this.activeDictionary.postData.showPatientInfo[0].checked ? 1 : 0,
 			showDrugsBagTypeCount: this.activeDictionary.postData.showDrugsBagTypeCount[0].checked ? 1 : 0,
 			showDrugsBagDetails: this.activeDictionary.postData.showDrugsBagDetails[0].checked ? 1 : 0,
+			drugsBagSendMergeOrder: this.activeDictionary.postData.drugsBagSendMergeOrder[0].checked ? 1 : 0,
 			autoCreate: this.activeDictionary.postData.autoCreate[0].checked ? 1 : 0,
 			autoCreateState:{
 				id:this.activeDictionary.postData.autoCreateState || undefined
@@ -339,6 +345,7 @@ export class ConfigurationDrugComponent implements OnInit {
 					this.activeDictionary.postData.showPatientInfo[0].checked = this.configs.showPatientInfo == 1;
 					this.activeDictionary.postData.showDrugsBagTypeCount[0].checked = this.configs.showDrugsBagTypeCount == 1;
 					this.activeDictionary.postData.showDrugsBagDetails[0].checked = this.configs.showDrugsBagDetails == 1;
+					this.activeDictionary.postData.drugsBagSendMergeOrder[0].checked = this.configs.drugsBagSendMergeOrder == 1;
 					this.activeDictionary.postData.autoCreate[0].checked = this.configs.autoCreate == 1;
 					this.activeDictionary.postData.autoCreateState = this.configs.autoCreateState && this.configs.autoCreateState.id || undefined;
 				}

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.html

@@ -85,19 +85,19 @@
                   <nz-form-label class="label">默认扫描标本进入标本扫描页</nz-form-label>
                   <nz-checkbox-group [(ngModel)]="defaultScanSpe"></nz-checkbox-group>
                 </div>
-								
+
 								<!-- 是否开通收取限制 -->
 								<div class="display_flex align-items_center mb8">
 								  <nz-form-label class="label">是否开通收取限制</nz-form-label>
 								  <nz-checkbox-group [(ngModel)]="speCollectLimit" (ngModelChange)="changeSpeCollect($event)"></nz-checkbox-group>
 								</div>
-								
+
 								<!-- 是否支持非起点科室收取 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 								  <nz-form-label class="label">是否支持非起点科室收取</nz-form-label>
 								  <nz-checkbox-group [(ngModel)]="speCollectSupportNotStartDept"></nz-checkbox-group>
 								</div>
-								
+
 								<!-- 限制标本状态收取 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 									<nz-form-label class="label">限制标本状态收取</nz-form-label>
@@ -107,7 +107,7 @@
 										</ng-container>
 									</nz-select>
 								</div>
-								
+
 								<!-- 限制终点科室收取 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 									<nz-form-label class="label">限制终点科室收取</nz-form-label>
@@ -121,7 +121,7 @@
 									  </nz-option>
 									</nz-select>
 								</div>
-								
+
 								<!-- 限制普通或紧急收取 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 									<nz-form-label class="label">限制普通或紧急收取</nz-form-label>
@@ -131,13 +131,13 @@
 										</ng-container>
 									</nz-select>
 								</div>
-								
+
 								<!-- 是否限制重复收取标本 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 								  <nz-form-label class="label">是否限制重复收取标本</nz-form-label>
 									<nz-checkbox-group [(ngModel)]="speCollectLimitRepeat"></nz-checkbox-group>
 								</div>
-								
+
 								<!-- 是否限制试管类型收取标本 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 								  <nz-form-label class="label">是否限制试管类型收取标本</nz-form-label>
@@ -147,18 +147,40 @@
 										</ng-container>
 									</nz-select>
 								</div>
-								
+
 								<!-- 是否开始收取前进入配置页 -->
 								<div class="display_flex align-items_center mb8" *ngIf="speCollectLimit[0].checked">
 								  <nz-form-label class="label">是否开始收取前进入配置页</nz-form-label>
 								  <nz-checkbox-group [(ngModel)]="speStartCollectShowConfig"></nz-checkbox-group>
 								</div>
-								
+
 								<!-- 是否允许转派 -->
 								<div class="display_flex align-items_center mb8">
 								  <nz-form-label class="label">是否允许转派</nz-form-label>
 								  <nz-checkbox-group [(ngModel)]="handoverOrder"></nz-checkbox-group>
 								</div>
+
+                <!-- 标本交接默认界面 -->
+                <div class="display_flex align-items_center mb8">
+                  <nz-form-label class="label">标本交接默认界面</nz-form-label>
+                  <nz-radio-group [(ngModel)]="speHandoverTubeType">
+                    <label nz-radio [nzValue]="1">患者</label>
+                    <label nz-radio [nzValue]="2">试管类型</label>
+                    <label nz-radio [nzValue]="3">检验标本</label>
+                  </nz-radio-group>
+                </div>
+
+                <!-- 交接是否展示试管类型 -->
+								<div class="display_flex align-items_center mb8">
+								  <nz-form-label class="label">交接是否展示试管类型</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speExpandTube" (ngModelChange)="changeSpeExpandTube($event)"></nz-checkbox-group>
+								</div>
+
+                <!-- 是否默认展开 -->
+								<div class="display_flex align-items_center mb8" *ngIf="speExpandTube[0].checked">
+								  <nz-form-label class="label">是否默认展开</nz-form-label>
+								  <nz-checkbox-group [(ngModel)]="speDefaultExpandTube"></nz-checkbox-group>
+								</div>
               </div>
               <!-- 自动建单配置 -->
               <div *ngIf="tabModalName=='automaticOrderCreation'">

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

@@ -30,6 +30,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 	];
 
   spePackageUnionReceive:any = undefined;//是否联合标本收取
+  speHandoverTubeType:any = undefined;//标本交接默认界面
   spePackageModel:any = undefined;//工单模式
   drugsCreateSign:any = [{ label:'是否开启', value: 0 }];//支持建单并签到
   drugsReceiveSign:any = [{ label:'是否开启', value: 0 }];//支持接单并签到
@@ -51,6 +52,16 @@ export class ConfigurationSpecimenComponent implements OnInit {
 	  {label:'是否开启',value: 0}
 	];
 
+  // 交接是否展示试管类型
+	speExpandTube:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+
+  // 是否默认展开
+	speDefaultExpandTube:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+
   // 工单模式
   spePackageModelList:any[] = [
     { label: '一单一包', value: 1 },
@@ -284,6 +295,14 @@ export class ConfigurationSpecimenComponent implements OnInit {
       this.deptNotAlertIds = [];
     }
   }
+
+  // 交接是否展示试管类型
+  changeSpeExpandTube(e){
+    console.log(e);
+    if(!e[0].checked){
+      this.speDefaultExpandTube[0].checked = false;
+    }
+  }
   // 收取时需扫描二维码
   changeArriveScanCode(e){
     console.log(e);
@@ -380,6 +399,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
       id: this.configs.id,
       taskType: this.tasktype.id,
       hosId: this.hosId,
+      speHandoverTubeType: this.speHandoverTubeType,
       deptNotAlert: this.deptNotAlert[0].checked ? 1 : 0,
       arriveScanCode: this.arriveScanCode[0].checked ? 1 : 0,
       arriveScanDynamicCode: this.arriveScanDynamicCode[0].checked ? 1 : 0,
@@ -399,6 +419,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
 			speCollectLimitEndDept: null,
 			speCollectLimitUrgent: null,
 			handoverOrder: this.handoverOrder[0].checked ? 1 : 0,
+			speExpandTube: this.speExpandTube[0].checked ? 1 : 0,
+			speDefaultExpandTube: this.speDefaultExpandTube[0].checked ? 1 : 0,
 		};
 		if(this.speCollectLimit[0].checked){
 			postData.speCollectSupportNotStartDept = this.speCollectSupportNotStartDept[0].checked ? 1 : 0;
@@ -603,7 +625,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
         if (result.status == 200) {
           this.configs = result.list[0] || {};
 					if(this.activeDictionaryKey=='examine'){
-						// 检验标本
+            // 检验标本
+            this.speHandoverTubeType = this.configs.speHandoverTubeType;
 						this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
 						this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;
 						this.arriveScanDynamicCode[0].checked = this.configs.arriveScanDynamicCode == 1;
@@ -617,6 +640,8 @@ export class ConfigurationSpecimenComponent implements OnInit {
 						this.deptList = this.configs.deptNotAlertList || [];
             this.speCollectLimit[0].checked = this.configs.speCollectLimit == 1;
 						this.handoverOrder[0].checked = this.configs.handoverOrder == 1;
+						this.speExpandTube[0].checked = this.configs.speExpandTube == 1;
+						this.speDefaultExpandTube[0].checked = this.configs.speDefaultExpandTube == 1;
 						if(this.configs.speCollectLimit == 1){
 							this.speCollectSupportNotStartDept[0].checked = this.configs.speCollectSupportNotStartDept == 1;
 							this.speCollectLimitRepeat[0].checked  = this.configs.speCollectLimitRepeat == 1;