seimin пре 3 година
родитељ
комит
0f36120f42

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

@@ -793,7 +793,7 @@
793 793
               <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">关联的检查</nz-form-label>
794 794
               <nz-form-control class="datesGroup" *ngIf="linkCheckLis.length">
795 795
                 <nz-checkbox-wrapper class="linkCheckCheck" ngDefaultControl formControlName="linkCheck"
796
-                  (nzOnChange)="linkCheckLisChange($event)" [ngModel]="linkCheckLis">
796
+                  (nzOnChange)="linkCheckLisChange($event)">
797 797
                   <div nz-row *ngFor="let item of linkCheckLis">
798 798
                     <div nz-col nzSpan="24">
799 799
                       <label nz-checkbox [nzValue]="item">{{item.label}}</label>

+ 9 - 11
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -214,8 +214,8 @@ export class HushijiandanComponent implements OnInit {
214 214
     this.workOrderRemark += item;
215 215
   }
216 216
   // 获取护士端更新提示
217
-  updateTipsForNurses = '';
218
-  getUpdateTipsForNurses(){
217
+  updateTipsForNurses = "";
218
+  getUpdateTipsForNurses() {
219 219
     let postData = {
220 220
       idx: 0,
221 221
       sum: 1,
@@ -1138,11 +1138,8 @@ export class HushijiandanComponent implements OnInit {
1138 1138
     }
1139 1139
     let checkedArr = [];
1140 1140
     let yy = false; //是否有预约时间
1141
-    if (
1142
-      that.patientForm.value.linkCheck &&
1143
-      that.patientForm.value.linkCheck.length
1144
-    ) {
1145
-      that.patientForm.value.linkCheck.forEach((e) => {
1141
+    if (that.linkCheckLis && that.linkCheckLis.length) {
1142
+      that.linkCheckLis.forEach((e) => {
1146 1143
         if (e.checked) {
1147 1144
           checkedArr.push({ id: e.value });
1148 1145
           if (e.yyTime) {
@@ -1173,7 +1170,7 @@ export class HushijiandanComponent implements OnInit {
1173 1170
     if (
1174 1171
       yy &&
1175 1172
       that.checkedShowMsg.status == 200 &&
1176
-      that.patientForm.value.linkCheck &&
1173
+      that.linkCheckLis &&
1177 1174
       checkedArr.length
1178 1175
     ) {
1179 1176
       // 有预约时间
@@ -1520,7 +1517,6 @@ export class HushijiandanComponent implements OnInit {
1520 1517
   isInspectPriority = false; //选择的检查是否紧急(患者)
1521 1518
   filterLinkCheckLis = []; //有预约时间并且选中的
1522 1519
   linkCheckLisChange(e) {
1523
-    console.log(e, this.linkCheckLis);
1524 1520
     let flag = false; //检查是否紧急
1525 1521
     this.linkCheckLis.forEach((item) => {
1526 1522
       if (e.length) {
@@ -1531,13 +1527,15 @@ export class HushijiandanComponent implements OnInit {
1531 1527
             flag = true;
1532 1528
           }
1533 1529
           //选中的检查设置checked
1534
-          item.checked = v.value == item.value;
1530
+          if (v.value == item.value) {
1531
+            item.checked = true;
1532
+          }
1535 1533
         });
1536 1534
       } else {
1537 1535
         item.checked = false;
1538 1536
       }
1539 1537
     });
1540
-
1538
+    console.log(e, this.linkCheckLis);
1541 1539
     //检查有紧急度,则加急
1542 1540
     if (flag) {
1543 1541
       this.allowUrgent = "1";