追加检查

src/app/share/add-inspect-two-modal/add-inspect-two-modal.component.html

@@ -0,0 +1,36 @@
+<div class="modal display_flex justify-content_flex-center align-items_center">
+  <div class="modalBody" style="width: 1200px;">
+    <div class="title">追加检查<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <div class="tableWrap">
+        <div class="inspectType">
+          检查类型：<u *ngFor="let item of inspectCheckItemList" (click)="clickInspectCheckItem(item.id)" [ngClass]="{ active: activeInspectCheckItemId == item.id }">{{item.name}}</u>
+        </div>
+        <nz-table class="hospitalTable" [nzData]="data2List" nzSize="middle" [nzShowPagination]="false"
+          [nzLoading]="hsLoading" (nzCurrentPageDataChange)="currentPageData2Change($event)" [nzScroll]="{ y: '385px' }">
+          <thead>
+            <tr class="thead">
+              <th nzWidth="4%" nzShowCheckbox [(nzChecked)]="isAllDisplayData2Checked" [nzIndeterminate]="isIndeterminateData2"
+                (nzCheckedChange)="checkAllData2($event)"></th>
+              <th nzWidth="32%">检查项目</th>
+              <th nzWidth="32%">检查地点</th>
+              <th nzWidth="32%">检查类型</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr *ngFor="let data of data2List;let i = index;" (click)="selectedListData2(data.id)">
+              <td nzShowCheckbox [(nzChecked)]="mapOfCheckedData2Id[data.id]" (nzCheckedChange)="refreshData2Status()"></td>
+              <td>{{ data.name}}</td>
+              <td>{{ deptDisplay == 2 ? data.extra4DTO?.deptalias : data.extra4DTO?.dept }}</td>
+              <td>{{ data.extra5DTO?.name }}</td>
+            </tr>
+          </tbody>
+        </nz-table>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn" nz-button nzType="primary" (click)="confirmModal()">确认</button>
+      <button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+    </div>
+  </div>
+</div>

src/app/share/add-inspect-two-modal/add-inspect-two-modal.component.less

