Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

src/api/dialysis.js

@@ -395,3 +395,11 @@ export function getSolutionlistByOrgId(params) {
     params: params
   })
 }
+
+export function getDialysisAdviceToday(params) {
+  return request({
+    url: '/api/patient/getdialysisadvicetoday',
+    method: 'get',
+    params: params
+  })
+}

src/lang/zh.js

@@ -403,6 +403,7 @@ export default {
     diagnosis_admission: '入院时病情',
     treatment: '诊疗经过',
     illness_discharge: '出院时病情',
-    discharge_advice: '出院医嘱'
+    discharge_advice: '出院医嘱',
+    dialysis_remark: '透析备注'
   }
 }

src/router/modules/dialysis.js

@@ -68,6 +68,18 @@ export default {
       }
     },
 
+    {
+      path: '/dialysis/doctorAdviceStaticPrint',
+      component: () => import('@/xt_pages/dialysis/doctorAdviceStaticPrint'),
+      name: '透析医嘱统计打印',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: '透析医嘱统计打印',
+        noCache: true
+      }
+    },
+
     {
       path: '/dialysis/signPrint',
       component: () => import('@/xt_pages/dialysis/signPrint'),

src/utils/data.js

@@ -6,7 +6,7 @@ export function getDataConfig(module, field) {
   if (moduleConfig == undefined) {
     return false
   }
-  if (module === 'summary' || module === 'education' || module === 'nursing_record' || module === 'special_record') {
+  if (module === 'summary' || module === 'education' || module === 'nursing_record' || module === 'special_record' || module == 'dialysis_remark') {
     var Aresult = []
     for (var j = 0; j < moduleConfig.length; j++) {
       var Atemp = []
@@ -37,7 +37,6 @@ export function getDataConfig(module, field) {
   }
 }
 
-
 export function getDictionaryDataConfig(module, field) {
   var storeConfigList = store.getters.dictionary_configlist
   var moduleConfig = storeConfigList[module]

src/xt_pages/data/components/templateTable.vue

@@ -355,7 +355,7 @@ export default {
         }
 
         if (valid) {
-           
+          console.log("tmpe233223322323",this.temp)
           createConfig(this.temp).then(response => {
             if (!response.data) {
               // 由于mockjs 不支持自定义状态码只能这样hack

src/xt_pages/data/template.vue

@@ -53,7 +53,8 @@ export default {
         { label: this.$t("data_config.diagnosis_admission"), key:"diagnosis_admission"},
         { label: this.$t("data_config.treatment"), key:"treatment"},
         { label: this.$t("data_config.illness_discharge"), key:"illness_discharge"},
-         { label: this.$t("data_config.discharge_advice"), key:"discharge_advice"},
+        { label: this.$t("data_config.discharge_advice"), key:"discharge_advice"},
+        { label: this.$t("data_config.dialysis_remark"), key:"dialysis_remark"},
       ],
       activeName: "education",
       createdTimes: 0

src/xt_pages/dialysis/details/BasicInfor.vue

@@ -29,7 +29,7 @@
       </li>
       <li>
         <label>年龄:</label>
-        <span>{{ tranAge(patient)}}</span>
+        <span>{{ getNewAge(patient)}}</span>
       </li>
       <li>
         <label>透析号 : </label>
@@ -134,11 +134,26 @@ export default {
       }
     },
    tranAge(val) {
+    console.log("val2323233223",val)
         if(val.birthday){
           var birth = uParseTime(val.birthday, '{y}-{m}-{d}');
           return jsGetAge(birth, '-');
         }
     },
+    getNewAge(val) {
+      if (val.id_card_no != null && val.id_card_no != '') {
+        // 获取年龄
+        var myDate = new Date()
+        var month = myDate.getMonth() + 1
+        var day = myDate.getDate()
+        var age = myDate.getFullYear() - val.id_card_no.substring(6, 10) - 1
+        if (val.id_card_no.substring(10, 12) < month || val.id_card_no.substring(10, 12) == month && val.id_card_no.substring(12, 14) <= day) {
+          age++
+        }
+        return age
+      }
+    },
+
 
     stepState: function() {
       return parseInt(Math.random() * 1000 + '') % 2 == 1

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -554,6 +554,7 @@
        
       </ul>
     </div>
+    <div style="color:#34495e;margin: 12px 100px 0 100px;" v-if="isShow('透析备注')">透析备注: <span style="color:#409eff;">{{this.prescription.dialysis_remark}}</span></div>
     <div style="color:#34495e;margin: 12px 100px 0 100px;">备注: <span style="color:#409eff;">{{ note }}</span></div>
   </div>
 </template>

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

@@ -257,16 +257,16 @@
                   <el-col :span="8" v-if="isShows('减肝素量')">
                        <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'减肝素量(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                                          v-model="dialysisPrescription.calculateAnticoagulantZL" v-on:input="searchReduceAmount"></el-input>
+                                          v-model="dialysisPrescription.calculateAnticoagulantZL"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                                          v-model="dialysisPrescription.reduce_amount" v-on:input="searchReduceAmount"></el-input>
+                                          v-model="dialysisPrescription.reduce_amount"></el-input>
                             </el-form-item>
 
                             <el-form-item v-else :label="'减肝素量(' + anticoagulant.shouji_unit + ') : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                                          v-model="dialysisPrescription.reduce_amount" v-on:input="searchReduceAmount"></el-input>
+                                          v-model="dialysisPrescription.reduce_amount"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
-                                          v-model="dialysisPrescription.reduce_amount" v-on:input="searchReduceAmount"></el-input>
+                                          v-model="dialysisPrescription.reduce_amount"></el-input>
                             </el-form-item>
                     </el-col>
 
@@ -941,7 +941,32 @@
 
 
                 </el-row>
-
+               
+                <el-row :gutter="20">
+                  <el-col :span="24" v-if="isShows('透析备注')">
+                    <el-form-item label="透析备注：">
+                      <el-select @change="dialysisAfterTeachSelectChange" v-model="value">
+                        <el-option
+                          v-for="(item, index) in educationList"
+                          :label="item.text"
+                          :value="item.value"
+                          :key="index"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+                  </el-col>
+                </el-row>
+                <el-row :gutter="20">
+                  <el-col v-if="isShows('透析备注')">
+                    <el-form-item>
+                      <el-input
+                        type="textarea"
+                        v-model="dialysisPrescription.dialysis_remark"
+                        :rows="4"
+                      ></el-input>
+                    </el-form-item>
+                  </el-col>
+              </el-row>
 
                 <el-row :gutter="20">
                     <el-col :span="24">
@@ -1469,7 +1494,7 @@
           water_machine:"否",
           add_amount:"",
           reduce_amount:"",
-          
+          dialysis_remark:"",
         },
 
         anticoagulant: {
@@ -1514,7 +1539,9 @@
           {id:1,name:"是"},
           {id:2,name:"否"}
         ],
-        zongliang:""
+        zongliang:"",
+        educationList:[],
+        value:"",
       }
     },
     methods: {
@@ -3694,6 +3721,21 @@
         return arr.filter((arr) => !res.has(arr.name) && res.set(arr.name, 1))
       },
 
+     dialysisAfterTeachSelectChange: function(values) {
+      console.log("values232323232wo",values)
+      if (this.dialysisPrescription.dialysis_remark == '' || this.dialysisPrescription.dialysis_remark==undefined) {
+        this.dialysisPrescription.dialysis_remark = values
+      } else {
+         console.log("this.dialysisPrescription.dialysis_remark",this.dialysisPrescription.dialysis_remark)
+        if (this.dialysisPrescription.dialysis_remark!=undefined&&this.dialysisPrescription.dialysis_remark.indexOf(values) == -1) {
+          if (this.dialysisPrescription.dialysis_remark.charAt(this.dialysisPrescription.dialysis_remark.length - 1).indexOf('。') == -1) {
+            this.dialysisPrescription.dialysis_remark = this.dialysisPrescription.dialysis_remark + ',' + values
+          } else {
+            this.dialysisPrescription.dialysis_remark = this.dialysisPrescription.dialysis_remark + values
+          }
+        }
+      }
+    },
     },
 
     watch: {
@@ -4310,8 +4352,8 @@
       this.bilirubinAdsorptionColumn = getDataConfig('hemodialysis', 'bilirubin_adsorption_column')
 
       
-
-
+      this.educationList = getDataConfig('dialysis_remark', 'dialysis_remark')
+      console.log("透析准备232323232323wo",this.educationList)
     }
   }
 </script>

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

@@ -220,6 +220,7 @@ export default {
       if (this.treatmentSummary.dialysis_summary == '') {
         this.treatmentSummary.dialysis_summary = values
       } else {
+       
         if (this.treatmentSummary.dialysis_summary.indexOf(values) == -1) {
           if (
             this.treatmentSummary.dialysis_summary

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -158,6 +158,10 @@
         <el-button type="primary" size="small" @click="toSettle">收费</el-button>
       </div> -->
 
+      <div style="margin-top: 10px;margin-bottom:10px">
+        <el-button type="primary" size="small" @click="toStatic">统计</el-button>
+      </div>
+
 
       <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         @selection-change="handleSelectionChange"
@@ -500,14 +504,86 @@
       </span>
     </el-dialog>
 
+
+
+    <el-dialog
+      title="药品统计表"
+      :visible.sync="startdialogVisible"
+      width="70%">
+      <span>
+        <div class="cell clearfix" style="margin-bottom:10px">
+          <label class="title"> <span class="name">排班班次</span> : </label>
+           <el-select v-model="schedule_type" placeholder="请选择" @change="changeScheduleType">
+            <el-option
+              v-for="item in schedulArr"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value">
+            </el-option>
+           </el-select>
+           <label class="title"> <span class="name">病区选择</span> : </label>
+           <el-select v-model="partion_type" placeholder="请选择" @change="changePartionType">
+            <el-option
+              v-for="item in partitionArr"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+           </el-select>
+           <el-button size="small" icon="el-icon-printer"  @click="toPrintOne" type="primary">打印</el-button>
+           <el-button size="small"  @click="toExportListOne" type="primary">导出</el-button>
+        </div> 
+
+      <el-table
+        :data="tableList"
+        border
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+         <el-table-column  align="center"  label="序号">
+           <template slot-scope="scope">
+              {{scope.$index+1}}
+           </template>
+        </el-table-column>
+        <el-table-column  align="center"   label="药品名称">
+         <template slot-scope="scope">
+            {{scope.row.advice_name}}
+          </template>
+        </el-table-column>
+        <el-table-column  align="center"  label="规格">
+           <template slot-scope="scope">
+             {{scope.row.specification_name}}
+           </template>
+        </el-table-column>
+       
+        <el-table-column  align="center"   label="数量">
+           <template slot-scope="scope">
+             <span v-if="config.is_open!=1">{{getCount(scope.row.child)}}</span>
+             <span v-if="config.is_open ==1">{{getHisCount(scope.row.child,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}</span>
+           </template>
+        </el-table-column>
+        
+     
+
+      </el-table>
+      </span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="startdialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="startdialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog>
     </div>
 
+
   </div>
 </template>
 
 <script>
 const moment = require('moment')
-import { getSchedualPatient, GetAllZone } from "@/api/dialysis";
+import { getSchedualPatient, GetAllZone,getDialysisAdviceToday } from "@/api/dialysis";
 import { parseTime } from "@/utils";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getPrintTemplate } from "@/api/data";
@@ -585,6 +661,12 @@ export default {
       is_status:0,
       execTimeDialogVisibleOne:false,
       current_row:{},
+      tableList:[],
+      startdialogVisible:false,
+      schedule_type:0,
+      partion_type:0,
+      druglist:[],
+      config:{},
     };
   },
   created() {
@@ -1413,13 +1495,11 @@ export default {
           return false
         }
        var execTime = Math.round(new Date(this.execTime).getTime() / 1000)
-      console.log("param2332323",this.current_row)
       var params= {
         advice_id:this.current_row.id,
         advice_date: moment(this.time).format('YYYY-MM-DD'),
         exec_time:execTime,
       }
-      console.log("prams232323",params)
       excutionDoctorAdviceById(params).then(response=>{
         if(response.data.state == 1){
           if(response.data.data.msg == 2){
@@ -1447,7 +1527,235 @@ export default {
            }
         }
       })
-    }
+    },
+
+     toStatic() {
+         this.tableList = []
+          var params = {
+            schedule_type:this.schedule_type,
+            partion_type:this.partion_type,
+            selected_date: moment(this.time).format('YYYY-MM-DD'),
+          }
+         console.log("params2332232wo",params)
+        getDialysisAdviceToday(params).then(response=>{
+          if(response.data.state == 1){
+             var doctorList = []
+             var druglist = response.data.data.drug
+             this.druglist = druglist
+             this.startdialogVisible = true
+             var list = response.data.data.list
+          
+             var config = response.data.data.config
+            
+             
+             if(list!=null && list.length > 0){
+               for(let i=0;i<list.length;i++){
+                for(let j=0;j<list[i].xt_doctor_advice.length;j++){
+                  doctorList.push(list[i].xt_doctor_advice[j])
+                }
+               }
+             }
+
+             if(config.is_open!=1){
+               if(doctorList!=null && doctorList.length > 0){
+                let dataInfo = {}
+                  doctorList.forEach((item, index) => {
+                  let { advice_name } = item
+                  if (!dataInfo[advice_name]) {
+                    dataInfo[advice_name] = {
+                      advice_name:item.advice_name,
+                      child: [],
+                      count:0,
+                      drug_id:item.drug_id,
+                      specification_name:item.advice_desc +item.drug_spec_unit,
+                      patient_id:item.patient_id,
+                    }
+                  }
+                })
+                let arr = Object.values(dataInfo)
+                // console.log("arr23332323232",arr)
+
+
+                if(arr.length > 0){
+                  for(let i=0;i<doctorList.length;i++){
+                    for(let j=0;j<arr.length;j++){
+                      if(doctorList[i].advice_name == arr[j].advice_name){
+                          arr[j].child.push(doctorList[i])
+                      }
+                    }
+                  }
+                }
+               
+                this.tableList = []
+                for(let i=0;i<list.length;i++){
+                  for(let j=0;j<arr.length;j++){
+                    if(list[i].patient_id == arr[j].patient_id){
+                      this.tableList.push(arr[j])
+                    }
+                  }
+                }
+               
+              }
+             }
+                       
+           var his_doctor_advice = []
+
+           for(let i=0;i<list.length;i++){
+             for(let j=0;j<list[i].his_doctor_advice.length;j++){
+                his_doctor_advice.push(list[i].his_doctor_advice[j])
+             }
+           }
+           console.log("his_doctor_advice",his_doctor_advice)
+          
+            var newHisArr = []
+            for(let i=0;i<his_doctor_advice.length;i++){    
+               his_doctor_advice[i].count_one = 0
+               if(his_doctor_advice[i].prescribing_number_unit == his_doctor_advice[i].drug.max_unit){
+                  his_doctor_advice[i].prescribing_number = parseInt(his_doctor_advice[i].prescribing_number) * his_doctor_advice[i].drug.min_number
+                  his_doctor_advice[i].count_one =  parseInt(his_doctor_advice[i].prescribing_number) * his_doctor_advice[i].drug.min_number
+               }
+            }
+
+            for(let i=0;i<his_doctor_advice.length;i++){
+              for(let j=0;j<druglist.length;j++){
+                if(his_doctor_advice[i].drug_id == druglist[j].id){
+                   newHisArr.push(his_doctor_advice[i])
+                }
+              }
+            }
+            console.log("下盘子3223323223",newHisArr)
+            
+             if(config.is_open == 1){
+               if(newHisArr!=null && newHisArr.length > 0){
+                  let dataInfoOne = {}
+                  newHisArr.forEach((item, index) => {
+                  let { advice_name } = item
+                  if (!dataInfoOne[advice_name]) {
+                    dataInfoOne[advice_name] = {
+                      advice_name:item.advice_name,
+                      child: [],
+                      count:0,
+                      specification_name:this.getSpecification(item.drug_id),
+                      drug_id:item.drug_id,
+                      patient_id:item.patient_id,
+                      min_number:item.drug.min_number,
+                      max_unit:item.drug.max_unit,
+                      min_unit:item.drug.min_unit
+                    }
+                  }
+                })
+                let hisarr = Object.values(dataInfoOne)
+                console.log("hisarr233232233232",hisarr)
+                if(hisarr.length > 0){
+                  for(let i=0;i<newHisArr.length;i++){
+                    for(let j=0;j<hisarr.length;j++){
+                      if(newHisArr[i].drug_id == hisarr[j].drug_id){
+                          hisarr[j].child.push(newHisArr[i])
+                      }
+                    }
+                  }
+                }
+                console.log("hisarr",hisarr)
+                this.tableList = []
+                this.tableList = hisarr
+              }
+
+              console.log("中国人民解放军",this.tableList)
+             }
+          }
+        })
+        
+      },
+    
+     getSpecification(id){
+        var specification_name = ""
+        for(let i=0;i<this.druglist.length;i++){
+          if(id == this.druglist[i].id){
+            specification_name = this.druglist[i].dose+this.druglist[i].dose_unit +"*"+this.druglist[i].min_number+this.druglist[i].min_unit +"/"+this.druglist[i].max_unit
+          }
+        }
+        return specification_name
+      },
+      getCount(val){
+       var count = 0
+       if(val!=null && val.length > 0){
+        for(let i=0;i<val.length;i++){
+          count += parseInt(val[i].prescribing_number)
+        }
+       }
+       if(count > 0){
+        return count
+       }else{
+        return 0
+       }
+      },
+      getHisCount(val,max_unit,min_unit,min_number){
+        var total = 0
+        var max_str = "";
+        var min_str = "";
+        for(let i=0;i<val.length;i++){
+          total+=parseInt(val[i].prescribing_number)
+        }
+        if (total < min_number) {
+        min_str = total + min_unit;
+      }
+      if (total == 0) {
+        min_str = "";
+        max_str = "";
+      }
+      if (total >= min_number) {
+        if (parseInt(total / min_number) != 0) {
+          max_str = parseInt(total / min_number) + max_unit;
+        }
+        if (total % min_number != 0) {
+          min_str = (total % min_number) + min_unit;
+        }
+      }
+      return max_str + min_str;
+        
+      },
+      toPrintOne(){
+         var schedule_date = moment(this.time).format('YYYY-MM-DD')
+        this.$router.push({path:"/dialysis/doctorAdviceStaticPrint?schedule_type="+this.schedule_type+"&partion_type="+this.partion_type+"&schedule_date="+schedule_date+"&is_open="+this.config.is_open})
+      },
+      toExportListOne(){
+        import('@/vendor/Export2Excel').then(excel => { 
+         
+          if(this.tableList!=null && this.tableList.length > 0){
+            for(let i=0;i<this.tableList.length;i++){
+              this.tableList[i].index = i+1
+              if(this.config.is_open == 1){
+                this.tableList[i].total_count = this.getHisCount(this.tableList[i].child,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+              }
+              if(this.config.is_open!=1){
+                this.tableList[i].total_count = this.getCount(this.tableList[i].child)
+              }
+             
+            }
+          }
+          const tHeader = ['序号','药品名称','规格','数量']
+          const filterVal = ['index','advice_name','specification_name','total_count']
+
+          const data = this.formatJson(filterVal, this.tableList)
+          excel.export_json_to_excel({
+            header: tHeader,
+            data,
+            filename: '药品统计'
+          })
+            this.downloadLoading = false
+          })  
+      },
+      formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]));
+      },
+      changeScheduleType(){
+        this.tableList = []
+        this.toStatic()
+      },
+      changePartionType(){
+        this.tableList = []
+        this.toStatic()
+      }
   },
   components: {
     BreadCrumb
@@ -1545,3 +1853,12 @@ export default {
   height: 20px;
 }
 </style>
+<style lang="scss" scoped>
+  .page_consumables {
+
+  .clearfix:after {
+    content: none;
+  }
+
+  }
+</style>

src/xt_pages/outpatientDoctorStation/batch_replacement.vue

@@ -127,6 +127,7 @@
           >
             <template slot-scope="scope">
               <el-select
+                filterable
                 v-model="scope.row.drug_name"
                 placeholder="请选择"
                 @change="changeid(scope.row, scope.$index)"

src/xt_pages/stock/stockOutOrder.vue

@@ -1472,7 +1472,7 @@ export default {
              tableArr.push(list[i]);
           }
 
-  // {{(getAllStockCount(scope.row.child,item.warehousing_id) - getCancelInfo(item.warehousing_id,item.good_id)) *  getAllStockCountPrice(scope.row.child,item.warehousing_id)}}
+  
           if(tableArr!=null && tableArr.length>0){
             for(let i=0;i<tableArr.length;i++){
               for(let j=0;j<tableArr[i].childTwo.length;j++){