导出

src/api/drug/drug_stock.js

@@ -418,6 +418,15 @@ export function getDrugCancelDetail(params){
 }
 
 
+export function getDrugAutoMaticList(params){
+  
+  return request({
+    url:"/api/drugstock/getdrugautomaticlist",
+    method:"Get",
+    params:params,
+  })
+}
+
 
 
 

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -296,6 +296,10 @@
           <span class="content" >{{ this.record.stroke_volume ? this.record.stroke_volume : ""  }}</span>
           <span class="unit">{{ this.record.stroke_volume ? "ml" : "" }}</span>
         </li>
+        <li v-if="isShow('KT/V')">
+          <label>KT/V: </label>
+          <span class="content" >{{ this.record.ktv ? this.record.ktv : ""  }}</span>
+        </li>
       </ul>
     </div>
     <div class="note">

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

@@ -595,8 +595,13 @@
             <el-input v-model="form.other_complication"></el-input>
           </el-form-item>
         </el-col>
-
+        <el-col :span="24" v-if="isShow('KT/V')">
+            <el-form-item label="KT/V：">
+              <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
+            </el-form-item>
+        </el-col>
       </el-form>
+         
 
       <span slot="footer" class="dialog-footer">
         <el-button @click="hide">取 消</el-button>
@@ -748,7 +753,8 @@ export default {
         supine_diastolic_blood_pressure:'',
         diastolic_pressure:'',
         additional_weight:'',
-        other_complication:''
+        other_complication:'',
+        ktv:""
       }
     }
   },
@@ -952,6 +958,7 @@ export default {
       data["diastolic_pressure"] = this.form.diastolic_pressure
       data["additional_weight"] = this.form.additional_weight ? parseFloat(this.form.additional_weight) : 0
       data["other_complication"] = this.form.other_complication
+      data["ktv"] = this.form.ktv
       postAssessmentAfterDislysis(ParamsQuery, data)
         .then(response => {
           this.loading = false

src/xt_pages/dialysis/template/DialysisPrintOrderThirty.vue

@@ -132,6 +132,8 @@
                          
                        <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('人造血管') > -1 ? true : false" showValue="人造血管"></label-box>
                         &nbsp;
+                       <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('扣眼') > -1 ? true : false" showValue="扣眼"></label-box>
+                        &nbsp;
                     </div>
                 </td>
                 <td width='10'></td>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -479,8 +479,27 @@
       getDictionaryDataConfig(module, filed_name) {
         return getDictionaryDataConfig(module, filed_name)
       },
-      show: function () {
-        this.form = Object.assign({}, this.resetForm)
+    show: function() {
+        this.visibility = true
+        // this.form = Object.assign({}, this.resetForm)
+        this.form.id = 0
+        this.form.settlement_value = ''
+        this.form.medical_insurance_card = ''
+        this.form.name = ''
+        this.form.gender = ''
+        this.form.medical_care = ''
+        this.form.birthda = ''
+        this.form.age = ''
+        this.form.id_card = ''
+        this.form.register = ''
+        this.form.doctor = ''
+        this.form.department = ''
+        this.form.registration_fee = ''
+        this.form.medical_expenses = ''
+        this.form.cost = ''
+        this.form.phone = ''
+        this.form.social_type = ''
+
         this.form.p_type = 14
         this.form.sick_type = this.sick[0].id
         this.form.diagnosis = this.diagnoses[0].id
@@ -498,9 +517,10 @@
         // if( this.form.social_type == 0){
         //   this.form.social_type = ""
         // }
-        this.visibility = true
 
-      }, hide: function () {
+      },
+      
+      hide: function () {
         this.visibility = false
         this.$refs['formValue'].resetFields()
       }, cancel: function (formName) {

src/xt_pages/outpatientDoctorStation/components/deskPrescription.vue

@@ -360,6 +360,9 @@
                 </div>
               </el-tab-pane>
               <el-tab-pane label="项目组套" name="2">
+                <el-input style="width:100%;" @input="searchProjectList" @keyup.enter.native='searchProjectList'
+                            v-model.trim="project_item_keyword"
+                            placeholder="请输入项目组套名称"></el-input>
                 <div style="width: 100%;flex:1;overflow-y: auto;">
                   <el-table :data="tabPrjectTeam" border
                             :height="multipleTableHeight != '' ? multipleTableHeight : '200'"
@@ -573,8 +576,9 @@
             }
           }
         },
-        hisList:[]
-
+        hisList:[],
+        project_item_keyword:"",
+        projectList:[] 
       }
     },
     methods: {
@@ -1393,7 +1397,8 @@
         }
         this.$refs.additionalCharges.hide()
 
