Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/data/prescription.vue

@@ -393,6 +393,24 @@
                     </el-form-item>
                   </el-col>
 
+                  <el-col :span="8">
+                    <el-form-item label="血管通路部位：">
+                      <el-select
+                        v-model="addPlan.blood_access_part_id"
+                        placeholder="请选择"
+                      >
+                        <el-option :key="1" label="请选择" :value="0"></el-option>
+
+                        <el-option
+                          v-for="(option, index) in blood_access_part"
+                          :key="index"
+                          :label="option.name"
+                          :value="option.name"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+
                   <el-col :span="8">
                     <el-form-item label="血管通路：">
                       <el-select
@@ -849,7 +867,8 @@ export default {
         ultrafiltration: "",
         blood_access: "",
         dialysis_dialyszers:"",
-        dialysis_irrigation:""
+        dialysis_irrigation:"",
+        blood_access_part_id:"",
       },
       system_prescription: [],
       isEdit: false,
@@ -880,6 +899,7 @@ export default {
       blood_access_option: [],
       dialysis_dialyszers:"",
       dialysis_irrigation:"",
+      blood_access_part:[],
     };
   },
   computed: {},
@@ -994,6 +1014,7 @@ export default {
         stockType:[],
         irrigations:[],
         dialyzers:[],
+        blood_access_part_id:"",
       };
 
       for (const key in tempAddPlan) {
@@ -1055,6 +1076,7 @@ export default {
           this.addPlan.dialysis_irrigation = prescription.dialysis_irrigation
           this.dialysis_dialyszers = prescription.dialysis_dialyszers
           this.dialysis_irrigation = prescription.dialysis_irrigation
+          this.addPlan.blood_access_part_id = prescription.blood_access_part_id
         }
       });
     },
@@ -1199,6 +1221,8 @@ export default {
     this.displace_liqui_part_option = this.$store.getters.displace_liqui;
     this.blood_access_option = getDataConfig('hemodialysis', 'vascular_access_desc')
     console.log("列表33333333血管通路",this.blood_access_option)
+
+    this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
     this.addPlan.mode = 1;
     this.dialyzerPerfusionApparatus = getDataConfig(
       'hemodialysis',

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -391,6 +391,12 @@
           <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>
         </li>
 
+        <li v-if="isShow('血管通路部位')">
+          <label>血管通路部位: </label>
+          <span class="content">{{ this.prescription.blood_access_part_id }}</span>
+          <span class="unit"></span>
+        </li>
+
         <li v-if="isShow('血管通路')">
           <label>血管通路: </label>
           <span class="content">{{ blood_access }}</span>

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1600,7 +1600,7 @@ export default {
         }
       }
 
-      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){
+      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){
          var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -889,6 +889,13 @@
                         </el-form-item>
                     </el-col>
 
+                    <el-col :span="8">
+                      <el-form-item label="血管通路部位： " :prop="isName('血管通路部位')"
+                        :rules="isCheckmust('血管通路部位')" v-if="isShows('血管通路部位')">
+                        <el-input v-model="dialysisPrescription.blood_access_part_id" readonly @focus="showInnerDialog('17')"></el-input>
+                      </el-form-item>
+                    </el-col>
+
                     <el-col :span="8" v-if="isShows('血管通路')">
                         <el-form-item label="血管通路：" prop="blood_access" :rules="isCheckmust('血管通路')">
                             <el-select
@@ -1735,6 +1742,7 @@
           chaptalization:"",
           warsh_count:"",
           washing_time:"",
+          blood_access_part_id:""
         },
 
         anticoagulant: {
@@ -1786,6 +1794,7 @@
         infoDialogVisible:false,
         selected_date:"",
         remark:"",
+        blood_access_part: [],
       }
 
     },
@@ -1882,6 +1891,14 @@ mu
             this.InnerDialogProps.type = 'dialysis_strainer'
             this.InnerDialogProps.selected = this.dialysisPrescription.dialysis_strainer
             this.InnerDialogProps.isShowTextArea = false
