核酸打印

angular.json

@@ -34,8 +34,7 @@
             ],
             "styles": [
               "src/styles.less",
-              "src/assets/iconfont/iconfont.css",
-              "node_modules/viewerjs/dist/viewer.min.css"
+              "src/assets/iconfont/iconfont.css"
             ],
             "scripts": [
               "node_modules/echarts/dist/echarts.min.js"
@@ -104,8 +103,7 @@
             ],
             "styles": [
               "src/styles.less",
-              "src/assets/iconfont/iconfont.css",
-              "node_modules/viewerjs/dist/viewer.min.css"
+              "src/assets/iconfont/iconfont.css"
             ],
             "scripts": [
               "node_modules/echarts/dist/echarts.min.js"

package-lock.json

@@ -26,6 +26,7 @@
         "echarts": "^4.6.0",
         "ng-zorro-antd": "^8.5.2",
         "ngx-echarts": "^4.2.2",
+        "ngx-print": "^1.2.1",
         "ngx-sortablejs": "^3.1.3",
         "npm": "^6.14.15",
         "overlayscrollbars": "^1.11.0",
@@ -33,7 +34,7 @@
         "rxjs": "~6.4.0",
         "sortablejs": "^1.14.0",
         "tslib": "^1.9.0",
-        "viewerjs": "^1.10.5",
+        "viewerjs": "^0.10.0",
         "zone.js": "^0.9.1"
       },
       "devDependencies": {
@@ -7631,6 +7632,18 @@
         "echarts": ">=3.1.1"
       }
     },
+    "node_modules/ngx-print": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/ngx-print/-/ngx-print-1.2.1.tgz",
+      "integrity": "sha512-+xz5wbVO9N5vAT/W6dgTzbE1RBB1jUeBOSF04Gs66QqTrb46paRAjHgqMr4TvE8CUiTp5aMmkL54QEKat9gj6w==",
+      "dependencies": {
+        "tslib": "^1.9.3"
+      },
+      "peerDependencies": {
+        "@angular/common": "*",
+        "@angular/core": "*"
+      }
+    },
     "node_modules/ngx-sortablejs": {
       "version": "3.1.4",
       "resolved": "https://registry.npm.taobao.org/ngx-sortablejs/download/ngx-sortablejs-3.1.4.tgz",
@@ -15948,9 +15961,9 @@
       }
     },
     "node_modules/viewerjs": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmmirror.com/viewerjs/-/viewerjs-1.10.5.tgz",
