药品待送达合并工单

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.sendingMergeOrder"></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 }],//是否支持查看药品详情信息
+				sendingMergeOrder: [{ 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 }],//是否支持查看药品详情信息
+				sendingMergeOrder: [{ 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 }],//是否支持查看药品详情信息
+        sendingMergeOrder: [{ 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 }],//是否支持查看药品详情信息
+        sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -152,6 +156,7 @@ export class ConfigurationDrugComponent implements OnInit {
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
+        sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
 				autoCreateState: undefined // 药品自动建单状态
 			}
@@ -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,
+			sendingMergeOrder: this.activeDictionary.postData.sendingMergeOrder[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.sendingMergeOrder[0].checked = this.configs.sendingMergeOrder == 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/views/hushijiandan/hushijiandan.component.html

@@ -1484,7 +1484,7 @@
                 <button nz-button nzSize="small" nzType="default" class="pos-btn ml8" (click)="nextDayNew()">
                   下一日
                 </button>
-                <button nz-button nzSize="small" nzType="default" class="pos-btn ml8" (click)="addInspect()" *ngIf="inspectAndPatientTransportConfig.nurseAppendInspect == 1">
+                <button nz-button nzSize="small" nzType="primary" class="ml8" (click)="addInspect()" *ngIf="inspectAndPatientTransportConfig.nurseAppendInspect == 1">
                   追加检查
                 </button>
               </div>