@@ -0,0 +1,194 @@
+@import "../../../../src/theme.less";
+.patient{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 56px;
+  font-size: 18px;
+  padding: 0 24px;
+}
+.tabs{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 45px;
+  font-size: 14px;
+  border-top: 1px solid #e5e9ed;
+  border-bottom: 1px solid #e5e9ed;
+  .tab{
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+    cursor: pointer;
+    &.active{
+      background-color: #F0F6ED;
+    }
+  }
+}
+.tableWrap{
+  padding: 16px;
+  .inspectType{
+    padding-bottom: 16px;
+    text-align: left!important;
+    u{
+      margin-right: 8px;
+      cursor: pointer;
+      &.active{
+        color: @primary-color;
+      }
+    }
+  }
+}
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+      word-break: break-all;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .modalBody {
+    width: 700px;
+    min-height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .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 {
+      height: 603px;
+      min-height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &.pagination {
+          font-size: 14px;
+          color: #666;
+          padding-top: 16px;
+          padding-bottom: 16px;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/share/add-inspect-two-modal/add-inspect-two-modal.component.ts

@@ -0,0 +1,129 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { MainService } from '../../services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+import { startOfDay, format } from 'date-fns';
+import { NzMessageService } from 'ng-zorro-antd';
+@Component({
+  selector: 'app-add-inspect-two-modal',
+  templateUrl: './add-inspect-two-modal.component.html',
+  styleUrls: ['./add-inspect-two-modal.component.less']
+})
+export class AddInspectTwoModalComponent implements OnInit {
+  // 切换科室，切换弹窗
+  isAllDisplayData2Checked = false;
+  listOfDisplayData2: any[] = [];
+  mapOfCheckedData2Id: { [key: string]: boolean } = {};
+  isIndeterminateData2 = false;
+  currentDept; //当前科室
+
+  hosId;
+  hsLoading = false;
+  data2List: any = [];// 列表
+
+  @Input() deptDisplay: any;
+
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+  @Output() confirmModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(
+    private mainService: MainService,
+    private tool: ToolService,
+    private message: NzMessageService,
+  ) { }
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.currentDept = this.tool.getCurrentUserDept();
+    this.getList();
+  }
+
+  currentPageData2Change($event: any[]): void {
+    this.listOfDisplayData2 = this.data2List; //改变页数，长度也要变
+    this.refreshData2Status();
+  }
+
+  refreshData2Status(): void {
+    this.isAllDisplayData2Checked = this.listOfDisplayData2.length ? this.listOfDisplayData2.every(
+      (item) => this.mapOfCheckedData2Id[item.id]
+    ) : false;
+    this.isIndeterminateData2 = this.listOfDisplayData2.some((item) => this.mapOfCheckedData2Id[item.id]) && !this.isAllDisplayData2Checked;
+  }
+
+  // 开通科室选择整行
+  selectedListData2(id) {
+    this.mapOfCheckedData2Id[id] = !this.mapOfCheckedData2Id[id];
+    this.refreshData2Status();
+  }
+
+  checkAllData2(value: boolean): void {
+    this.listOfDisplayData2.forEach(
+      (item) => (this.mapOfCheckedData2Id[item.id] = value)
+    );
+    this.refreshData2Status();
+  }
+
+  // 确认弹窗
+  confirmModal() {
+    console.log(this[`mapOfCheckedData2Id`]);
+    let list = [];
+    for (const key in this[`mapOfCheckedData2Id`]) {
+      if (this[`mapOfCheckedData2Id`][key]) {
+        list.push({id: key});
+      }
+    }
+    if(list.length == 0){
+      this.message.warning('请选择数据');
+      return;
+    }
+    this.confirmModelHs.emit(JSON.stringify({ show: false, list, type: 2 }));//emits(向上弹射)事件
+  }
+
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  getList(){
+    this.getInspectCheckItem();
+    this.getList2();
+  }
+
+  // 获取列表数据
+  getList2() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      dictionary: {
+        key: 'inspect_check_type',
+        extra5: this.activeInspectCheckItemId,
+      }
+    }
+    this.hsLoading = true;
+    this.mainService.getFetchDataList('simple/data','dictionary',postData).subscribe(data => {
+      this.hsLoading = false;
+      this.data2List = data.list || [];
+    })
+  }
+
+  // 获取检查项目
+  inspectCheckItemList:any[] = [];
+  activeInspectCheckItemId;
+  getInspectCheckItem() {
+    this.mainService.getDictionary("list", "inspect_check_item").subscribe((data) => {
+			this.inspectCheckItemList = data || [];
+		});
+  }
+
+  clickInspectCheckItem(id){
+    if(this.activeInspectCheckItemId == id){
+      this.activeInspectCheckItemId = undefined;
+    }else{
+      this.activeInspectCheckItemId = id;
+    }
+    this.getList2();
+  }
+
+}
+
+
+

src/app/share/share.module.ts

@@ -66,6 +66,7 @@ import { PackageSpecimenRuleComponent } from './package-specimen-rule/package-sp
 import { SpecimenPackageListModalComponent } from './specimen-package-list-modal/specimen-package-list-modal.component';
 import { NgxPrintModule } from 'ngx-print';
 import { SpecimenPackageLogPromptModalComponent } from './specimen-package-log-prompt-modal/specimen-package-log-prompt-modal.component';