+            break
+          case '17': // 水肿
+            this.InnerDialogProps.values = this.blood_access_part
+            this.InnerDialogProps.titles = '血管通路部位'
+            this.InnerDialogProps.type = 'blood_access_part_id'
+            this.InnerDialogProps.selected = this.dialysisPrescription.blood_access_part_id
+            this.InnerDialogProps.isShowTextArea = false
+
             break
         }
       },
@@ -1963,6 +1980,9 @@ mu
           case 'dialysis_strainer':
             this.dialysisPrescription.dialysis_strainer = val.value.join(',')
             break
+          case 'blood_access_part_id':
+            this.dialysisPrescription.blood_access_part_id = val.value.join(',')
+           break
         }
       },
       innerDialogCancle: function() {
@@ -2616,6 +2636,14 @@ mu
             } else if (schedual.schedule_type == 3) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
             }
+           }else if(this.$store.getters.xt_user.org.id == 10580){
+              if (schedual.schedule_type == 1) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
+            } else if (schedual.schedule_type == 2) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '11:00'
+            } else if (schedual.schedule_type == 3) {
+              this.start_time = year + '-' + month + '-' + day + ' ' + '15:00'
+            }
            }else if(this.$store.getters.xt_user.org.id == 10517){
               if (schedual.schedule_type == 1) {
               this.start_time = year + '-' + month + '-' + day + ' ' + '7:00'
@@ -5047,12 +5075,15 @@ mu
       console.log("schedual232323323232323232",this.adminRoles)
       this.illnessList = getDataConfig('hemodialysis', 'illness')
 
+      this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
       this.plasmaSeparatorList = getDataConfig('hemodialysis', 'plasma_separator')
 
       this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis', 'bilirubin_adsorption_column')
 
 
       this.educationList = getDataConfig('dialysis_remark', 'dialysis_remark')
+
+     
       console.log("透析准备232323232323wo",this.educationList)
     }
   }

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

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

src/xt_pages/outpatientCharges/chargeDetailManagement.vue

@@ -671,6 +671,8 @@ export default {
 
               } else {
                 that.radio = 1
+                that.getPatientList()
+
                 that.$message({ message: '撤销成功', type: 'success', duration: 5000 })
               }
 
@@ -715,6 +717,7 @@ export default {
 
               } else {
                 that.radio = 2
+                that.getPatientList()
                 that.$message({ message: '上传成功', type: 'success', duration: 5000 })
               }
             }
@@ -813,18 +816,34 @@ export default {
             case 1:
               this.all_table_data = response.data.data.list
               this.patientTableData = response.data.data.list
-              this.$refs.tab.setCurrentRow(this.patientTableData[0])
-              this.getPatientInformation(this.patientTableData[0].id)
+              if (this.hisPatientInfo&&this.hisPatientInfo.id > 0){
+                for(let i = 0; i < this.patientTableData.length;i++){
+                  if(this.hisPatientInfo.id == this.patientTableData[i].id){
+                    this.$refs.tab.setCurrentRow(this.patientTableData[i])
+                  }
+                }
+              }else{
+                this.$refs.tab.setCurrentRow(this.patientTableData[0])
+                this.getPatientInformation(this.patientTableData[0].id)
+              }
               break
             case 2:
               this.all_table_data = response.data.data.list_two
               this.patientTableData = response.data.data.list_two
               this.upload_list = response.data.data.upload_list
               this.all_upload_list = response.data.data.upload_list
+              if (this.hisPatientInfo && this.hisPatientInfo.id > 0){
+                for(let i = 0; i < this.upload_list.length;i++){
+                  if(this.hisPatientInfo.id == this.upload_list[i].his_patient.id){
+                    this.$refs.tab.setCurrentRow(this.upload_list[i])
+                    this.getPatientInformation(this.upload_list[0].id)
 
-              this.$refs.tab.setCurrentRow(this.upload_list[0])
-              console.log(this.upload_list[0].id)
-              this.getPatientInformationtwo(this.upload_list[0].id)
+                  }
+                }
+              }else{
+                this.$refs.tab.setCurrentRow(this.upload_list[0])
+                this.getPatientInformation(this.upload_list[0].id)
+              }
               break
           }
         }

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -322,7 +322,7 @@
                                       </template>
                                     </el-table-column>
 
