增加业务信息菜单中的药品信息和静配信息

proxy.conf.json

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

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

@@ -1 +1,76 @@
-<p>drug-search works!</p>
+<div class="list-template">
+  <div class="list-template__content">
+    <div class="list-template__top" nz-row>
+      <div nz-col nzXl='16' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">请领单号：</span>
+          <input nz-input class="formItem" placeholder="请输入请领单号" [(ngModel)]="searchCriteria.packid" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">发药科室：</span>
+          <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear
+            nzPlaceHolder="请选择发药科室" [(ngModel)]="searchCriteria.launch" (nzOnSearch)="changeInp($event)"
+            (nzOpenChange)="changeSearch($event)">
+            <ng-container *ngFor="let data of deptList">
+              <nz-option *ngIf="!isLoading" nzLabel="{{data.dept}}" nzValue="{{data.id}}"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">申请科室：</span>
+          <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear
+            nzPlaceHolder="请选择申请科室" [(ngModel)]="searchCriteria.target" (nzOnSearch)="changeInp($event)"
+            (nzOpenChange)="changeSearch($event)">
+            <ng-container *ngFor="let data of deptList">
+              <nz-option *ngIf="!isLoading" nzLabel="{{data.dept}}" nzValue="{{data.id}}"></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
+      </div>
+      <div nz-col nzXl="8" class="list-template__btns">
+        <button nz-button class="btn default" (click)='reset()'>重置</button>
+        <button nz-button class="btn default ml8" (click)='getList(1)'>搜索</button>
+      </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="6%">序号</th>
+            <th nzWidth="14%">发药科室</th>
+            <th nzWidth="14%">申请科室</th>
+            <th nzWidth="14%">创建时间</th>
+            <th nzWidth="14%">药品状态</th>
+            <th nzWidth="14%">批次号</th>
+            <th nzWidth="12%">请领单号</th>
+            <th nzWidth="12%">药品标识</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of listOfData;let i = index">
+            <td>{{i+1}}</td>
+            <td>{{ data.launch?.dept}}</td>
+            <td>{{ data.target?.dept }}</td>
+            <td>{{ data.creatTime }}</td>
+            <td>{{ data.drugsState?.name }}</td>
+            <td>{{data.batchNo}}</td>
+            <td>{{ data.packid }}</td>
+            <td>{{data.id}}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="list-template__pagination">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)">
+        </nz-pagination>
+      </div>
+    </div>
+  </div>
+</div>

src/app/views/drug-search/drug-search.component.less

@@ -0,0 +1,167 @@
+@import "../../../../src/theme.less";
+
+.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;
+        }
+      }
+      .roundRobinTips {
+        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/drug-search/drug-search.component.ts

@@ -1,15 +1,132 @@
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit } from "@angular/core";
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
+import { MainService } from "src/app/services/main.service";
+import { ToolService } from "src/app/services/tool.service";
 
 @Component({
-  selector: 'app-drug-search',
-  templateUrl: './drug-search.component.html',
-  styleUrls: ['./drug-search.component.less']
+  selector: "app-drug-search",
+  templateUrl: "./drug-search.component.html",
+  styleUrls: ["./drug-search.component.less"],
 })
 export class DrugSearchComponent implements OnInit {
+  constructor(private mainService: MainService, private tool: ToolService) {}
 
-  constructor() { }
-
+  searchCriteria = {
+    //搜索条件
+    packid: "", //请领单号
+    launch: null, //发药科室
+    target: null, //发药科室
+  };
+  deptList = []; // 院区下的支助人员列表(搜索框)
+  hosId;
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
+  changeInpSubject = new Subject();
   ngOnInit() {
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
+      this.searchDept(v);
+    });
+    this.getHospital();
+  }
+  // 重置
+  reset() {
+    this.searchCriteria = {
+      //搜索条件
+      packid: "",
+      launch: null,
+      target: null,
+    };
+    this.getList(1);
+  }
+
+  // 获取所有院区
+  getHospital() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getList(1);
+  }
+  // 查看标本历史记录
+  historyPromptModalShow = false; //标本历史记录弹窗开关
+  scode = ""; //查看历史记录携带
+  viewSpecimenHistory(data) {
+    this.scode = data.scode;
+    this.historyPromptModalShow = true;
+  }
+  // 关闭标本历史记录弹窗
+  closeModelHistory(e) {
+    this.historyPromptModalShow = JSON.parse(e).show;
+  }
+  // 打开搜索框
+  changeSearch(flag) {
+    if (flag) {
+      this.changeInp("no");
+    }
+  }
+  // 边输边搜节流阀
+  isLoading = false;
+  changeInp(dept) {
+    if (!dept) {
+      return;
+    }
+    if (dept === "no") {
+      dept = "";
+    }
+    this.isLoading = true;
+    this.changeInpSubject.next(dept);
+  }
+  // 搜索科室
+  searchDept(dept) {
+    let postData = {
+      department: {
+        hospital: { id: this.hosId },
+        dept,
+      },
+      idx: 0,
+      sum: 10,
+    };
+    this.mainService
+      .getFetchDataList("data", "department", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.isLoading = false;
+          this.deptList = result.list;
+        }
+      });
   }
 
