优化

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1641,13 +1641,12 @@
                     >
                       <thead>
                         <tr class="thead">
-                          <th nzWidth="6%">序号</th>
+                          <th nzWidth="5%">#</th>
                           <th nzWidth="12%">患者姓名<br>住院号</th>
                           <th nzWidth="12%">手术时间</th>
                           <th nzWidth="20%">申请科室</th>
-                          <th>手术名称</th>
-                          <th nzWidth="15%">状态</th>
-                          <th nzWidth="20%" *ngIf="currentDept.typeValue == 'surgery'">操作</th>
+                          <th>手术名称<br>状态</th>
+                          <th nzWidth="30%" *ngIf="currentDept.typeValue == 'surgery'">操作</th>
                         </tr>
                       </thead>
                       <tbody>
@@ -1656,8 +1655,7 @@
                           <td>{{ item.patientDTO ? item.patientDTO.patientName : '' }}({{ item.patientDTO ? item.patientDTO.bedNum : '' }})<br>{{ item.patientDTO ? item.patientDTO.residenceNo : '' }}</td>
                           <td>{{ item.applyDate | date:'MM-dd HH:mm' }}</td>
                           <td>{{ item.areaDeptDTO ? (deptDisplay == 2 ? item.areaDeptDTO.deptalias : item.areaDeptDTO.dept) : '' }}</td>
-                          <td>{{ item.surgeryName }}</td>
-                          <td>{{ item.state?.name }}</td>
+                          <td>{{ item.surgeryName }}<br>{{ item.state?.name }}</td>
                           <td *ngIf="currentDept.typeValue == 'surgery'">
                             <!-- 手术状态是【手术安排】和【接患者中】，并且【是否开启手术即将开始通知】开启 -->
                             <button class="btn1 mr8 mb8 mt8" (click)="surgeryBegin($event, item)" *ngIf="item.state && (item.state.value == 3 || item.state.value == 7) && surgeryConfigs.surgeryBegin == 1">即将开始</button>
@@ -1667,6 +1665,7 @@
                             <button class="btn1 mr8 mb8 mt8" (click)="sendWard($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1 && item.state && item.state.value == 8">送回病房</button>
                             <!-- 手术状态是【手术中】，并且【是否开通送回苏醒室】开启 -->
                             <button class="btn1 mr8 mb8 mt8" (click)="sendAwakeningRoom($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1 && item.state && item.state.value == 8">送回苏醒间</button>
+                            <button class="btn1 mr8 mb8 mt8" (click)="createOrder($event, item)">一键建单</button>
                           </td>
                         </tr>
                       </tbody>

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

