28169 hace 1 año
padre
commit
c2b8d3c6bb

+ 2 - 2
src/xt_pages/dialysis/details/consumable/dialysisGather.vue Ver fichero

@@ -78,7 +78,7 @@
78 78
         
79 79
           <el-table-column align="center" label="住院(门诊)号"  v-if="gatherSetting.admission_number==1">
80 80
              <template slot-scope="scope">
81
-               {{scope.row.xt_receive_treatment_asses.admission_number}}
81
+               {{scope.row.patient.admission_number}}
82 82
              </template>
83 83
           </el-table-column>
84 84
 
@@ -132,7 +132,7 @@
132 132
              </template>
133 133
           </el-table-column>
134 134
   
135
-          <el-table-column align="center" label="滤过器"  v-if="gatherSetting.dialysis_irrigation ==1">
135
+          <el-table-column align="center" label="滤过器"  v-if="gatherSetting.dialysis_strainer ==1">
136 136
              <template slot-scope="scope">
137 137
                <span>{{scope.row.dialysis_prescription.dialysis_strainer}}</span>
138 138
              </template>

+ 2 - 2
src/xt_pages/dialysis/details/consumable/dialysisGatherPrint.vue Ver fichero

@@ -32,7 +32,7 @@
32 32
                   <td width="100" v-if="gatherSetting.mode_type==1">透析模式</td>
33 33
                   <td width="100" v-if="gatherSetting.dialysis_dialyszers == 1">透析器</td>
34 34
                   <td width="100"  v-if="gatherSetting.dialysis_irrigation ==1">灌流器</td>
35
-                  <td width="100"  v-if="gatherSetting.dialysis_irrigation ==1">滤过器</td>
35
+                  <td width="100"  v-if="gatherSetting.dialysis_strainer ==1">滤过器</td>
36 36
                   <td width="100"  v-if="gatherSetting.change_nurse ==1">换药包/穿刺针</td>
37 37
                   <td width="100" v-if="gatherSetting.anticoagulant==1">抗凝剂(首剂)(维持)(总量)</td>
38 38
                   <td width="200" v-if="gatherSetting.tube==1">封管液</td>
@@ -55,7 +55,7 @@
55 55
                     {{item.patient.dialysis_no}}
56 56
                   </td>
57 57
                   <td width="100"  v-if="gatherSetting.admission_number==1">
58
-                    {{item.xt_receive_treatment_asses.admission_number}}
58
+                    {{item.patient.admission_number}}
59 59
                   </td>
60 60
                   <td width="100" v-if="gatherSetting.mode_type==1">
61 61
                     <span v-if="item.mode_id == 1">HD</span>

+ 143 - 58
src/xt_pages/dialysis/details/consumable/dialysisParameter.vue Ver fichero

@@ -466,6 +466,7 @@
466 466
   import {getRemindPrintList,saveRemindPrint} from '@/api/schedule'
467 467
   import { getDataConfig } from '@/utils/data'
468 468
   import store from "@/store";
469
+  const moment = require('moment')
469 470
   export default {
470 471
     components: {
471 472
       
@@ -593,6 +594,7 @@
593 594
         partition_id:0,
594 595
         zoneList:[],
595 596
         org_id:0,
597
+       
596 598
       }
597 599
     },
598 600
     open(){
@@ -785,72 +787,155 @@
785 787
           partion_type:this.partitionType,
786 788
           selected_date:this.query.schedule_date,
787 789
         }
