Преглед изворни кода

Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

陈少旭 пре 1 недеља
родитељ
комит
5f8ce658c9

+ 5 - 5
src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue Прегледај датотеку

@@ -698,7 +698,7 @@
698 698
                                     monitor_record.operate_time ==
699 699
                                       record.dialysis_order.start_time)
700 700
                                   "
701
-                                  >【开始透析】
701
+                                  >【开始透析】引血100ml/min
702 702
                                   </template>
703 703
 
704 704
                                 {{ monitor_record.end }} {{ monitor_record.symptom }} &nbsp;{{
@@ -1697,21 +1697,21 @@ export default {
1697 1697
               this.records[i].monitor_records[j].end = ""
1698 1698
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
1699 1699
                 if(this.org_id!=10683){
1700
-                  this.records[i].monitor_records[j].end = "【结束透析】";
1700
+                  this.records[i].monitor_records[j].end = "【结束透析】回血100ml/min";
1701 1701
                 }
1702 1702
 
1703 1703
                tempmonitorflag = false;
1704 1704
             }
1705
-            if(this.org_id!=10515 && this.org_id!=0){
1705
+            if(this.org_id!=10515){
1706 1706
               if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
1707 1707
                 if(this.org_id!=10683){
1708
-                  this.records[i].monitor_records[j].end = "【结束透析】";
1708
+                  this.records[i].monitor_records[j].end = "【结束透析】回血100ml/min";
1709 1709
                 }
1710 1710
 
1711 1711
              }
1712 1712
              if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
1713 1713
                if(this.org_id!=10683){
1714
-                  this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
1714
+                  this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】回血100ml/min"
1715 1715
                }
1716 1716
 
1717 1717
              }

+ 2 - 2
src/xt_pages/dialysis/details/assessmentAfter.vue Прегледај датотеку

@@ -17,8 +17,8 @@
17 17
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
18 18
             actual_ultrafiltration
19 19
           }}</span>
20
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  this.$store.getters.xt_user.template_info.org_id == 10597  ||  this.$store.getters.xt_user.template_info.org_id == 10599 ||  this.$store.getters.xt_user.template_info.org_id == 10612 ||  this.$store.getters.xt_user.template_info.org_id == 10617 ||  this.$store.getters.xt_user.template_info.org_id == 10702 ||  this.$store.getters.xt_user.template_info.org_id == 10697 ||  this.$store.getters.xt_user.template_info.org_id == 10635) " >ml</span>
21
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  this.$store.getters.xt_user.template_info.org_id!= 10597  &&  this.$store.getters.xt_user.template_info.org_id!= 10599  &&  this.$store.getters.xt_user.template_info.org_id!= 10612  &&  this.$store.getters.xt_user.template_info.org_id!= 10617  &&  this.$store.getters.xt_user.template_info.org_id!= 10702  &&  this.$store.getters.xt_user.template_info.org_id!= 10697 &&  this.$store.getters.xt_user.template_info.org_id!= 10635"  >L</span>
20
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495 ||  this.$store.getters.xt_user.template_info.org_id == 10597  ||  this.$store.getters.xt_user.template_info.org_id == 10599 ||  this.$store.getters.xt_user.template_info.org_id == 10612 ||  this.$store.getters.xt_user.template_info.org_id == 10617 ||  this.$store.getters.xt_user.template_info.org_id == 10702 ||  this.$store.getters.xt_user.template_info.org_id == 10697 ||  this.$store.getters.xt_user.template_info.org_id == 10635 ||  this.$store.getters.xt_user.template_info.org_id == 10721) " >ml</span>
21
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495 &&  this.$store.getters.xt_user.template_info.org_id!= 10597  &&  this.$store.getters.xt_user.template_info.org_id!= 10599  &&  this.$store.getters.xt_user.template_info.org_id!= 10612  &&  this.$store.getters.xt_user.template_info.org_id!= 10617  &&  this.$store.getters.xt_user.template_info.org_id!= 10702  &&  this.$store.getters.xt_user.template_info.org_id!= 10697 &&  this.$store.getters.xt_user.template_info.org_id!= 10635 &&  this.$store.getters.xt_user.template_info.org_id!= 10721"  >L</span>
22 22
         </li>
23 23
         <li v-if="isShow('导管')">
24 24
           <label>导管 : </label>

+ 1 - 1
src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue Прегледај датотеку

@@ -30,7 +30,7 @@
30 30
           <el-col :span="8" v-if="isShow('实际超滤量')">
31 31
             <el-form-item
32 32
               label="实际超滤量(ml): " :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')"
33
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693  || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635"  >
33
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495 || this.$store.getters.xt_user.template_info.org_id == 10558 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10693  || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10721"  >
34 34
               <el-input v-model="form.actual_ultrafiltration"></el-input>
35 35
             </el-form-item>
36 36
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">

+ 3 - 3
src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue Прегледај датотеку

@@ -675,7 +675,7 @@
675 675
                                   monitor.operate_time ==
676 676
                                     dialysisOrder.start_time)&&(org_id!=10414) && (org_id!=10683)
677 677
                                 "