@@ -1609,11 +1609,11 @@ export class HushijiandanComponent implements OnInit {
   // 获取患者信息
   snum = 0;
   getPatient(e?) {
-    if ((this.currentDept.typeValue == "checkRoom2" || this.currentDept.typeValue == "outpatientDept" || this.currentDept.typeValue == "checkRoom" || this.currentDept.typeValue == "outpatientService") && !this.tabSearchCont) {
+    if ((this.currentDept.typeValue == "outpatientDept" || this.currentDept.typeValue == "checkRoom" || this.currentDept.typeValue == "outpatientService") && !this.tabSearchCont) {
       this.pLoading = false;
       this.patientList = [];
       this.infoLength = 0;
-      return; //护士端如果登录后如果科室类型为“检查科室”、“门诊科室”、“检验科室”、“门诊服务点”，默认不显示患者信息
+      return; //护士端如果登录后如果科室类型为“门诊科室”、“检验科室”、“门诊服务点”，默认不显示患者信息
     }
     this.pLoading = true;
     let postData = {
@@ -1642,6 +1642,19 @@ export class HushijiandanComponent implements OnInit {
       postData["patient"]["parentIdOnly"] = true;
       postData["patient"]["recoveryDept"] = this.loginUserDeptId;
       postData["patient"]["recoveryDeptDTO"] = {keyWord: '1'};
+    }else if(this.currentDept.typeValue == "checkRoom2"){
+      // 患者信息
+      postData["patient"] = {
+        keyWord: e ? e : this.tabSearchCont,
+      };
+      // 查询父级科室患者
+      postData["patient"]["parentIdOnly"] = true;
+      if (this.tabSearchCont) {
+        delete postData["patient"]["department"]; //搜索范围为全院在院患者
+        delete postData["patient"]["checkTempDept"];
+      } else {
+        postData["patient"]["checkTempDept"] = { id: this.loginUserDeptId };
+      }
     }else{
       // 患者信息
       postData["patient"] = {
@@ -2111,6 +2124,12 @@ export class HushijiandanComponent implements OnInit {
     this.sendAwakeningRoomInfo = `您是否确定将<span style="color:red;">${item.patientDTO ? item.patientDTO.patientName : ''}</span>患者送往<span style="color:red;">${this.surgeryConfigs.recoveryDeptDTO ? (this.deptDisplay == 2 ? this.surgeryConfigs.recoveryDeptDTO.deptalias : this.surgeryConfigs.recoveryDeptDTO.dept) : ''}</span>科室吗？`
   }
 
+  // 手术排程信息-一键建单
+  createOrder(e, item){
+    e.stopPropagation();
+    this.newPatientOrder(item.patientDTO);
+  }
+
   // 患者信息一键建单
   patientModal: boolean = false; //患者信息一键建单模态框
   patientMsg; //患者信息

src/app/views/quilt-washing-trend-analysis/quilt-washing-trend-analysis.component.html

@@ -28,6 +28,18 @@
             <nz-option [nzLabel]="item.name" [nzValue]="item.value" *ngFor="let item of quarterList"></nz-option>
           </nz-select>
         </div>
+        <div class="searchItem">
+          <span class="label">被服种类</span>：
+          <nz-select style="width: 135px;" class="formItem" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
+            (nzOnSearch)="changeClothesTypeId($event)" nzAllowClear nzPlaceHolder="请选择被服" [(ngModel)]="searchDto.clothesTypeId">
+            <ng-container *ngFor="let option of allClothesType">
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.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 class="btns">
         <button nz-button nzType="primary" (click)='search()'>搜索</button>

src/app/views/quilt-washing-trend-analysis/quilt-washing-trend-analysis.component.ts

@@ -6,6 +6,8 @@ import { MainService } from "../../services/main.service";
 import { DateService } from "../../services/date.service";
 import { MyServiceService } from "../../services/my-service.service";
 import { ToolService } from "../../services/tool.service";
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: "app-quilt-washing-trend-analysis",
@@ -21,10 +23,15 @@ export class QuiltWashingTrendAnalysisComponent implements OnInit {
     private myService: MyServiceService,
     private tool: ToolService
   ) {}
-
+  searchTimerSubject = new Subject();
   ngOnInit() {
+    this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
+      let fun = v[0];
+      fun.call(this, v[1]);
+    });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.getAllHos();
+    this.getAllClothesType();
     this.changeDateType();
   }
 
@@ -34,6 +41,7 @@ export class QuiltWashingTrendAnalysisComponent implements OnInit {
     year: +format(new Date(), "yyyy"),//季度-年
     quarter: getQuarter(new Date()),//季度
     tabType: 'YoY',//YoY/同比，MoM/环比
+    clothesTypeId: undefined, //选择被服
   }
 
   tabTypes = [
@@ -291,6 +299,38 @@ export class QuiltWashingTrendAnalysisComponent implements OnInit {
   search() {
     this.getData();
   }
+  // 用户输入搜索被服
+  isLoading = false;
+  changeClothesTypeId(e) {
+    this.searchTimer(this.getAllClothesType, e);
+  }
+  // 边输入边搜索节流阀
+  searchTimer(fun, e) {
+    this.isLoading = true;
+    this.searchTimerSubject.next([fun, e]);
+  }
+  // 获取被服
+  getAllClothesType(e?, those?) {
+    let that = those || this;
+    let postData: any = {
+      idx: 0,
+      sum: 10,
+      dictionaryTree: {
+        name: e || "",
+        hosId: that.hospital,
+        level: 2,
+        key: 'clothes_type',
+        deleted: 0,
+      },
+    };
+    that.isLoading = true;
+    that.mainService
+      .getFetchDataList("simple/data", "dictionaryTree", postData)
+      .subscribe((data) => {
+        that.allClothesType = data.list;
+        that.isLoading = false;
+      });
+  }
   // 重置
   reset() {
     this.searchDto = {
@@ -299,6 +339,7 @@ export class QuiltWashingTrendAnalysisComponent implements OnInit {
       year: +format(new Date(), "yyyy"),//季度-年
       quarter: getQuarter(new Date()),//季度
       tabType: 'YoY',//YoY/同比，MoM/环比
+      clothesTypeId: undefined, //选择被服
     }
     this.search();
   }
@@ -317,6 +358,7 @@ export class QuiltWashingTrendAnalysisComponent implements OnInit {
       tabType: this.searchDto.tabType,
       hosId: this.hospital,
       type: this.searchDto.dateType,
+      clothesTypeId: this.searchDto.clothesTypeId || undefined,
     };
     switch (postData.type) {
       case "day":

src/app/views/washing-batch-view/washing-batch-view-routing.module.ts

@@ -4,7 +4,7 @@ import { WashingBatchViewComponent } from "./washing-batch-view.component";
 
 const routes: Routes = [
   {
-    path: ":id",
+    path: ":id/:createTime",
     component: WashingBatchViewComponent,
   },
 ];

src/app/views/washing-batch-view/washing-batch-view.component.html

@@ -3,7 +3,7 @@
   <div class="head">
     <div class="head_logo">
       <div class="logo"><img [src]="tool.logoUrl" [alt]="tool.logoTitle"></div>
-      <div class="title">被服洗涤</div>
+      <div class="title">被服洗涤<span class="createTime">{{createTime|date:'yyyy-MM-dd HH:mm'}}</span></div>
     </div>
     <div class="red">请选择被服科室绑定分类和父级被服分类后进行搜索</div>
   </div>

src/app/views/washing-batch-view/washing-batch-view.component.less

@@ -43,6 +43,9 @@
         font-weight: bold;
         color: @primary-color;
         margin-left: 30px;
+        .createTime{
+          margin-left: 24px;
+        }
       }
     }
 

src/app/views/washing-batch-view/washing-batch-view.component.ts

@@ -64,6 +64,8 @@ export class WashingBatchViewComponent implements OnInit, AfterViewInit {
   rows:any[] = [['id', 'clothesState', ''], [], ['','件数', '费用/元']];
   totalData:any = {};
 
+  createTime = this.route.snapshot.paramMap.get("createTime");
+
   //搜索
   changeInpSubject = new Subject(); //防抖
   changeInp(e, type) {

src/app/views/washing-batch/washing-batch.component.ts

@@ -131,7 +131,7 @@ export class WashingBatchComponent implements OnInit {
     if(data.batchState.value == 1){
       this.recallOrderShow = true;
     }else{
-      this.router.navigateByUrl("/washingBatchView/" + this.coopData.id);
+      this.router.navigateByUrl(`/washingBatchView/${this.coopData.id}/${this.coopData.createTime}`);
     }
   }
   // 设置为洗涤中
@@ -155,7 +155,7 @@ export class WashingBatchComponent implements OnInit {
   }
   // 立即查看
   recAndDel() {
-    this.router.navigateByUrl("/washingBatchView/" + this.coopData.id);
+    this.router.navigateByUrl(`/washingBatchView/${this.coopData.id}/${this.coopData.createTime}`);
   }
   // 取消
   closeRecallOrderModal() {

upload/production.js

@@ -1,11 +1,11 @@
 const shell = require('shelljs')
 const path = require('path');
 const config = {
-  ip: "118.190.89.49", // ssh地址
+  ip: "47.113.226.223", // ssh地址
   username: "root", // ssh 用户名
   port: 22,      //端口
-  password: "dstech@123", // ssh 密码
-  path: '/home/itsm_v2_/web/pc', // 上传地址,删除地址
+  password: "DStech@123", // ssh 密码
+  path: '/home/itsm/project/html2/pc', // 上传地址,删除地址
   buildPath: '../dist/pc' // 本地打包后文件地址
 }
 let Client = require('ssh2-sftp-client');