Merge branch 'lmm' into develop

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

@@ -804,7 +804,8 @@
               </nz-form-control>
               <div *ngIf="!linkCheckLis.length">暂无关联的检查</div>
             </nz-form-item>
-            <div class="pos">
+            <div class="pos"
+              *ngIf="(currentTasktype.associationType.value ==='patientTransport'&&appointmentZyBuildFlag == 1)||(currentTasktype.associationType.value === 'inspect'&&appointmentBuildFlag == 1)">
               <!-- 需要预约检查 -->
               <nz-form-item class="pos-item">
                 <nz-form-control>

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

@@ -737,7 +737,7 @@ export class HushijiandanComponent implements OnInit {
       this.currentUser.typeValue == "outpatientDept" ||
       this.currentUser.typeValue == "checkRoom"
     ) {
-      delete postData["patient"]["department"];//搜索范围为全院在院患者
+      delete postData["patient"]["department"]; //搜索范围为全院在院患者
     } else {
       postData["patient"]["department"] = { id: this.loginUserDeptId };
     }
@@ -1345,6 +1345,7 @@ export class HushijiandanComponent implements OnInit {
     if (appointmentZyBuildFlag.length) {
       this.appointmentZyBuildFlag =
         appointmentZyBuildFlag[0].appointmentOtherSwitch == 1 ? "1" : "0";
+      console.log(this.appointmentZyBuildFlag, "seimin");
       this.yyDateZy = new Date();
       this.yyTimeZy = new Date();
       if (this.yyTimeZy.getMinutes() >= 0 && this.yyTimeZy.getMinutes() <= 30) {
@@ -1357,7 +1358,9 @@ export class HushijiandanComponent implements OnInit {
         this.yyTimeZy.setHours(this.yyTimeZy.getHours() + 1);
       }
     } else {
-      this.appointmentZyBuildFlag = "0";
+      this.appointmentBuildFlag =
+        this.currentTasktype.appointmentSwitch == 1 ? "1" : "0";
+      console.log(this.appointmentBuildFlag, "seimin");
     }
     console.log(this.patientForm.controls.checkedType.value, this.checkTypeLis);
     this.current_allowUrgent =
@@ -1422,7 +1425,13 @@ export class HushijiandanComponent implements OnInit {
   yyInspectChange(e) {
     if (this.currentTasktype.associationType.value === "inspect") {
       //陪检
-      if (this.filterLinkCheckLis.length) {
+      let obj = this.filterLinkCheckLis.find((item) => {
+        return (
+          new Date(item.yyTime).getTime() - new Date().getTime() >
+          this.leadTime * 60 * 1000
+        );
+      });
+      if (obj) {
         this.showDateTime();
       } else {
         this.yyTime = null;
@@ -1494,8 +1503,8 @@ export class HushijiandanComponent implements OnInit {
     this.filterLinkCheckLis = this.linkCheckLis.filter(
       (item) => Boolean(item.yyTime) && item.checked
     );
-    //有预约时间并且选中的检查数组不为空
-    if (this.filterLinkCheckLis.length) {
+    //有预约时间并且选中的检查数组不为空,并且预约建单的开关开启
+    if (this.filterLinkCheckLis.length && this.appointmentBuildFlag == "1") {
       //当前时间要大于生效时间
       this.isYyInspect = this.filterLinkCheckLis.every((item) => {
         return (