增加工单类型备注等

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

@@ -17,7 +17,7 @@
         <div class="info" nz-row>
           <div nz-col nzSpan="6">工单日期：{{orderInfo.workOrderObj.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
           <div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
-          <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}
+          <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container *ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
           </div>
           <div nz-col nzSpan="4">支助人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
         </div>
@@ -66,7 +66,7 @@
         <div class="info" nz-row>
           <div nz-col nzSpan="6">工单日期：{{orderInfo.workOrderObj.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
           <div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
-          <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}
+          <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container *ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
           </div>
           <div nz-col nzSpan="4">支助人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
         </div>
@@ -157,7 +157,7 @@
         <div class="info" nz-row>
           <div nz-col nzSpan="6">工单日期：{{orderInfo.workOrderObj.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
           <div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
-          <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}
+          <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container *ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
           </div>
           <div nz-col nzSpan="4">支助人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
         </div>
@@ -260,7 +260,7 @@
         <div class="info" nz-row>
           <div nz-col nzSpan="6">工单日期：{{orderInfo.workOrderObj.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
           <div nz-col nzSpan="6">总耗时：{{orderInfo.workOrderObj.showTimeNum}}</div>
-          <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}
+          <div nz-col nzSpan="8">申请类型：{{orderInfo.workOrderObj.taskType?orderInfo.workOrderObj.taskType.taskName:''}}<ng-container *ngIf="orderInfo.workOrderObj.goodsRemark">-{{orderInfo.workOrderObj.goodsRemark}}</ng-container>
           </div>
           <div nz-col nzSpan="4">支助人员信息：{{orderInfo.workOrderObj.worker?orderInfo.workOrderObj.worker.name:''}}</div>
         </div>

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

@@ -10,7 +10,7 @@
       <div class="info" nz-row>
         <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
         <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
-        <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
+        <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
         <div nz-col nzSpan="8">
           申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
         </div>

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

@@ -10,7 +10,7 @@
       <div class="info" nz-row>
         <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
         <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
-        <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}</div>
+        <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
         <div nz-col nzSpan="8">
           申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
         </div>

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

@@ -11,7 +11,7 @@
         <div class="info" nz-row>
           <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
           <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
-          <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}</div>
+          <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
           <div nz-col nzSpan="8">
             申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
           </div>

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

@@ -10,7 +10,7 @@
       <div class="info" nz-row>
         <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
         <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
-        <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}</div>
+        <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
         <div nz-col nzSpan="8">预计接收：{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:''}}</div>
 
         <div nz-col nzSpan="8">

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

