Browse Source

新分支

28169 1 year ago
parent
commit
120ebe5e65

+ 25 - 1
src/xt_pages/data/prescription.vue View File

@@ -393,6 +393,24 @@
393 393
                     </el-form-item>
394 394
                   </el-col>
395 395
 
396
+                  <el-col :span="8">
397
+                    <el-form-item label="血管通路部位:">
398
+                      <el-select
399
+                        v-model="addPlan.blood_access_part_id"
400
+                        placeholder="请选择"
401
+                      >
402
+                        <el-option :key="1" label="请选择" :value="0"></el-option>
403
+
404
+                        <el-option
405
+                          v-for="(option, index) in blood_access_part"
406
+                          :key="index"
407
+                          :label="option.name"
408
+                          :value="option.name"
409
+                        ></el-option>
410
+                      </el-select>
411
+                    </el-form-item>
412
+                  </el-col>
413
+
396 414
                   <el-col :span="8">
397 415
                     <el-form-item label="血管通路:">
398 416
                       <el-select
@@ -849,7 +867,8 @@ export default {
849 867
         ultrafiltration: "",
850 868
         blood_access: "",
851 869
         dialysis_dialyszers:"",
852
-        dialysis_irrigation:""
870
+        dialysis_irrigation:"",
871
+        blood_access_part_id:"",
853 872
       },
854 873
       system_prescription: [],
855 874
       isEdit: false,
@@ -880,6 +899,7 @@ export default {
880 899
       blood_access_option: [],
881 900
       dialysis_dialyszers:"",
882 901
       dialysis_irrigation:"",
902
+      blood_access_part:[],
883 903
     };
884 904
   },
885 905
   computed: {},
@@ -994,6 +1014,7 @@ export default {
994 1014
         stockType:[],
995 1015
         irrigations:[],
996 1016
         dialyzers:[],
1017
+        blood_access_part_id:"",
997 1018
       };
998 1019
 
999 1020
       for (const key in tempAddPlan) {
@@ -1055,6 +1076,7 @@ export default {
1055 1076
           this.addPlan.dialysis_irrigation = prescription.dialysis_irrigation
1056 1077
           this.dialysis_dialyszers = prescription.dialysis_dialyszers
1057 1078
           this.dialysis_irrigation = prescription.dialysis_irrigation
1079
+          this.addPlan.blood_access_part_id = prescription.blood_access_part_id
1058 1080
         }
1059 1081
       });
1060 1082
     },
@@ -1199,6 +1221,8 @@ export default {
1199 1221
     this.displace_liqui_part_option = this.$store.getters.displace_liqui;
1200 1222
     this.blood_access_option = getDataConfig('hemodialysis', 'vascular_access_desc')
1201 1223
     console.log("列表33333333血管通路",this.blood_access_option)
1224
+
1225
+    this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
1202 1226
     this.addPlan.mode = 1;
1203 1227
     this.dialyzerPerfusionApparatus = getDataConfig(
1204 1228
       'hemodialysis',

+ 6 - 0
src/xt_pages/dialysis/details/DialysisPrescription.vue View File

@@ -391,6 +391,12 @@
391 391
           <span v-if="this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29" class="unit">{{ displace_liqui != "0" ? "ml" : "" }}</span>
392 392
         </li>
393 393
 
394
+        <li v-if="isShow('血管通路部位')">
395
+          <label>血管通路部位: </label>
396
+          <span class="content">{{ this.prescription.blood_access_part_id }}</span>
397
+          <span class="unit"></span>
398
+        </li>
399
+
394 400
         <li v-if="isShow('血管通路')">
395 401
           <label>血管通路: </label>
396 402
           <span class="content">{{ blood_access }}</span>

+ 1 - 1
src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue View File

@@ -1600,7 +1600,7 @@ export default {
1600 1600
         }
1601 1601
       }
1602 1602
 
1603
-      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517){
1603
+      if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 || this.$store.getters.xt_user.org.id == 10517 || this.$store.getters.xt_user.org.id == 10580){
1604 1604
          var date = new Date()
1605 1605
           var year = date.getFullYear()
1606 1606
           var month = date.getMonth() + 1

+ 31 - 0
src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue View File

@@ -889,6 +889,13 @@
889 889
                         </el-form-item>
890 890
                     </el-col>
891 891
 
892
+                    <el-col :span="8">
893
+                      <el-form-item label="血管通路部位: " :prop="isName('血管通路部位')"
894
+                        :rules="isCheckmust('血管通路部位')" v-if="isShows('血管通路部位')">
895
+                        <el-input v-model="dialysisPrescription.blood_access_part_id" readonly @focus="showInnerDialog('17')"></el-input>
896
+                      </el-form-item>
897
+                    </el-col>
898
+
892 899
                     <el-col :span="8" v-if="isShows('血管通路')">
893 900
                         <el-form-item label="血管通路:" prop="blood_access" :rules="isCheckmust('血管通路')">
894 901
                             <el-select
@@ -1735,6 +1742,7 @@
1735 1742
           chaptalization:"",
1736 1743
           warsh_count:"",
1737 1744
           washing_time:"",
1745
+          blood_access_part_id:""
1738 1746
         },
