Merge branch 'develop' into lmm

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

@@ -996,23 +996,18 @@ export class HushijiandanComponent implements OnInit {
       .subscribe((data) => {
         that.checkTypeLis = data.data;
         // 默认选中患者陪检,没有患者陪检，则选择第一个患者其他服务的任务类型
-        for (let i = 0; i < that.checkTypeLis.length; i++) {
+        let id;
+        for (let i = that.checkTypeLis.length - 1; i >= 0; i--) {
           if (that.checkTypeLis[i].associationType.value == "inspect") {
-            that.patientForm.controls.checkedType.setValue(
-              that.checkTypeLis[i].id
-            );
-            that.patientForm.value.checkedType = that.checkTypeLis[i].id;
+            id = that.checkTypeLis[i].id;
             break;
           } else if (
             that.checkTypeLis[i].associationType.value == "patientTransport"
           ) {
-            that.patientForm.controls.checkedType.setValue(
-              that.checkTypeLis[i].id
-            );
-            that.patientForm.value.checkedType = that.checkTypeLis[i].id;
-            break;
+            id = that.checkTypeLis[i].id;
           }
         }
+        that.patientForm.controls.checkedType.setValue(id);
         this.changeCheckedType();
       });
   }