@@ -18,7 +18,7 @@
           <div class="info" nz-row>
             <div nz-col nzSpan="6">工单日期：{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
             <div nz-col nzSpan="6">总耗时：{{orderInfo.showTimeNum}}</div>
-            <div nz-col nzSpan="6">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
+            <div nz-col nzSpan="6">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
             <div nz-col nzSpan="6">支助人员信息：{{orderInfo.worker?orderInfo.worker.name:''}}</div>
           </div>
           <div class="info" nz-row>
@@ -73,7 +73,7 @@
           <div class="info" nz-row>
             <div nz-col nzSpan="6">工单日期：{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
             <div nz-col nzSpan="6">总耗时：{{orderInfo.showTimeNum}}</div>
-            <div nz-col nzSpan="6">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
+            <div nz-col nzSpan="6">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
             <div nz-col nzSpan="6">支助人员信息：{{orderInfo.worker?orderInfo.worker.name:''}}</div>
           </div>
           <div class="info" nz-row>
@@ -175,7 +175,7 @@
           <div class="info" nz-row>
             <div nz-col nzSpan="6">工单日期：{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
             <div nz-col nzSpan="6">总耗时：{{orderInfo.showTimeNum}}</div>
-            <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
+            <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
             <div nz-col nzSpan="4">支助人员信息：{{orderInfo.worker?orderInfo.worker.name:''}}</div>
           </div>
           <div class="info" nz-row>
@@ -271,7 +271,7 @@
           <div class="info" nz-row>
             <div nz-col nzSpan="6">工单日期：{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
             <div nz-col nzSpan="6">总耗时：{{orderInfo.showTimeNum}}</div>
-            <div nz-col nzSpan="6">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
+            <div nz-col nzSpan="6">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
             <div nz-col nzSpan="6">支助人员信息：{{orderInfo.worker?orderInfo.worker.name:''}}</div>
           </div>
           <div class="info" nz-row>
@@ -381,7 +381,7 @@
           <div class="info" nz-row>
             <div nz-col nzSpan="6">工单日期：{{orderInfo.startTime|date:'yyyy-MM-dd HH:mm'}}</div>
             <div nz-col nzSpan="6">总耗时：{{orderInfo.showTimeNum}}</div>
-            <div nz-col nzSpan="6">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}</div>
+            <div nz-col nzSpan="6">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
             <div nz-col nzSpan="6">支助人员信息：{{orderInfo.worker?orderInfo.worker.name:''}}</div>
           </div>
           <div class="info" nz-row>

src/app/views/compre-statistics/compre-statistics.component.ts

@@ -409,6 +409,7 @@ export class CompreStatisticsComponent implements OnInit {
               percent = datas[i].percent;
             }
           }
+          console.log(datas)
           var arr = ["" + name + " | " + percent + "% " + target];
           return arr.join("\n");
         },
@@ -546,6 +547,7 @@ export class CompreStatisticsComponent implements OnInit {
   // 各类型平均时间柱状图
   durationOption;
   durationChart(datas) {
+    console.log(datas)
     let labels = [];
     let nums = [];
     if (datas.length) {

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

@@ -213,13 +213,13 @@
                     class="left gongdan_name"
                     nz-tooltip
                     [nzTooltipTitle]="
-                      data.taskType.taskName + '(' + data.gdcode + ')'
+                      data.taskType.taskName + (data.goodsRemark?'-'+data.goodsRemark:'')+'(' + data.gdcode + ')'
                     "
                     >{{
                       data.isHalfInspect === 1
                         ? "半程陪检"
                         : data.taskType.taskName
-                    }}({{ data.gdcode }})</span
+                    }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container>({{ data.gdcode }})</span
                   >
                   <span
                     nz-tooltip
@@ -632,13 +632,13 @@
                     class="left gongdan_name"
                     nz-tooltip
                     [nzTooltipTitle]="
-                      data.taskType.taskName + '(' + data.gdcode + ')'
+                      data.taskType.taskName + (data.goodsRemark?'-'+data.goodsRemark:'')+'(' + data.gdcode + ')'
                     "
                     >{{
                       data.isHalfInspect === 1
                         ? "半程陪检"
                         : data.taskType.taskName
-                    }}({{ data.gdcode }})</span
+                    }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container>({{ data.gdcode }})</span
                   >
                   <span
                     nz-tooltip
@@ -1037,13 +1037,13 @@
                     class="left gongdan_name"
                     nz-tooltip
                     [nzTooltipTitle]="
-                      data.taskType.taskName + '(' + data.gdcode + ')'
+                      data.taskType.taskName + (data.goodsRemark?'-'+data.goodsRemark:'')+'(' + data.gdcode + ')'
                     "
                     >{{
                       data.isHalfInspect === 1
                         ? "半程陪检"
                         : data.taskType.taskName
-                    }}({{ data.gdcode }})</span
+                    }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container>({{ data.gdcode }})</span
                   >
                   <span
                     nz-tooltip

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -119,7 +119,7 @@ export class HushijiandanComponent implements OnInit {
           });
           this.mainService
             .coopConfig("setOrders", postData)
-            .subscribe((result) => { });
+            .subscribe((result) => {});
         }, 500);
       },
     };
