标记回科

proxy.conf.json

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

src/app/services/main.service.ts

@@ -1218,4 +1218,11 @@ export class MainService {
 		});
 	}
 
+  // 患者闭环-标记回科
+	setPatientInspectBackDept(data = {}){
+		return this.http.post(host.host + `/nurse/patientInspect/setPatientInspectBackDept`, data, {
+		  headers: this.headers,
+		});
+	}
+
 }

src/app/services/tool.service.ts

@@ -103,13 +103,9 @@ export class ToolService {
   }
   //获取当前菜单的权限
   initCoopBtns(route) {
-    let link;
+    let link = route.parent.snapshot.routeConfig.path; //当前路由;
     let menu: any = JSON.parse(localStorage.getItem("menu")) || []; //菜单
-    if (route === "dataDictionary") {
-      link = route;
-    } else {
-      link = route.parent.snapshot.routeConfig.path; //当前路由
-    }
+
     let secondMenus = []; // 二级菜单
     let jurisdiction = []; //当前菜单的权限列表
 		let menuItem = null;
@@ -127,8 +123,8 @@ export class ToolService {
       }
     });
     if(!jurisdiction.length){
-      // type为panel路由
       menu.forEach(v => {
+        // type为panel路由
         if(v.type === 'panel' && v.link == link && v.childrens){
           jurisdiction = v.childrens || []; //匹配路由后，取得对应的权限
         }
@@ -318,6 +314,9 @@ export class ToolService {
 				case "viewGd":
 				  coopBtns.viewGd = true; //查看工单
 				  break;
+        case "tagBackDepartment":
+				  coopBtns.tagBackDepartment = true; //标记回科
+				  break;
       }
     });
     console.log(coopBtns);

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view.component.html

@@ -52,13 +52,14 @@
   <nz-table class="list-template__nzTable" [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false" [nzLoading]="loading1">
     <thead>
       <tr class="thead">
-        <th nzWidth="14%">科室信息</th>
-        <th nzWidth="14%">患者信息</th>
-        <th nzWidth="14%">护理信息</th>
-        <th nzWidth="14%">陪检方式</th>
-        <th nzWidth="16%">检查项目</th>
-        <th nzWidth="14%">签到信息</th>
-        <th nzWidth="14%">状态</th>
+        <th nzWidth="13%">科室信息</th>
+        <th nzWidth="13%">患者信息</th>
+        <th nzWidth="13%">护理信息</th>
+        <th nzWidth="13%">陪检方式</th>
+        <th nzWidth="15%">检查项目</th>
+        <th nzWidth="13%">签到信息</th>
+        <th nzWidth="13%">状态</th>
+        <th nzWidth="7%">操作</th>
       </tr>
     </thead>
     <tbody>
@@ -70,6 +71,11 @@
         <td><ng-container *ngFor="let item of data.inspectList;let last = last">{{item.inspectName}}<ng-container *ngIf="!last"><br></ng-container></ng-container></td>
         <td>{{ data.signTime | date: "yyyy-MM-dd HH:mm" }}<br>{{ data.signDeptDTO?.dept }}<br>{{ data.signUserDTO?.name }}</td>
         <td>{{data.state?.name}}</td>
+        <td>
+          <div class="coop">
+            <span *ngIf="coopBtns.tagBackDepartment && data.state && data.state.value == '4'" (click)="showDelModal(data, '您确认' + data.patientName + '患者已回科吗？', '操作', 'tagBackDepartment')">已回科</span>
+          </div>
+        </td>
       </tr>
     </tbody>
   </nz-table>
@@ -77,3 +83,11 @@
 <div class="footer display_flex align-items_center justify-content_flex-end">
   <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize" nzShowSizeChanger (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)"></nz-pagination>
 </div>
+<!-- 操作成功/失败提示框 -->
+<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
+  [info]="promptInfo">
+</app-prompt-modal>
+
+<!-- 删除模态框 -->
+<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
+(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>

src/app/views/inspect-closed-loop-view/inspect-closed-loop-view.component.ts

@@ -41,6 +41,11 @@ export class InspectClosedLoopViewComponent implements OnInit, OnDestroy {
 
   searchTimerSubject = new Subject(); //防抖
 
+  // 初始化增删改按钮
+  coopBtns: any = {};
+  coopData: any = {}; //当前操作列
+  btnLoading: boolean = false; //提交按钮loading状态
+
   ngOnInit() {
     //防抖
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -48,6 +53,7 @@ export class InspectClosedLoopViewComponent implements OnInit, OnDestroy {
       fun.call(this, v[1]);
     });
 
+    this.coopBtns = this.tool.initCoopBtns(this.route);
     this.init();
   }
 
@@ -55,6 +61,64 @@ export class InspectClosedLoopViewComponent implements OnInit, OnDestroy {
     clearInterval(this.timer);
   }
 
+  delModal: boolean = false; //删除模态框
+  tipsMsg1: string; //提示框信息
+  tipsMsg2: string; //操作后信息
+  confirmDelType: string; //确认的类型（启用/停用，删除）
+  showDelModal(
+    data,
+    tipsMsg1: string,
+    tipsMsg2: string,
+    type: string,
+  ) {
+    this.confirmDelType = type;
+    this.delModal = true;
+    this.coopData = data;
+    this.tipsMsg1 = tipsMsg1;
+    this.tipsMsg2 = tipsMsg2;
+  }
+  // 隐藏删除框
+  hideDelModal() {
+    this.delModal = false;
+  }
+  // 确认删除
+  confirmDel() {
+    this.btnLoading = true;
+    if (this.confirmDelType === "tagBackDepartment") {
+      let postData = {
+        pilId: this.coopData.id,
+      };
+      //标记回科
+      this.mainService
+        .setPatientInspectBackDept(postData)
+        .subscribe((data:any) => {
+          this.btnLoading = false;
+          this.delModal = false;
+          if (data.state == 200) {
+            this.showPromptModal(this.tipsMsg2, true, "");
+          } else {
+            this.showPromptModal(this.tipsMsg2, false, data.msg);
+          }
+        });
+    }
+  }
+
+  // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
+  promptContent: string; //操作提示框提示信息
+  ifSuccess: boolean; //操作成功/失败
+  promptInfo: string; //操作结果提示信息
+  promptModalShow: boolean; //操作提示框是否展示
+  showPromptModal(con, success, promptInfo?) {
+    this.promptModalShow = false;
+    this.promptContent = con;
+    this.ifSuccess = success;
+    this.promptInfo = promptInfo;
+    setTimeout(() => {
+      this.promptModalShow = true;
+    }, 100);
+    this.getList(1);
+  }
+
   // 日期选择
   onCalendarChangeDate(dateArr){
     if(dateArr.length == 2){