-                                      <el-table-column label="库存" width="60" v-if="org_id != 10206">
+                                      <el-table-column label="库存" width="60" v-if="org_id != 10206 && org_id != 0">
                                           <template slot-scope="scope">
                                              <!-- <span v-if="org_id == 9671 || org_id == 9675 || org_id == 4 || org_id == 10138 || org_id == 3877 || org_id == 10028 || org_id == 10243 || org_id == 10088 || org_id == 10245 || org_id == 9919 || org_id == 10106 || org_id == 9504 || org_id ==10215 || org_id == 10188 || org_id == 10265 || org_id == 10164 || org_id ==9956 || org_id == 10188 || org_id == 10191 || org_id == 10278 || org_id == 10217 || org_id ==10210 || org_id ==record_date ||org_id ==10340">
                                              <span v-if="scope.row.count/scope.row.min_number>0">{{Math.floor(scope.row.count/scope.row.min_number)}}{{scope.row.max_unit}}</span>
@@ -336,7 +336,7 @@
                                       </el-table-column>
 
 <!--                                    //针对对接坐标系统的，使用坐标的库存数据-->
-                                    <el-table-column label="库存" width="60" v-if="org_id == 10206">
+                                    <el-table-column label="库存" width="60" v-if="org_id == 10206 || org_id == 0">
                                       <template slot-scope="scope">
                                         <span>{{scope.row.zuobiao_stock_num}}</span>
                                       </template>
@@ -422,10 +422,10 @@
                                             :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
                                             highlight-current-row>
                                       <el-table-column type="selection" width="40" align="center"></el-table-column>
-                                      <el-table-column prop="name" label="名称" v-if="org_id != 10206">
+                                      <el-table-column prop="name" label="名称" v-if="org_id != 10206 && org_id != 0">
                                           <template slot-scope="scope">{{ scope.row.project_name }}</template>
                                       </el-table-column>
-                                    <el-table-column prop="name" label="名称" v-if="org_id == 10206">
+                                    <el-table-column prop="name" label="名称" v-if="org_id == 10206 || org_id == 0">
                                       <template slot-scope="scope">{{ scope.row.project_name }}{{scope.row.number}}</template>
                                     </el-table-column>
                                       <el-table-column label="规格" width="60">
