Browse Source

排序问题处理

XMLWAN 4 years ago
parent
commit
535025c2b5

+ 2 - 2
config/prod.env.js View File

1
 "use strict";
1
 "use strict";
2
 module.exports = {
2
 module.exports = {
3
   NODE_ENV: '"production"',
3
   NODE_ENV: '"production"',
4
-  BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
5
-  //BASE_API: '"https://api.xt.kuyicloud.com"'
4
+  //BASE_API: '"http://new_mobile.xt.api.sgjyun.com"'
5
+  BASE_API: '"https://api.xt.kuyicloud.com"'
6
   // BASE_API:'"http://localhost:9529"',
6
   // BASE_API:'"http://localhost:9529"',
7
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
7
   // BASE_API: '"http://api.xt.test.sgjyun.com"'
8
   // http://api.xt.test.sgjyun.com
8
   // http://api.xt.test.sgjyun.com

+ 27 - 0
src/pages/advice/DialysisAdviceTable.vue View File

440
         if (resp.state == 1) {
440
         if (resp.state == 1) {
441
           this.admin_user = resp.data.adminUser;
441
           this.admin_user = resp.data.adminUser;
442
           var schedules = resp.data.scheduals;
442
           var schedules = resp.data.scheduals;
443
+          console.log("scheduals", schedules);
444
+          for (let i = 0; i < schedules.length; i++) {
445
+            schedules[i].dialysis_no = parseInt(
446
+              schedules[i].patient.dialysis_no
447
+            );
448
+          }
449
+          // console.log("schedules", schedules);
450
+          var arr = [];
451
+          for (let j = 0; j < schedules.length; j++) {
452
+            arr.push(schedules[j].dialysis_no);
453
+          }
454
+          arr.sort();
455
+          // console.log("arr", arr);
456
+          var arrTwo = [];
457
+          for (let i = 0; i < arr.length; i++) {
458
+            for (let j = 0; j < schedules.length; j++) {
459
+              if (arr[i] == schedules[j].dialysis_no) {
460
+                arrTwo.push(schedules[j]);
461
+              }
462
+            }
463
+          }
464
+          console.log("arrTwo", arrTwo);
465
+          // var arrthree = [];
466
+          // for (let i = 0; i < arrTwo.length; i++) {
467
+          //  arrthree.push(arrTwo[i].doctor_advice);
468
+          // }
469
+          schedules = arrTwo;
443
           var zoneMap = {};
470
           var zoneMap = {};
444
           var scheduleMap = {};
471
           var scheduleMap = {};
445
           for (let index = 0; index < schedules.length; index++) {
472
           for (let index = 0; index < schedules.length; index++) {

+ 10 - 13
src/pages/main/dialog/MonitDialog.vue View File

26
                 <th v-if="isShow('血流量')" width="70px">血流量(ml/min)</th>
26
                 <th v-if="isShow('血流量')" width="70px">血流量(ml/min)</th>
27
                 <th width="76px">静脉压/动脉压(mmHg)</th>
27
                 <th width="76px">静脉压/动脉压(mmHg)</th>
28
                 <th v-if="isShow('跨膜压')" width="70px">跨膜压(mmHg)</th>
28
                 <th v-if="isShow('跨膜压')" width="70px">跨膜压(mmHg)</th>
29
-                <th v-if="isShow('超滤量') && (template_id ==6 || template_id == 10 || template_id == 11)" width="60px">超滤量(ml)</th>
30
-                <th v-if="isShow('超滤量') && template_id !=6 && template_id !=10 && template_id !=11" width="60px">超滤量(L)</th>
29
+                <th v-if="isShow('超滤量') && (template_id ==6 || template_id == 10 || template_id == 11 || template_id == 12)" width="60px">超滤量(ml)</th>
30
+                <th v-if="isShow('超滤量') && template_id !=6 && template_id !=10 && template_id !=11 && template_id !=12" width="60px">超滤量(L)</th>
31
                 <th v-if="isShow('钠浓度')" width="82px">钠浓度(mmol/L)</th>
31
                 <th v-if="isShow('钠浓度')" width="82px">钠浓度(mmol/L)</th>
32
                 <th v-if="isShow('透析液温度')" width="82px">透析液温度(℃)</th>
32
                 <th v-if="isShow('透析液温度')" width="82px">透析液温度(℃)</th>
33
                 <th v-if="isShow('置换率') && (template_id ==6 || template_id == 10 || template_id == 11)" width="92px">置换率(ml/min)</th>
33
                 <th v-if="isShow('置换率') && (template_id ==6 || template_id == 10 || template_id == 11)" width="92px">置换率(ml/min)</th>
206
               >转换</button>
206
               >转换</button>
207
             </div>
207
             </div>
208
             <div class="cell" v-if="isShow('超滤量')">
208
             <div class="cell" v-if="isShow('超滤量')">
209
-              <label v-if="template_id == 6 || template_id == 10 || template_id == 11">超滤量(ml)</label>
209
+              <label v-if="template_id == 6 || template_id == 10 || template_id == 11 || template_id == 12">超滤量(ml)</label>
210
               <label v-else>超滤量(L)</label>
210
               <label v-else>超滤量(L)</label>
211
               <input
211
               <input
212
                 type="number"
212
                 type="number"
516
         blood_oxygen_saturation: "",
516
         blood_oxygen_saturation: "",
517
         monitoring_nurse: this.$store.getters.user.admin.id, // 监测人
517
         monitoring_nurse: this.$store.getters.user.admin.id, // 监测人
518
         creator: 0,
518
         creator: 0,
519
-        heparin:"",
519
+        heparin: ""
520
       },
520
       },
521
       doctor: this.$store.getters.user.user.user_name,
521
       doctor: this.$store.getters.user.user.user_name,
522
       value: 0,
522
       value: 0,
679
           ? resp.monitor.replacement_rate
679
           ? resp.monitor.replacement_rate
680
           : "";
680
           : "";
681
 
681
 
682
-        this.form.heparin = resp.monitor.heparin
683
-          ? resp.monitor.heparin
684
-          : "";
685
-
682
+        this.form.heparin = resp.monitor.heparin ? resp.monitor.heparin : "";
686
 
683
 
687
         this.form.displacement_quantity = ""; // this.last_monitor_record.displacement_quantity;
684
         this.form.displacement_quantity = ""; // this.last_monitor_record.displacement_quantity;
688
         this.form.conductivity = "";
685
         this.form.conductivity = "";
693
         this.form.dispose = ""; // this.last_monitor_record.dispose;
690
         this.form.dispose = ""; // this.last_monitor_record.dispose;
694
         this.form.result = ""; // this.last_monitor_record.result;
691
         this.form.result = ""; // this.last_monitor_record.result;
695
         this.form.id = -1;
692
         this.form.id = -1;
696
-        console.log(this.form);
693
+        console.log("hheh", resp.monitor);
694
+        this.form.blood_oxygen_saturation = resp.monitor.blood_oxygen_saturation
695
+          ? resp.monitor.blood_oxygen_saturation
696
+          : "";
697
       });
697
       });