678
-                                >【开始透析】 <span v-if="org_id ==10598">引血100ml/min</span>
678
+                                >【开始透析】 <span>引血100ml/min</span>
679 679
                                 </template>
680 680
 
681 681
                               {{ monitor.end }} {{ monitor.symptom }} &nbsp;{{
@@ -2207,14 +2207,14 @@ export default {
2207 2207
           if (Object.keys(monitor).length > 0 && index > 1) {
2208 2208
             if ((this.dialysisOrder &&monitor.operate_time == this.dialysisOrder.end_time)&&(this.org_id!=10414)) {
2209 2209
               if(this.org_id!=10683){
2210
-                this.monitors[index].end = "【结束透析】";
2210
+                this.monitors[index].end = "【结束透析】回血100ml/min";
2211 2211
               }
2212 2212
 
2213 2213
               tempmonitorflag = false;
2214 2214
             }
2215 2215
             if ((tempmonitorflag && index == this.monitors.length - 1)&&(this.org_id!=10414)) {
2216 2216
               if(this.org_id!=10683){
2217
-                this.monitors[index].end = "【结束透析】";
2217
+                this.monitors[index].end = "【结束透析】回血100ml/min";
2218 2218
               }
2219 2219
             }
2220 2220
           }

+ 13 - 6
src/xt_pages/outpatientDoctorStation/doctorDesk.vue Прегледај датотеку

@@ -61,7 +61,6 @@
61 61
               <template slot-scope="scope">
62 62
                 <span>{{ scope.row.name }}</span>
63 63
                 <span class="futou" v-if="scope.row.patient_type==4">腹</span>
64
-                <!--  v-if="scope.row.patient_type==1" -->
65 64
               </template>
66 65
             </el-table-column>
67 66
             <el-table-column prop="name" label="就诊号" width="110">
@@ -944,7 +943,7 @@ export default {
944 943
           return false
945 944
         } else {
946 945
           //挂号
947
-          console.log('response.data.data',response.data.data);
946
+          console.log('response.data.data12121212134',response.data.data);
948 947
           
949 948
           for (let i = 0; i < response.data.data.list.length; i++) {
950 949
             for (let b = 0; b < response.data.data.list[i].his_patient.length; b++) {
@@ -955,6 +954,7 @@ export default {
955 954
                   number: response.data.data.list[i].his_patient[b].number,
956 955
                   id: response.data.data.list[i].id,
957 956
                   his_patient_id: response.data.data.list[i].his_patient[b].id,
957
+                  patient_type: response.data.data.list[i].patient_type
958 958
                   // patient_type:
959 959
                 }
960 960
                 this.un_cure_data.push(obj)
@@ -965,7 +965,8 @@ export default {
965 965
                   name: response.data.data.list[i].his_patient[b].name,
966 966
                   number: response.data.data.list[i].his_patient[b].number,
967 967
                   id: response.data.data.list[i].id,
968
-                  his_patient_id: response.data.data.list[i].his_patient[b].id
968
+                  his_patient_id: response.data.data.list[i].his_patient[b].id,
969
+                  patient_type: response.data.data.list[i].patient_type
969 970
                 }
970 971
                 this.cure_data.push(obj)
971 972
               }
@@ -979,7 +980,8 @@ export default {
979 980
                 name: response.data.data.list_two[i].name,
980 981
                 number: response.data.data.list_two[i].his_patient.number,
981 982
                 id: response.data.data.list_two[i].id,
982
-                his_patient_id: response.data.data.list_two[i].his_patient.id
983
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
984
+                patient_type: response.data.data.list_two[i].patient_type
983 985
               }
984 986
               this.un_cure_data.push(obj)
985 987
             }
@@ -990,7 +992,8 @@ export default {
990 992
                 name: response.data.data.list_two[i].name,
991 993
                 number: response.data.data.list_two[i].his_patient.number,
992 994
                 id: response.data.data.list_two[i].id,
993
-                his_patient_id: response.data.data.list_two[i].his_patient.id
995
+                his_patient_id: response.data.data.list_two[i].his_patient.id,
996
+                patient_type: response.data.data.list_two[i].patient_type
994 997
               }
995 998
               this.cure_data.push(obj)
996 999
             }
@@ -5816,7 +5819,6 @@ export default {
5816 5819
       } else if (index == 20) {
5817 5820
         this.getPrescriptionList(this.patientInfo.id, this.record_date, 2, 3)
5818 5821
       }
5819
-
5820 5822
     },
5821 5823
 
5822 5824
     // changePatient(val){
@@ -5834,11 +5836,16 @@ export default {
5834 5836
     },
5835 5837
 
5836 5838
     getPrescriptionList(id, record_date, type, checkType) {
5839
+      
5837 5840
       getPrescriptionList(id, 2, record_date).then(response => {
5841
+        console.log('123456response.data.data',response.data.data,checkType);
5838 5842
         if (response.data.state == 1) {
5843
+          
5839 5844
           if (checkType != 3) {
5840 5845
             this.centerDialogVisible = true
5841 5846
             var list = response.data.data.list
5847
+           
5848
+            
5842 5849
             let arr1 = []
5843 5850
             let arr2 = []
5844 5851
             let arr3 = []