1739 1747
 
1740 1748
         anticoagulant: {
@@ -1786,6 +1794,7 @@
1786 1794
         infoDialogVisible:false,
1787 1795
         selected_date:"",
1788 1796
         remark:"",
1797
+        blood_access_part: [],
1789 1798
       }
1790 1799
 
1791 1800
     },
@@ -1882,6 +1891,14 @@ mu
1882 1891
             this.InnerDialogProps.type = 'dialysis_strainer'
1883 1892
             this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_strainer
1884 1893
             this.InnerDialogProps.isShowTextArea = false
1894
+            break
1895
+          case '17': // 水肿
1896
+            this.InnerDialogProps.values = this.blood_access_part
1897
+            this.InnerDialogProps.titles = '血管通路部位'
1898
+            this.InnerDialogProps.type = 'blood_access_part_id'
1899
+            this.InnerDialogProps.selected = this.dialysisPrescription.blood_access_part_id
1900
+            this.InnerDialogProps.isShowTextArea = false
1901
+
1885 1902
             break
1886 1903
         }
1887 1904
       },
@@ -1963,6 +1980,9 @@ mu
1963 1980
           case 'dialysis_strainer':
1964 1981
             this.dialysisPrescription.dialysis_strainer = val.value.join(',')
1965 1982
             break
1983
+          case 'blood_access_part_id':
1984
+            this.dialysisPrescription.blood_access_part_id = val.value.join(',')
1985
+           break
1966 1986
         }
1967 1987
       },
1968 1988
       innerDialogCancle: function() {
@@ -2616,6 +2636,14 @@ mu
2616 2636
             } else if (schedual.schedule_type == 3) {
2617 2637
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
2618 2638
             }
2639
+           }else if(this.$store.getters.xt_user.org.id == 10580){
2640
+              if (schedual.schedule_type == 1) {
2641
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
2642
+            } else if (schedual.schedule_type == 2) {
2643
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
2644
+            } else if (schedual.schedule_type == 3) {
2645
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
2646
+            }
2619 2647
            }else if(this.$store.getters.xt_user.org.id == 10517){
2620 2648
               if (schedual.schedule_type == 1) {
2621 2649
               this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
@@ -5047,12 +5075,15 @@ mu
5047 5075
       console.log("schedual232323323232323232",this.adminRoles)
5048 5076
       this.illnessList = getDataConfig('hemodialysis', 'illness')
5049 5077
 
5078
+      this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
5050 5079
       this.plasmaSeparatorList = getDataConfig('hemodialysis', 'plasma_separator')
5051 5080
 
5052 5081
       this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis', 'bilirubin_adsorption_column')
5053 5082
 
5054 5083
 
5055 5084
       this.educationList = getDataConfig('dialysis_remark', 'dialysis_remark')
5085
+
5086
+     
5056 5087
       console.log("透析准备232323232323wo",this.educationList)
5057 5088
     }
5058 5089
   }

+ 2 - 2
src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue View File

@@ -1165,8 +1165,8 @@
1165 1165
                         style="width: 600px; text-align: center"
1166 1166
                       >
1167 1167
                         {{
1168
-                          predialysis.remark
1169
-                            ? predialysis.remark
1168
+                          prescription.remark
1169
+                            ? prescription.remark
1170 1170
                             : "/"
1171 1171
                         }}