-      "integrity": "sha512-QwKrmXlSfKg5x4y74F/jicpHIRqBMMfHXyboOxHDi5n4XAaejjpalphPq4/HW6venQAoMiD57HpVwBk0JvqpSA=="
+      "version": "0.10.0",
+      "resolved": "https://registry.npmmirror.com/viewerjs/-/viewerjs-0.10.0.tgz",
+      "integrity": "sha512-bNx8kfK561QilHXlqGPiOIDvr5v1bitElz7SYvHdYK9y+OnlzULsxX0zNRFrFiwWALmvGWAoHmWRCH7MBxRAGw=="
     },
     "node_modules/vm-browserify": {
       "version": "1.1.2",
@@ -16999,7 +17012,8 @@
     "node_modules/zone.js": {
       "version": "0.9.1",
       "resolved": "https://registry.npm.taobao.org/zone.js/download/zone.js-0.9.1.tgz",
-      "integrity": "sha1-43xuXFTBP65N4mtf/o2OkhLabZs="
+      "integrity": "sha1-43xuXFTBP65N4mtf/o2OkhLabZs=",
+      "dev": true
     },
     "node_modules/zrender": {
       "version": "4.3.2",
@@ -18075,8 +18089,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npm.taobao.org/acorn-dynamic-import/download/acorn-dynamic-import-4.0.0.tgz",
       "integrity": "sha1-SCIQFAWCo2uDw+NC4c/ryqkkCUg=",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-walk": {
       "version": "7.2.0",
@@ -18130,15 +18143,13 @@
       "version": "1.0.1",
       "resolved": "https://registry.npm.taobao.org/ajv-errors/download/ajv-errors-1.0.1.tgz",
       "integrity": "sha1-81mGrOuRr63sQQL72FAUlQzvpk0=",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ajv-keywords": {
       "version": "3.5.2",
       "resolved": "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz?cache=0&sync_timestamp=1616882384060&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv-keywords%2Fdownload%2Fajv-keywords-3.5.2.tgz",
       "integrity": "sha1-MfKdpatuANHC0yms97WSlhTVAU0=",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "amdefine": {
       "version": "1.0.1",
@@ -19239,8 +19250,7 @@
       "version": "5.0.2",
       "resolved": "https://registry.npm.taobao.org/circular-dependency-plugin/download/circular-dependency-plugin-5.0.2.tgz",
       "integrity": "sha1-2haMCzfntDVj+5+RLBwAfCEzie8=",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "class-utils": {
       "version": "0.3.6",
@@ -22635,8 +22645,7 @@
       "version": "1.7.0",
       "resolved": "https://registry.nlark.com/karma-jasmine-html-reporter/download/karma-jasmine-html-reporter-1.7.0.tgz",
       "integrity": "sha1-UsSJp012CTShCJv6XqSo/LhMwos=",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "karma-source-map-support": {
       "version": "1.4.0",
@@ -23368,6 +23377,14 @@
         "tslib": "^1.9.0"
       }
     },
+    "ngx-print": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmmirror.com/ngx-print/-/ngx-print-1.2.1.tgz",
+      "integrity": "sha512-+xz5wbVO9N5vAT/W6dgTzbE1RBB1jUeBOSF04Gs66QqTrb46paRAjHgqMr4TvE8CUiTp5aMmkL54QEKat9gj6w==",
+      "requires": {
+        "tslib": "^1.9.3"
+      }
+    },
     "ngx-sortablejs": {
       "version": "3.1.4",
       "resolved": "https://registry.npm.taobao.org/ngx-sortablejs/download/ngx-sortablejs-3.1.4.tgz",
@@ -26966,8 +26983,7 @@
     "overlayscrollbars-ngx": {
       "version": "0.1.1",
       "resolved": "https://registry.nlark.com/overlayscrollbars-ngx/download/overlayscrollbars-ngx-0.1.1.tgz",
-      "integrity": "sha1-APyVynU9vV7by2Njp9AokJJVIow=",
-      "requires": {}
+      "integrity": "sha1-APyVynU9vV7by2Njp9AokJJVIow="
     },
     "p-defer": {
       "version": "1.0.0",
@@ -29922,9 +29938,9 @@
       }
     },
     "viewerjs": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmmirror.com/viewerjs/-/viewerjs-1.10.5.tgz",
-      "integrity": "sha512-QwKrmXlSfKg5x4y74F/jicpHIRqBMMfHXyboOxHDi5n4XAaejjpalphPq4/HW6venQAoMiD57HpVwBk0JvqpSA=="
+      "version": "0.10.0",
+      "resolved": "https://registry.npmmirror.com/viewerjs/-/viewerjs-0.10.0.tgz",
+      "integrity": "sha512-bNx8kfK561QilHXlqGPiOIDvr5v1bitElz7SYvHdYK9y+OnlzULsxX0zNRFrFiwWALmvGWAoHmWRCH7MBxRAGw=="
     },
     "vm-browserify": {
       "version": "1.1.2",
@@ -30785,7 +30801,8 @@
     "zone.js": {
       "version": "0.9.1",
       "resolved": "https://registry.npm.taobao.org/zone.js/download/zone.js-0.9.1.tgz",
-      "integrity": "sha1-43xuXFTBP65N4mtf/o2OkhLabZs="
+      "integrity": "sha1-43xuXFTBP65N4mtf/o2OkhLabZs=",
+      "dev": true
     },
     "zrender": {
       "version": "4.3.2",

package.json

@@ -31,6 +31,7 @@
     "echarts": "^4.6.0",
     "ng-zorro-antd": "^8.5.2",
     "ngx-echarts": "^4.2.2",
+    "ngx-print": "^1.2.1",
     "ngx-sortablejs": "^3.1.3",
     "npm": "^6.14.15",
     "overlayscrollbars": "^1.11.0",
@@ -38,7 +39,7 @@
     "rxjs": "~6.4.0",
     "sortablejs": "^1.14.0",
     "tslib": "^1.9.0",
-    "viewerjs": "^1.10.5",
+    "viewerjs": "^0.10.0",
     "zone.js": "^0.9.1"
   },
   "devDependencies": {

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.3.207",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/services/main.service.ts

@@ -608,4 +608,40 @@ export class MainService {
       }
     );
   }
+  //查询楼栋核酸
+  getNucleicAcidBuildingSummary(data) {
+    return this.http.post(
+      host.host + "/workerOrder/nucleicAcidBuildingSummary",
+      data,
+      {
+        headers: this.headers,
+      }
+    );
+  }
+  //打印楼栋核酸
+  printNucleicAcid(data) {
+    return this.http.post(
+      host.host + "/api/printNucleicAcid",
+      data,
+      {
+        headers: this.headers,
+      }
+    );
+  }
+  //获取核酸图片
+  getPreviewImage(type, id) {
+    return this.http.get(host.host + "/common/common/listAttachment/"+ type +"/" + id, {
+      headers: this.headers,
+    });
+  }
+  //补充打印楼栋核酸
+  supplementPrintNucleicAcid(data) {
+    return this.http.post(
+      host.host + "/api/supplementPrintNucleicAcid",
+      data,
+      {
+        headers: this.headers,
+      }
+    );
+  }
 }

src/app/share/image-viewer/image-viewer.component.ts

