拉取代码

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

@@ -336,6 +336,11 @@
                       <nz-option *ngFor="let item of drugsManualList" [nzLabel]="item.label" [nzValue]="item.value"></nz-option>
                     </nz-select>
                   </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>
                 </ng-container>
               </div>
               <!-- 护士打包配置 -->

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

@@ -46,7 +46,11 @@ export class ConfigurationSpecimenComponent implements OnInit {
   spePackageInventoryTypes:any[] = [{label: '患者', value: 1, disabled: true, checked: true}, {label: '试管', value: 2}];//清点方式
   spePackageCreateOrder:any = [{ label:'是否开启', value: 0 }];//生成配送工单
   spePackageCodeSize:any = undefined;//条码打印尺寸
-
+	// 是否允许转派
+	handoverOrder:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	
   // 工单模式
   spePackageModelList:any[] = [
     { label: '一单一包', value: 1 },
@@ -147,7 +151,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
 	speStartCollectShowConfig:any[] = [
 	  {label:'是否开启',value: 0}
 	];
-
+	
 	// 速冻标本数量控制
 	pathologyFrozenSpecimenNum:any = '0';
 
@@ -465,6 +469,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
       spePackageInventoryTypes: this.spePackageInventoryTypes.filter(v => v.checked).map(v => v.value).toString() || undefined,
       spePackageCreateOrder: this.spePackageCreateOrder[0].checked ? 1 : 0,
       spePackageCodeSize: this.spePackageCodeSize || undefined,
+			handoverOrder: this.handoverOrder[0].checked ? 1 : 0,
     };
     this.btnLoading = true;
     this.mainService
@@ -653,6 +658,7 @@ export class ConfigurationSpecimenComponent implements OnInit {
             this.spePackageInventoryTypes = this.spePackageInventoryTypes.map(v => ({...v, checked: (this.configs.spePackageInventoryTypes || '').split(',').includes(v.value.toString())}));
             this.spePackageCreateOrder[0].checked = this.configs.spePackageCreateOrder == 1;
             this.spePackageCodeSize = this.configs.spePackageCodeSize || undefined;
+						this.handoverOrder[0].checked = this.configs.handoverOrder == 1;
 					}
         }
       });

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

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

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

@@ -11,6 +11,16 @@
 		text-decoration: underline;
 		cursor: pointer;
 	}
+	.sign{
+		display: inline-block;
+		width: 8px;
+		height: 8px;
+		border-radius: 50%;
+		background: red;
+		margin-right: 2px;
+		position: relative;
+		top: -1px;
+	}
   .drugsBag{
     display: flex;
     align-items: center;

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

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

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

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

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

@@ -3,7 +3,7 @@ import { MainService } from "../../services/main.service";
 import { ToolService } from "../../services/tool.service";
 import { Subject } from "rxjs";
 import { debounceTime } from "rxjs/operators";
-import { format } from "date-fns";
+import { format, subDays, endOfDay } from "date-fns";
 @Component({
   selector: "app-specimen-search",
   templateUrl: "./specimen-search.component.html",
@@ -38,6 +38,12 @@ export class SpecimenSearchComponent implements OnInit {
   changeInpSubject = new Subject();
   changeInp2Subject = new Subject();
   ngOnInit() {
+		this.searchCriteria.dateRange = [
+			format(subDays(new Date(), 7), "yyyy-MM-dd") + ' ' +'00:00:00',
+			format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss")
+		]
+		this.startDate = format(subDays(new Date(), 7), "yyyy-MM-dd") + ' ' +'00:00:00';
+		this.endDate = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.searchDepartment(v[0], v[1]);
     });
@@ -116,28 +122,24 @@ export class SpecimenSearchComponent implements OnInit {
   // 日期选择
   startDate: string; //发起时间开始
   endDate: string; //发起时间结束
-  changeDate(result?): void {
-    if (!result) {
-      this.startDate = this.endDate = "";
-      return;
-    }
-    this.startDate =
-      result[0].getFullYear() +
-      "-" +
-      (result[0].getMonth() + 1) +
-      "-" +
-      result[0].getDate() +
-      " " +
-      "00:00:00";
-    this.endDate =
-      result[1].getFullYear() +
-      "-" +
-      (result[1].getMonth() + 1) +
-      "-" +
-      result[1].getDate() +
-      " " +
-      "23:59:59";
-  }
+	changeDate(result?): void {
+	  if (!result) {
+	    this.startDate = this.endDate = "";
+	    return;
+	  }
+	  this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
+	  this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+	}
+	onCalendarChangeDate(dateArr){
+	  console.log(dateArr)
+	  if(dateArr.length == 2){
+	    let dateStart = new Date(dateArr[0]);
+	    let dateEnd = new Date(dateArr[1]);
+	    dateStart.setHours(0,0,0);
+	    dateEnd.setHours(23,59,59);
+	    this.searchCriteria.dateRange = [dateStart,dateEnd];
+	  }
+	}
   // 重置
   reset() {
     this.searchCriteria = {
@@ -151,6 +153,8 @@ export class SpecimenSearchComponent implements OnInit {
       dateRange: [],
       checkDept: null,
     };
+		this.startDate = null;
+		this.endDate = null;
     this.sortCurrentKey = "";
     this.sortCurrentValue = "";
     this.sortCurrent = {
@@ -314,11 +318,9 @@ export class SpecimenSearchComponent implements OnInit {
     if (field && sort) {
       postData.specimen.orderBy = sort === "ascend" ? field : `${field} desc`;
     }
-    if (this.searchCriteria.dateRange.length) {
-      postData.specimen.startArriveTime =
-        format(this.searchCriteria.dateRange[0], "yyyy-MM-dd ") + "00:00:00";
-      postData.specimen.endArriveTime =
-        format(this.searchCriteria.dateRange[1], "yyyy-MM-dd ") + "23:59:59";
+    if (this.startDate && this.endDate) {
+      postData.specimen.startArriveTime = this.startDate;
+      postData.specimen.endArriveTime = this.endDate;
     }
     this.loading1 = true;
     this.mainService