1172 1172
                       </div>

+ 8 - 1
src/xt_pages/stock/drugs/drugStockOutOrder.vue View File

@@ -354,11 +354,18 @@
354 354
             <template slot-scope="scope">
355 355
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
356 356
                   <td style="border-right: none; border-inline-end: none;text-align: center">
357
-                    <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
357
+                    <span v-if="org_id!=0 && org_id!=0">
358
+                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
358 359
                     <span v-if="is_sys == 0">
359 360
                       <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span> 
360 361
                       <span v-if="scope.row.child.length > 1">{{item.count * item.price}}</span> 
361 362
                     </span>
363
+                    </span>
364
+
365
+                    <span v-if="org_id==0 || org_id ==10480">
366
+                      {{(item.count * item.price).toFixed(2)}}
367
+                    </span>
368
+                  
362 369
 
363 370
                   </td>
364 371
                </tr>

+ 38 - 0
src/xt_pages/user/dialysisSolution.vue View File

@@ -645,6 +645,25 @@
645 645
             </el-form-item>
646 646
           </el-col>
647 647
 
648
+         
649
+          
650
+          <el-col :span="8" v-if="isShows('血管通路部位')">
651
+            <el-form-item label="血管通路部位:">
652
+              <el-select v-model="addPlan.blood_access_part_id" placeholder="请选择">
653
+                <el-option :key="0" label="请选择" :value="0"></el-option>
654
+
655
+                <el-option
656
+                  v-for="(option, index) in blood_access_part"
657
+                  :key="index"
658
+                  :label="option.name"
659
+                  :value="option.name"
660
+                ></el-option>
661
+              </el-select>
662
+            </el-form-item>
663
+          </el-col>
664
+
665
+
666
+
648 667
           <el-col :span="8" v-if="isShows('血管通路')">
649 668
             <el-form-item label="血管通路:">
650 669
               <el-select v-model="addPlan.blood_access" placeholder="请选择">
@@ -1085,6 +1104,7 @@
1085 1104
           amylaceum:"",
1086 1105
           dialysis_strainer:"",
1087 1106
           chaptalization:"",
1107
+          blood_access_part_id:"",
1088 1108
         },
1089 1109
         childPlan: {
1090 1110
           mode: '',
@@ -1231,6 +1251,7 @@
1231 1251
         limitOne:10,
1232 1252
         startShow:false,
1233 1253
         solutionDetail:{},
1254
+        blood_access_part:[],
1234 1255
       }
1235 1256
     },
1236 1257
     watch: {
@@ -1376,6 +1397,15 @@
1376 1397
             this.InnerDialogProps.isShowTextArea = false
1377 1398
 
1378 1399
             break
1400
+
1401
+            case '17': // 水肿
1402
+            this.InnerDialogProps.values = this.blood_access_part
1403
+            this.InnerDialogProps.titles = '血管通路部位'
1404
+            this.InnerDialogProps.type = 'blood_access_part_id'
1405
+            this.InnerDialogProps.selected = this.addPlan.blood_access_part_id
1406
+            this.InnerDialogProps.isShowTextArea = false
1407
+
1408
+            break
1379 1409
         }
1380 1410
       },
1381 1411
       innerDialogComfirm: function(val) {
@@ -1403,6 +1433,11 @@
1403 1433
           case 'dialysis_strainer':
1404 1434
              this.dialysis_strainer = val.value.join(',')
1405 1435
             break
1436
+          case 'blood_access_part_id':
1437
+            this.addPlan.blood_access_part_id = val.value.join(',')
1438
+
1439
+          console.log("数据2o",this.addPlan.blood_access_part_id)
1440
+           break
1406 1441
         }
1407 1442
       },
1408 1443
       innerDialogCancle: function() {
@@ -2626,8 +2661,11 @@
2626 2661
       )
2627 2662
       this.plasmaSeparatorList = getDataConfig('hemodialysis','plasma_separator')
2628 2663
       this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis','bilirubin_adsorption_column')
2664
+     
2629 2665
       this.queryParams.id = this.patientID
2630 2666
 
2667
+      this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
2668
+
2631 2669
 
2632 2670
     }
2633 2671
   }