@@ -581,6 +581,7 @@ export default {
   },
   data() {
     return {
+      drugs:[],
       zuobiao_project:[],
       start_time: moment(new Date()).subtract(30, 'days').format('YYYY-MM-DD'),
       end_time: moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
@@ -642,7 +643,7 @@ export default {
       form: {
         name: ''
       },
-      drugs: [],
+
       allDrugs: [],
       advices_template: [],
       additions: [],
@@ -738,7 +739,7 @@ export default {
     getzuobiao(){
       if(this.org_id == 10206){
         var that = this
-        axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystock', {
+        axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystockgood', {
 
         })
           .then(function(response) {
@@ -2232,7 +2233,9 @@ export default {
       if(this.org_id == 10206 || this.org_id == 0){
         this.departmentValue = 263
         this.state1 = 677
-        this.diagnose.push(716)
+        if (this.diagnose.length == 0){
+          this.diagnose.push(716)
+        }
       }
 
     },

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -1497,10 +1497,12 @@ export default {
 
           this.additions = response.data.data.additions
 
+
+
           //针对普爱医院获取药品和耗材相关库存数据
           if(this.org_id == 10206){
             var that = this
-            axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystock', {
+            axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/querystockdrug', {
 
             })
               .then(function(response) {
@@ -1520,15 +1522,28 @@ export default {
 
                   } else {
                     that.zuobiao_drug  = response.data.data.drug
+                    console.log("坐标～～坐标")
+                    console.log(that.zuobiao_drug)
+                    console.log(response.data.data.drug)
+                    console.log("坐标～～坐标")
+
                     // that.zuobiao_project  = response.data.data.project
                     //跟坐标数据进行匹配，如果bbx01相等的话则，替换库存数量
                       for (let i = 0; i < that.zuobiao_drug.length; i++) {
                         for (let b = 0; b < that.drugs.length; b++) {
                           if (that.zuobiao_drug[i].bby01 == that.drugs[b].bby01){
                             that.drugs[b]["zuobiao_stock_num"] = that.zuobiao_drug[i].sysl
+                            that.drugs[b].min_price = that.zuobiao_drug[i].price
+
+
                           }
+
                         }
                       }
+                    console.log("坐标～～坐标")
+                    console.log(that.drugs)
+                    console.log("坐标～～坐标")
+
 
                   }
                 }
@@ -2047,7 +2062,6 @@ export default {
                   med_type: '',
                   is_medicine_status:false,
                 }
-                if(this.org_id != 10206) {
                   if (prescription.med_type == 0 || prescription.med_type == '') {
 
                     obj.med_type = ''
@@ -2060,11 +2074,10 @@ export default {
                     if (this.org_id != 10206 ) {
                       obj.med_type = 14
                     } else {
-
-                      obj.med_type = ""
+                      obj.med_type = 1
                     }
                   }
-                }
+
                 this.prescriptions.push(obj)
               }
 

src/xt_pages/role/admin.vue

@@ -25,13 +25,13 @@
         >医药师登记</el-button>
 
 
-        <el-button
+        <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
           @click="toJiaBan">加班</el-button>
-       
+        -->
 
          <!-- <el-button
           type="primary"

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -354,11 +354,18 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <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>
+                    <span v-if="org_id!=0 && org_id!=0">
+                      <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>
                     <span v-if="is_sys == 0">
                       <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span> 
                       <span v-if="scope.row.child.length > 1">{{item.count * item.price}}</span> 
                     </span>
+                    </span>
+
+                    <span v-if="org_id==0 || org_id ==10480">
+                      {{(item.count * item.price).toFixed(2)}}
+                    </span>
+                  
 
                   </td>
                </tr>

src/xt_pages/user/dialysisSolution.vue

@@ -645,6 +645,25 @@
             </el-form-item>
           </el-col>
 
+         
+          
+          <el-col :span="8" v-if="isShows('血管通路部位')">
+            <el-form-item label="血管通路部位：">
+              <el-select v-model="addPlan.blood_access_part_id" placeholder="请选择">
+                <el-option :key="0" label="请选择" :value="0"></el-option>
+
+                <el-option
+                  v-for="(option, index) in blood_access_part"
+                  :key="index"
+                  :label="option.name"
+                  :value="option.name"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+
+
           <el-col :span="8" v-if="isShows('血管通路')">
             <el-form-item label="血管通路：">
               <el-select v-model="addPlan.blood_access" placeholder="请选择">
@@ -1085,6 +1104,7 @@
           amylaceum:"",
           dialysis_strainer:"",
           chaptalization:"",
+          blood_access_part_id:"",
         },
         childPlan: {
           mode: '',
@@ -1231,6 +1251,7 @@
         limitOne:10,
         startShow:false,
         solutionDetail:{},
+        blood_access_part:[],
       }
     },
     watch: {
@@ -1376,6 +1397,15 @@
             this.InnerDialogProps.isShowTextArea = false
 
             break
+
+            case '17': // 水肿
+            this.InnerDialogProps.values = this.blood_access_part
+            this.InnerDialogProps.titles = '血管通路部位'
+            this.InnerDialogProps.type = 'blood_access_part_id'
+            this.InnerDialogProps.selected = this.addPlan.blood_access_part_id
+            this.InnerDialogProps.isShowTextArea = false
+
+            break
         }
       },
       innerDialogComfirm: function(val) {
@@ -1403,6 +1433,11 @@
           case 'dialysis_strainer':
              this.dialysis_strainer = val.value.join(',')
             break
+          case 'blood_access_part_id':
+            this.addPlan.blood_access_part_id = val.value.join(',')
+
+          console.log("数据2o",this.addPlan.blood_access_part_id)
+           break
         }
       },
       innerDialogCancle: function() {
@@ -2626,8 +2661,11 @@
       )
       this.plasmaSeparatorList = getDataConfig('hemodialysis','plasma_separator')
       this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis','bilirubin_adsorption_column')
+     
       this.queryParams.id = this.patientID
 
+      this.blood_access_part = getDataConfig('hemodialysis', 'vascular_access')
+
 
     }
   }