瀏覽代碼

拉取代码

maotao 2 周之前
父節點
當前提交
98b7d3d06c

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

@@ -336,6 +336,11 @@
336 336
                       <nz-option *ngFor="let item of drugsManualList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
337 337
                     </nz-select>
338 338
                   </div>
339
+									<!-- 是否允许转派 -->
340
+									<div class="display_flex align-items_center mb8">
341
+									  <nz-form-label class="label">是否允许转派</nz-form-label>
342
+									  <nz-checkbox-group [(ngModel)]="handoverOrder"></nz-checkbox-group>
343
+									</div>
339 344
                 </ng-container>
340 345
               </div>
341 346
               <!-- 护士打包配置 -->

+ 8 - 2
src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.ts

@@ -46,7 +46,11 @@ export class ConfigurationSpecimenComponent implements OnInit {
46 46
   spePackageInventoryTypes:any[] = [{label: '患者', value: 1, disabled: true, checked: true}, {label: '试管', value: 2}];//清点方式
47 47
   spePackageCreateOrder:any = [{ label:'是否开启', value: 0 }];//生成配送工单
48 48
   spePackageCodeSize:any = undefined;//条码打印尺寸
49
-
49
+	// 是否允许转派
50
+	handoverOrder:any[] = [
51
+	  {label:'是否开启',value: 0}
52
+	];
53
+	
50 54
   // 工单模式
51 55
   spePackageModelList:any[] = [
52 56
     { label: '一单一包', value: 1 },
@@ -147,7 +151,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
147 151
 	speStartCollectShowConfig:any[] = [
148 152
 	  {label:'是否开启',value: 0}
149 153
 	];
150
-
154
+	
151 155
 	// 速冻标本数量控制
152 156
 	pathologyFrozenSpecimenNum:any = '0';
153 157
 
@@ -465,6 +469,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
465 469
       spePackageInventoryTypes: this.spePackageInventoryTypes.filter(v => v.checked).map(v => v.value).toString() || undefined,
466 470
       spePackageCreateOrder: this.spePackageCreateOrder[0].checked ? 1 : 0,
467 471
       spePackageCodeSize: this.spePackageCodeSize || undefined,
472
+			handoverOrder: this.handoverOrder[0].checked ? 1 : 0,
468 473
     };
469 474
     this.btnLoading = true;
470 475
     this.mainService
@@ -653,6 +658,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
653 658
             this.spePackageInventoryTypes = this.spePackageInventoryTypes.map(v => ({...v, checked: (this.configs.spePackageInventoryTypes || '').split(',').includes(v.value.toString())}));
654 659
             this.spePackageCreateOrder[0].checked = this.configs.spePackageCreateOrder == 1;
655 660
             this.spePackageCodeSize = this.configs.spePackageCodeSize || undefined;
661
+						this.handoverOrder[0].checked = this.configs.handoverOrder == 1;
656 662
 					}
657 663
         }
658 664
       });

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

@@ -156,7 +156,7 @@
156 156
         </thead>
157 157
         <tbody>
158 158
           <tr *ngFor="let data of specimenList;let i = index;">
159
-            <td>{{ (pageIndex - 1) * pageSize + i + 1 }}</td>
159
+            <td><span class="sign" *ngIf="orderId != data.gdid"></span>{{ (pageIndex - 1) * pageSize + i + 1 }}</td>
160 160
             <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
161 161
             <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
162 162
             <td class="underline" (click)="viewSpecimenHistory(data)">{{ data.scode || "-" }}</td>

+ 10 - 0
src/app/share/businessData-detail-modal/businessData-detail-modal.component.less

@@ -11,6 +11,16 @@
11 11
 		text-decoration: underline;
12 12
 		cursor: pointer;
13 13
 	}
14
+	.sign{
15
+		display: inline-block;
16
+		width: 8px;
17
+		height: 8px;
18
+		border-radius: 50%;
19
+		background: red;
20
+		margin-right: 2px;
21
+		position: relative;
22
+		top: -1px;
23
+	}
14 24
   .drugsBag{
15 25
     display: flex;
16 26
     align-items: center;

+ 1 - 1
src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -213,7 +213,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
213 213
         gdid: this.orderId,
214 214
         stype: this.searchCriteria.stype ? { id: this.searchCriteria.stype } : undefined,
215 215
         specimenDesc: this.searchCriteria.specimenDesc ? this.specimenDescList.find(v => v.id == this.searchCriteria.specimenDesc).name: undefined,
216
-				practical: this.searchCriteria.practical ? 1 : undefined
216
+				actualCollect: this.searchCriteria.practical ? 1 : undefined
217 217
 			}
218 218
     }
219 219
     this.hsLoading = true;

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

