6.27

src/api/advice.js

@@ -494,7 +494,6 @@ export function GetLastOrNextDoctorAdvice(params) {
 }
 
 export function getSchedualDoctors(params) {
-  console.log('中国国323322332232323232323', params)
   return request({
     url: '/api/schedule/advices',
     method: 'get',

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

@@ -1329,7 +1329,8 @@
       console.log("针眼",this.pinholings)
       this.catheter_maintenancelist = getDataConfig('hemodialysis','catheter_maintenance')
       console.log("导管维护",this.catheter_maintenancelist)
-     
+       
+      console.log("predialysis_evaluation2332323323222323",this.predialysis_evaluation)
       // this.weight_adjust.weight = this.dry_weight.dry_weight
 
       // if(this.predialysis_evaluation.id == 0){

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -441,7 +441,7 @@ export default {
     this.getTemplateInfo();
     this.requestSchedualDoctors(this.time)
     // this.template_id = this.$store.getters.xt_user.template_info.template_id;
-
+    this.org_id = this.$store.getters.xt_user.template_info.org_id;
   },
   methods: {
     getTemplateInfo() {
@@ -536,51 +536,47 @@ export default {
             if(project_config.is_open == 1){
               this.project = resp.data.project
               console.log( this.project)
+             
               let projectArr = []
-              this.project.map(item => {
-                resp.data.hisAdvices.map(it => {
-                  if(item.patient_id == it.patient_id){
-                    projectArr.push(item)
+              if(this.org_id !=9671 && this.org_id!= 10318){
+                this.project.map(item => {
+                  resp.data.hisAdvices.map(it => {
+                    if(item.patient_id == it.patient_id){
+                      projectArr.push(item)
+                    }
+                  })
+                })
+               
+                 resp.data.hisAdvices.map((item,index) => {
+                  if(projectArr[index].project && projectArr[index].project.length > 0){
+                    projectArr[index].project.map(it => {
+                      let obj = {
+                        advice_doctor: it.doctor,
+                        start_time:it.start_time,
+                        advice_name:it.team_id > 0 && it.is_check_team == 1 ? it.team.project_team : it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                        execution_time:it.execution_time,
+                        execution_state:it.execution_state,
+                        execution_staff:it.execution_staff,
+                        check_time:it.check_time,
+                        check_state:it.check_state,
+                        checker:it.checker,
+                        created_time:it.ctime,
+                        delivery_way:'',
+                        execution_frequency:'',
+                        remark:'',
+                        id:it.id,
+                        patient_id:it.patient_id,
+                        parent_id:0,
+                        groupno:0
+                      }
+                      item.doctor_advice.push(obj)
+                    })
                   }
                 })
-              })
-
+              }
+            
               console.log(projectArr)
 
-              resp.data.hisAdvices.map((item,index) => {
-                if(projectArr[index].project && projectArr[index].project.length > 0){
-                  projectArr[index].project.map(it => {
-                    let obj = {
-                      advice_doctor: it.doctor,
-                      start_time:it.start_time,
-                      advice_name:it.team_id > 0 && it.is_check_team == 1 ? it.team.project_team : it.type == 2 ? it.project.project_name : it.good_info.good_name,
-                      execution_time:it.execution_time,
-                      execution_state:it.execution_state,
-                      execution_staff:it.execution_staff,
-                      check_time:it.check_time,
-                      check_state:it.check_state,
-                      checker:it.checker,
-                      created_time:it.ctime,
-                      delivery_way:'',
-                      execution_frequency:'',
-                      remark:'',
-                      id:it.id,
-                      patient_id:it.patient_id,
-                      parent_id:0,
-                      groupno:0
-                    }
-                    // let advice = []
-                    // advice.push(obj)
-                    // let advices = {
-                    //   advices: advice,
-                    //   group_no: 123
-                    // }
-
-                //     // console.log(11111,item.new_advice)
-                    item.doctor_advice.push(obj)
-                  })
-                }
-              })
             }
             console.log('resp.data.hisAdvices',resp.data.hisAdvices)
            if(config.is_open == 0 || config.is_open == 2){

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -258,7 +258,8 @@ export default {
             time:'',
             show:true,
             showOne:false,
-            delivery_way:""
+            delivery_way:"",
+            org_id:0,
         }
     },
     methods:{
@@ -291,36 +292,31 @@ export default {
                     this.project = resp.data.project
                     resp.data.hisAdvices.map((item,index) => {
                     item.new_advice = item.new_advice ? item.new_advice : []
-                    if(this.project[index].project.length > 0){
-                        this.project[index].project.map(it => {
-                        let obj = {
-                            advice_doctor: it.doctor,
-                            start_time:it.start_time,
-                            advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
-                            execution_time:it.execution_time,
-                            execution_state:it.execution_state,
-                            execution_staff:it.execution_staff,
-                            check_time:it.check_time,
-                            check_state:it.check_state,
-                            checker:it.checker,
-                            created_time:it.ctime,
-                            remark:'',
-                            id:it.id,
-                            parent_id:0,
-                            groupno:0
+                      if(this.org_id!=9671 && this.org_id!= 10318){
+                        if(this.project[index].project.length > 0){
+                            this.project[index].project.map(it => {
+                            let obj = {
+                                advice_doctor: it.doctor,
+                                start_time:it.start_time,
+                                advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                                execution_time:it.execution_time,
+                                execution_state:it.execution_state,
+                                execution_staff:it.execution_staff,
+                                check_time:it.check_time,
+                                check_state:it.check_state,
+                                checker:it.checker,
+                                created_time:it.ctime,
+                                remark:'',
+                                id:it.id,
+                                parent_id:0,
+                                groupno:0
+                            }
+                        
+                            item.doctor_advice.push(obj)
+                            })
                         }
-                        // let advice = []
-                        // advice.push(obj)
-                        // let advices = {
-                        //   advices: advice,
-                        //   group_no: 123
-                        // }
-
-                        // console.log(11111,item.new_advice)
-                        item.doctor_advice.push(obj)
-                        })
                     }
-                    })
+                   })
                 }
                 if(config.is_open == 0 || config.is_open == 2){
 
@@ -781,11 +777,11 @@ export default {
     created(){
       var time = this.$route.query.time
       var delivery_way = this.$route.query.delivery_way
-      console.log("delivery_Way",delivery_way)
       this.delivery_way = delivery_way
       this.time = moment(time).format('YYYY-MM-DD')
       console.log(11,this.$route.query)
       this.requestSchedualDoctors(time)
+      this.org_id = this.$store.getters.xt_user.template_info.org_id;
     }
 }
 </script>

src/xt_pages/outpatientTool/export.vue

@@ -65,7 +65,7 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
-         <el-button  size="small" type="primary" @click="exportList">导出</el-button>
+         <el-button  size="small" type="primary" @click="exportList" style="width:50px">导出</el-button>
         <el-table
         :data="tableList"
          border

src/xt_pages/outpatientTool/exportOne.vue

@@ -65,61 +65,78 @@
           end-placeholder="结束日期"
         >
         </el-date-picker>
-         <el-button  size="small" type="primary" @click="exportList">导出</el-button>
+         <el-button  size="small" type="primary" @click="exportList" style="width:50px">导出</el-button>
         <el-table
         :data="tableList"
          border
         style="width: 100%">
          <el-table-column prop="date" label="姓名"  width="100" align="center">
            <template slot-scope="scope" >
-            {{ scope.row.name }}
+            {{ scope.row.patient.name }}
            </template>
         </el-table-column>
         <el-table-column  prop="date"  label="身份证"  width="200" align="center">
            <template slot-scope="scope" >
-            {{ scope.row.id_card_no }}
+            {{ scope.row.patient.id_card_no }}
            </template> 
         </el-table-column>
         <el-table-column prop="name"  label="医保类型" width="100" align="center">
           <template slot-scope="scope" >
-            <span v-if="scope.row.insutype == 0">居民</span>
-            <span v-if="scope.row.insutype == 310">职工</span>
-            <span v-if="scope.row.insutype == 390">居民</span>
+            <span v-if="scope.row.order.insutype == 0">居民</span>
+            <span v-if="scope.row.order.insutype == 310">职工</span>
+            <span v-if="scope.row.order.insutype == 390">居民</span>
            </template>  
         </el-table-column>
         <el-table-column  prop="address" label="年"  width="50" align="center">
           <template slot-scope="scope" >
-            {{getTime(scope.row.settle_accounts_date)}}
+            {{getTime(scope.row.order.settle_accounts_date)}}
          </template>  
         </el-table-column>
          <el-table-column prop="address" label="月"  width="50"  align="center">
           <template slot-scope="scope">
-            {{getTimeOne(scope.row.settle_accounts_date)}}
+            {{getTimeOne(scope.row.order.settle_accounts_date)}}
            </template>  
         </el-table-column>
-         <el-table-column prop="address" label="收费项目"  width="100" align="center">
+         <el-table-column prop="address" label="药品编码"  width="100" align="center">
            <template slot-scope="scope" >
-            <span v-if="scope.row.med_chrgitm_type == '01'">床位费</span>
-            <span v-if="scope.row.med_chrgitm_type == '02'">诊察费</span>
-            <span v-if="scope.row.med_chrgitm_type == '03'">检查费</span>
-            <span v-if="scope.row.med_chrgitm_type == '04'">化验费</span>
-            <span v-if="scope.row.med_chrgitm_type == '05'">治疗费</span>
-            <span v-if="scope.row.med_chrgitm_type == '06'">手术费</span>
-            <span v-if="scope.row.med_chrgitm_type == '08'">材料费</span>
-            <span v-if="scope.row.med_chrgitm_type == '09'">西药费</span>
-            <span v-if="scope.row.med_chrgitm_type == '11'">中成费</span>
-            <span v-if="scope.row.med_chrgitm_type == '14'">其他费</span>
+             <span v-if="scope.row.his_doctor_advice.id > 0">
+               {{scope.row.his_doctor_advice.id}}
+             </span>
+             <span v-if="scope.row.his_prescription_project.id > 0">
+               {{scope.row.his_prescription_project.id}}
+             </span>
            </template>  
         </el-table-column>
-         <el-table-column prop="address" label="数量"  width="100" align="center">
+         <el-table-column prop="address" label="名称"  width="100" align="center">
            <template slot-scope="scope" >
-            {{getCount(scope.row.child)}}
+             <span v-if="scope.row.his_doctor_advice.id > 0">
+               {{scope.row.his_doctor_advice.advice_name}}
+             </span>
+             <span v-if="scope.row.his_prescription_project.id > 0">
+               {{scope.row.his_prescription_project.good_info.good_name}}
+             </span>
            </template>  
           </el-table-column>
        
-         <el-table-column  prop="address"  label="金额"  width="130" align="center">
+         <el-table-column  prop="address"  label="单位"  width="130" align="center">
          <template slot-scope="scope" >
-            {{getAllPrice(scope.row.child)}}
+          
+             <span v-if="scope.row.his_doctor_advice.id > 0">
+               {{scope.row.his_doctor_advice.prescribing_number_unit}}
+             </span>
+             <span v-if="scope.row.his_prescription_project.id > 0">
+               {{scope.row.his_prescription_project.unit}}
+             </span>
+           </template>  
+        </el-table-column>
+        <el-table-column  prop="address"  label="数量"  width="130" align="center">
+         <template slot-scope="scope" >
+               {{scope.row.cnt}}
+           </template>  
+        </el-table-column>
+       <el-table-column  prop="address"  label="金额"  width="130" align="center">
+         <template slot-scope="scope" >   
+               {{(scope.row.cnt * scope.row.pric).toFixed(2)}}
            </template>  
         </el-table-column>
          </el-table>
@@ -151,13 +168,14 @@ export default {
       keywords: "",
       tableList:[],
       tableData:[],
-     chargeDate: [
+      chargeDate: [
         moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
         moment(new Date()).add("year", 0).format("YYYY-MM-DD"),
       ],
       start_time:"",
       end_time:"",
-
+      drugList:[],
+      goodList:[],
     };
   },
 
@@ -247,7 +265,19 @@ export default {
         end_time:this.end_time,
        } 
      getHisAdviceOrderList(params).then(response=>{
-
+        if(response.data.state == 1){
+          var arr= []
+           var list =  response.data.data.list
+           console.log("list2323322323我的",list)
+           for(let i=0;i<list.length;i++){
+             if(list[i].order.order_status  == 2){
+               arr.push(list[i])
+             }
+           }
+           this.tableList = arr
+           this.tableData = arr
+         
+        }
      })
     },
     changeDate(){
@@ -299,71 +329,110 @@ export default {
         return ""
       }
     },
-      exportList(){
-         import('@/vendor/Export2Excel').then(excel => {
-          for(let i=0;i<this.tableData.length;i++){
-             if(this.tableData[i].insutype == 310){
-              this.tableData[i].insutype = "职工"
-             }
-             if(this.tableData[i].insutype == 390){
-              this.tableData[i].insutype = "居民"
-             }
-             
-             this.tableData[i].year = this.getTime(this.tableData[i].settle_accounts_date)
-             this.tableData[i].month = this.getTimeOne(this.tableData[i].settle_accounts_date)
-              
-             if(this.tableData[i].med_chrgitm_type == "01"){
-               this.tableData[i].med_chrgitm_type = "床位费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "02"){
-               this.tableData[i].med_chrgitm_type = "诊察费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "03"){
-               this.tableData[i].med_chrgitm_type = "检查费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "04"){
-               this.tableData[i].med_chrgitm_type = "化验费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "05"){
-               this.tableData[i].med_chrgitm_type = "治疗费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "06"){
-               this.tableData[i].med_chrgitm_type = "治疗费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "08"){
-               this.tableData[i].med_chrgitm_type = "材料费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "09"){
-               this.tableData[i].med_chrgitm_type = "西药费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "11"){
-               this.tableData[i].med_chrgitm_type = "中成费"
-             }
-             if(this.tableData[i].med_chrgitm_type == "14"){
-               this.tableData[i].med_chrgitm_type = "其他费"
-             }
-             
-             this.tableData[i].sum_count = this.getCount(this.tableData[i].child)
-
-             this.tableData[i].find_price = this.getAllPrice(this.tableData[i].child)
+    exportList(){
+      import('@/vendor/Export2Excel').then(excel => {
+      for(let i=0;i<this.tableData.length;i++){
+          if(this.tableData[i].insutype == 310){
+          this.tableData[i].insutype = "职工"
+          }
+          if(this.tableData[i].insutype == 390){
+          this.tableData[i].insutype = "居民"
+          }
+          
+          this.tableData[i].year = this.getTime(this.tableData[i].settle_accounts_date)
+          this.tableData[i].month = this.getTimeOne(this.tableData[i].settle_accounts_date)
+          
+          if(this.tableData[i].med_chrgitm_type == "01"){
+            this.tableData[i].med_chrgitm_type = "床位费"
           }
-         const tHeader = ['姓名','身份证','医保类型','年','月','收费项目','数量','金额']
-         const filterVal = ['name', 'id_card_no','insutype','year','month','med_chrgitm_type','sum_count','find_price']
-
-         const data = this.formatJson(filterVal,this.tableData)
-
-         excel.export_json_to_excel({
-           header: tHeader,
-           data,
-           filename: '药品信息'
-         })
-          this.downloadLoading = false
-
-        })
-       },
-       formatJson(filterVal, jsonData) {
-        return jsonData.map(v => filterVal.map(j => v[j]))
-       },
+          if(this.tableData[i].med_chrgitm_type == "02"){
+            this.tableData[i].med_chrgitm_type = "诊察费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "03"){
+            this.tableData[i].med_chrgitm_type = "检查费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "04"){
+            this.tableData[i].med_chrgitm_type = "化验费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "05"){
+            this.tableData[i].med_chrgitm_type = "治疗费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "06"){
+            this.tableData[i].med_chrgitm_type = "治疗费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "08"){
+            this.tableData[i].med_chrgitm_type = "材料费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "09"){
+            this.tableData[i].med_chrgitm_type = "西药费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "11"){
+            this.tableData[i].med_chrgitm_type = "中成费"
+          }
+          if(this.tableData[i].med_chrgitm_type == "14"){
+            this.tableData[i].med_chrgitm_type = "其他费"
+          }
+
+        this.tableData[i].name = this.tableData[i].patient.name
+        this.tableData[i].id_card_no = this.tableData[i].patient.id_card_no 
+        this.tableData[i].total_price = (this.tableData[i].cnt * this.tableData[i].pric).toFixed(2)
+        if(this.tableData[i].his_doctor_advice.id > 0){
+          this.tableData[i].his_advice_name = this.tableData[i].his_doctor_advice.advice_name
+          this.tableData[i].his_prescribing_number_unit = this.tableData[i].his_doctor_advice.prescribing_number_unit
+        }
+        if(this.tableData[i].his_prescription_project.id > 0){
+          this.tableData[i].his_advice_name = this.tableData[i].his_prescription_project.good_info.good_name
+          this.tableData[i].his_prescribing_number_unit = this.tableData[i].his_prescription_project.unit
+        }
+        if(this.tableData[i].order.insutype == 0){
+           this.tableData[i].insutype = "居民"
+        }
+        if(this.tableData[i].order.insutype == 310){
+          this.tableData[i].insutype = "职工"
+        }
+        if(this.tableData[i].order.insutype == 390){
+          this.tableData[i].insutype = "居民"
+        }
+        
+        this.tableData[i].year = this.getTime(this.tableData[i].order.settle_accounts_date)
+        this.tableData[i].month = this.getTimeOne(this.tableData[i].order.settle_accounts_date)
+      }
+      const tHeader = ['姓名','身份证','医保类型','年','月','名称','单位','数量','金额']
+      const filterVal = ['name', 'id_card_no','insutype','year','month','his_advice_name','his_prescribing_number_unit','cnt','total_price']
+
+      const data = this.formatJson(filterVal,this.tableData)
+
+      excel.export_json_to_excel({
+        header: tHeader,
+        data,
+        filename: '药品信息'
+      })
+      this.downloadLoading = false
+
+    })
+   },
+   formatJson(filterVal, jsonData) {
+     return jsonData.map(v => filterVal.map(j => v[j]))
+    },
+    getDrugNumber(drug_id){
+      
+      var id = ""
+      for(let i=0;i<this.drugList.length;i++){
+        if(this.drugList[i].id == drug_id){
+          id = this.drugList[i].id
+        }
+      }
+      return id
+    },
+    getGoodNumber(good_id){
+      var good_name = ""
+      for(let i=0;i<this.goodList.length;i++){
+        if(this.goodList[i].id == good_id){
+           good_name = this.goodList[i].good_name
+        }
+      }
+      return good_name
+    }
   },
   created() {