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

src/api/patient.js

@@ -1615,4 +1615,13 @@ export function savePatientOrderSetting(params){
     method:"get",
     params:params
   })
+}
+
+export function getPatientCountFlowList(params){
+
+  return request({
+    url:"/api/patient/getpatientcountflowlist",
+    method:"get",
+    params:params
+  })
 }

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -540,9 +540,13 @@ export default {
       console.log("this.currentRow", this.currentRow);
     
       if (this.state == 1) {
+        this.tableData = []
+        this.patients = {}
         this.getpatientdetails(0);
       }
       if (this.state == 2) {
+        this.patients = {}
+        this.tableData = []
         this.getpatientdetails(1);
       }
     },
@@ -868,6 +872,7 @@ export default {
             diagnose:res.data.data.patients.diagnose,
             zhixing:res.data.data.patients.created_time
           }
+          this.patients = {}
           this.patients =obj
           if(this.$store.getters.xt_user.org.id == 10188 || this.$store.getters.xt_user.org.id == 10217 || this.$store.getters.xt_user.org.id == 10387 ||  this.$store.getters.xt_user.org.id == 0  ||  this.$store.getters.xt_user.org.id == 10480  ){
             this.tableData = []

src/xt_pages/charging/chargin_kf.vue

@@ -6,7 +6,7 @@
     <div class="app-container">
       <div style="display: flex;">
         <div style="flex: 2;display: flex;justify-content: space-around;">
-          <!-- <div > <el-input v-model="input" placeholder="请输入内容"></el-input></div> -->
+         
           <el-autocomplete
               class="inline-input"
                v-model.trim="smart_keyword"

src/xt_pages/charging/charging_collect.vue

@@ -3,10 +3,25 @@
     <div class="position"></div>
     <div class="app-container">
       <div style="display: flex;justify-content: space-around;">
-        <div > <el-input v-model="input" placeholder="请输入内容"></el-input></div>
+        <div> 
+          <el-autocomplete
+              class="inline-input"
+               v-model.trim="smart_keyword"
+              :fetch-suggestions="querySearch"
+              placeholder="请输入内容"
+              @select="handleSelect"
+              
+            >
+           <i class="el-icon-search el-input__icon" slot="suffix"></i>
+          <template slot-scope="{ item }">
+            <div class="name">{{ item.name }}</div>
+          </template>
+          </el-autocomplete>
+        </div>
         <div>
           日期查询:
           <el-date-picker
+           @change="changeTime"
             v-model="value1"
             type="daterange"
             range-separator="至"
@@ -16,7 +31,7 @@
         </div>
         <div>
           费用类型:
-          <el-select v-model="value" placeholder="请选择">
+          <el-select v-model="is_type" placeholder="请选择">
             <el-option
               v-for="item in options"
               :key="item.value"
@@ -135,6 +150,7 @@
   </div>
 </template>
 <script>
+import {getPatientMapList,getPatientCountFlowList} from "@/api/patient"
   export default{
     data(){
       return{
@@ -145,10 +161,47 @@
         state1:'',
         collect_show:false,
         options:[{value:0,label:'全部'},{value:1,label:'充值'},{value:2,label:'扣费'}],
-        tableData: [{ index: 1, name: '小米', HD: 1, HDF: 1, 'HD+HP': 1, 'qita': 1 ,examine:false}],
+        tableData: [],
+        start_time:"",
+        end_time:"",
+        smart_keyword:"",
+        patient_id:0,
+        limit:10,
+        page:1,
+        is_type:0,
+        total:0,
       }
     },
     methods:{
+      handleSelect(val){
+        this.smart_keyword = val.name;
+        this.patient_id = val.id
+      },
+      querySearch(queryString, cb){
+        let key = ''
+        if (queryString != undefined) {
+          key = queryString
+        }
+        let searchArray = []
+         var  params = {
+          keyword:key
+         }
+        getPatientMapList(params).then(response => {
+          if (response.data.state == 1) {
+            searchArray = response.data.data.patient
+            cb(searchArray)
+          } else {
+            this.$message.error(response.data.msg)
+            cb([])
+          }
+        })
+        return searchArray
+      },
+      changeTime(val){
+       this.start_time = val[0]
+       this.end_time = val[1]
+       this.getlist()
+     },
       mingx_click(){
         this.collect_show = true
       },
@@ -164,6 +217,30 @@
       handleCurrentChange(){
 
       },
+      getlist(){
+        var params = {
+          start_time:this.start_time,
+          end_time:this.end_time,
+          patient_id:this.patient_id,
+          limit:this.limit,
+          page:this.page,
+          is_type:this.is_type,
+        }
+        getPatientCountFlowList(params).then(response=>{
+          if(response.data.state == 1){
+             var list = response.data.data.list
+             this.tableData =[]
+             this.tableData = list
+             var total = response.data.data.total
+
+             this.total = total
+          }
+        })
+      }
+    },
+    created(){
+      this.getlist()
     }
+    
   }
 </script>

src/xt_pages/dialysis/batch_print/batch_print_order_twentyEight.vue

@@ -1400,6 +1400,7 @@
                     <td width="60" style="line-height: 20px">
                       电导度<br />mS/cm
                     </td>
+                    <td width="60" style="line-height:20px" v-if="org_id == 10015">置换液流量<br />L/h</td>
                     <td width="" style="line-height: 20px">病情变化及处理</td>
                   </tr>
 
@@ -1490,7 +1491,9 @@
                         monitor.conductivity ? monitor.conductivity : ""
                       }}
                     </td>