790
+    
791
+        var timeStamp = Date.parse(this.query.schedule_date)
792
+       
793
+        var arrDateOne = (timeStamp/1000) -28800
794
+        console.log("时间搓",arrDateOne) 
795
+        let dateone =  moment().format('YYYY-MM-DD')//获取标准时间 //Tue Aug 16 2022 15:06:24 GMT+0800 (中国标准时间)
796
+        //方式一
797
+        let timeStampOne = Date.parse(dateone)
798
+        
799
+        var arrDateTwo = (timeStampOne/1000)-28800
800
+
801
+        console.log("时间搓2222",arrDateTwo)
802
+     
788 803
         getDialysisParameterGoodList(params).then(response=>{
789 804
            if(response.data.state == 1){
790 805
             this.startdialogVisible = true
791 806
             var list = response.data.data.list
792 807
             var anticoagulantList = []
793
-            if(list!=null && list.length>0){
794
-              for(let i=0;i<list.length;i++){
795
-                 list[i].dialysis_dialyszers_arr = []
796
-                 list[i].dialyzer_perfusion_apparatus_arr = []
797
-                 list[i].dialysis_irrigation_arr = []
798
-                 list[i].dialysis_strainer_arr =[]
799
-                 if(list[i].dialysis_solution.dialysis_dialyszers!=""){
800
-                   list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
801
-                 }
802
-                 if(list[i].dialysis_solution.dialyzer_perfusion_apparatus!=""){
803
-                   list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_solution.dialyzer_perfusion_apparatus.split(",")
804
-                 }
805
-                 if(list[i].dialysis_solution.dialysis_irrigation!=""){
806
-                   list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
807
-                 }
808
-                 if(list[i].dialysis_solution.dialysis_strainer!=""){
809
-                    list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
810
-                 }
808
+            
809
+            if(arrDateOne > arrDateTwo){
810
+              if(list!=null && list.length>0){
811
+                  for(let i=0;i<list.length;i++){
812
+                    list[i].dialysis_dialyszers_arr = []
813
+                    list[i].dialyzer_perfusion_apparatus_arr = []
814
+                    list[i].dialysis_irrigation_arr = []
815
+                    list[i].dialysis_strainer_arr =[]
816
+                    if(list[i].dialysis_solution.dialysis_dialyszers!=""){
817
+                      list[i].dialysis_dialyszers_arr = list[i].dialysis_solution.dialysis_dialyszers.split(",")
818
+                    }
819
+                    if(list[i].dialysis_solution.dialyzer_perfusion_apparatus!=""){
820
+                      list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_solution.dialyzer_perfusion_apparatus.split(",")
821
+                    }
822
+                    if(list[i].dialysis_solution.dialysis_irrigation!=""){
823
+                      list[i].dialysis_irrigation_arr = list[i].dialysis_solution.dialysis_irrigation.split(",")
824
+                    }
825
+                    if(list[i].dialysis_solution.dialysis_strainer!=""){
826
+                        list[i].dialysis_strainer_arr = list[i].dialysis_solution.dialysis_strainer.split(",")
827
+                    }
828
+
829
+                    
830
+                    if(list[i].dialysis_solution.anticoagulant == 1){
831
+                        anticoagulantList.push(list[i].dialysis_solution)
832
+                    }
833
+                    if(list[i].dialysis_solution.anticoagulant == 2){
834
+                        anticoagulantList.push(list[i].dialysis_solution)
835
+                    }
836
+                    if(list[i].dialysis_solution.anticoagulant == 3){
837
+                        anticoagulantList.push(list[i].dialysis_solution)
838
+                    }
839
+                    if(list[i].dialysis_solution.anticoagulant == 4){
840
+                        anticoagulantList.push(list[i].dialysis_solution)
841
+                    }
842
+                    if(list[i].dialysis_solution.anticoagulant == 5){
843
+                      anticoagulantList.push(list[i].dialysis_solution)
844
+                    }
845
+                      if(list[i].dialysis_solution.anticoagulant == 6){
846
+                        anticoagulantList.push(list[i].dialysis_solution)
847
+                    }
848
+                      if(list[i].dialysis_solution.anticoagulant == 7){
849
+                      anticoagulantList.push(list[i].dialysis_solution)
850
+                    }
851
+                      if(list[i].dialysis_solution.anticoagulant == 8){
852
+                      anticoagulantList.push(list[i].dialysis_solution)
853
+                    }
854
+                    if(list[i].dialysis_solution.anticoagulant == 9){
855
+                      anticoagulantList.push(list[i].dialysis_solution)
856
+                    }
857
+                      if(list[i].dialysis_solution.anticoagulant == 10){
858
+                        anticoagulantList.push(list[i].dialysis_solution)
859
+                    }
860
+                      if(list[i].dialysis_solution.anticoagulant == 11){
861
+                        anticoagulantList.push(list[i].dialysis_solution)
862
+                    }
863
+                      if(list[i].dialysis_solution.anticoagulant == 12){
864
+                        anticoagulantList.push(list[i].dialysis_solution)
865
+                    }
866
+                    if(list[i].dialysis_solution.anticoagulant == 13){
867
+                      anticoagulantList.push(list[i].dialysis_solution)
868
+                    }
869
+                  }
870
+              }
871
+            }
811 872
 
812
-                
813
-                 if(list[i].dialysis_solution.anticoagulant == 1){
814
-                    anticoagulantList.push(list[i].dialysis_solution)
815
-                 }
816
-                 if(list[i].dialysis_solution.anticoagulant == 2){
817
-                    anticoagulantList.push(list[i].dialysis_solution)
818
-                 }
819
-                if(list[i].dialysis_solution.anticoagulant == 3){
820
-                    anticoagulantList.push(list[i].dialysis_solution)
821
-                 }
822
-                 if(list[i].dialysis_solution.anticoagulant == 4){
823
-                    anticoagulantList.push(list[i].dialysis_solution)
824
-                 }
825
-                if(list[i].dialysis_solution.anticoagulant == 5){
826
-                   anticoagulantList.push(list[i].dialysis_solution)
827
-                 }
828
-                  if(list[i].dialysis_solution.anticoagulant == 6){
829
-                    anticoagulantList.push(list[i].dialysis_solution)
830
-                 }
831
-                  if(list[i].dialysis_solution.anticoagulant == 7){
832
-                   anticoagulantList.push(list[i].dialysis_solution)
833
-                 }
834
-                  if(list[i].dialysis_solution.anticoagulant == 8){
835
-                   anticoagulantList.push(list[i].dialysis_solution)
836
-                 }
837
-                 if(list[i].dialysis_solution.anticoagulant == 9){
838
-                   anticoagulantList.push(list[i].dialysis_solution)
839
-                 }
840
-                  if(list[i].dialysis_solution.anticoagulant == 10){
841
-                    anticoagulantList.push(list[i].dialysis_solution)
842
-                 }
843
-                  if(list[i].dialysis_solution.anticoagulant == 11){
844
-                    anticoagulantList.push(list[i].dialysis_solution)
845
-                 }
846
-                  if(list[i].dialysis_solution.anticoagulant == 12){
847
-                    anticoagulantList.push(list[i].dialysis_solution)
848
-                 }
849
-                 if(list[i].dialysis_solution.anticoagulant == 13){
850
-                   anticoagulantList.push(list[i].dialysis_solution)
851
-                 }
873
+            if(arrDateOne <= arrDateTwo){
874
+            
875
+
876
+              if(list!=null && list.length>0){
877
+                for(let i=0;i<list.length;i++){
878
+                    list[i].dialysis_dialyszers_arr = []
879
+                    list[i].dialyzer_perfusion_apparatus_arr = []
880
+                    list[i].dialysis_irrigation_arr = []
881
+                    list[i].dialysis_strainer_arr =[]
882
+                    if(list[i].dialysis_prescription.dialysis_dialyszers!=""){
883
+                      list[i].dialysis_dialyszers_arr = list[i].dialysis_prescription.dialysis_dialyszers.split(",")
884
+                    }
885
+                    if(list[i].dialysis_prescription.dialyzer_perfusion_apparatus!=""){
886
+                      list[i].dialyzer_perfusion_apparatus_arr = list[i].dialysis_prescription.dialyzer_perfusion_apparatus.split(",")
887
+                    }
888
+                    if(list[i].dialysis_prescription.dialysis_irrigation!=""){
889
+                      list[i].dialysis_irrigation_arr = list[i].dialysis_prescription.dialysis_irrigation.split(",")
890
+                    }
891
+                    if(list[i].dialysis_prescription.dialysis_strainer!=""){
892
+                        list[i].dialysis_strainer_arr = list[i].dialysis_prescription.dialysis_strainer.split(",")
893
+                    }
894
+
895
+                    
896
+                    if(list[i].dialysis_prescription.anticoagulant == 1){
897
+                        anticoagulantList.push(list[i].dialysis_prescription)
898
+                    }
899
+                    if(list[i].dialysis_prescription.anticoagulant == 2){
900
+                        anticoagulantList.push(list[i].dialysis_prescription)
901
+                    }
902
+                    if(list[i].dialysis_prescription.anticoagulant == 3){
903
+                        anticoagulantList.push(list[i].dialysis_prescription)
904
+                    }
905
+                    if(list[i].dialysis_prescription.anticoagulant == 4){
906
+                        anticoagulantList.push(list[i].dialysis_prescription)
907
+                    }
908
+                    if(list[i].dialysis_prescription.anticoagulant == 5){
909
+                      anticoagulantList.push(list[i].dialysis_prescription)
910
+                    }
911
+                      if(list[i].dialysis_prescription.anticoagulant == 6){
912
+                        anticoagulantList.push(list[i].dialysis_prescription)
913
+                    }
914
+                      if(list[i].dialysis_prescription.anticoagulant == 7){
915
+                      anticoagulantList.push(list[i].dialysis_prescription)
916
+                    }
917
+                      if(list[i].dialysis_prescription.anticoagulant == 8){
918
+                      anticoagulantList.push(list[i].dialysis_prescription)
919
+                    }
920
+                    if(list[i].dialysis_prescription.anticoagulant == 9){
921
+                      anticoagulantList.push(list[i].dialysis_prescription)
922
+                    }
923
+                      if(list[i].dialysis_prescription.anticoagulant == 10){
924
+                        anticoagulantList.push(list[i].dialysis_prescription)
925
+                    }
926
+                      if(list[i].dialysis_prescription.anticoagulant == 11){
927
+                        anticoagulantList.push(list[i].dialysis_prescription)
928
+                    }
929
+                      if(list[i].dialysis_prescription.anticoagulant == 12){
930
+                        anticoagulantList.push(list[i].dialysis_prescription)
931
+                    }
932
+                    if(list[i].dialysis_prescription.anticoagulant == 13){
933
+                      anticoagulantList.push(list[i].dialysis_prescription)
934
+                    }
935
+                  }
852 936
               }
853 937
             }
938
+          
854 939
             console.log("anticoagulantList",anticoagulantList)
855 940
            this.tableList = []
856 941
            if(anticoagulantList!=null && anticoagulantList.length > 0){

+ 2 - 2
src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue Ver fichero

@@ -175,13 +175,13 @@
175 175
                    <span>{{item.dialysis_solution.blood_flow_volume?item.dialysis_solution.blood_flow_volume:""}}</span> 
176 176
                 </td>
177 177
                 
178
-                <td v-if="org_id!=10587 && org_id!=0">
178
+                <td v-if="org_id!=10587 && org_id!=0 && org_id!=10599">
179 179
                   <span v-if="getBloodAccessOption(item.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
180 180
                   <span v-else></span>
181 181
                 </td>
182 182
                 
183 183
                 
184
-                <td v-if="org_id!=10587&& org_id!=0">
184
+                <td v-if="org_id!=10587&& org_id!=0 && org_id!=10599">
185 185
                   {{ item.advice_spc }}
186 186
                 </td>
187 187
                </tr>

+ 23 - 13
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue Ver fichero

@@ -331,14 +331,16 @@
331 331
                         this.$store.getters.xt_user.template_info.org_id != 10469 &&
332 332
                         this.$store.getters.xt_user.template_info.org_id != 10471 &&
333 333
                         this.$store.getters.xt_user.template_info.org_id != 10495 &&
334
-                        this.$store.getters.xt_user.template_info.org_id != 10375">
334
+                        this.$store.getters.xt_user.template_info.org_id != 10375 &&
335
+                        this.$store.getters.xt_user.template_info.org_id != 10600">
335 336
                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 &&
336 337
                           this.$store.getters.xt_user.template_info.template_id != 45 &&
337 338
                           this.$store.getters.xt_user.template_info.org_id != 10346 &&
338 339
                           this.$store.getters.xt_user.template_info.org_id != 10387 &&
339 340
                           this.$store.getters.xt_user.template_info.org_id != 10495 &&
340 341
                           this.$store.getters.xt_user.template_info.org_id != 10375 &&
341
-                          this.$store.getters.xt_user.template_info.org_id != 10551
342
+                          this.$store.getters.xt_user.template_info.org_id != 10551 &&
343
+                          this.$store.getters.xt_user.template_info.org_id != 10600
342 344
                            ">
343 345
                             <el-form-item
344 346
                                     v-if='dialysisPrescription.anticoagulant != 1 &&
@@ -386,7 +388,8 @@
386 388
                                     this.$store.getters.xt_user.template_info.org_id == 10387 ||
387 389
                                     this.$store.getters.xt_user.template_info.org_id ==10495 ||
388 390
                                     this.$store.getters.xt_user.template_info.org_id ==10375 ||
389
-                                    this.$store.getters.xt_user.template_info.org_id ==10551
391
+                                    this.$store.getters.xt_user.template_info.org_id ==10551 ||
392
+                                    this.$store.getters.xt_user.template_info.org_id ==10600
390 393
                                     '
391 394
                                     :label="'首剂(mg) : '" prop="anticoagulant_shouji" :rules="isCheckmust('首剂')">
392 395
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
@@ -438,7 +441,7 @@
438 441
 
439 442
 
440 443
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.weichi != -1 && isShows('维持')  && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
441
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375">
444
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157  && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 9671  && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10600">
442 445
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 ">
443 446
                             <el-form-item :label="'维持(' + anticoagulant.weichi_unit + ') : '"
444 447
                                           v-if="anticoagulant.weichi != -1 &&
@@ -450,7 +453,8 @@
450 453
                                             this.$store.getters.xt_user.template_info.org_id != 9990 &&
451 454
                                             this.$store.getters.xt_user.template_info.org_id != 10495 &&
452 455
                                             this.$store.getters.xt_user.template_info.org_id != 10375 &&
453
-                                            this.$store.getters.xt_user.template_info.org_id != 10551" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
456
+                                            this.$store.getters.xt_user.template_info.org_id != 10551 &&
457
+                                            this.$store.getters.xt_user.template_info.org_id != 10600" prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
454 458
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
455 459
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
456 460
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
@@ -468,7 +472,8 @@
468 472
                                           this.$store.getters.xt_user.template_info.org_id == 9990 ||
469 473
                                           this.$store.getters.xt_user.template_info.org_id == 10495 ||
470 474
                                           this.$store.getters.xt_user.template_info.org_id == 10375 ||
471
-                                          this.$store.getters.xt_user.template_info.org_id == 10551
475
+                                          this.$store.getters.xt_user.template_info.org_id == 10551 ||
476
+                                          this.$store.getters.xt_user.template_info.org_id == 10600
472 477
                                           " prop="anticoagulant_weichi" :rules="isCheckmust('维持')">
473 478
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
474 479
                                           v-model="dialysisPrescription.anticoagulant_weichi"></el-input>
@@ -524,10 +529,10 @@
524 529
 
525 530
 
526 531
                     <el-col :span="8" v-if="anticoagulant!=undefined &&anticoagulant.zongliang != -1 && isShows('总量') && dialysisPrescription.anticoagulant!=1&& dialysisPrescription.anticoagulant!=12">
527
-                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10551">
532
+                        <div v-if="this.$store.getters.xt_user.template_info.org_id != 10157 && this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 9675 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432 && this.$store.getters.xt_user.template_info.org_id != 9829 && this.$store.getters.xt_user.template_info.org_id != 10440 && this.$store.getters.xt_user.template_info.org_id != 10469 && this.$store.getters.xt_user.template_info.org_id != 10471 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375 && this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600">
528 533
                           <div v-if="this.$store.getters.xt_user.template_info.org_id != 10101 && this.$store.getters.xt_user.template_info.template_id != 45 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 10495">
529 534
                             <el-form-item
530
-                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375  && this.$store.getters.xt_user.template_info.org_id != 10551'
535
+                                    v-if='this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 38  && this.$store.getters.xt_user.template_info.org_id != 9987 && this.$store.getters.xt_user.template_info.template_id != 54 && this.$store.getters.xt_user.template_info.org_id != 10346 && this.$store.getters.xt_user.template_info.org_id != 10387 && this.$store.getters.xt_user.template_info.org_id != 9990 && this.$store.getters.xt_user.template_info.org_id != 10495 && this.$store.getters.xt_user.template_info.org_id != 10375  && this.$store.getters.xt_user.template_info.org_id != 10551 && this.$store.getters.xt_user.template_info.org_id != 10600'
531 536
                                     :label="'总量(' + anticoagulant.zongliang_unit + ') : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
532 537
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
533 538
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -535,7 +540,7 @@
535 540
                                           v-model="dialysisPrescription.no_anticoagulant_zongliang"></el-input>
536 541
                             </el-form-item>
537 542
                             <el-form-item
538
-                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10551 '
543
+                                    v-if='this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 38||  this.$store.getters.xt_user.template_info.org_id == 9987 || this.$store.getters.xt_user.template_info.template_id == 54 || this.$store.getters.xt_user.template_info.org_id == 10346 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10551 || this.$store.getters.xt_user.template_info.org_id == 10600 '
539 544
                                     :label="'总量(mg) : '" prop="anticoagulant_zongliang" :rules="isCheckmust('总量')">
540 545
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
541 546
                                           v-model="dialysisPrescription.anticoagulant_zongliang"></el-input>
@@ -2945,10 +2950,13 @@ mu
2945 2950
       },
2946 2951
 
2947 2952
       handleCommit (formName) {
2948
-         if(this.dialysisPrescription.target_ultrafiltration==0){
2953
+        if(this.$store.getters.xt_user.template_info.org_id ==10579 ){
2954
+          if(this.dialysisPrescription.target_ultrafiltration==0){
2949 2955
              this.$message.error("目标超滤量不能为空")
2950 2956
              return false
2951 2957
          }
2958
+        }
2959
+         
2952 2960
         this.$refs[formName].validate((valid)=>{
2953 2961
           if(valid){
2954 2962
             if(!this.isLoading){
@@ -3497,9 +3505,11 @@ mu
3497 3505
         if(this.dialysisPrescription.anticoagulant == "" || this.dialysisPrescription.anticoagulant == 0){
3498 3506
           this.dialysisPrescription.anticoagulant = 3
3499 3507
         }
3500
-        if(this.dialysisPrescription.target_ultrafiltration == 0){
3501
-           this.$message.error("目标超滤量不能为空!")
3502
-           return false
3508
+        if(this.$store.getters.xt_user.template_info.org_id ==10579 ){
3509
+          if(this.dialysisPrescription.target_ultrafiltration==0){
3510
+             this.$message.error("目标超滤量不能为空")
3511
+             return false
3512
+         }
3503 3513
         }
3504 3514
         this.$refs[formName].validate((valid)=>{
3505 3515
           if(valid){

+ 1 - 0
src/xt_pages/user/components/PatientSidebar.1.vue Ver fichero

@@ -123,6 +123,7 @@ export default {
123 123
         fetchAllList().then(response => {
124 124
           if (response.data.state == 1) {
125 125
             this.patientsList = response.data.data.patients
126
+            console.log("哈哈哈哈哈",this.patientsList)
126 127
             var len = this.patientsList.length
127 128
             if (len > 0) {
128 129
               for (let index = 0; index < len; index++) {

+ 13 - 2
src/xt_pages/user/components/PatientSidebar.vue Ver fichero

@@ -77,6 +77,7 @@ export default {
77 77
       keyword: '',
78 78
       value: '',
79 79
       treeKey: '',
80
+      org_id:0,
80 81
       treeData: [
81 82
         {
82 83
           name: '1',
@@ -404,7 +405,17 @@ export default {
404 405
     getList() {
405 406
       fetchAllList().then(response => {
406 407
         if (response.data.state == 1) {
407
-          this.patientsList = response.data.data.patients
408
+          if(this.org_id ==10191){
409
+             var patients = response.data.data.patients
410
+             for(let i=0;i<patients.length;i++){
411
+               this.patientsList.push(patients[i])
412
+             }
413
+          }else{
414
+            this.patientsList = response.data.data.patients
415
+            console.log("哈哈哈哈哈哈",this.patientsList)
416
+          }
417
+        
418
+
408 419
           var len = this.patientsList.length
409 420
           if (len > 0) {
410 421
             for (let index = 0; index < len; index++) {
@@ -482,7 +493,7 @@ export default {
482 493
   },
483 494
   created() {
484 495
     var patientKey =  window.sessionStorage.getItem('patientKey')
485
-
496
+    this.org_id = this.$store.getters.xt_user.template_info.org_id
486 497
     console.log("patient",patientKey)
487 498
     var query = this.$route.path
488 499
     console.log("query",this.$route.path)

+ 3 - 1
src/xt_pages/user/doctorAdvice.vue Ver fichero

@@ -199,7 +199,9 @@
199 199
           <template slot-scope="scope">
200 200
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
201 201
               <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
202
-                {{ scope.row.advice_name}}<i class="el-icon-arrow-down el-icon--right"></i>
202
+                <span v-if="scope.row.frequency_type >0" style="color:#1AAD19"> {{ scope.row.advice_name}}</span>
203
+                <span v-if="scope.row.frequency_type ==0"> {{ scope.row.advice_name}}</span>
204
+                <i class="el-icon-arrow-down el-icon--right"></i>
203 205
               </span>
204 206
 
205 207
               <el-dropdown-menu slot="dropdown">

+ 2 - 2
src/xt_pages/workforce/remind_print_setting.vue Ver fichero

@@ -132,7 +132,7 @@
132 132
                 <!-- 透析器灌流器 -->
133 133
                
134 134
                  <div>
135
-                  <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器 <span v-if="org_id==10445 || org_id == 0">/滤过器</span>:</span>
135
+                  <span v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器 <span v-if="org_id==10445 || org_id == 0 || org_id == 10600">/滤过器</span>:</span>
136 136
                   <span v-if="printObj.dialyzers == 1&& main_collection.dialysissolution.dialysis_dialyszers!=''">{{main_collection.dialysissolution.dialysis_dialyszers}}</span>
137 137
                   <span v-if="printObj.perfusion_apparatus == 1&& main_collection.dialysissolution.dialysis_irrigation!=''">{{main_collection.dialysissolution.dialysis_irrigation}}</span>
138 138
                
@@ -145,7 +145,7 @@
145 145
                 </div>
146 146
                 
147 147
                
148
-                <div v-if="org_id!=10440">打印时间:
148
+                <div v-if="org_id!=10440 && org_id!=10600">打印时间:
149 149
                      {{getTime(main_collection.schedule_date)}}   
150 150
                      <span v-if="main_collection.schedule_week ==1">星期一</span>
151 151
                      <span v-if="main_collection.schedule_week ==2">星期二</span>