@@ -1,29 +1,32 @@
-import { Component, ElementRef, Input, OnInit, ViewChild } from "@angular/core";
+import { Component, ElementRef, Input, OnInit, ViewChild, AfterViewInit, OnDestroy } from "@angular/core";
 import Viewer from 'viewerjs';
 @Component({
   selector: "app-image-viewer",
   templateUrl: "./image-viewer.component.html",
   styleUrls: ["./image-viewer.component.less"],
 })
-export class ImageViewerComponent implements OnInit {
+export class ImageViewerComponent implements OnInit, AfterViewInit,OnDestroy {
   @ViewChild("ljImgViewerId", { static: false }) ljImgViewer: ElementRef;
   // 图片地址
   @Input() imageUrl: any = [];
   // 默认预览图大小 (单位px)
   @Input() width: any = 100;
   @Input() height: any = 100;
+  @Input() isPreviewNow: boolean = false;
+  viewer = null;
 
   constructor() {}
 
   ngOnInit(): void {
     console.log('初始化')
-    // 传入是单条转换为数租
-    if (typeof this.imageUrl == "string") {
-      this.imageUrl = [this.imageUrl];
-    }
   }
 
   ngAfterViewInit(): void {
-    new Viewer(this.ljImgViewer["nativeElement"]);
+    this.viewer = new Viewer(this.ljImgViewer["nativeElement"]);
+    this.isPreviewNow && this.viewer.show();
+  }
+
+  ngOnDestroy(): void {
+    this.viewer && this.viewer.destroy();
   }
 }

src/app/share/order-detail/order-detail.component.html

@@ -1109,7 +1109,7 @@
                 <td>
                   <button
                     *ngIf="item.attachments"
-                    (click)="previewImageHandler(item.attachments[0].token)"
+                    (click)="previewImageHandler(item.attachments[0])"
                   >
                     查看图片</button
                   ><span *ngIf="!item.attachments">无</span>
@@ -1145,13 +1145,7 @@
 >
   <!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
 </app-prompt-modal>
-<!-- 图片提示框 -->
-<app-prompt-modal
-  *ngIf="promptModalShowImg"
-  [show]="promptModalShowImg"
-  (closeModel)="closeImg()"
-  [previewImage]="previewImage"
->
-</app-prompt-modal>
+
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
+<app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true"></app-image-viewer>

src/app/share/order-detail/order-detail.component.ts

@@ -71,9 +71,7 @@ export class OrderDetailComponent implements OnInit {
   promptContent: string; //操作提示框提示信息
   ifSuccess: boolean; //操作成功/失败
   promptInfo: string; //操作结果提示信息
-  previewImage: string; //操作结果图片预览
   promptModalShow: boolean; //是否展示提示框
-  promptModalShowImg: boolean; //是否展示提示框-图片
 
   urgentLoading: boolean = false; //确认加急按钮loading状态
   recLoading: boolean = false; //撤回并删除按钮loading状态
@@ -124,8 +122,18 @@ export class OrderDetailComponent implements OnInit {
       });
   }
   // 预览图片