-      }, searchProjectAction() {
+      }, 
+      searchProjectAction() {
 
         if (this.search_project_keyword.length == 0) {
           this.tabProject = this.allProject
@@ -1410,6 +1415,20 @@
         }
 
       },
+      searchProjectList(){
+         if(this.project_item_keyword.length == 0){
+             this.tabPrjectTeam = this.projectList
+         }else{
+           let arr = []
+           for(let i=0;i<this.projectList.length;i++){
+              if(this.projectList[i].project_team.indexOf(this.project_item_keyword)!=-1){
+                 arr = arr.concat(this.projectList[i])
+              }
+           }
+           this.tabPrjectTeam = arr
+         }
+      },
+
       searchAction() {
         if (this.search_keyword.length == 0) {
           this.drugs = this.allDrugs
@@ -1932,6 +1951,8 @@
               'prescriptions': this.prescriptions
             }
             isLoading = true
+           
+            
             createHisPrescription(data, params).then(response => {
               if (response.data.state == 1) {
                 this.$emit('change')
@@ -2464,6 +2485,7 @@
             var team = response.data.data.team
             console.log("team2222",team)
             this.tabPrjectTeam = team
+            this.projectList = team
           }
         })
       },

src/xt_pages/qcd/basicInformationAnalysis.vue

@@ -63,13 +63,13 @@
           :picker-options="pickerOptions"
         ></el-date-picker>
       </div>
-       <!-- <div class="cell clearfix">
+       <div class="cell clearfix">
         <label class="title"><span class="name">转归情况</span> : </label>
         <div class="time ">
           <ul class="">
             <li
               :class="item.lapseto == lapsetoType ? 'active' : ''"
-              @click="selectLapseTo(item.lapseto)"
+              @click="selectLapseOne(item.lapseto)"
               v-for="item in lapsetoArr"
               :key="item.value"
             >
@@ -77,8 +77,8 @@
             </li>
           </ul>
         </div>
-      </div> -->
-      <!-- <div class="cell clearfix">
+      </div>
+      <div class="cell clearfix">
         <label class="title"><span class="name">病人来源</span> : </label>
         <div class="time ">
           <ul class="">
@@ -92,7 +92,7 @@
             </li>
           </ul>
         </div>
-      </div> -->
+      </div>
 
        <div class="cell clearfix" v-show="treatShow">
         <label class="title">
@@ -243,10 +243,12 @@
                 <p class="infoTitle">转归统计(总人数{{patientCount}}人)</p>
               </div>
               <div class="borderBox1">