+import { AddInspectTwoModalComponent } from './add-inspect-two-modal/add-inspect-two-modal.component';
 
 @NgModule({
   declarations: [
@@ -130,6 +131,7 @@ import { SpecimenPackageLogPromptModalComponent } from './specimen-package-log-p
     MedicalWasteLogPromptModalComponent,
     SelectDateComponent,
     AddInspectModalComponent,
+    AddInspectTwoModalComponent,
     SelectDateYytimeComponent,
     PackageSpecimenRuleComponent,
     SpecimenPackageListModalComponent,
@@ -207,6 +209,7 @@ import { SpecimenPackageLogPromptModalComponent } from './specimen-package-log-p
     MedicalWasteLogPromptModalComponent,
     SelectDateComponent,
     AddInspectModalComponent,
+    AddInspectTwoModalComponent,
     SelectDateYytimeComponent,
     PackageSpecimenRuleComponent,
     SpecimenPackageListModalComponent,

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

@@ -1484,6 +1484,9 @@
                 <button nz-button nzSize="small" nzType="default" class="pos-btn ml8" (click)="nextDayNew()">
                   下一日
                 </button>
+                <button nz-button nzSize="small" nzType="default" class="pos-btn ml8" (click)="addInspect()" *ngIf="inspectAndPatientTransportConfig.nurseAppendInspect == 1">
+                  追加检查
+                </button>
               </div>
               <!-- 检查 -->
               <nz-form-item>
@@ -1493,6 +1496,7 @@
                     <div nz-row nz-col nzSpan="12" *ngFor="let item of linkCheckLis">
                       <div nz-col nzSpan="24">
                         <label nz-checkbox [nzValue]="item">{{ item.label}}</label>
+                        <i class="icon_transport transport-shanchu1 cur" *ngIf="item.manualCreate == 1" (click)="delInspect(item.value)"></i>
                         <i class="icon_transport transport-zu1468 priority" *ngIf="item.priority === 1 || item.priority === '1'"></i>
                       </div>
                     </div>
@@ -2346,6 +2350,14 @@
   (confirmDelEvent)="confirmDelAdvice()"
   content="您确认要删除此条意见吗？"
 ></app-dialog-delete>
+<!-- 删除检查模态框 -->
+<app-dialog-delete
+  [delModal]="delInspectModal"
+  (hideDelModalEvent)="hideDelInspectModal()"
+  [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmDelInspect()"
+  content="您确认要删除此条检查吗？"
+></app-dialog-delete>
 <!-- 撤销报修 -->
 <app-dialog-delete
   [delModal]="delBxModal"
@@ -2760,3 +2772,6 @@
 
 <!-- 标本打包-数字点击 -->
 <app-specimen-package-list-modal *ngIf="isShowSpecimenPackageList" (closeModelHs)="closeSpecimenPackageList($event)" [specimenPackageStateValue]="specimenPackageStateValue"></app-specimen-package-list-modal>
+
+<!-- 追加检查 -->
+<app-add-inspect-two-modal *ngIf="isShowAddInspect" [deptDisplay]="deptDisplay" (closeModelHs)="closeAddInspectModel($event)" (confirmModelHs)="confirmAddInspectModel($event)"></app-add-inspect-two-modal>

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

@@ -3325,6 +3325,7 @@ export class HushijiandanComponent implements OnInit {
               execDeptId: e.execDept.id,
               yyTime: e.yyTime,
               priority: e.priority,
+              manualCreate: e.manualCreate,
               label:
                 (e.yyTime || "") +
                 " " +
@@ -4622,6 +4623,30 @@ export class HushijiandanComponent implements OnInit {
   hideDelAdviceModal() {
     this.delAdviceModal = false;
   }
+  // 追加检查删除模态框
+  delInspectModal: boolean = false;
+  delInspectId: number; //删除id
+  delInspect(id) {
+    this.delInspectId = id;
+    this.delInspectModal = true;
+  }
+  confirmDelInspect() {
+    this.btnLoading = true;
+    this.mainService
+      .simplePost("rmvData", "inspect", [this.delInspectId])
+      .subscribe((data) => {
+        this.delInspectModal = false;
+        if (data.status == 200) {
+          this.message.success('追加检查成功！')
+          this.refreshInspectList();
+        } else {
+          this.message.error(data.msg || '追加检查失败！')
+        }
+      });
+  }
+  hideDelInspectModal() {
+    this.delInspectModal = false;
+  }
   // 报修撤销模态框
   delBxModal: boolean = false;
   delBxData: any; //删除的data
@@ -5457,6 +5482,7 @@ export class HushijiandanComponent implements OnInit {
               execDeptId: e.execDept.id,
               yyTime: e.yyTime,
               priority: e.priority,
+              manualCreate: e.manualCreate,
               label:
                 (e.yyTime || "") +
                 " " +
@@ -5485,4 +5511,50 @@ export class HushijiandanComponent implements OnInit {
   closeSpecimenPackageList(e) {
     this.isShowSpecimenPackageList = JSON.parse(e).show;
   }
+
+  // 追加检查
+  isShowAddInspect = false; //弹窗开关
+  addInspect(){
+    this.isShowAddInspect = true;
+  }
+  // 关闭弹窗
+  closeAddInspectModel(e) {
+    this.isShowAddInspect = JSON.parse(e).show;
+  }
+  // 确定弹窗
+  confirmAddInspectModel(e) {
+    console.log(e);
+    let obj = JSON.parse(e);
+    this.isShowAddInspect = obj.show;
+    if(obj.type == 2){
+      let user = JSON.parse(localStorage.getItem("user"));
+      // 手动添加
+      let postData:any = {
+        inspectList: obj.list.map(v => ({
+          patientCode: this.patientMsg.patientCode,
+          patientName: this.patientMsg.patientName,
+          barCode: this.patientMsg.barCode,
+          inspectCheckType: { id: v.id },
+          applyDeptId: user.user.dept.id,
+          bedNum: this.patientMsg.bedNum,
+          hosId: this.patientMsg.hosId,
+        })) || undefined,
+      };
+      this.maskFlag = this.message.loading("正在加载中..", {
+        nzDuration: 0,
+      }).messageId;
+      this.mainService
+        .simplePost("addData", "inspect", postData)
+        .subscribe((data:any) => {
+          this.message.remove(this.maskFlag);
+          this.maskFlag = false;
+          if (data.status == 200) {
+            this.message.success('追加检查成功！')
+            this.refreshInspectList();
+          } else {
+            this.message.error(data.msg || '追加检查失败！')
+          }
+        });
+    }
+  }
 }

src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.html

@@ -157,6 +157,11 @@
           <nz-form-label class="label">是否开启陪检方式</nz-form-label>
           <nz-checkbox-group [(ngModel)]="enableTripType"></nz-checkbox-group>
         </div>
+        <!-- 是否开启护士端追加检查 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">是否开启护士端追加检查</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="nurseAppendInspect"></nz-checkbox-group>
+        </div>
         <!-- 检查预约不进行工单合并 -->
         <!-- <div class="display_flex align-items_center mb8">
           <nz-form-label class="label">检查预约不进行工单合并</nz-form-label>

src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.ts

@@ -92,6 +92,10 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
   enableTripType:any[] = [
     {label:'是否开启',value: 0}
   ];
+  // 是否开启护士端追加检查
+  nurseAppendInspect:any[] = [
+    {label:'是否开启',value: 0}
+  ];
   // 检查预约不进行工单合并
   // yyInspectMergeOrder:any[] = [
   //   {label:'是否开启',value: 0}
@@ -292,6 +296,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       hideInspectScan: this.hideInspectScan[0].checked ? 1 : 0,
       enableGoods: this.enableGoods[0].checked ? 1 : 0,
       enableTripType: this.enableTripType[0].checked ? 1 : 0,
+      nurseAppendInspect: this.nurseAppendInspect[0].checked ? 1 : 0,
       // yyInspectMergeOrder: this.yyInspectMergeOrder[0].checked ? 1 : 0,
       addService: this.addService[0].checked ? 1 : 0,
       addServiceTaskIds: this.addServiceTaskIds.length ? this.addServiceTaskIds.toString() : undefined,
@@ -422,6 +427,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
           this.hideInspectScan[0].checked = this.configs.hideInspectScan == 1;
           this.enableGoods[0].checked = this.configs.enableGoods == 1;
           this.enableTripType[0].checked = this.configs.enableTripType == 1;
+          this.nurseAppendInspect[0].checked = this.configs.nurseAppendInspect == 1;
           // this.yyInspectMergeOrder[0].checked = this.configs.yyInspectMergeOrder == 1;
           this.addService[0].checked = this.configs.addService == 1;
           this.addServiceTaskIds = this.configs.addServiceTaskIds ? this.configs.addServiceTaskIds.split(',').map(v => +v) : [];