698
     },
698
     },
699
 
699
 
808
               monitor.displacement_flow_quantity;
808
               monitor.displacement_flow_quantity;
809
           }
809
           }
810
 
810
 
811
-
812
           if (monitor.heparin == 0) {
811
           if (monitor.heparin == 0) {
813
             this.form.heparin = "";
812
             this.form.heparin = "";
814
           } else {
813
           } else {
815
             this.form.heparin = monitor.heparin;
814
             this.form.heparin = monitor.heparin;
816
           }
815
           }
817
 
816
 
818
-
819
-
820
           this.form.ktv = monitor.ktv;
817
           this.form.ktv = monitor.ktv;
821
           this.form.symptom = monitor.symptom;
818
           this.form.symptom = monitor.symptom;
822
           this.form.dispose = monitor.dispose;
819
           this.form.dispose = monitor.dispose;
1278
             this.form.result = "";
1275
             this.form.result = "";
1279
             this.form.conductivity = "";
1276
             this.form.conductivity = "";
1280
             this.form.displacement_flow_quantity = "";
1277
             this.form.displacement_flow_quantity = "";
1281
-            this.form.heparin= "";
1278
+            this.form.heparin = "";
1282
 
1279
 
1283
             // this.last_monitor_record.sodium_concentration =
1280
             // this.last_monitor_record.sodium_concentration =
1284
             //   monitor.sodium_concentration
1281
             //   monitor.sodium_concentration