Explorar o código

药品待送达合并工单

seimin hai 1 semana
pai
achega
853f39cb10

+ 5 - 0
src/app/components/configurationCenter/configuration-drug/configuration-drug.component.html

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

+ 7 - 0
src/app/components/configurationCenter/configuration-drug/configuration-drug.component.ts

@@ -64,6 +64,7 @@ export class ConfigurationDrugComponent implements OnInit {
64 64
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
65 65
 				showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
66 66
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
67
+				sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
67 68
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
68 69
 				autoCreateState: undefined // 药品自动建单状态
69 70
 			}
@@ -86,6 +87,7 @@ export class ConfigurationDrugComponent implements OnInit {
86 87
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
87 88
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
88 89
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
90
+				sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
89 91
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
90 92
 				autoCreateState: undefined // 药品自动建单状态
91 93
 			}
@@ -108,6 +110,7 @@ export class ConfigurationDrugComponent implements OnInit {
108 110
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
109 111
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
110 112
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
113
+        sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
111 114
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
112 115
 				autoCreateState: undefined // 药品自动建单状态
113 116
 			}
@@ -130,6 +133,7 @@ export class ConfigurationDrugComponent implements OnInit {
130 133
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
131 134
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
132 135
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
136
+        sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
133 137
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
134 138
 				autoCreateState: undefined // 药品自动建单状态
135 139
 			}
@@ -152,6 +156,7 @@ export class ConfigurationDrugComponent implements OnInit {
152 156
         drugsEndPhoto: [{ label:'是否开启', value: 0 }],//终点科室支持拍照留存
153 157
         showDrugsBagTypeCount: [{ label:'是否开启', value: 0 }],//是否显示药品数、种类数
154 158
 				showDrugsBagDetails: [{ label:'是否开启', value: 0 }],//是否支持查看药品详情信息
159
+        sendingMergeOrder: [{ label:'是否开启', value: 0 }],//待送达合并工单
155 160
 				autoCreate: [{ label:'是否开启', value: 0 }], // 是否自动建单
156 161
 				autoCreateState: undefined // 药品自动建单状态
157 162
 			}
@@ -238,6 +243,7 @@ export class ConfigurationDrugComponent implements OnInit {
238 243
 			showPatientInfo: this.activeDictionary.postData.showPatientInfo[0].checked ? 1 : 0,
239 244
 			showDrugsBagTypeCount: this.activeDictionary.postData.showDrugsBagTypeCount[0].checked ? 1 : 0,
240 245
 			showDrugsBagDetails: this.activeDictionary.postData.showDrugsBagDetails[0].checked ? 1 : 0,
246
+			sendingMergeOrder: this.activeDictionary.postData.sendingMergeOrder[0].checked ? 1 : 0,
241 247
 			autoCreate: this.activeDictionary.postData.autoCreate[0].checked ? 1 : 0,
242 248
 			autoCreateState:{
243 249
 				id:this.activeDictionary.postData.autoCreateState || undefined
@@ -339,6 +345,7 @@ export class ConfigurationDrugComponent implements OnInit {
339 345
 					this.activeDictionary.postData.showPatientInfo[0].checked = this.configs.showPatientInfo == 1;
340 346
 					this.activeDictionary.postData.showDrugsBagTypeCount[0].checked = this.configs.showDrugsBagTypeCount == 1;
341 347
 					this.activeDictionary.postData.showDrugsBagDetails[0].checked = this.configs.showDrugsBagDetails == 1;
348
+					this.activeDictionary.postData.sendingMergeOrder[0].checked = this.configs.sendingMergeOrder == 1;
342 349
 					this.activeDictionary.postData.autoCreate[0].checked = this.configs.autoCreate == 1;
343 350
 					this.activeDictionary.postData.autoCreateState = this.configs.autoCreateState && this.configs.autoCreateState.id || undefined;
344 351
 				}

+ 1 - 1
src/app/views/hushijiandan/hushijiandan.component.html

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