seimin 3 years ago
parent
commit
38f4735e5a

+ 1 - 1
src/app/views/hushijiandan/hushijiandan.component.html

@@ -804,7 +804,7 @@
804
               </nz-form-control>
804
               </nz-form-control>
805
               <div *ngIf="!linkCheckLis.length">暂无关联的检查</div>
805
               <div *ngIf="!linkCheckLis.length">暂无关联的检查</div>
806
             </nz-form-item>
806
             </nz-form-item>
807
-            <div class="pos">
807
+            <div class="pos" *ngIf="appointmentZyBuildFlag == 1||appointmentBuildFlag == 1">
808
               <!-- 需要预约检查 -->
808
               <!-- 需要预约检查 -->
809
               <nz-form-item class="pos-item">
809
               <nz-form-item class="pos-item">
810
                 <nz-form-control>
810
                 <nz-form-control>

+ 4 - 3
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -737,7 +737,7 @@ export class HushijiandanComponent implements OnInit {
737
       this.currentUser.typeValue == "outpatientDept" ||
737
       this.currentUser.typeValue == "outpatientDept" ||
738
       this.currentUser.typeValue == "checkRoom"
738
       this.currentUser.typeValue == "checkRoom"
739
     ) {
739
     ) {
740
-      delete postData["patient"]["department"];//搜索范围为全院在院患者
740
+      delete postData["patient"]["department"]; //搜索范围为全院在院患者
741
     } else {
741
     } else {
742
       postData["patient"]["department"] = { id: this.loginUserDeptId };
742
       postData["patient"]["department"] = { id: this.loginUserDeptId };
743
     }
743
     }
@@ -1345,6 +1345,7 @@ export class HushijiandanComponent implements OnInit {
1345
     if (appointmentZyBuildFlag.length) {
1345
     if (appointmentZyBuildFlag.length) {
1346
       this.appointmentZyBuildFlag =
1346
       this.appointmentZyBuildFlag =
1347
         appointmentZyBuildFlag[0].appointmentOtherSwitch == 1 ? "1" : "0";
1347
         appointmentZyBuildFlag[0].appointmentOtherSwitch == 1 ? "1" : "0";
1348
+      console.log(this.appointmentZyBuildFlag, "seimin");
1348
       this.yyDateZy = new Date();
1349
       this.yyDateZy = new Date();
1349
       this.yyTimeZy = new Date();
1350
       this.yyTimeZy = new Date();
1350
       if (this.yyTimeZy.getMinutes() >= 0 && this.yyTimeZy.getMinutes() <= 30) {
1351
       if (this.yyTimeZy.getMinutes() >= 0 && this.yyTimeZy.getMinutes() <= 30) {
@@ -1494,8 +1495,8 @@ export class HushijiandanComponent implements OnInit {
1494
     this.filterLinkCheckLis = this.linkCheckLis.filter(
1495
     this.filterLinkCheckLis = this.linkCheckLis.filter(
1495
       (item) => Boolean(item.yyTime) && item.checked
1496
       (item) => Boolean(item.yyTime) && item.checked
1496
     );
1497
     );
1497
-    //有预约时间并且选中的检查数组不为空
1498
-    if (this.filterLinkCheckLis.length) {
1498
+    //有预约时间并且选中的检查数组不为空,并且预约建单的开关开启
1499
+    if (this.filterLinkCheckLis.length && this.appointmentBuildFlag == "1") {
1499
       //当前时间要大于生效时间
1500
       //当前时间要大于生效时间
1500
       this.isYyInspect = this.filterLinkCheckLis.every((item) => {
1501
       this.isYyInspect = this.filterLinkCheckLis.every((item) => {
1501
         return (
1502
         return (