Merge branch 'lmm' into lmm1

src/app/views/fuwutai/fuwutai.component.ts

@@ -3812,7 +3812,35 @@ export class FuwutaiComponent implements OnInit {
     this.getSearchTaskList('', this.countRemarkIndex > -1 ? countRemark : '').subscribe((result) => {
       if (result.status == 200) {
         this.searchTaskLoading = false;
-        this.workTypesArrange[index].value = result.data || [];
+        // this.workTypesArrange[index].value = result.data || [];
+        this.workTypes = result['data'] || [];
+        // 整理后的任务类型
+        for (const value of this.workTypesArrange) {
+          value.value = [];
+        }
+        this.workTypes.forEach((item) => {
+          if(item.associationTypeValue === 'patientTransport'){
+            // 患者其他服务
+            let obj = this.workTypesArrange.find(v => v.key === '患者转运');
+            if(obj){
+              obj.value.push(item);
+            }else{
+              this.workTypesArrange.unshift({ key: '患者转运', value: [item] });
+            }
+          }else if(item.associationTypeValue === 'other' || item.associationTypeValue === 'specimen' || item.associationTypeValue === 'ordinary'){
+            // 物品配送
+            let obj = this.workTypesArrange.find(v => v.key === '物品配送');
+            if(obj){
+              obj.value.push(item);
+            }else{
+              this.workTypesArrange.unshift({ key: '物品配送', value: [item] });
+            }
+          }
+        });
+        console.log('workTypesArrange', this.workTypesArrange);
+        // 任务类型是否显示操作项
+        let arr = this.workTypesArrange;
+        this.workTypesFlag = arr.length >= 5;
       }
     });
   }

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

@@ -260,7 +260,7 @@
 
     .content {
       width: 100%;
-      height: 117px;
+      // height: 117px;
       background: #f9fafb;
       border: 1px solid #e5e9ed;
       border-radius: 5px;