Merge branch 'lmm' into develop

src/app/views/group-management/group-management.component.ts

@@ -309,18 +309,21 @@ export class GroupManagementComponent implements OnInit {
   }
   // 确认删除
   confirmDel() {
-    let that = this;
-    that.btnLoading = true;
-    that.mainService
-      .coopData("rmvData", "group2", [that.checkedGroup["id"]])
+    this.btnLoading = true;
+    this.mainService
+      .coopData("rmvData", "group2", [this.checkedGroup["id"]])
       .subscribe((data) => {
-        that.hideDelModal();
-        that.btnLoading = false;
-        if (data.status == 200) {
-          that.showPromptModal("删除", true, "");
-          this.checkedGroup = {};
+        this.hideDelModal();
+        this.btnLoading = false;
+        if (data.data && data.data[0]) {
+          if (!data.data[0].msg) {
+            this.showPromptModal("删除", true, "");
+            this.checkedGroup = {};
+          } else {
+            this.showPromptModal("删除", false, data.data[0].msg);
+          }
         } else {
-          that.showPromptModal("删除", false, data.msg);
+          this.showPromptModal("删除", false, "");
         }
       });
   }

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

@@ -179,11 +179,11 @@
                     <div nz-col nzSpan="6" class="borderR h100p">
                       <div class="quick">
                         <button class="btn txtC" (click)="newShortcutOrder1(bbMsg,'bb')">
-                          收取所有标本
+                          收取标本
                         </button>
-                        <button class="btn txtC" (click)="newShortcutOrder1(bbMsg,'bb',true)">
+                        <!-- <button class="btn txtC" (click)="newShortcutOrder1(bbMsg,'bb',true)">
                           收取急查标本
-                        </button>
+                        </button> -->
                       </div>
                     </div>
                   </div>
@@ -965,7 +965,6 @@
       <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
       <div class="defeat">{{buildMsg1.msg}}</div>
     </div>
-
     <!-- 100013 （护士端一键建单展示策略）取起点科室，和mgs值展示 -->
     <div class="content" *ngIf='buildMsg1.status==100013'>
       <div class="jiTit borderB">
@@ -1052,6 +1051,24 @@
         </form>
       </div>
     </div>
+    <!-- 标本配送备注 -->
+    <!-- baba -->
+    <div *ngIf="buildMsg1.remarksSwitch == 1">
+      <p>工单备注：</p>
+      <textarea nz-input [placeholder]="workOrderRemarkTips"
+        [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100"
+        [(ngModel)]="workOrderRemark" #remarksEle></textarea>
+      <p class="mt8 mb8" *ngIf="customRemarks.length">快捷输入：</p>
+      <div *ngIf="customRemarks.length">
+        <span class="addRemarks" *ngFor="let item of customRemarks"
+          (click)="addRemarks(item)">【{{item}}】</span>
+      </div>
+      <p class="mt8 mb8" *ngIf="historyCustomRemarks.length">历史输入：</p>
+      <div *ngIf="historyCustomRemarks.length">
+        <span class="addRemarks" *ngFor="let item of historyCustomRemarks"
+          (click)="addRemarks(item)">【{{item}}】</span>
+      </div>
+    </div>
     <div class="btns display_flex justify-content_flex-center">
       <button *ngIf="buildMsg1.status!=100009&&buildMsg1.status!=100010" nz-button nzType="primary"
         [nzLoading]="btnLoading" (click)="confirmShortcut1()">确认</button>
@@ -1299,5 +1316,6 @@
 <app-mask *ngIf="maskFlag"></app-mask>
 <!-- 是否需要医护陪同检查模态框 -->
 <app-dialog-delete [delModal]="accompanyModal" (hideDelModalEvent)="hideAccompanyModal($event)"
-  [btnLoading]="accompanyLoading" [cancenlLoading]="cancenlLoading" (confirmDelEvent)="confirmAccompany()"
-  confirmTxt="是" cancelTxt="否" content="您选择的患者是危重或特级护理或一级护理患者，请问是否需要医护陪同检查？"></app-dialog-delete>
+  (cancelDelEvent)="hideAccompanyModal($event)" [btnLoading]="accompanyLoading" [cancenlLoading]="cancenlLoading"
+  (confirmDelEvent)="confirmAccompany()" confirmTxt="是" cancelTxt="否" content="您选择的患者是危重或特级护理或一级护理患者，请问是否需要医护陪同检查？">
+</app-dialog-delete>

src/app/views/hushijiandan/hushijiandan.component.less

@@ -849,7 +849,7 @@
                   padding: 5px;
                   display: flex;
                   flex-direction: column;
-                  justify-content: space-between;
+                  justify-content: center;
 
                   .btn {
                     height: 48%;
@@ -1513,7 +1513,7 @@
 
         &.defeat {
           color: #333;
-          font-size: 18px;
+          font-size: 16px;
         }
 
         &.otherInfo {

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

@@ -1770,9 +1770,29 @@ export class HushijiandanComponent implements OnInit {
     };
     this.mainService
       .postCustom("nurse", "workOrder/buildTrip", postData)
-      .subscribe((data) => {
+      .subscribe((result) => {
         this.shortcutModal = true;
-        this.buildMsg1 = data;
+        this.buildMsg1 = result;
+        if (result.remarksSwitch == 1) {
+          if (result.customRemarks === null || result.customRemarks === "") {
+            this.customRemarks = [];
+          } else {
+            this.customRemarks = result.customRemarks.split("$");
+          }
+          this.workOrderRemarkTips =
+            result.remarksPrompts || "请填写工单备注,不超过100个字符";
+          let user = JSON.parse(localStorage.getItem("user"));
+          this.mainService
+            .postCustom("nurse", "workOrder/recentRemarks", {
+              deptId: user.user.dept.id,
+              taskTypeId: msg.id,
+            })
+            .subscribe((result1) => {
+              if (result1.state == 200) {
+                this.historyCustomRemarks = result1.data;
+              }
+            });
+        }
       });
   }
   hideShortcutOrder() {

src/app/views/office-management/office-management.component.ts

@@ -512,17 +512,21 @@ export class OfficeManagementComponent implements OnInit {
       .subscribe((data) => {
         that.btnLoading = false;
         that.delModal = false;
-        if (data.status == 200 && !data.data[0].msg) {
-          if (
-            that.listOfData.length == 1 &&
-            that.pageIndex == Math.ceil(that.listLength / that.pageSize)
-          ) {
-            that.listLength--;
-            that.pageIndex = Math.ceil(that.listLength / that.pageSize);
+        if (data.data && data.data[0]) {
+          if (!data.data[0].msg) {
+            if (
+              that.listOfData.length == 1 &&
+              that.pageIndex == Math.ceil(that.listLength / that.pageSize)
+            ) {
+              that.listLength--;
+              that.pageIndex = Math.ceil(that.listLength / that.pageSize);
+            }
+            that.showPromptModal("删除", true, "");
+          } else {
+            that.showPromptModal("删除", false, data.data[0].msg);
           }
-          that.showPromptModal("删除", true, "");
         } else {
-          that.showPromptModal("删除", false, data.data[0].msg);
+          that.showPromptModal("删除", false, "");
         }
       });
   }

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

@@ -46,7 +46,8 @@
             <td>{{ data.title }}</td>
             <td>{{ data.taskType.taskName }}</td>
             <td [ngSwitch]="data.timeStep">
-              <ng-container *ngSwitchCase="'day'">每日{{data.dayType == 0?'':'（'+dayType[data.dayType]+'）'}}</ng-container>
+              <ng-container *ngSwitchCase="'day'">每日{{data.dayType == 0?'':'（'+dayType[data.dayType]+'）'}}
+              </ng-container>
               <ng-container *ngSwitchCase="'week'">每周{{data.dayType == 0?'':'（'+dayType[data.dayType]+'）'}}
               </ng-container>
               <ng-container *ngSwitchCase="'month'">每月{{data.dayType == 0?'':'（'+dayType[data.dayType]+'）'}}
@@ -110,7 +111,7 @@
                 (nzOpenChange)="changeFormTasktype($event)" (ngModelChange)="selectedTasktypeHandler($event)">
                 <ng-container *ngFor="let data of roundRobinTypes">
                   <nz-option *ngIf="!isLoading" [nzLabel]="data.taskName" [nzValue]="data.id"
-                    [nzDisabled]="!data.carryingCourses[0].departmentStrategy||!data.carryingCourses[1].departmentStrategy">
+                    [nzDisabled]="data.carryingCourses&&(!data.carryingCourses[0].departmentStrategy||!data.carryingCourses[1].departmentStrategy)">
                   </nz-option>
                 </ng-container>
                 <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>

src/app/views/task-type-management/task-type-management.component.html

@@ -133,7 +133,7 @@
           </nz-radio-group>
         </div>
         <div class="mb8 w100"
-          *ngIf="!(association['id'] == 255||association['id'] == 256||association['id'] == 257||association['id'] == 258||association['id'] == 260||association['id'] == 380)">
+          *ngIf="!(association['id'] == 255||association['id'] == 257||association['id'] == 258||association['id'] == 260||association['id'] == 380)">
           <nz-form-label class="label" nzRequired>是否需要备注信息</nz-form-label>
           <nz-radio-group class="handlerType" [(ngModel)]="isRemarks">
             <label nz-radio nzValue='1'>是</label>

src/app/views/task-type-management/task-type-management.component.ts

@@ -1096,12 +1096,16 @@ export class TaskTypeManagementComponent implements OnInit {
         .subscribe((data) => {
           this.btnLoading = false;
           this.delModal = false;
-          if (data.status == 200 && !data.data[0].msg) {
-            this.showPromptModal("删除", true, "");
-            this.getAllTaskType();
-            this.itemChoice(this.allTaskType[0], this.index);
+          if (data.data && data.data[0]) {
+            if (!data.data[0].msg) {
+              this.showPromptModal("删除", true, "");
+              this.getAllTaskType();
+              this.itemChoice(this.allTaskType[0], this.index);
+            } else {
+              this.showPromptModal("删除", false, data.data[0].msg);
+            }
           } else {
-            this.showPromptModal("删除", false, data.data[0].msg);
+            this.showPromptModal("删除", false, "");
           }
         });
     } else {