+  // 表格数据
+  loading1 = false;
+  getList(type) {
+    if (type == 1) {
+      this.pageIndex = 1;
+    }
+    let postData: any = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      drugsBag: {
+        hosId: this.hosId,
+      },
+    };
+    if (this.searchCriteria.target) {
+      postData.drugsBag.target = { id: this.searchCriteria.target };
+    }
+    if (this.searchCriteria.launch) {
+      postData.drugsBag.launch = { id: this.searchCriteria.launch };
+    }
+    if (this.searchCriteria.packid) {
+      postData.drugsBag.packid = this.searchCriteria.packid;
+    }
+    this.loading1 = true;
+    this.mainService
+      .getFetchDataList("drugsBag", "drugsBag", postData)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data["status"] == 200) {
+          this.listOfData = data["list"];
+          this.listLength = data["totalNum"];
+        }
+      });
+  }
 }

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

@@ -3,20 +3,16 @@
     <div class="list-template__top" nz-row>
       <div nz-col nzXl='16' class="list-template__searchBox">
         <div class="list-template__searchItem">
-          <span class="label">请领单号：</span>
-          <input nz-input class="formItem" placeholder="请输入请领单号" [(ngModel)]="searchCriteria.patientName" />
+          <span class="label">静配标识：</span>
+          <input nz-input class="formItem" placeholder="请输入静配标识" [(ngModel)]="searchCriteria.id" />
         </div>
-        <!-- <div class="list-template__searchItem">
-          <span class="label">检查单号：</span>
-          <input nz-input class="formItem" placeholder="请输入检查单号" [(ngModel)]="searchCriteria.inspectCode" />
-        </div> -->
         <div class="list-template__searchItem">
           <span class="label">发药科室：</span>
           <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear
-            nzPlaceHolder="请选择发药科室" [(ngModel)]="searchCriteria.workerId" (nzOnSearch)="changeInp($event)"
+            nzPlaceHolder="请选择发药科室" [(ngModel)]="searchCriteria.launch" (nzOnSearch)="changeInp($event)"
             (nzOpenChange)="changeSearch($event)">
-            <ng-container *ngFor="let data of workerSearch">
-              <nz-option *ngIf="!isLoading" nzLabel="{{data.name}}" nzValue="{{data.id}}"></nz-option>
+            <ng-container *ngFor="let data of deptList">
+              <nz-option *ngIf="!isLoading" nzLabel="{{data.dept}}" nzValue="{{data.id}}"></nz-option>
             </ng-container>
             <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -26,10 +22,10 @@
         <div class="list-template__searchItem">
           <span class="label">申请科室：</span>
           <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear
-            nzPlaceHolder="请选择申请科室" [(ngModel)]="searchCriteria.workerId" (nzOnSearch)="changeInp($event)"
+            nzPlaceHolder="请选择申请科室" [(ngModel)]="searchCriteria.target" (nzOnSearch)="changeInp($event)"
             (nzOpenChange)="changeSearch($event)">
-            <ng-container *ngFor="let data of workerSearch">
-              <nz-option *ngIf="!isLoading" nzLabel="{{data.name}}" nzValue="{{data.id}}"></nz-option>
+            <ng-container *ngFor="let data of deptList">
+              <nz-option *ngIf="!isLoading" nzLabel="{{data.dept}}" nzValue="{{data.id}}"></nz-option>
             </ng-container>
             <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -47,26 +43,22 @@
         [nzLoading]="loading1">
         <thead>
           <tr class="thead">
-            <th nzWidth="6%">序号</th>
-            <th nzWidth="14%">发药科室</th>
-            <th nzWidth="14%">申请科室</th>
-            <th nzWidth="14%">创建时间</th>
-            <th nzWidth="14%">药品状态</th>
-            <th nzWidth="14%">批次号</th>
-            <th nzWidth="12%">请领单号</th>
-            <th nzWidth="12%">药品标识</th>
+            <th nzWidth="5%">序号</th>
+            <th nzWidth="19%">发药科室</th>
+            <th nzWidth="19%">申请科室</th>
+            <th nzWidth="19%">创建时间</th>
+            <th nzWidth="19%">静配状态</th>
+            <th nzWidth="19%">静配标识</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let i = index">
             <td>{{i+1}}</td>
