Merge branch 'master' into develop

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

@@ -1571,7 +1571,11 @@ export class HushijiandanComponent implements OnInit {
           this.leadTime * 60 * 1000
         );
       });
-      this.showDateTime();
+      this.allowUrgentChange(this.allowUrgent);
+      if (this.allowUrgent == 0) {
+        //不加急状态下，回显时间
+        this.showDateTime();
+      }
     } else {
       //有预约时间并且选中的检查数组为空
       this.isYyInspect = false;
@@ -1765,7 +1769,7 @@ export class HushijiandanComponent implements OnInit {
   shortcutMsg1; //一键发起信息
   buildMsg1: any = {}; //一键发起返回信息
   urgentFlag = false;
-  bLoading = false;//收取标本的loading
+  bLoading = false; //收取标本的loading
   // 打开一键发起建单模态框,urgent为true的时候是紧急
   historyCustomRemarks1 = [];
   newShortcutOrder1(msg, type, urgent?) {
@@ -1808,7 +1812,7 @@ export class HushijiandanComponent implements OnInit {
                 this.historyCustomRemarks1 = result1.data;
               }
             });
-        }else{
+        } else {
           this.bLoading = false;
         }
       });