-  previewImageHandler(token) {
-    this.showPromptModalImg(token);
+  imgs = [];
+  isPreview = false;
+  previewImageHandler(data) {
+    this.isPreview = false;
+    this.mainService.getPreviewImage(data.bindType,data.bindId).subscribe((result:any)=>{
+      if (result.status == 200) {
+        this.imgs = result.data.map((v) => v.previewUrl);
+        this.isPreview = true;
+      } else {
+        this.imgs = [];
+      }
+    })
   }
   // 获取历史记录
   workOrderRecord: any = [];
@@ -142,9 +150,6 @@ export class OrderDetailComponent implements OnInit {
   close() {
     history.go(-1);
   }
-  closeImg() {
-    this.promptModalShowImg = false;
-  }
 
   // 获取工单历史记录
   logList = []; //工单历史记录
@@ -198,23 +203,15 @@ export class OrderDetailComponent implements OnInit {
   }
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
-  showPromptModal(con, success, promptInfo?, previewImage?) {
+  showPromptModal(con, success, promptInfo?) {
     this.promptModalShow = false;
     this.promptContent = con;
     this.ifSuccess = success;
     this.promptInfo = promptInfo;
-    this.previewImage = previewImage ? previewImage : "";
     setTimeout(() => {
       this.promptModalShow = true;
     }, 100);
   }
-  showPromptModalImg(previewImage) {
-    this.promptModalShowImg = false;
-    this.previewImage = previewImage ? previewImage : "";
-    setTimeout(() => {
-      this.promptModalShowImg = true;
-    }, 100);
-  }
 
   // 格式化时分秒
   // （时间小于一分钟则显示秒，时间大于一分钟则显示分钟数，如超出一小时则显示小时和分钟。）time单位:秒

src/app/share/prompt-modal/prompt-modal.component.html

@@ -1,15 +1,12 @@
 <div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show&&!loading">
   <div class="modalBody">
-    <div class="title">{{previewImage?'查看图片':'提示'}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
-    <div class="content" *ngIf="!previewImage">
+    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
       <div class="icon"><i
           [ngClass]="{'icon_transport':true, 'transport-duigou':success,'transport-shibai':!success}"></i></div>
       <div class="defeat">{{content}}{{(success?"成功":"失败")}}</div>
       <div *ngIf="info" [innerHTML]="info"></div>
     </div>
-    <div class="content" *ngIf="previewImage">
-      <img [src]="host+'/common/common/previewAttachmentImage/'+previewImage" class="w100">
-    </div>
     <div class="display_flex justify-content_flex-center">
       <button class="btn know" nz-button nzType="primary" nzGhost (click)="hideModal()">知道了</button>
     </div>

src/app/share/prompt-modal/prompt-modal.component.ts

@@ -14,24 +14,17 @@ export class PromptModalComponent implements OnInit {
   @Input() back: string = "";
   @Input() isReLoad: Boolean = false;
   @Input() loading: Boolean = false;
-  @Input() previewImage: string = "";
-  // @Input() nUrl: string;
 
   @Output() closeModel = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
   constructor() {}
-  // constructor(private router: Router) {}
 
   ngOnInit() {
     console.log(this.show);
-    console.log(this.previewImage);
   }
   hideModal() {
     this.show = false;
     this.closeModel.emit(this.back); //emits(向上弹射)事件
-    // if(this.nUrl){
-    //   this.router.navigateByUrl(this.nUrl);
-    // }
     if (this.isReLoad) {
       location.reload(true);
     }

src/app/views/fuwutai/fuwutai.component.html

@@ -1877,6 +1877,13 @@
               展示形式
             </div>
             <div
+              [ngClass]="{ item: true, checked: fixedTab == 'nucleicAcidPrinting' }"
+              (click)="checkFixedTab('nucleicAcidPrinting')"
+              *ngIf="isShowNucleicAcidPrinting"
+            >
+              核酸打印
+            </div>
+            <div
               [ngClass]="{ item: true, checked: fixedTab == 'queueNum' }"
               (click)="checkFixedTab('queueNum')"
             >
@@ -1918,6 +1925,88 @@
     ></div>
   </div>
 
+  <!-- 核酸打印 -->
+  <div
+    class="newOrder display_flex justify-content_flex-center align-items_center" *ngIf="fixedTab == 'nucleicAcidPrinting'">
+    <div class="modalBody">
+      <p class="title">
+        汇总
+        <i class="icon_transport transport-guanbi" (click)="nucleicAcidPrintingCancel()"></i>
+      </p>
+      <div class="content">
+        <nz-table class="hospitalTable" [nzData]="nucleicAcidList" nzSize="middle" [nzShowPagination]="false"
+          [nzLoading]="nucleicAcidLoading" [nzScroll]="{ y: '428px' }">
+          <thead>
+            <tr class="thead">
+                <th nzWidth="5%">序号</th>
+                <th nzWidth="25%">楼栋名字</th>
+                <th nzWidth="10%">工单总量</th>
+                <th nzWidth="60%">涉及科室</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of nucleicAcidList;let i = index;">
+                <td>{{ i + 1 }}</td>
+                <td>{{ data.buildName || '无' }}</td>
+                <td>{{ data.buildCount || '无' }}</td>
+                <td>{{ data.deptNames || '无' }}</td>
+            </tr>
+          </tbody>
+        </nz-table>
+        <!-- <div class="pagination">
+          <nz-pagination [(nzPageIndex)]="nucleicAcidListPageIndex" [(nzTotal)]="nucleicAcidListLength"
+            [(nzPageSize)]="nucleicAcidListPageSize" (nzPageIndexChange)="getNucleicAcidList()"
+            (nzPageSizeChange)="getNucleicAcidList()">
+          </nz-pagination>
+        </div> -->
+      </div>
+      <div class="btns display_flex justify-content_flex-center align-items_center">
+        <button
+          nz-button
+          class="btn"
+          nzType="primary"
+          (click)="printAucleicAcid()"
+          [nzLoading]="isOkLoading"
+        >
+          打印
+        </button>
+        <button
+          class="btn cancel"
+          nz-button
+          nzType="default"
+          (click)="nucleicAcidPrintingCancel()"
+        >
+          取消
+        </button>
+      </div>
+    </div>
+  </div>
+  <!-- 打印的内容 -->
+  <div id="print-section" hidden>
+    <div *ngFor="let building of nucleicAcidList;let first = first;" [ngStyle]="{'page-break-before':first?'':'always'}" style="overflow: hidden;">
+      <h1 style="text-align: center;position: relative;"><span style="position: absolute;left: 0;font-size:0.5em;top: 50%;transform: translateY(-50%);">{{printDate|date:'yyyy-MM-dd HH:mm'}}</span>{{building.buildName}}<img style="width: 50px;position: absolute;right: 50px;" [src]="mapQrcodes[building.buildId]"></h1>
+      <div style="width: 50%;float: left;">
+        <div style="display: flex;justify-content: center;text-align: center;font-weight: bold;">
+          <span style="flex: 2; border: 1px solid #ccc;">科室名称</span>
+          <span style="flex: 1; border-bottom: 1px solid #ccc;border-right: 1px solid #ccc;border-top: 1px solid #ccc;">只数</span>
+        </div>
+      </div>
+      <div style="width: 50%;float: left;">
+        <div style="display: flex;justify-content: center;text-align: center;font-weight: bold;">
+          <span style="flex: 2; border-bottom: 1px solid #ccc;border-right: 1px solid #ccc;border-top: 1px solid #ccc;">科室名称</span>
+          <span style="flex: 1; border-bottom: 1px solid #ccc;border-right: 1px solid #ccc;border-top: 1px solid #ccc;">只数</span>
+        </div>
+      </div>
+      <div *ngFor="let item of building.deptData;let even = even;" style="width: 50%;float: left;">
+        <div style="display: flex;justify-content: center;text-align: center;">
+          <span style="flex: 2;word-break: break-all; border-bottom: 1px solid #ccc;border-right: 1px solid #ccc;" [ngStyle]="{'border-left':even?'1px solid #ccc':''}">{{item.deptName}}<span *ngIf="item.workOrderRemarks">+{{item.workOrderRemarks.slice(0,2)}}</span></span>
+          <span style="flex: 1; border-bottom: 1px solid #ccc;border-right: 1px solid #ccc;"></span>
+        </div>
+      </div>
+    </div>
+  </div>
+  <button ngxPrint printSectionId="print-section" #printBtn hidden>打印</button>
+
   <!-- 新建工单 -->
   <div
     class="newOrder display_flex justify-content_flex-center align-items_center"

src/app/views/fuwutai/fuwutai.component.less

@@ -1392,6 +1392,22 @@
     cursor: pointer;
   }
 
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
   // 右侧悬浮菜单
   .fixed {
     position: fixed;

src/app/views/fuwutai/fuwutai.component.ts

@@ -25,6 +25,7 @@ import { SourceId } from "src/app/type/types";
   styleUrls: ["./fuwutai.component.less"],
 })
 export class FuwutaiComponent implements OnInit {
+  @ViewChild('printBtn', { static: false }) printBtn: ElementRef<HTMLElement>;
   @ViewChild("remarksEle", { static: false }) remarksEle: ElementRef;
   @ViewChild("tabs", { static: false }) tabs: ElementRef;
   @ViewChild("tab", { static: false }) elementView: ElementRef;
@@ -154,6 +155,20 @@ export class FuwutaiComponent implements OnInit {
   searchHosDepartmentSubject = new Subject();
   searchHosDepartmentQtSubject = new Subject();
   searchPatientListSubject = new Subject();
+
+  // 获取院区配置配置，是否核酸打印
+  isShowNucleicAcidPrinting = false;
+  getHospitalConfigList(key) {
+    let postData = { idx: 0, sum: 1, hospitalConfig: { hosId: this.checkedHos, key } };
+    this.mainService.getFetchDataList("simple/data", "hospitalConfig", postData).subscribe(result=>{
+      if(result.status == 200){
+        this.isShowNucleicAcidPrinting = result.list[0].value == 1;
+      }else{
+        this.isShowNucleicAcidPrinting = false;
+      }
+    });
+  }
+
   // 打开选择楼栋多选框
   openChangeUnassignedBuilding(e) {
     if (e) {
@@ -487,6 +502,56 @@ export class FuwutaiComponent implements OnInit {
       }
     });
   }
+  // 核酸打印
+  nucleicAcidLoading = false;
+  nucleicAcidList: any = [];
+  // nucleicAcidListPageIndex: number = 1;//表格当前页码
+  // nucleicAcidListPageSize: number = 5;//表格每页展示条数
+  // nucleicAcidListLength: number = 10;//表格总数据量
+  // 获取列表数据
+  getNucleicAcidBuildingSummary(idx?) {
+    // if (idx) {
+    //   this.nucleicAcidListPageIndex = 1;
+    // }
+    this.nucleicAcidLoading = true;
+    this.mainService.getNucleicAcidBuildingSummary({}).subscribe((data:any) => {
+      this.nucleicAcidLoading = false;
+      let nucleicAcidList = data.data || [];
+      for (let i = 0; i < nucleicAcidList.length; i++) {
+        if(nucleicAcidList[i].deptData && Array.isArray(nucleicAcidList[i].deptData)){
+          nucleicAcidList[i].deptNames = nucleicAcidList[i].deptData.map(v=>v.deptName).toString();
+        }else{
+          nucleicAcidList[i].deptData = [];
+          nucleicAcidList[i].deptNames = '';
+        }
+      }
+      this.nucleicAcidList = nucleicAcidList;
+      console.log(this.nucleicAcidList)
+      // this.nucleicAcidListLength = data.totalNum || 0;
+    })
+  }
+  // 打印
+  mapQrcodes:any = {};
+  printDate:number = Date.now();
+  printAucleicAcid(){
+    this.isOkLoading = true;
+    this.mainService.printNucleicAcid({}).subscribe((data:any) => {
+      this.isOkLoading = false;
+      if(data.state == 200){
+        let mapQrcodes = {};
+        data.data.forEach(v=>{
+          mapQrcodes[v.buildId] = v.qrcode;
+        })
+        this.mapQrcodes = mapQrcodes;
+        this.nucleicAcidPrintingCancel();
+        setTimeout(()=>{
+          this.printBtn.nativeElement.click();
+        },0)
+      }else{
+        this.msg.create('error', `操作失败!`);
+      }
+    })
+  }
   ngOnInit() {
     //防抖
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -521,6 +586,7 @@ export class FuwutaiComponent implements OnInit {
       workOrderRemark: [null], //工单备注
     });
 
+    this.getHospitalConfigList('allowNucleicAcidPrinting');
     this.getWebsocketSer();
     this.initRole();
     this.initLogin();
@@ -847,17 +913,17 @@ export class FuwutaiComponent implements OnInit {
       });
       postData.groups = groups;
     }
-    // if (this.hurseInfoHiding == '1'){
-    //   that.workerMessage = [];
-    //   that.initTopCount();
-    //   return;
-    // }
-    // that.mainService.getSerInfo("getWorkInfo", postData).subscribe((data) => {
-    //   that.workerMessage = data.data ? data.data : [];
-    //   that.initTopCount();
-    // });
-    that.workerMessage = [];
-    that.initTopCount();
+    if (this.hurseInfoHiding == '1'){
+      that.workerMessage = [];
+      that.initTopCount();
+      return;
+    }
+    that.mainService.getSerInfo("getWorkInfo", postData).subscribe((data) => {
+      that.workerMessage = data.data ? data.data : [];
+      that.initTopCount();
+    });
+    // that.workerMessage = [];
+    // that.initTopCount();
   }
 
   // 获取三个状态数据数据
@@ -1148,6 +1214,9 @@ export class FuwutaiComponent implements OnInit {
     if (type == "logout") {
       this.logOut();
     }
+    if (type == "nucleicAcidPrinting") {
+      this.getNucleicAcidBuildingSummary();
+    }
     if (this.fixedTab == type) {
       this.fixedTab = "";
     } else {
@@ -1826,6 +1895,10 @@ export class FuwutaiComponent implements OnInit {
     }
   }
 
+  nucleicAcidPrintingCancel():void {
+    this.fixedTab = '';
+  }
+
   newOrderCancel(): void {
     this.newOrderShow = false;
     this.newOrderShowOpen = false;

src/app/views/fuwutai/fuwutai.module.ts

@@ -5,6 +5,8 @@ import { FuwutaiRoutingModule } from './fuwutai-routing.module';
 import { FuwutaiComponent } from './fuwutai.component';
 import { ShareModule } from 'src/app/share/share.module';
 
+import { NgxPrintModule } from 'ngx-print';
+
 
 @NgModule({
   declarations: [
@@ -13,7 +15,8 @@ import { ShareModule } from 'src/app/share/share.module';
   imports: [
     CommonModule,
     ShareModule,
-    FuwutaiRoutingModule
+    FuwutaiRoutingModule,
+    NgxPrintModule,
   ]
 })
 export class FuwutaiModule { }

src/app/views/main/main-routing.module.ts

@@ -156,6 +156,14 @@ const routes: Routes = [
           ),
       },
       {
+        // 核酸接收列表
+        path: "nucleicAcidCollection",
+        loadChildren: () =>
+          import("../nucleic-acid-collection/nucleic-acid-collection.module").then(
+            (m) => m.NucleicAcidCollectionModule
+          ),
+      },
+      {
         // 统计分析-综合统计
         path: "compreStatistics",
         loadChildren: () =>

src/app/views/nucleic-acid-collection/nucleic-acid-collection-routing.module.ts

@@ -0,0 +1,14 @@
+import { NgModule } from '@angular/core';
+import { Routes, RouterModule } from '@angular/router';
+import { NucleicAcidCollectionComponent } from './nucleic-acid-collection.component';
+
+
+const routes: Routes = [
+  { path: '', component: NucleicAcidCollectionComponent }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class NucleicAcidCollectionRoutingModule { }

src/app/views/nucleic-acid-collection/nucleic-acid-collection.component.html

@@ -0,0 +1,77 @@
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='15' class="list-template__searchBox"></div>
+      <div nz-col nzXl="9" class="list-template__btns"></div>
+    </div>
+    <div class="list-template__bottom">
+      <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="loading1">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="4%">序号</th>
+            <th nzWidth="10%">批次号</th>
+            <th nzWidth="10%">楼栋名称</th>
+            <th nzWidth="10%">创建时间</th>
+            <th nzWidth="10%">工单总数</th>
+            <th nzWidth="10%">状态</th>
+            <th nzWidth="10%">闭环时间</th>
+            <th nzWidth="10%">闭环人</th>
+            <th nzWidth="10%">备注</th>
+            <th nzWidth="16%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let i = index">
+            <td>{{ i+1 }}</td>
+            <td>{{ data.batchNo || '无' }}</td>
+            <td>{{ data.buildId?data.buildId.buildingName:'无' }}</td>
+            <td>{{data.addTime?(data.addTime|date:'yyyy-MM-dd HH:mm'):'无'}}</td>
+            <td>{{data.orderCount || '无'}}</td>
+            <td>{{data.closedLoopState == 1?'已闭环':'未闭环'}}</td>
+            <td>{{data.closedLoopTime?(data.closedLoopTime|date:'yyyy-MM-dd HH:mm'):'无'}}</td>
+            <td>{{data.closedLoopUser ? data.closedLoopUser.name : '无'}}</td>
+            <td>{{data.remark || '无'}}</td>
+            <td>
+              <div class="coop">
+                <span *ngIf="data.pictureId" (click)="previewImageHandler(data)">查看图片</span>
+                <button nz-button nzType="link" *ngIf="isShowNucleicAcidPrinting && data.closedLoopState === 0" (click)="supplementPrint(data)" [nzLoading]="data.isOkLoading">补打</button>
+              </div>
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList()" (nzPageSizeChange)="getList()">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+  <app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true"></app-image-viewer>
+</div>
+<!-- 打印的内容 -->
+<div id="print-section" hidden>
+  <div *ngFor="let building of nucleicAcidList;let first = first;" [ngStyle]="{'page-break-before':first?'':'always'}" style="overflow: hidden;">
+    <h1 style="text-align: center;position: relative;"><span style="position: absolute;left: 0;font-size:0.5em;top: 50%;transform: translateY(-50%);">{{printDate|date:'yyyy-MM-dd HH:mm'}}</span>{{building.buildName}}<img style="width: 50px;position: absolute;right: 50px;" [src]="mapQrcodes[building.buildId]"></h1>
+    <div style="width: 50%;float: left;">
+      <div style="display: flex;justify-content: center;text-align: center;font-weight: bold;">
+        <span style="flex: 2; border: 1px solid #ccc;">科室名称</span>
+        <span style="flex: 1; border-bottom: 1px solid #ccc;border-right: 1px solid #ccc;border-top: 1px solid #ccc;">只数</span>
+      </div>
+    </div>
+    <div style="width: 50%;float: left;">
+      <div style="display: flex;justify-content: center;text-align: center;font-weight: bold;">
+        <span style="flex: 2; border-bottom: 1px solid #ccc;border-right: 1px solid #ccc;border-top: 1px solid #ccc;">科室名称</span>
+        <span style="flex: 1; border-bottom: 1px solid #ccc;border-right: 1px solid #ccc;border-top: 1px solid #ccc;">只数</span>
+      </div>
+    </div>
+    <div *ngFor="let item of building.deptData;let even = even;" style="width: 50%;float: left;">
+      <div style="display: flex;justify-content: center;text-align: center;">
+        <span style="flex: 2;word-break: break-all; border-bottom: 1px solid #ccc;border-right: 1px solid #ccc;" [ngStyle]="{'border-left':even?'1px solid #ccc':''}">{{item.deptName}}<span *ngIf="item.workOrderRemarks">+{{item.workOrderRemarks.slice(0,2)}}</span></span>
+        <span style="flex: 1; border-bottom: 1px solid #ccc;border-right: 1px solid #ccc;"></span>
+      </div>
+    </div>
+  </div>
+</div>
+<button ngxPrint printSectionId="print-section" #printBtn hidden>打印</button>

src/app/views/nucleic-acid-collection/nucleic-acid-collection.component.less

@@ -0,0 +1,177 @@
+@import "../../../../src/theme.less";
+
+::ng-deep .executeTime,
+::ng-deep
+  .executeTime[nzplaceholder="请选择定时发送时间"]
+  .ant-calendar-picker {
+  width: 100% !important;
+}
+::ng-deep .ant-calendar-picker-input {
+  width: 410px !important;
+}
+
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+
+  .modalBody {
+    width: 350px;
+    height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 310px;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      & > div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+      .timingMessageSendingTips {
+        font-size: 12px;
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+        max-height: 497px;
+        overflow-y: auto;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+
+            .desc {
+              margin-top: 5px;
+            }
+          }
+
+          .datesControl {
+            margin-top: -16px;
+
+            .ant-form-item-label {
+              line-height: 40px;
+            }
+          }
+
+          .timer {
+            .ant-form-item-label {
+              width: 100%;
+              text-align: left;
+            }
+
+            .numInp {
+              margin-right: 5px;
+            }
+
+            .line {
+              margin-right: 5px;
+            }
+          }
+
+          .timer2 {
+            .ant-form-item-label {
+              line-height: 20px;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/views/nucleic-acid-collection/nucleic-acid-collection.component.ts

@@ -0,0 +1,126 @@
+import { Component, OnInit, ViewChild, ElementRef } from "@angular/core";
+import { ActivatedRoute } from "@angular/router";
+
+import { MainService } from "../../services/main.service";
+import { ToolService } from "../../services/tool.service";
+import { NzMessageService } from 'ng-zorro-antd';
+@Component({
+  selector: "app-nucleic-acid-collection",
+  templateUrl: "./nucleic-acid-collection.component.html",
+  styleUrls: ["./nucleic-acid-collection.component.less"],
+})
+export class NucleicAcidCollectionComponent implements OnInit {
+  @ViewChild('printBtn', { static: false }) printBtn: ElementRef<HTMLElement>;
+  constructor(
+    private mainService: MainService,
+    private route: ActivatedRoute,
+    private tool: ToolService,
+    private msg: NzMessageService,
+  ) {}
+
+  userInfo: any = JSON.parse(localStorage.getItem("user")) || {}; //登录用户信息
+  hosId;
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getList();
+    this.getHospitalConfigList('allowNucleicAcidPrinting');
+    this.coopBtns = this.tool.initCoopBtns(this.route);
+  }
+
+  // 初始化权限按钮
+  coopBtns: any = {};
+
+  // 预览图片
+  imgs = [];
+  isPreview = false;
+  previewImageHandler(data) {
+    if(data.pictureId){
+      console.log(data.id)
+      this.isPreview = false;
+      this.mainService.getPreviewImage('specimenPhotos', data.id).subscribe((result:any)=>{
+        if (result.status == 200) {
+          this.imgs = result.data.map((v) => v.previewUrl);
+          this.isPreview = true;
+        } else {
+          this.imgs = [];
+        }
+      })
+    }
+  }
+
+  // 获取院区配置配置，是否核酸打印
+  isShowNucleicAcidPrinting = false;
+  getHospitalConfigList(key) {
+    let postData = { idx: 0, sum: 1, hospitalConfig: { hosId: this.hosId, key } };
+    this.mainService.getFetchDataList("simple/data", "hospitalConfig", postData).subscribe(result=>{
+      if(result.status == 200){
+        this.isShowNucleicAcidPrinting = result.list[0].value == 1;
+      }else{
+        this.isShowNucleicAcidPrinting = false;
+      }
+    });
+  }
+
+  // 补充打印
+  nucleicAcidList: any = [];
+  printDate:number = Date.now();
+  mapQrcodes:any = {};
+  supplementPrint(data){
+    data.isOkLoading = true;
+    this.mainService.supplementPrintNucleicAcid({buildingId:data.buildId?data.buildId.id:undefined,code:data.qrcode}).subscribe((result:any) => {
+      data.isOkLoading = false;
+      if(result.status == 200){
+        this.mapQrcodes = {[data.buildId.id]: result.qrcode};
+        let nucleicAcidList:any = [
+          {
+            buildName: data.buildId.buildingName,
+            buildId: data.buildId.id,
+            deptData: result.deptData
+          }
+        ]
+        for (let i = 0; i < nucleicAcidList.length; i++) {
+          if(nucleicAcidList[i].deptData && Array.isArray(nucleicAcidList[i].deptData)){
+            nucleicAcidList[i].deptNames = nucleicAcidList[i].deptData.map(v=>v.deptName).toString();
+          }else{
+            nucleicAcidList[i].deptData = [];
+            nucleicAcidList[i].deptNames = '';
+          }
+        }
+        this.nucleicAcidList = nucleicAcidList;
+        setTimeout(()=>{
+          this.printBtn.nativeElement.click();
+        },0)
+      }else{
+        this.msg.create('error', `操作失败!`);
+      }
+    })
+  }
+
+  // 表格数据
+  loading1 = false;
+  getList() {
+    let postData = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      messageJob: {
+        hospital: this.hosId,
+      },
+    };
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("simple/data", "nucleicAcid", postData)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.listOfData = data.list;
+          this.listLength = data.totalNum;
+        }
+      });
+  }
+}
+

src/app/views/nucleic-acid-collection/nucleic-acid-collection.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { NucleicAcidCollectionRoutingModule } from './nucleic-acid-collection-routing.module';
+import { ShareModule } from 'src/app/share/share.module';
+import { NucleicAcidCollectionComponent } from './nucleic-acid-collection.component';
+
+import { NgxPrintModule } from 'ngx-print';
+
+
+@NgModule({
+  declarations: [NucleicAcidCollectionComponent],
+  imports: [
+    CommonModule,
+    NucleicAcidCollectionRoutingModule,
+    ShareModule,
+    NgxPrintModule
+  ]
+})
+export class NucleicAcidCollectionModule { }

src/common.less

@@ -287,7 +287,10 @@
               border: none;
 
               .coop {
-                span {
+                button{
+                  color: #333;
+                }
+                span,button {
                   display: inline-block;
                   padding: 0 8px;
                   cursor: pointer;

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.12');
+    console.info('v2.4.13');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)

src/styles.less

@@ -2,3 +2,4 @@
 @import "./theme.less"; //自定义全局样式
 @import "./common.less"; //common
 @import "~overlayscrollbars/css/OverlayScrollbars.css"; //滚动条
+@import "~viewerjs/dist/viewer.min.css"; //viewerjs