-            <td>{{ data.patientName||'-' }}</td>
-            <td>{{ data.patientCode||'-' }}</td>
-            <td>{{ data.inspectCode||'-' }}</td>
-            <td>{{ data.patientBedNum||'-' }}</td>
-            <td>{{data.inspectName||'-'}}</td>
-            <td>{{ data.yyTime||'-' }}</td>
-            <td>{{data.arriveTime||'-'}}</td>
+            <td>{{ data.launch?.dept}}</td>
+            <td>{{ data.target?.dept }}</td>
+            <td>{{ data.creatTime }}</td>
+            <td>{{ data.jpstate?.name }}</td>
+            <td>{{data.id}}</td>
           </tr>
         </tbody>
       </nz-table>

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

@@ -14,13 +14,12 @@ export class JpSearchComponent implements OnInit {
 
   searchCriteria = {
     //搜索条件
-    patientName: "",
-    inspectCode: "",
-    hospital: null,
-    workerId: null,
+    id: "", //静配标识
+    launch: null, //发药科室
+    target: null, //发药科室
   };
-  workerSearch = []; // 院区下的支助人员列表(搜索框)
-  allHospital: any = []; //院区下拉框
+  deptList = []; // 院区下的支助人员列表(搜索框)
+  hosId;
   listOfData: any[] = []; //表格数据
   pageIndex: number = 1; //表格当前页码
   pageSize: number = 10; //表格每页展示条数
@@ -28,26 +27,24 @@ export class JpSearchComponent implements OnInit {
   changeInpSubject = new Subject();
   ngOnInit() {
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
-      this.searchWorker(v);
+      this.searchDept(v);
     });
-    this.getAllHospital();
+    this.getHospital();
   }
   // 重置
   reset() {
     this.searchCriteria = {
       //搜索条件
-      patientName: "",
-      inspectCode: "",
-      hospital: this.allHospital[0] ? this.allHospital[0]["id"] + "" : null,
-      workerId: null,
+      id: "",
+      launch: null,
+      target: null,
     };
     this.getList(1);
   }
 
   // 获取所有院区
-  getAllHospital() {
-    this.allHospital = [this.tool.getCurrentHospital()];
-    this.searchCriteria.hospital = this.tool.getCurrentHospital().id + "";
+  getHospital() {
+    this.hosId = this.tool.getCurrentHospital().id;
     this.getList(1);
   }
   // 查看标本历史记录
@@ -69,33 +66,32 @@ export class JpSearchComponent implements OnInit {
   }
   // 边输边搜节流阀
   isLoading = false;
-  changeInp(worker) {
-    if (!worker) {
+  changeInp(dept) {
+    if (!dept) {
       return;
     }
-    if (worker === "no") {
-      worker = "";
+    if (dept === "no") {
+      dept = "";
     }
     this.isLoading = true;
-    this.changeInpSubject.next(worker);
+    this.changeInpSubject.next(dept);
   }
-  // 搜索支助人员
-  searchWorker(worker) {
+  // 搜索科室
+  searchDept(dept) {
     let postData = {
-      user: {
-        name: worker,
-        hospital: { id: this.searchCriteria.hospital },
-        usertype: { id: 106 },
+      department: {
+        hospital: { id: this.hosId },
+        dept,
       },
       idx: 0,
       sum: 10,
     };
     this.mainService
-      .getFetchDataList("data", "user", postData)
+      .getFetchDataList("data", "department", postData)
       .subscribe((result) => {
         if (result.status == 200) {
           this.isLoading = false;
-          this.workerSearch = result.list;
+          this.deptList = result.list;
         }
       });
   }
@@ -106,17 +102,25 @@ export class JpSearchComponent implements OnInit {
     if (type == 1) {
       this.pageIndex = 1;
     }
-    let postData = {
+    let postData: any = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
-      hosId: this.searchCriteria.hospital,
-      patientName: this.searchCriteria.patientName,
-      inspectCode: this.searchCriteria.inspectCode,
-      workerId: this.searchCriteria.workerId,
+      jPBag: {
+        hosId: this.hosId,
+      },
     };
+    if (this.searchCriteria.target) {
+      postData.jPBag.target = { id: this.searchCriteria.target };
+    }
+    if (this.searchCriteria.launch) {
+      postData.jPBag.launch = { id: this.searchCriteria.launch };
+    }
+    if (this.searchCriteria.id) {
+      postData.jPBag.id = this.searchCriteria.id;
+    }
     this.loading1 = true;
     this.mainService
-      .listMsgByMain("listInspect", postData)
+      .getFetchDataList("pivas", "jPBag", postData)
       .subscribe((data) => {
         this.loading1 = false;
         if (data["status"] == 200) {