@@ -231,34 +231,42 @@ export class HushijiandanComponent implements OnInit {
   jpDrugsWKOMsg: any = {}; //药品静配提示信息
 
   // 获取报修区域（所属院区）
-  areas: any = [];//区域（所属院区）列表
+  areas: any = []; //区域（所属院区）列表
   getArea() {
     this.areas = [];
-    this.mainService.fetchListBx('area', { idx: 0, sum: 1000 }).subscribe((result: any) => {
-      if (result.status == 200) {
-        this.areas = result.list;
-        if (this.areas.length) {
-          this.bxForm.controls.hospital.setValue(this.areas[0].id);
-        } else {
-          this.bxForm.controls.hospital.setValue(null);
+    this.mainService
+      .fetchListBx("area", { idx: 0, sum: 1000 })
+      .subscribe((result: any) => {
+        if (result.status == 200) {
+          this.areas = result.list;
+          if (this.areas.length) {
+            this.bxForm.controls.hospital.setValue(this.areas[0].id);
+          } else {
+            this.bxForm.controls.hospital.setValue(null);
+          }
         }
-      }
-    });
+      });
   }
   //根据区域(所属院区)获取地点(楼栋)
-  places: any = [];//地点（楼栋）列表
+  places: any = []; //地点（楼栋）列表
   getPlace(buildingId) {
     this.places = [];
-    this.mainService.fetchListBx('place', { idx: 0, sum: 1000, place: { area: { id: buildingId } } }).subscribe((result: any) => {
-      if (result.status == 200) {
-        this.places = result.list;
-        if (this.places.length) {
-          this.bxForm.controls.building.setValue(this.places[0].id);
-        } else {
-          this.bxForm.controls.building.setValue(null);
+    this.mainService
+      .fetchListBx("place", {
+        idx: 0,
+        sum: 1000,
+        place: { area: { id: buildingId } },
+      })
+      .subscribe((result: any) => {
+        if (result.status == 200) {
+          this.places = result.list;
+          if (this.places.length) {
+            this.bxForm.controls.building.setValue(this.places[0].id);
+          } else {
+            this.bxForm.controls.building.setValue(null);
+          }
         }
-      }
-    });
+      });
   }
 
   btnLoading: boolean = false; //确认按钮loading状态
@@ -410,6 +418,17 @@ export class HushijiandanComponent implements OnInit {
   closeModelHistory(e) {
     this.historyPromptModalShow = JSON.parse(e).show;
   }
+  // 查看药单历史记录
+  historyDPromptModalShow = false; //药单历史记录弹窗开关
+  packidD = ""; //查看历史记录携带
+  viewDrugsbagHistory(data) {
+    this.packidD = data.scode;
+    this.historyDPromptModalShow = true;
+  }
+  // 关闭药单历史记录弹窗
+  closeModelHistoryDrugsbag(e) {
+    this.historyDPromptModalShow = JSON.parse(e).show;
+  }
   // 查看报修信息弹窗
   bxPromptModalShow = false; //弹窗开关
   bData = ""; //查看详情携带所有数据
@@ -689,11 +708,11 @@ export class HushijiandanComponent implements OnInit {
       data,
       data.focusPatient === 0
         ? "您将设置患者【" +
-        data.patientName +
-        "】为重点关注，后期此患者的相关检查将会自动建单通知支助中心"
+            data.patientName +
+            "】为重点关注，后期此患者的相关检查将会自动建单通知支助中心"
         : "您将取消设置患者【" +
-        data.patientName +
-        "】为重点关注，后期此患者的相关检查将不会自动建单通知支助中心"
+            data.patientName +
+            "】为重点关注，后期此患者的相关检查将不会自动建单通知支助中心"
     );
   }
   // 通用提示模态框
@@ -761,9 +780,9 @@ export class HushijiandanComponent implements OnInit {
   // 确认
   confirmBx() {
     this.loading6 = true;
-    this.mainService.wxbx({}).subscribe(result => {
+    this.mainService.wxbx({}).subscribe((result) => {
       if ((result as any).status == 200) {
-        let bxcode = (result as any).data;//生成微信报修号
+        let bxcode = (result as any).data; //生成微信报修号
         let postData: any = {
           verification: "true",
           incident: {
@@ -773,31 +792,31 @@ export class HushijiandanComponent implements OnInit {
             requester: { account: this.loginUser.account },
             sourceType: "wechatUserIncident",
             fileUrl: "url",
-            bxcode
+            bxcode,
           },
           loginUser: {
             account: this.loginUser.account,
-            id: this.loginUser.id
-          }
+            id: this.loginUser.id,
+          },
         };
         if (this.coopBx.category) {
-          postData.incident.categoryId = this.coopBx.category.id
+          postData.incident.categoryId = this.coopBx.category.id;
         }
-        this.mainService.addWxIncident(postData).subscribe(res => {
+        this.mainService.addWxIncident(postData).subscribe((res) => {
           this.loading6 = false;
           this.bxModal = false;
           if ((res as any).state == 200) {
             this.showPromptModal("提交", true, "");
-            this.checkTable('bxlb');
+            this.checkTable("bxlb");
           } else {
             this.showPromptModal("提交", false, (res as any).msg);
           }
-        })
+        });
       } else {
         this.loading6 = false;
         this.showPromptModal("提交", false, "");
       }
-    })
+    });
   }
 
   // 获取当前登录人科室任务类型信息
@@ -994,7 +1013,7 @@ export class HushijiandanComponent implements OnInit {
       keyWord: e ? e : this.tabSearchCont,
     };
     // 查询父级科室患者
-    postData['patient']['parentIdOnly'] = true;
+    postData["patient"]["parentIdOnly"] = true;
     if (
       this.currentUser.typeValue == "checkRoom2" ||
       this.currentUser.typeValue == "outpatientDept" ||
@@ -2341,17 +2360,20 @@ export class HushijiandanComponent implements OnInit {
     this.checkedTableType = type;
     if (type === "historySpecimen") {
       this.getHistorySpecimen();
-    } else if (type === "bxlb") {
-      this.getBxlb();
-    } else if (type === "kjbx") {
-      this.getQuickBxlb();
-      // 获取报修的区域(所属院区)
-      this.getArea();
-      this.bxForm.controls.name.setValue(this.loginUser.name);
-      this.bxForm.controls.phone.setValue(this.loginUser.phone);
-      this.bxForm.controls.address.setValue(null);
-      this.bxForm.controls.content.setValue(null);
-    }
+    } else if (type === "historyDrugsbag") {
+      this.getHistoryDrugsbag();
+    }
+    // else if (type === "bxlb") {
+    //   this.getBxlb();
+    // } else if (type === "kjbx") {
+    //   this.getQuickBxlb();
+    //   // 获取报修的区域(所属院区)
+    //   this.getArea();
+    //   this.bxForm.controls.name.setValue(this.loginUser.name);
+    //   this.bxForm.controls.phone.setValue(this.loginUser.phone);
+    //   this.bxForm.controls.address.setValue(null);
+    //   this.bxForm.controls.content.setValue(null);
+    // }
   }
   //提交报修
   bxLoading = false;
@@ -2362,9 +2384,9 @@ export class HushijiandanComponent implements OnInit {
     }
     if (this.bxForm.invalid) return;
     this.bxLoading = true;
-    this.mainService.wxbx({}).subscribe(result => {
+    this.mainService.wxbx({}).subscribe((result) => {
       if ((result as any).status == 200) {
-        let bxcode = (result as any).data;//生成微信报修号
+        let bxcode = (result as any).data; //生成微信报修号
         let postData = {
           verification: "true",
           incident: {
@@ -2377,27 +2399,27 @@ export class HushijiandanComponent implements OnInit {
             requester: { account: this.loginUser.account },
             sourceType: "wechatUserIncident",
             fileUrl: "url",
-            bxcode
+            bxcode,
           },
           loginUser: {
             account: this.loginUser.account,
-            id: this.loginUser.id
-          }
+            id: this.loginUser.id,
+          },
         };
-        this.mainService.addWxIncident(postData).subscribe(res => {
+        this.mainService.addWxIncident(postData).subscribe((res) => {
           this.bxLoading = false;
           if ((res as any).state == 200) {
             this.showPromptModal("提交", true, "");
-            this.checkTable('bxlb');
+            this.checkTable("bxlb");
           } else {
             this.showPromptModal("提交", false, (res as any).msg);
           }
-        })
+        });
       } else {
         this.bxLoading = false;
         this.showPromptModal("提交", false, "");
       }
-    })
+    });
   }
 
   // 意见箱表格数据
@@ -2471,48 +2493,84 @@ export class HushijiandanComponent implements OnInit {
         this.historySpecimenListLength = data.totalNum || 0;
       });
   }
-  // 报修列表查询表格数据
-  bxlbList: any = [];
-  bxlbPageIndex: number = 1; //表格当前页码
-  bxlbPageSize: number = 10; //表格每页展示条数
-  bxlbListLength: number = 10; //表格总数据量
-  bxlbCodeSearchInp: string = ""; //标本编码搜索
-  bxlbParentSearchInp: string = ""; //患者信息搜索
-  bxlbLoading = false;
-  getBxlb(idx?) {
+  // 历史药单查询表格数据
+  historyDrugsbagList: any = [];
+  historyDrugsbagPageIndex: number = 1; //表格当前页码
+  historyDrugsbagPageSize: number = 10; //表格每页展示条数
+  historyDrugsbagListLength: number = 10; //表格总数据量
+  historyDrugsbagCodeSearchInp: string = ""; //发药单号搜索
+  // historyDrugsbagParentSearchInp: string = ""; //患者信息搜索
+  hsDLoading = false;
+  getHistoryDrugsbag(idx?) {
     if (idx) {
-      this.bxlbPageIndex = 1;
+      this.historyDrugsbagPageIndex = 1;
     }
     let current = JSON.parse(localStorage.getItem("user"));
-    this.bxlbLoading = true;
+    let postData = {
+      drugsBag: {
+        target: {
+          id: current.user.dept.id,
+        },
+        packid:
+          this.historyDrugsbagCodeSearchInp === ""
+            ? ''
+            : this.historyDrugsbagCodeSearchInp,
+        platform: 2,
+      },
+      idx: this.historyDrugsbagPageIndex - 1,
+      sum: this.historyDrugsbagPageSize,
+    };
+    this.hsDLoading = true;
     this.mainService
-      .listWxIncident({
-        "assignee": current.user.account,
-        "state": 0,
-        "idx": this.bxlbPageIndex - 1,
-        "sum": this.bxlbPageSize
-      })
-      .subscribe((data: any) => {
-        this.bxlbLoading = false;
-        this.bxlbList = data.data || [];
-        this.bxlbListLength = data.resultCount || 0;
+      .getFetchDataList("api", "drugsBag", postData)
+      .subscribe((data) => {
+        this.hsDLoading = false;
+        this.historyDrugsbagList = data.list || [];
+        this.historyDrugsbagListLength = data.totalNum || 0;
       });
   }
+  // 报修列表查询表格数据
+  // bxlbList: any = [];
+  // bxlbPageIndex: number = 1; //表格当前页码
+  // bxlbPageSize: number = 10; //表格每页展示条数
+  // bxlbListLength: number = 10; //表格总数据量
+  // bxlbCodeSearchInp: string = ""; //标本编码搜索
+  // bxlbParentSearchInp: string = ""; //患者信息搜索
+  // bxlbLoading = false;
+  // getBxlb(idx?) {
+  //   if (idx) {
+  //     this.bxlbPageIndex = 1;
+  //   }
+  //   let current = JSON.parse(localStorage.getItem("user"));
+  //   this.bxlbLoading = true;
+  //   this.mainService
+  //     .listWxIncident({
+  //       "assignee": current.user.account,
+  //       "state": 0,
+  //       "idx": this.bxlbPageIndex - 1,
+  //       "sum": this.bxlbPageSize
+  //     })
+  //     .subscribe((data: any) => {
+  //       this.bxlbLoading = false;
+  //       this.bxlbList = data.data || [];
+  //       this.bxlbListLength = data.resultCount || 0;
+  //     });
+  // }
 
   //快速报修列表
-  quickBxlbLoading = false;
-  quickBxlbList = [];
-  getQuickBxlb() {
-    this.quickBxlbLoading = true;
-    this.mainService
-      .fetchListBx("incidentCategoryContent", { idx: 0, sum: 10 })
-      .subscribe((data: any) => {
-        this.quickBxlbLoading = false;
-        if (data.status == 200) {
-          this.quickBxlbList = data.list || [];
-        }
-      });
-  }
+  // quickBxlbLoading = false;
+  // quickBxlbList = [];
+  // getQuickBxlb() {
+  //   this.quickBxlbLoading = true;
+  //   this.mainService
+  //     .fetchListBx("incidentCategoryContent", { idx: 0, sum: 10 })
+  //     .subscribe((data: any) => {
+  //       this.quickBxlbLoading = false;
+  //       if (data.status == 200) {
+  //         this.quickBxlbList = data.list || [];
+  //       }
+  //     });
+  // }
 
   // 意见箱-查看模态框
   adviceModal: boolean = false;
@@ -2640,7 +2698,7 @@ export class HushijiandanComponent implements OnInit {
           if (
             that.adviceList.length == 1 &&
             that.advicePageIndex ==
-            Math.ceil(that.adviceListLength / that.advicePageSize)
+              Math.ceil(that.adviceListLength / that.advicePageSize)
           ) {
             that.adviceListLength--;
             that.advicePageIndex = Math.ceil(

src/app/views/login/login.component.ts

@@ -215,7 +215,7 @@ export class LoginComponent implements OnInit {
       this.router.navigateByUrl("/dispatchingDesk");
       return;
     } else if (yfang) {
-      // 药房端
+      // 药房端2
       if (successLoginMsg) {
         this.msg.success("登录成功！", {
           nzDuration: 1000,
@@ -223,7 +223,7 @@ export class LoginComponent implements OnInit {
       }
       successLoginMsg = false;
       localStorage.setItem("user", JSON.stringify(data.user));
-      this.router.navigateByUrl("/pharmacy");
+      this.router.navigateByUrl("/pharmacy2");
       return;
     }
     // 有菜单可以进入系统主页面

src/app/views/order-management/order-management.component.html

@@ -110,7 +110,7 @@
             <td>{{ data.gdcode }}</td>
             <td>{{ data.createDeptDTO?data.createDeptDTO.dept:'' }}</td>
             <td>{{ data.taskType.associationType.name}}</td>
-            <td>{{ data.taskType.taskName }}</td>
+            <td>{{ data.taskType.taskName }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container></td>
             <td>{{ data.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
             <td>{{ data.showTimeNum }}</td>
             <td>

src/app/views/round-robin-detail/round-robin-detail.component.html

@@ -4,7 +4,7 @@
     <div class="content">
       <div class="bottom display_flex justify-content_space-between align-items_center">
         <span>{{userInfo.title}}</span>
-        <span>{{userInfo.planType?userInfo.planType.name:''}}</span>
+        <span>{{userInfo.taskType?userInfo.taskType.taskName:''}}</span>
       </div>
       <div class="info">
         <div nz-row>
@@ -25,7 +25,7 @@
           <div nz-col nzSpan="24">
             <div class="item display_flex align-items_flex-start">
               <span>执行时间</span>
-              <span>{{userInfo.orderPlanTimeShow.join()}}</span>
+              <span>{{userInfo.orderPlanTimeShow?userInfo.orderPlanTimeShow.join():''}}</span>
             </div>
           </div>
           <div nz-col nzSpan="24">

src/main.ts

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