-
+                    <td>
+                     &nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
+                    </td>
                     <td>
                       &nbsp;{{ monitor.symptom }} &nbsp;{{
                         monitor.dispose

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyEight.vue

@@ -878,6 +878,8 @@
               <td width="40" style="line-height:20px">机温<br />℃</td>
               <td width="60" style="line-height:20px">血流量<br />ml/min</td>
               <td width="60" style="line-height:20px">电导度<br />mS/cm</td>
+
+              <td width="60" style="line-height:20px" v-if="org_id == 10015">置换液流量<br />L/h</td>
               <!-- <td width="60">钠浓度<br/>mmol/L</td>
           <td width="80">透析液温度<br/>℃</td>
           <td width="60">置换率<br/>ml/min</td> -->
@@ -934,6 +936,9 @@
               <td>
                 &nbsp;{{ monitor.conductivity ? monitor.conductivity : "" }}
               </td>
+              <td>
+                &nbsp;{{ monitor.displacement_flow_quantity ? monitor.displacement_flow_quantity : "" }}
+              </td>
               <!-- <td>&nbsp;{{monitor.sodium_concentration}}</td>
           <td>&nbsp;{{monitor.dialysate_temperature}}</td>
           <td>&nbsp;{{monitor.replacement_rate}}</td> -->

src/xt_pages/dialysis/template/DialysisPrintOrdereightyone.vue

@@ -1694,27 +1694,27 @@ export default {
         for (let i in this.monitors) {
           if (this.monitors[i].operate_time != null) {
             if (this.monitors[i].blood_flow_volume == 0 ||
-              this.prescription.blood_flow_volume < 180 ||
-              this.prescription.blood_flow_volume > 300
+              this.monitors[i].blood_flow_volume < 180 ||
+              this.monitors[i].blood_flow_volume > 300
             ) {
               const obj55 = '监测第' + ((i * 1) + 1) + '行血流量'
-              monearr.push(obj55)
+              checkDate.push(obj55)
             } if (this.monitors[i].venous_pressure == 0 ||
               this.monitors[i].venous_pressure < 20 ||
               this.monitors[i].venous_pressure > 150
             ) {
               const obj56 = '监测第' + ((i * 1) + 1) + '行静脉压'
-              monearr.push(obj56)
+              checkDate.push(obj56)
             } if (this.monitors[i].ultrafiltration_rate == 0) {
               const obj57 = '监测第' + ((i * 1) + 1) + '行超滤率'
-              monearr.push(obj57)
+              checkDate.push(obj57)
             } if (this.monitors[i].ultrafiltration_volume == 0 && i != 0) {
               const obj53 = '监测第' + ((i * 1) + 1) + '行超滤量'
-              monearr.push(obj53)
+              checkDate.push(obj53)
             } if (this.monitors[i].replacement_rate == 0 && this.prescription.mode == 'HDF'
             ) {
               const obj58 = '监测第' + ((i * 1) + 1) + '行置换率'
-              monearr.push(obj58)
+              checkDate.push(obj58)
             }
             // if(this.monitors[i].displacement_quantity == 0 && this.prescription.mode =='HDF'&& i !=0){
             //   const obj54 = '监测第'+((i*1)+1)+'行置换量'
@@ -1725,19 +1725,19 @@ export default {
             ) {
               // this.monitors[i].temperature == 0
               const obj59 = '监测第' + ((i * 1) + 1) + '行钠浓度'
-              monearr.push(obj59)
+              checkDate.push(obj59)
             } if (this.monitors[i].pulse_frequency == 0 ||
               this.monitors[i].pulse_frequency < 60 ||
               this.monitors[i].pulse_frequency > 100
             ) {
               const obj60 = '监测第' + ((i * 1) + 1) + '行脉搏'
-              monearr.push(obj60)
+              checkDate.push(obj60)
             } if (this.monitors[i].breathing_rate == 0 ||
               this.monitors[i].breathing_rate < 12 ||
               this.monitors[i].breathing_rate > 20
             ) {
               const obj61 = '监测第' + ((i * 1) + 1) + '行呼吸'
-              monearr.push(obj61)
+              checkDate.push(obj61)
             } if (this.monitors[i].systolic_blood_pressure == 0 ||
               this.monitors[i].systolic_blood_pressure < 90 ||
               this.monitors[i].systolic_blood_pressure > 180 ||
@@ -1746,27 +1746,28 @@ export default {
               this.monitors[i].diastolic_blood_pressure > 120
             ) {
               const obj62 = '监测第' + ((i * 1) + 1) + '行血压'
-              monearr.push(obj62)
-            } if (this.monitors[i].temperature == 0||
-                  this.monitors[i].temperature < 36 ||
-                  this.monitors[i].temperature > 37
+              checkDate.push(obj62)
+            } if (this.monitors[i].temperature == 0 ||
+              this.monitors[i].temperature < 36 ||
+              this.monitors[i].temperature > 37
             ) {
               const obj51 = '监测第' + ((i * 1) + 1) + '行温度'
-              monearr.push(obj51)
+              checkDate.push(obj51)
             } if (this.monitors[i].transmembrane_pressure == 0 ||
               this.monitors[i].transmembrane_pressure < 20 ||
               this.monitors[i].transmembrane_pressure > 300
             ) {
               const obj52 = '监测第' + ((i * 1) + 1) + '行跨膜压'
-              monearr.push(obj52)
+              checkDate.push(obj52)
             }
           }
         }
       }
       if (monearr.length > 0) {
         checkDate = checkDate.concat(monearr)
-        console.log('1111', checkDate.concat(monearr));
+        
       }
+      console.log('1111', checkDate);
       this.getcheckData(checkDate)
     },
     getDisplaceLiquiPart: function (val) {

src/xt_pages/dialysis/template/DialysisPrintOrdereightytwo.vue

@@ -1172,6 +1172,11 @@ export default {
               tableAdvice.push(doctorAdevieInfo[i]) 
             }
            }
+          }else{
+            for(let i in doctorAdevieInfo){
+              tableAdvice.push(doctorAdevieInfo[i])
+            }
+           
           }
        
           

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

@@ -541,7 +541,9 @@
             if (scope.row.prescribing_number_unit == scope.row.drug.min_unit) {
               console.log('123',scope.row.drug.dose,scope.row.execution_frequency,scope.row.drug.min_unit)
               // 单次用量single_dose，用量单位single_dose_unit，用法delivery_way，频率execution_frequency 总量prescribing_number，规格drug.dose
-              scope.row.prescribing_number = Math.ceil((parseInt(scope.row.single_dose) * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / parseInt(this.getdrugdose(scope.row.drug.dose)) ) //  / scope.row.drug.dose
+              scope.row.prescribing_number = Math.ceil((parseFloat(scope.row.single_dose) * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / parseFloat(this.getdrugdose(scope.row.drug.dose)) ) //  / scope.row.drug.dose
+              console.log("prescribing_number=====",scope.row.prescribing_number)
+             
             } else {
               console.log(1234,scope.row.drug.dose)
               scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / (scope.row.drug.dose*1) / (scope.row.drug.min_number*1))//

src/xt_pages/outpatientDoctorStation/template/printTwoteen.vue

@@ -12,8 +12,7 @@
         <div class="printTitle" v-if="prescriptions[index].med_type == '1112'">
           {{ orgname }}第二类精神处方笺
         </div> -->
-        <div
-          class="printTitle"
+        <div class="printTitle"
           v-if="
             prescriptions[index].med_type != '1111' &&
             prescriptions[index].med_type != '1112'
@@ -61,7 +60,7 @@
             </div>
             <div style="display: flex;width: 100%;">
               <div style="flex: 1;">
-                临床诊断:{{ item.info ? getDepart(item.info.departments) : "" }}
+                临床诊断:{{ getDiagnosis(item.info.diagnosis) }}
               </div>
               <div style="flex: 1;">
                 开具日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
@@ -115,7 +114,7 @@
                   </div>
                   <div style="display: flex;width: 100%;">
                     <div style="flex: 1;">
-                      临床诊断:{{ item.info ? getDepart(item.info.departments) : "" }}
+                      临床诊断:{{ getDiagnosis(item.info.diagnosis) }}
                     </div>
                     <div style="flex: 1;">
                       开具日期:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}