新增字段展示

src/app/services/main.service.ts

@@ -48,13 +48,18 @@ export class MainService {
   }
   // 字典表
   cachedDictionary = {}; //缓存到内存的字典
-  getDictionary(type, key): any {
+  getDictionary(type, key, flag = false): any {
     const data = {
       type: type,
       key: key,
     };
     console.log(this.cachedDictionary, "------------db");
-    if (this.cachedDictionary[key]) {
+    if (flag) {
+      //特殊情况下处理，flag是true
+      return this.http.post(host.host + "/common/common/getDictionary", data, {
+        headers: this.headers,
+      });
+    } else if (this.cachedDictionary[key]) {
       return new Observable((observer) => {
         observer.next(this.cachedDictionary[key]);
       });

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

@@ -3,9 +3,9 @@
   <div class="title">差评查看<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
   <div class="box">
     <div class="tab display_flex">
-      <div [ngClass]="{'item':true, 'flex_1':true, checked:tabType==1}" (click)="checkTab(1)">工单信息</div>
-      <div [ngClass]="{'item':true, 'flex_1':true, checked:tabType==2}" (click)="checkTab(2)">评价内容</div>
-      <div [ngClass]="{'item':true, 'flex_1':true, checked:tabType==3}" (click)="checkTab(3)">调解</div>
+      <div [ngClass]="{'item':true, 'flex_1':true, 'checked':tabType==1}" (click)="checkTab(1)">工单信息</div>
+      <div [ngClass]="{'item':true, 'flex_1':true, 'checked':tabType==2}" (click)="checkTab(2)">评价内容</div>
+      <div [ngClass]="{'item':true, 'flex_1':true, 'checked':tabType==3}" (click)="checkTab(3)">调解</div>
     </div>
     <!-- 其他类型工单信息 -->
     <div *ngIf="(tabType==1)&&(orderInfo.workOrderObj.taskType.associationType.value=='other')" class="content orders">
@@ -116,12 +116,13 @@
                 <th nzWidth="95px">标本类型</th>
                 <th nzWidth="110px">标本编码</th>
                 <th nzWidth="88px">患者姓名</th>
+                <th nzWidth="88px">住院号</th>
                 <th nzWidth="50px">床号</th>
                 <th nzWidth="88px">目标科室</th>
                 <!-- <th nzWidth="75px">是否接收</th> -->
                 <!-- <th nzWidth="75px">是否送达</th> -->
                 <th nzWidth="123px">接收扫描时间</th>
-                <th nzWidth="123px">送达扫描时间</th>
+                <!-- <th nzWidth="123px">送达扫描时间</th> -->
               </tr>
             </thead>
             <tbody *ngIf="orderInfo.workOrderObj.specimenSet">
@@ -131,12 +132,13 @@
                 <td>{{data.stype?data.stype.name:''}}</td>
                 <td>{{data.scode}}</td>
                 <td>{{data.patientName}}</td>
+                <td>{{data.residenceNo}}</td>
                 <td>{{data.bedNum}}</td>
                 <td>{{data.checkDept.dept}}</td>
                 <!-- <td>{{data.received?"是":"否"}}</td> -->
                 <!-- <td>{{data.arrived?"是":"否"}}</td> -->
-                <td>{{data.arriveTime|date:'yyyy-MM-dd HH:mm'}}</td>
-                <td>{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}</td>
+                <td>{{data.arriveTime|date:'MM-dd HH:mm'}}</td>
+                <!-- <td>{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}</td> -->
               </tr>
             </tbody>
           </nz-table>

src/app/share/appraise-detail/appraise-detail.component.less

@@ -13,6 +13,12 @@
   justify-content: center;
   align-items: center;
 }
+.ji {
+  position: absolute;
+  right: 0px;
+  top: -3px;
+  width: 30px;
+}
 
 .detail {
   width: 1000px;

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

@@ -2,8 +2,8 @@ import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { FormBuilder, Validators, FormGroup } from "@angular/forms";
 import { MainService } from "../../services/main.service";
-import { NzMessageService } from "ng-zorro-antd";
 import { forkJoin } from "rxjs";
+import { NzMessageService } from "ng-zorro-antd";
 
 @Component({
   selector: "app-appraise-detail",
@@ -19,7 +19,7 @@ export class AppraiseDetailComponent implements OnInit {
   ) {}
 
   id: number; //工单id
-  orderInfo; //工单详情信息
+  orderInfo:any = {}; //工单详情信息
   showCoop: boolean = true; //是否展示详情页操作按钮
   loginUser: any = localStorage.getItem("user")
     ? JSON.parse(localStorage.getItem("user")).user
@@ -86,7 +86,7 @@ export class AppraiseDetailComponent implements OnInit {
   // 获取所有院区
   allHandleType: any = [];
   getAllHandleType() {
-    return this.mainService.getDictionary("list", "bad_evaluation_handle_type");
+    return this.mainService.getDictionary("list", "bad_evaluation_handle_type",true);
   }
 
   // 初始化新增form表单

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

@@ -61,12 +61,13 @@
               <th nzWidth="95px">标本类型</th>
               <th nzWidth="110px">标本编码</th>
               <th nzWidth="88px">患者姓名</th>
+              <th nzWidth="88px">住院号</th>
               <th nzWidth="50px">床号</th>
               <th nzWidth="88px">目标科室</th>
               <!-- <th nzWidth="75px">是否接收</th> -->
               <!-- <th nzWidth="75px">是否送达</th> -->
               <th nzWidth="123px">接收扫描时间</th>
-              <th nzWidth="123px">送达扫描时间</th>
+              <!-- <th nzWidth="123px">送达扫描时间</th> -->
             </tr>
           </thead>
           <tbody *ngIf="orderInfo.specimenSet">
@@ -76,13 +77,14 @@
               <td>{{data.stype?data.stype.name:''}}</td>
               <td>{{data.scode}}</td>
               <td>{{data.patientName}}</td>
+              <td>{{data.residenceNo}}</td>
               <td>{{data.bedNum}}</td>
               <td>{{!showCoop&&deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept}}</td>
               <!-- <td>{{data.received?"是":"否"}}</td> -->
               <!-- <td>{{data.arrived?"是":"否"}}</td> -->
-              <td>{{data.arriveTime?data.arriveTime:'-'}}</td>
-              <td style="position: relative;">{{data.sendTime?data.sendTime:'-'}}<img *ngIf="data.urgent == 1"
-                  src="../../assets/images/icon_ji.png" alt="" class="ji"></td>
+              <td>{{data.arriveTime|date:'MM-dd HH:mm'}}<img *ngIf="data.urgent == 1||true"
+                src="../../assets/images/icon_ji.png" alt="" class="ji"></td>
+              <!-- <td style="position: relative;">{{data.sendTime?data.sendTime:'-'}}</td> -->
             </tr>
           </tbody>
         </nz-table>

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

@@ -133,12 +133,13 @@
                   <th nzWidth="95px">标本类型</th>
                   <th nzWidth="110px">标本编码</th>
                   <th nzWidth="88px">患者姓名</th>
+                  <th nzWidth="88px">住院号</th>
                   <th nzWidth="50px">床号</th>
                   <th nzWidth="88px">目标科室</th>
                   <!-- <th nzWidth="75px">是否接收</th> -->
                   <!-- <th nzWidth="75px">是否送达</th> -->
                   <th nzWidth="123px">接收扫描时间</th>
-                  <th nzWidth="123px">送达扫描时间</th>
+                  <!-- <th nzWidth="123px">送达扫描时间</th> -->
                 </tr>
               </thead>
               <tbody *ngIf="orderInfo.specimenSet">
@@ -148,13 +149,14 @@
                   <td>{{data.stype?data.stype.name:''}}</td>
                   <td>{{data.scode}}</td>
                   <td>{{data.patientName}}</td>
+                  <td>{{data.residenceNo}}</td>
                   <td>{{data.bedNum}}</td>
                   <td>{{data.checkDept.dept}}</td>
                   <!-- <td>{{data.received?"是":"否"}}</td> -->
                   <!-- <td>{{data.arrived?"是":"否"}}</td> -->
-                  <td>{{data.arriveTime|date:'yyyy-MM-dd HH:mm'}}</td>
-                  <td style="position: relative;">{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}<img *ngIf="data.urgent == 1"
-                      src="../../assets/images/icon_ji.png" alt="" class="ji"></td>
+                  <td>{{data.arriveTime|date:'MM-dd HH:mm'}}<img *ngIf="data.urgent == 1"
+                    src="../../assets/images/icon_ji.png" alt="" class="ji"></td>
+                  <!-- <td style="position: relative;">{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}</td> -->
                 </tr>
               </tbody>
             </nz-table>
@@ -225,12 +227,13 @@
                   <th nzWidth="95px">标本类型</th>
                   <th nzWidth="110px">标本编码</th>
                   <th nzWidth="88px">患者姓名</th>
+                  <th nzWidth="88px">住院号</th>
                   <th nzWidth="50px">床号</th>
                   <th nzWidth="88px">目标科室</th>
                   <!-- <th nzWidth="75px">是否接收</th> -->
                   <!-- <th nzWidth="75px">是否送达</th> -->
                   <th nzWidth="123px">接收扫描时间</th>
-                  <th nzWidth="123px">送达扫描时间</th>
+                  <!-- <th nzWidth="123px">送达扫描时间</th> -->
                 </tr>
               </thead>
               <tbody *ngIf="orderInfo.specimenSet">
@@ -240,13 +243,14 @@
                   <td>{{data.stype?data.stype.name:''}}</td>
                   <td>{{data.scode}}</td>
                   <td>{{data.patientName}}</td>
+                  <td>{{data.residenceNo}}</td>
                   <td>{{data.bedNum}}</td>
                   <td>{{data.checkDept.dept}}</td>
                   <!-- <td>{{data.received?"是":"否"}}</td> -->
                   <!-- <td>{{data.arrived?"是":"否"}}</td> -->
-                  <td>{{data.arriveTime|date:'yyyy-MM-dd HH:mm'}}</td>
-                  <td style="position: relative;">{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}<img *ngIf="data.urgent == 1"
-                      src="../../assets/images/icon_ji.png" alt="" class="ji"></td>
+                  <td>{{data.arriveTime|date:'MM-dd HH:mm'}}<img *ngIf="data.urgent == 1"
+                    src="../../assets/images/icon_ji.png" alt="" class="ji"></td>
+                  <!-- <td style="position: relative;">{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}</td> -->
                 </tr>
               </tbody>
             </nz-table>

src/main.ts

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