-                <p>留治:{{rollOutTotal}}人({{(rollOutTotal/patientCount*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="(rollOutTotal/patientCount*100).toFixed(1)"></el-progress>
-                <p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
-                <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
+                 <span v-if="lapsetoType == 0 || lapsetoType == 1"><p>留治:{{rollOutTotal}}人({{(rollOutTotal/patientCount*100).toFixed(1)}}%)</p>
+                  <el-progress :percentage="(rollOutTotal/patientCount*100).toFixed(1)"></el-progress>
+                </span>
+                <span v-if="lapsetoType == 0 || lapsetoType == 2"><p>转出:{{outTotal}}人({{(outTotal/patientCount*100).toFixed(1)}}%)</p>
+                 <el-progress :percentage="(outTotal/patientCount*100).toFixed(1)"></el-progress>
+                </span> 
               </div>
             </div>
             <div class="infoOne">
@@ -327,7 +329,7 @@
         </div>
         <div>
 
-        <div class="cell clearfix" v-show="treatShow">
+        <!-- <div class="cell clearfix" v-show="treatShow">
         <label class="title">
           <span class="name">转归状态</span> :
         </label>
@@ -341,7 +343,7 @@
             >{{ item.label }}</li>
           </ul>
         </div>
-       </div>
+       </div> -->
 
           <p style="font-size: 16px;font-weight: bold;color: #000;">转归统计</p>
           <line-chart :options="bar"></line-chart>
@@ -421,7 +423,7 @@ export default {
         { value: 0, label: '全部', source: 0, lapseto: 0 },
         { value: 1, label: '转出', source: 0, lapseto: 2 },
         { value: 2, label: '留治', source: 0, lapseto: 1 },
-        { value: 3, label: '死亡', source:0,  lapseto: 3 },
+        // { value: 3, label: '死亡', source:0,  lapseto: 3 },
       ],
       sourceType: 0,
       sourceArr: [
@@ -652,7 +654,7 @@ export default {
         //统计转归状态
         this.getTotalLapseCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计男女比例
-        this.getTotalSexCount(timeStar,timeEnd)
+        this.getTotalSexCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
         //统计传染病
         this.getTotalInfectiousCount(this.listQuery.start_time,this.listQuery.end_time,this.lapsetoType,this.sourceType)
         //统计年龄
@@ -662,7 +664,7 @@ export default {
         this.start = timeStar
         this.end =timeEnd
         this.getCountModeId()
-        this.getRolloutCount(timeStar,timeEnd)
+        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
       }
     },
     changeEndTime(val) {
@@ -690,7 +692,7 @@ export default {
         this.start = timeStar
         this.end =timeEnd
         this.getCountModeId()
-        this.getRolloutCount(timeStar,timeEnd)
+        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
       }
     },
     selectLapseTo(state) {
@@ -728,7 +730,7 @@ export default {
         this.start = timeStar
         this.end = timeEnd
         this.getCountModeId()
-        this.getRolloutCount(timeStar,timeEnd)
+        this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
       }
       //近三月
       if(state == 1){
@@ -757,7 +759,7 @@ export default {
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
-        this.getRolloutCount(startunitx,endunitx)
+        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
       }
 
      //近半年
@@ -788,7 +790,7 @@ export default {
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
-        this.getRolloutCount(startunitx,endunitx)
+        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
      }
 
      //近一年
@@ -815,11 +817,10 @@ export default {
         this.getTotalAgeCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
         //统计透析年龄
         this.getTotalDialysisCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
-
         this.start = startunitx
         this.end = endunitx
         this.getCountModeId()
-        this.getRolloutCount(startunitx,endunitx)
+        this.getRolloutCount(startunitx,endunitx,this.lapsetoType,this.sourceType)
      }
 
 
@@ -846,8 +847,8 @@ export default {
           this.modetype = modetype
           var total =  response.data.data.total
           
-          // this.total = total.count
-          this.total = total
+          this.total = total.count
+          // this.total = total
           // console.log("数据",this.modetype)
           var modedate = response.data.data.modetype
           for(let i=0;i<modedate.length;i++){
@@ -919,60 +920,52 @@ export default {
       })
     },
     //统计转归
-    getTotalLapseCount(startDate,endDate){
+    getTotalLapseCount(startDate,endDate,lapsetoType,sourceType ){
+   
        this.modesDataTwo.series = []
        this.modesDataTwo.xAxis = []
-      getTotalLapseCount(startDate,endDate).then(response=>{
+      getTotalLapseCount(startDate,endDate,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
            var arr = [
              {name:"留治",count:0},
              {name:"转出",count:0}
            ]
           var patients =  response.data.data.patients
-
+      
           this.rollOutTotal = patients.length
+
           var patienttwo = response.data.data.patienttwo
           this.outTotal = patienttwo.length
           var count = response.data.data.count
           this.patientCount = count
 
           var rollout = response.data.data.rollout
-          console.log("rollout",rollout)
+        
 
           for(let i=0;i<arr.length;i++){
             arr[0].count = this.rollOutTotal
             arr[1].count = this.outTotal
           }
-
-          // for(let j=0;j<arr.length;j++){
-          //   this.modesDataTwo.xAxis.push(arr[j].name)
-          //   this.modesDataTwo.series.push(((arr[j].count/count)*100).toFixed(1))
-          // }
-          // this.bar.series[0].data = this.modesDataTwo.series
-          // this.bar.xAxis.data = this.modesDataTwo.xAxis
-          // this.getArrLength(this.bar.xAxis.data)
-
          }
       })
     },
     //统计男女比例
-    getTotalSexCount(timeStar,timeEnd){
-      getTotalSexCount(timeStar,timeEnd).then(response=>{
+    getTotalSexCount(timeStar,timeEnd,lapsetoType,sourceType){
+      getTotalSexCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
         if(response.data.state === 1){
+          console.log("resp2222",response.data.data.totalWoman)
           var total = response.data.data.total
-        //  console.log("总人数",total)
           this.totalGender = total
           var totalMan = response.data.data.totalSex
-       //  console.log("男人",totalMan)
           this.totalMan = totalMan
-          var totalWoman = total - totalMan
+          var totalWoman = response.data.data.totalWoman
           this.totalWoman = totalWoman
         }
       })
     },
     //统计传染病
-    getTotalInfectiousCount(timeStar,timeEnd){
-       getTotalInfectiousCount(timeStar,timeEnd).then(response=>{
+    getTotalInfectiousCount(timeStar,timeEnd,lapsetoType,sourceType){
+       getTotalInfectiousCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
            if(response.data.state === 1){
              this.InfectiousTotal = response.data.data.total
              var infectious = response.data.data.count
@@ -995,11 +988,10 @@ export default {
            }
        })
     },
-    getTotalAgeCount(timeStar,timeEnd){
-      getTotalAgeCount(timeStar,timeEnd).then(response=>{
+    getTotalAgeCount(timeStar,timeEnd,lapsetoType,sourceType){
+      getTotalAgeCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
           var ageCount =  response.data.data.ageCount
-          // console.log("ageCount",ageCount)
           var arr = []
           arr =  ageCount.sort(this.compare('age'))
           this.ageCount = arr
@@ -1017,8 +1009,8 @@ export default {
           }
       },
     //统计透析年龄
-    getTotalDialysisCount(timeStar,timeEnd){
-      getTotalDialysisCount(timeStar,timeEnd).then(response=>{
+    getTotalDialysisCount(timeStar,timeEnd,lapsetoType,sourceType){
+      getTotalDialysisCount(timeStar,timeEnd,lapsetoType,sourceType).then(response=>{
          if(response.data.state == 1){
            var dataage =  response.data.data.dataage
           //  console.log("dataage",dataage)
@@ -1175,7 +1167,9 @@ export default {
        this.modesDataTwo.xAxis = []
         const params = {
           start_time:this.start,
-          end_time:this.end
+          end_time:this.end,
+          lapsetotype:this.lapsetoType,
+          sourcetype:this.sourceType,
         }
       getRolloutCount(params).then(response=>{
          if(response.data.state == 1){
@@ -1224,8 +1218,10 @@ export default {
       this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getRolloutCount(this.lapsetoType,this.sourceType)
     },
-    selectLapseTo(lapseto) {
+    selectLapseOne(lapseto) {
+      console.log("lapseto22222",lapseto)
       this.lapsetoType = lapseto
       this.getDialysisModeType(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalLapseCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
@@ -1233,6 +1229,7 @@ export default {
       this.getTotalInfectiousCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalAgeCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
       this.getTotalDialysisCount(this.startDate,this.endDate,this.lapsetoType,this.sourceType)
+      this.getRolloutCount(this.lapsetoType,this.sourceType)
     },
   },
   created() {
@@ -1269,7 +1266,7 @@ export default {
       this.start = timeStar
       this.end = timeEnd
 
-     this.getRolloutCount(timeStar,timeEnd)
+     this.getRolloutCount(timeStar,timeEnd,this.lapsetoType,this.sourceType)
 
 
   },

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -293,7 +293,7 @@ import {
   GetAllConfig,
   getDrugWarehouseInfoList,
   getDrugWarehouseList,
-  
+ 
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 
@@ -339,6 +339,7 @@ export default {
     this.GetWarehouse();
     // this.GetConfigInfo();
     this.fetchAllAdminUsers();
+   
   },
   data() {
     return {
@@ -665,7 +666,8 @@ export default {
           });
         })
         .catch(() => {});
-    }
+    },
+   
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -145,7 +145,7 @@
                 size="small"
                 type="warning"
                 icon="el-icon-document"
-                @click="handleSearch(scope.row.id)"
+                @click="handleSearch(scope.row.id,scope.row.warehouse_out_time,scope.row.warehouse_out_order_number)"
               >
               </el-button>
             </el-tooltip>
@@ -233,7 +233,8 @@
               <span>单价</span>
             </template>
             <template slot-scope="scope">
-              <span>{{scope.row.price}}</span>
+              <!-- <span>{{scope.row.price}}</span> -->
+              <span>{{getRetailPrice(scope.row.drug_id)}}</span>
             </template>
           </el-table-column>
 
@@ -242,13 +243,15 @@
               <span>出库数量</span>
             </template>
             <template slot-scope="scope">
-              <span>{{scope.row.count}}</span>
-
+              <span v-if="drugConfig.is_open == 0 || drugConfig.is_open ==2 ">{{scope.row.count}}</span>
+              <span v-if="drugConfig.is_open ==1">{{getDrugCount(scope.row.drug_id)}}</span>
             </template>
           </el-table-column>
           <el-table-column label="总价" min-width="20" align="center">
             <template slot-scope="scope">
-              {{calculate(scope.row.price*scope.row.count)}}
+              <!-- {{calculate(scope.row.price*scope.row.count)}} -->
+              <span v-if="drugConfig.is_open == 0 || drugConfig.is_open == 2">{{(scope.row.count * getRetailPrice(scope.row.drug_id)).toFixed(2)}}</span>
+              <span v-if="drugConfig.is_open == 1">{{(getRetailPrice(scope.row.drug_id) * getDrugCount(scope.row.drug_id)).toFixed(2)}}</span>
             </template>
           </el-table-column>
 
@@ -357,7 +360,8 @@ import {
   GetAllConfig,
   getDrugWarehouseOutList,
   getDrugWarehouseOutInfo,
-  getDrugWarehouseOutUser
+  getDrugWarehouseOutUser,
+  getDrugAutoMaticList
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
 
@@ -436,7 +440,9 @@ export default {
        info: {}
       },
       userList:[],
-     
+      list:[],
+      drugConfig:{},
+      drugList:[]
     };
   },
   methods: {
@@ -486,6 +492,7 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.warehouseOutDate.push(response.data.data.list[i]);
           }
+          console.log("列表22222",this.warehouseOutDate)
         }
       });
     },
@@ -581,9 +588,12 @@ export default {
         query: { id: row.id, type: this.type }
       });
     },
-    handleSearch(id){
+    handleSearch(id,time,warehouse_out_order_number){
+    
       this.warehousingOutInfo.warehousingOutData = []
       this.GetOrderDetail(id)
+      this.list = []
+      this.getDrugAutoMaticList(id,time,warehouse_out_order_number)
       this.dialogVisible = true
       
     },
@@ -777,7 +787,46 @@ export default {
           }
         })
         this.sameRowArr = sameRowArr
+      },
+    getDrugAutoMaticList(id,recordTime,warehouse_out_order_number){
+        var params = {
+          warehous_out_id:id,
+          record_time:recordTime,
+          warehouse_out_order_number:warehouse_out_order_number,
+        }
+      getDrugAutoMaticList(params).then(response=>{
+         if(response.data.state ==1){
+           var list =   response.data.data.list
+           console.log("list222222",list)
+           this.list = list
+           var drugConfig =  response.data.data.drugConfig
+           console.log("drugconfig",drugConfig)
+           this.drugConfig = drugConfig
+           var drugList = response.data.data.drugList
+           console.log("药品列表",drugList)
+           this.drugList = drugList
+         }
+      })
+    },
+    getDrugCount(id){
+      
+      var count = 0 
+      for(let i=0;i<this.list.length;i++){
+         if(this.list[i].drug_id == id){
+            count = this.list[i].Total
+         }
       }
+      return count
+    },
+    getRetailPrice(id){
+      var price = 0
+      for(let i=0;i<this.drugList.length;i++){
+         if(id == this.drugList[i].id){
+            price = this.drugList[i].retail_price
+         }
+      }
+      return price
+    }
   }
 };
 </script>

src/xt_pages/user/dialysisSolution.vue

@@ -389,8 +389,8 @@
             </el-form-item>
           </el-col>
 
-          <el-col :span="8" v-if="isShows('电导度')">
-            <el-form-item label="电导度（mS/cm）: " prop="conductivity">
+          <el-col :span="8" v-if="isShows('电导率')">
+            <el-form-item label="电导率（mS/cm）: " prop="conductivity">
               <el-input v-model="addPlan.conductivity"></el-input>
             </el-form-item>
           </el-col>