@@ -121,7 +121,7 @@
121 121
         </div>
122 122
         <div class="list-template__searchItem">
123 123
           <span class="label">收取时间:</span>
124
-          <nz-range-picker [(ngModel)]="searchCriteria.dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
124
+          <nz-range-picker nzShowTime (nzOnCalendarChange)="onCalendarChangeDate($event)" [(ngModel)]="searchCriteria.dateRange" (ngModelChange)="changeDate($event)"></nz-range-picker>
125 125
         </div>
126 126
 
127 127
       </div>

+ 30 - 28
src/app/views/specimen-search/specimen-search.component.ts

@@ -3,7 +3,7 @@ import { MainService } from "../../services/main.service";
3 3
 import { ToolService } from "../../services/tool.service";
4 4
 import { Subject } from "rxjs";
5 5
 import { debounceTime } from "rxjs/operators";
6
-import { format } from "date-fns";
6
+import { format, subDays, endOfDay } from "date-fns";
7 7
 @Component({
8 8
   selector: "app-specimen-search",
9 9
   templateUrl: "./specimen-search.component.html",
@@ -38,6 +38,12 @@ export class SpecimenSearchComponent implements OnInit {
38 38
   changeInpSubject = new Subject();
39 39
   changeInp2Subject = new Subject();
40 40
   ngOnInit() {
41
+		this.searchCriteria.dateRange = [
42
+			format(subDays(new Date(), 7), "yyyy-MM-dd") + ' ' +'00:00:00',
43
+			format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss")
44
+		]
45
+		this.startDate = format(subDays(new Date(), 7), "yyyy-MM-dd") + ' ' +'00:00:00';
46
+		this.endDate = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
41 47
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
42 48
       this.searchDepartment(v[0], v[1]);
43 49
     });
@@ -116,28 +122,24 @@ export class SpecimenSearchComponent implements OnInit {
116 122
   // 日期选择
117 123
   startDate: string; //发起时间开始
118 124
   endDate: string; //发起时间结束
119
-  changeDate(result?): void {
120
-    if (!result) {
121
-      this.startDate = this.endDate = "";
122
-      return;
123
-    }
124
-    this.startDate =
125
-      result[0].getFullYear() +
126
-      "-" +
127
-      (result[0].getMonth() + 1) +
128
-      "-" +
129
-      result[0].getDate() +
130
-      " " +
131
-      "00:00:00";
132
-    this.endDate =
133
-      result[1].getFullYear() +
134
-      "-" +
135
-      (result[1].getMonth() + 1) +
136
-      "-" +
137
-      result[1].getDate() +
138
-      " " +
139
-      "23:59:59";
140
-  }
125
+	changeDate(result?): void {
126
+	  if (!result) {
127
+	    this.startDate = this.endDate = "";
128
+	    return;
129
+	  }
130
+	  this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
131
+	  this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
132
+	}
133
+	onCalendarChangeDate(dateArr){
134
+	  console.log(dateArr)
135
+	  if(dateArr.length == 2){
136
+	    let dateStart = new Date(dateArr[0]);
137
+	    let dateEnd = new Date(dateArr[1]);
138
+	    dateStart.setHours(0,0,0);
139
+	    dateEnd.setHours(23,59,59);
140
+	    this.searchCriteria.dateRange = [dateStart,dateEnd];
141
+	  }
142
+	}
141 143
   // 重置
142 144
   reset() {
143 145
     this.searchCriteria = {
@@ -151,6 +153,8 @@ export class SpecimenSearchComponent implements OnInit {
151 153
       dateRange: [],
152 154
       checkDept: null,
153 155
     };
156
+		this.startDate = null;
157
+		this.endDate = null;
154 158
     this.sortCurrentKey = "";
155 159
     this.sortCurrentValue = "";
156 160
     this.sortCurrent = {
@@ -314,11 +318,9 @@ export class SpecimenSearchComponent implements OnInit {
314 318
     if (field && sort) {
315 319
       postData.specimen.orderBy = sort === "ascend" ? field : `${field} desc`;
316 320
     }
317
-    if (this.searchCriteria.dateRange.length) {
318
-      postData.specimen.startArriveTime =
319
-        format(this.searchCriteria.dateRange[0], "yyyy-MM-dd ") + "00:00:00";
320
-      postData.specimen.endArriveTime =
321
-        format(this.searchCriteria.dateRange[1], "yyyy-MM-dd ") + "23:59:59";
321
+    if (this.startDate && this.endDate) {
322
+      postData.specimen.startArriveTime = this.startDate;
323
+      postData.specimen.endArriveTime = this.endDate;
322 324
     }
323 325
     this.loading1 = true;
324 326
     this.mainService