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

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyFour.vue

@@ -242,16 +242,14 @@
                   </td> -->
                       <!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
                       <td height="32px">
-                        <span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getAdminUser(advice.advice_doctor) }}</span>
-                        <img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
+                        <span>{{ getAdminUser(advice.advice_doctor) }}</span>
                       </td>
                       <!-- <td height="35px">
                     <span v-if="setAdminUserES(advice.checker) == ''">{{getAdminUser(advice.checker)}}</span>
                     <img style="height:20px;" :src="setAdminUserES(advice.checker)" alt="" srcset="" v-else>
                   </td> -->
                       <td height="32px">
-                        <span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
-                        <img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt="" srcset="" v-else />
+                        <span>{{ getAdminUser(advice.execution_staff) }}</span>
                       </td>
                       <td height="32px">
                         <span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
@@ -311,12 +309,9 @@
                             </div>
                         </td>
                         <td>
-                            <span v-if="setAdminUserES(monitor.monitoring_nurse) == ''">
+                            <span>
                                 {{ getAdminUser(monitor.monitoring_nurse) }}
                             </span>
-                            <span v-else style="display:flex;align-items:center;justify-content:space-around;height:36px;">
-                                <img style="height:30px;" :src="setAdminUserES(monitor.monitoring_nurse)" alt srcset />
-                            </span>
                         </td>
                     </tr>
                   </tbody>
@@ -364,48 +359,41 @@
                         <div class="inline_block">
                             预冲者
                             <div class="under_line" style="width: 70px;text-align: center">
-                                <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)}}</span>
-                                <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)" alt="" srcset="" v-else>
+                                <span>{{getAdminUser(dialysisOrder==null?0:dialysisOrder.washpipe_nurse)}}</span>
                             </div>
                         </div>
                         <div class="inline_block" style="margin-left:20px;">
                             穿刺者/换药者
                             <div class="under_line" style="width: 70px;text-align: center">
-                                <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
-                                <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.puncture_nurse)" alt="" srcset="" v-else>
+                                <span>{{getAdminUser(dialysisOrder==null?0:dialysisOrder.puncture_nurse)}}</span>
                             </div>
                         </div>
                         <div class="inline_block" style="margin-left:20px;">
                             责任护士
                             <div class="under_line" style="width: 70px;text-align: center">
-                                <span v-if="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse) == ''">{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
-                                <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder==null?0:dialysisOrder.start_nurse)" alt="" srcset="" v-else>
+                                <span>{{getAdminUser(dialysisOrder==null?0:dialysisOrder.start_nurse)}}</span>
                             </div>
                         </div>
                         <div class="inline_block" style="margin-left:20px;">
                             查对者
                             <div class="under_line" style="width: 70px;text-align: center">
-                                <span v-if="setAdminUserES(check == null ? 0 : check.creater) == ''">
+                                <span>
                                     {{ getAdminUser(check == null ? 0 : check.creater) }}
                                 </span>
-                                <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.creater)" alt srcset v-else />
                             </div>
                         </div>
                         <div class="inline_block" style="margin-left:20px;">
                             交叉核对者
                             <div class="under_line" style="width: 70px;text-align: center">
-                                <span v-if="setAdminUserES(check == null ? 0 : check.modifier) == ''">
+                                <span>
                                 {{ getAdminUser(check == null ? 0 : check.modifier) }}
                                 </span>
-                                <img style="height:30px;" :src="setAdminUserES(check == null ? 0 : check.modifier)" alt srcset v-else />
                             </div>
                         </div>
                         <div class="inline_block" style="margin-left:20px;">
                             下机护士
                             <div class="under_line" style="width: 70px;text-align: center">
-                                <span v-if="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) == ''">
-                                    {{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) }}</span>
-                                <img class="es-img" style="height:30px" :src="setAdminUserES(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse)" alt="" srcset="" v-else />
+                                <span>{{ getAdminUser(dialysisOrder == null ? 0 : dialysisOrder.finish_nurse) }}</span>
                             </div>
                         </div>
                         
@@ -424,10 +412,9 @@
         <div class="row" style="padding: 2px 0;line-height:30px; display:flex;">
             <div class="inline_block">
                 医生签字
-                <!-- <div class="under_line" style="width: 70px;text-align: center">
-                    <span v-if="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) == ''"> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
-                    <img style="height:30px;" :src="setAdminUserES(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:''))" alt="" srcset="" v-else />
-                </div> -->
+                <div class="under_line" style="width: 70px;text-align: center">
+                    <span> {{ getAdminUser(prescription==null?0:(prescription.prescription_doctor?prescription.prescription_doctor:'')) }} </span>
+                </div>
             </div>
         </div>
       </div>

src/xt_pages/outpatientCharges/components/registerDialog.vue

@@ -455,6 +455,7 @@
         return getDictionaryDataConfig(module, filed_name)
       },
       show: function () {
+        this.form = Object.assign({}, this.resetForm)
         // this.form.name = patientInfo.name
         // this.form.gender = patientInfo.gender
         // this.form.age = patientInfo.age
@@ -472,6 +473,7 @@
 
       }, hide: function () {
         this.visibility = false
+        this.$refs['formValue'].resetFields()
       }, cancel: function (formName) {
         this.$emit('cancel', this.getValue())
         this.$refs['formValue'].resetFields()
@@ -482,7 +484,6 @@
             let value = {}
             value = this.getValue()
             this.$emit('confirm', value)
-            this.form = Object.assign({}, this.resetForm)
           }
         })
       },

src/xt_pages/outpatientCharges/summary.vue

@@ -85,6 +85,7 @@
         <el-table-column align="center" prop="name" label="操作">
           <template slot-scope="scope">
             <el-button size="mini" type="primary" @click="toDetail(scope.row)">详情</el-button>
+            <el-button size="mini" type="primary" @click="toPrint(scope.row)" v-if="$store.getters.xt_user.org_id == 9919 && scope.row.order_status == 2">结算单</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -102,6 +103,14 @@
       </el-pagination>
     </div>
 
+    <el-dialog
+      class="centerDialog"
+      width="1200px"
+      title="打印"
+      :visible.sync="statementVisible">
+      <statementPrint ref="print" :paramsObj='orderObj'></statementPrint>
+    </el-dialog>
+
 
   </div>
 </template>
@@ -111,6 +120,8 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import { getHisOrderList,getDoctorList,getExportConsumeDetailList } from '@/api/his/his'
   import { uParseTime } from '@/utils/tools'
+  import statementPrint from './statementPrint'
+
 
   export default {
     components: {
@@ -118,6 +129,8 @@
     },
     data() {
       return {
+        orderObj: {},
+        statementVisible: false,
         crumbs: [
           { path: false, name: '门诊收费' },
           { path: false, name: '项目消费明细汇总' }
@@ -135,6 +148,14 @@
       }
     },
     methods: {
+      toPrint(row){
+        this.statementVisible = true
+        let obj = {
+          order_id: row.id
+        }
+        this.orderObj = obj
+
+      },
       export_detail(){
         let params= {
           start_time:this.start_time,

src/xt_pages/outpatientCharges/summaryDetail.vue

@@ -78,7 +78,7 @@
 
                     </div>
                     <div class="costBox">
-                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt }}元</span></span>
+                      <span>当前处方总费用：<span style="color:red;">{{ order.medfee_sumamt}}元</span></span>
                       <span v-if="order.order_status == 1">待结算</span>
                       <span v-if="order.order_status == 2">已结算</span>
                       <span v-if="order.order_status == 3">已退费</span>
@@ -165,6 +165,33 @@ export default {
     },created(){
       this.GetOrderDetail()
   },methods:{
+    // getTotal() {
+    //   var total = 0
+    //   for (let i = 0; i < this.prescriptions.length; i++) {
+    //     if (this.prescriptions[i].advices != null) {
+    //       for (let a = 0; a < this.prescriptions[i].advices.length; a++) {
+    //         console.log(this.prescriptions[i].advices[a].price )
+    //         console.log(this.prescriptions[i].advices[a].prescribing_number)
+    //
+    //         total = parseFloat(total) + parseFloat(this.prescriptions[i].advices[a].price * this.prescriptions[i].advices[a].prescribing_number)
+    //       }
+    //     }
+    //     if (this.prescriptions[i].project != null) {
+    //       for (let a = 0; a < this.prescriptions[i].project.length; a++) {
+    //
+    //         total = parseFloat(total) + parseFloat(this.prescriptions[i].project[a].price * this.prescriptions[i].project[a].count)
+    //       }
+    //     }
+    //
+    //     if (this.prescriptions[i].addition != null) {
+    //       for (let b = 0; b < this.prescriptions[i].addition.length; b++) {
+    //         total = parseFloat(total) + parseFloat(this.prescriptions[i].addition[a].price * this.prescriptions[i].addition[b].count)
+    //       }
+    //     }
+    //   }
+    //   return total.toFixed(2)
+    //
+    // },
     getDictionaryDataConfig(module, filed_name) {
       return getDictionaryDataConfig(module, filed_name)
     },
@@ -221,7 +248,155 @@ export default {
       if (tab == 'more') {
         return false
       }
+    },   setMonthPrescription(month_prescriptions) {
+      console.log(month_prescriptions)
+      let drug_month_prescriptions = {
+        advices: []
+      }
+      let drug_ids = []
+      let project_month_prescriptions = {
+        project: []
+
+      }
+      let project_ids = []
+
+      let addition_month_prescriptions = {
+        addition: []
+
+      }
+      let additions_ids = []
+
+      for (let i = 0; i < month_prescriptions.length; i++) {
+        if (month_prescriptions[i].type == 1) { //药品
+          for (let a = 0; a < month_prescriptions[i].advices.length; a++) {
+            let obj = {
+              id: month_prescriptions[i].advices[a].drug_id,
+              price: month_prescriptions[i].advices[a].price
+
+            }
+            drug_ids.push(obj)
+            drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
+          }
+
+        } else if (month_prescriptions[i].type == 2) { //项目
+          for (let a = 0; a < month_prescriptions[i].project.length; a++) {
+            let obj = {
+              id: month_prescriptions[i].project[a].project_id,
+              price: month_prescriptions[i].project[a].price
+
+            }
+            project_ids.push(obj)
+            project_month_prescriptions.project.push(month_prescriptions[i].project[a])
+          }
+        }
+        //附加收费
+        for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
+          let obj = {
+            id: month_prescriptions[i].addition[a].item_id,
+            price: month_prescriptions[i].addition[a].price
+
+          }
+          additions_ids.push(obj)
+          addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
+
+        }
+
+      }
+      console.log(drug_ids)
+      console.log(project_ids)
+      console.log(additions_ids)
+
+
+
+      const obj = {}
+      const obj1 = {}
+      const obj2 = {}
+
+      drug_ids = drug_ids.reduce((cur, next) => {
+        obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
+        return cur
+      }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      project_ids = project_ids.reduce((cur, next) => {
+        obj1[next.price] ? '' : obj1[next.price] = true && cur.push(next)
+        return cur
+      }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      additions_ids = additions_ids.reduce((cur, next) => {
+        obj2[next.price] ? '' : obj2[next.price] = true && cur.push(next)
+        return cur
+      }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+
+
+
+
+      for (let i = 0; i < drug_ids.length; i++) {
+        let obj = {}
+        let count = 0
+        for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
+          if (drug_ids[i].price == drug_month_prescriptions.advices[a].price) {
+            obj['name'] = drug_month_prescriptions.advices[a].advice_name
+            obj['statistical_classification'] = ''
+            obj['type'] = 1
+            obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
+            obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
+            obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
+            obj['day'] = drug_month_prescriptions.advices[a].day
+            obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
+            obj['remark'] = drug_month_prescriptions.advices[a].remark
+            obj['price'] = parseFloat(drug_month_prescriptions.advices[a].price)
+            count = count + drug_month_prescriptions.advices[a].prescribing_number
+
+          }
+        }
+        obj['count'] = count
+        this.tableData.push(obj)
+      }
+
+      for (let i = 0; i < project_ids.length; i++) {
+        let obj = {}
+        let count = 0
+        for (let a = 0; a < project_month_prescriptions.project.length; a++) {
+          if (project_ids[i].price == project_month_prescriptions.project[a].price) {
+            obj['name'] = project_month_prescriptions.project[a].project.project_name
+            obj['statistical_classification'] = ''
+            obj['single_dose'] = project_month_prescriptions.project[a].single_dose
+            obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
+            obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
+            obj['day'] = project_month_prescriptions.project[a].day
+            obj['single_dose_unit'] = project_month_prescriptions.project[a].unit
+            obj['prescribing_number_unit'] = project_month_prescriptions.project[a].unit
+            count = count + project_month_prescriptions.project[a].count
+            obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
+            obj['remark'] = project_month_prescriptions.project[a].remark
+            obj['type'] = 2
+
+
+          }
+        }
+        obj['count'] = count
+        this.tableData.push(obj)
+
+      }
+
+      for (let i = 0; i < additions_ids.length; i++) {
+        let obj = {}
+        let count = 0
+        console.log(addition_month_prescriptions.addition)
+        if (addition_month_prescriptions.addition) {
+          for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
+            if (additions_ids[i].price == addition_month_prescriptions.addition[a].price) {
+              obj['item_name'] = addition_month_prescriptions.addition[a].item_name
+              count = count + addition_month_prescriptions.addition[a].count
+              obj['price'] = parseFloat(addition_month_prescriptions.addition[a].price)
+            }
+          }
+          obj['count'] = count
+          this.additions.push(obj)
+
+        }
+      }
+
     },
+
     GetOrderDetail(){
       let params={
         number:this.$route.query.number,
@@ -240,50 +415,56 @@ export default {
           this.prescriptions = []
           this.tableData = []
 
-          for (let i = 0; i < response.data.data.prescription.length; i++) {
-            var prescription = response.data.data.prescription[i]
-
-
-            for (let b = 0; b < prescription.advices.length; b++) {
-              let obj = {
-                name: prescription.advices[b].advice_name,
-                statistical_classification:"",
-                type:1,
-                single_dose: prescription.advices[b].single_dose,
-                delivery_way: prescription.advices[b].delivery_way,
-                execution_frequency: prescription.advices[b].execution_frequency,
-                price: prescription.advices[b].price.toString(),
-                day: prescription.advices[b].day,
-                count:prescription.advices[b].prescribing_number.toString(),
-                remark: prescription.advices[b].remark,
-                single_dose_unit: prescription.advices[b].single_dose_unit,
-                prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
-
-              }
-              this.tableData.push(obj)
-            }
-
-            for (let b = 0; b < prescription.project.length; b++) {
-              let obj = {
-                name: prescription.project[b].project.project_name,
-                statistical_classification: prescription.project[b].project.statistical_classification,
-                single_dose: prescription.project[b].single_dose,
-                delivery_way: prescription.project[b].delivery_way,
-                execution_frequency: prescription.project[b].execution_frequency,
-                price: prescription.project[b].price,
-                day: prescription.project[b].day,
-                count: prescription.project[b].count.toString(),
-                remark: prescription.project[b].remark,
-                single_dose_unit:prescription.project[b].project.unit,
-                prescribing_number_unit:prescription.project[b].project.unit,
-                type:2,
-              }
-              this.tableData.push(obj)
-            }
 
-            for (let b = 0; b < prescription.addition.length; b++) {
-                this.additions.push( prescription.addition[b])
-            }
+          var prescription = response.data.data.prescription
+          this.prescriptions = prescription
+          this.setMonthPrescription(prescription)
+
+
+          // for (let i = 0; i < response.data.data.prescription.length; i++) {
+          //   var prescription = response.data.data.prescription[i]
+
+
+            // for (let b = 0; b < prescription.advices.length; b++) {
+            //   let obj = {
+            //     name: prescription.advices[b].advice_name,
+            //     statistical_classification:"",
+            //     type:1,
+            //     single_dose: prescription.advices[b].single_dose,
+            //     delivery_way: prescription.advices[b].delivery_way,
+            //     execution_frequency: prescription.advices[b].execution_frequency,
+            //     price: prescription.advices[b].price.toString(),
+            //     day: prescription.advices[b].day,
+            //     count:prescription.advices[b].prescribing_number.toString(),
+            //     remark: prescription.advices[b].remark,
+            //     single_dose_unit: prescription.advices[b].single_dose_unit,
+            //     prescribing_number_unit: prescription.advices[b].prescribing_number_unit,
+            //
+            //   }
+            //   this.tableData.push(obj)
+            // }
+            //
+            // for (let b = 0; b < prescription.project.length; b++) {
+            //   let obj = {
+            //     name: prescription.project[b].project.project_name,
+            //     statistical_classification: prescription.project[b].project.statistical_classification,
+            //     single_dose: prescription.project[b].single_dose,
+            //     delivery_way: prescription.project[b].delivery_way,
+            //     execution_frequency: prescription.project[b].execution_frequency,
+            //     price: prescription.project[b].price,
+            //     day: prescription.project[b].day,
+            //     count: prescription.project[b].count.toString(),
+            //     remark: prescription.project[b].remark,
+            //     single_dose_unit:prescription.project[b].project.unit,
+            //     prescribing_number_unit:prescription.project[b].project.unit,
+            //     type:2,
+            //   }
+            //   this.tableData.push(obj)
+            // }
+            //
+            // for (let b = 0; b < prescription.addition.length; b++) {
+            //     this.additions.push( prescription.addition[b])
+            // }
 
 
 
@@ -298,7 +479,7 @@ export default {
             // this.prescriptions.push(obj)
             // this.curPrescriptions = this.prescriptions[0]
 
-          }
+          // }
           // this.tableData = response.data.data.order
 
         }

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -325,46 +325,70 @@
           }
         })
       },
-      setMonthPrescription(month_prescriptions){
+      setMonthPrescription(month_prescriptions) {
+        console.log("11111111")
+        console.log(month_prescriptions)
+
+
+        this.month_prescriptions = []
+
         let drug_month_prescriptions = {
-          advices:[],
+          advices: []
         }
-        let drug_ids=[]
-        let project_month_prescriptions ={
-          project:[],
+        let drug_ids = []
+        let project_month_prescriptions = {
+          project: []
 
         }
-        let project_ids=[]
+        let project_ids = []
 
-        let addition_month_prescriptions ={
-          addtions:[],
+        let addition_month_prescriptions = {
+          addition: []
 
         }
-        let additions_ids=[]
+        let additions_ids = []
 
+        for (let i = 0; i < month_prescriptions.length; i++) {
+          if (month_prescriptions[i].type == 1) { //药品
+            for (let a = 0; a < month_prescriptions[i].advices.length; a++) {
+              let obj = {
+                id: month_prescriptions[i].advices[a].drug_id,
+                price:month_prescriptions[i].advices[a].price,
 
-        for (let i = 0; i < month_prescriptions.length; i++){
-          if(month_prescriptions[i].type == 1){ //药品
-            for (let a = 0; a < month_prescriptions[i].advices.length; a++){
-              drug_ids.push(month_prescriptions[i].advices[a].drug_id)
+              }
+              drug_ids.push(obj)
               drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
             }
 
-          }else if(month_prescriptions[i].type == 2){ //项目
-            for (let a = 0; a < month_prescriptions[i].project.length; a++){
-              project_ids.push(month_prescriptions[i].project[a].project_id)
+          } else if (month_prescriptions[i].type == 2) { //项目
+            for (let a = 0; a < month_prescriptions[i].project.length; a++) {
+              let obj = {
+                id: month_prescriptions[i].project[a].project_id,
+                price:month_prescriptions[i].project[a].price,
+
+              }
+              project_ids.push(obj)
               project_month_prescriptions.project.push(month_prescriptions[i].project[a])
             }
           }
           //附加收费
           for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
-            additions_ids.push(month_prescriptions[i].addition[a].item_id)
-            addition_month_prescriptions.addtions.push(month_prescriptions[i].addition[a])
-          }
+            let obj = {
+              id: month_prescriptions[i].addition[a].item_id,
+              price:month_prescriptions[i].addition[a].price,
 
-        }
+            }
+            additions_ids.push(obj)
+            addition_month_prescriptions.addition.push(month_prescriptions[i].addition[a])
 
+          }
 
+        }
+        console.log("00000000000000")
+        console.log(drug_ids)
+        console.log(project_ids)
+        console.log(additions_ids)
+        console.log("00000000000000")
 
 
         const obj = {}
@@ -372,119 +396,278 @@
         const obj2 = {}
 
         drug_ids = drug_ids.reduce((cur, next) => {
-          obj[next] ? '' : obj[next] = true && cur.push(next)
+          obj[next.price] ? '' : obj[next.price] = true && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
         project_ids = project_ids.reduce((cur, next) => {
-          obj1[next] ? '' : obj1[next] = true && cur.push(next)
+            obj[next.price] ? '' : obj[next.price] = true &&  cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
         additions_ids = additions_ids.reduce((cur, next) => {
-          obj2[next] ? '' : obj2[next] = true && cur.push(next)
+          obj[next.price] ? '' : obj[next.price] = true  && cur.push(next)
           return cur
         }, []) // 设置cur默认类型为数组，并且初始值为空的数组
 
 
 
+        let drugs = []
+        let projects = []
+        let additions = []
 
-
-        let drugs =[]
-        let projects =[]
-        let additions =[]
-
-
-        for (let i = 0; i < drug_ids.length; i++){
+        for (let i = 0; i < drug_ids.length; i++) {
           let obj = {}
-          let price = 0
           let count = 0
-          for (let a = 0; a < drug_month_prescriptions.advices.length; a++){
-            if(drug_ids[i] ==  drug_month_prescriptions.advices[a].drug_id){
+          for (let a = 0; a < drug_month_prescriptions.advices.length; a++) {
+            if (drug_ids[i].price == drug_month_prescriptions.advices[a].price) {
               obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
               obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
               obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
               obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
               obj['day'] = drug_month_prescriptions.advices[a].day
               // obj['prescribing_number'] =  obj['prescribing_number']  + drug_month_prescriptions.advices[a].prescribing_number
-              obj['prescribing_number_unit'] =  drug_month_prescriptions.advices[a].prescribing_number_unit
-              obj['medical_insurance_number'] =  drug_month_prescriptions.advices[a].drug.medical_insurance_number
-              obj['id'] =  drug_month_prescriptions.advices[a].drug_id
+              obj['prescribing_number_unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
+              obj['medical_insurance_number'] = drug_month_prescriptions.advices[a].drug.medical_insurance_number
+              obj['id'] = drug_month_prescriptions.advices[a].drug_id
               // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
-
-
-              count = count +  drug_month_prescriptions.advices[a].prescribing_number
-              price = price +   drug_month_prescriptions.advices[a].price
+              obj['retail_price'] = parseFloat(drug_month_prescriptions.advices[a].price)
+              count = count + drug_month_prescriptions.advices[a].prescribing_number
 
             }
           }
-          obj['retail_price'] = price
           obj['prescribing_number'] = count
           drugs.push(obj)
         }
 
-
-
-
-        for (let i = 0; i < project_ids.length; i++){
+        for (let i = 0; i < project_ids.length; i++) {
           let obj = {}
-          let price = 0
           let count = 0
-          for (let a = 0; a < project_month_prescriptions.project.length; a++){
-            if(project_ids[i] ==  project_month_prescriptions.project[a].project_id){
+          for (let a = 0; a < project_month_prescriptions.project.length; a++) {
+            if (project_ids[i].price == project_month_prescriptions.project[a].price) {
               obj['project_name'] = project_month_prescriptions.project[a].project.project_name
               obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
               obj['single_dose'] = project_month_prescriptions.project[a].single_dose
               obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
               obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
               obj['number_days'] = project_month_prescriptions.project[a].day
-              obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
-              obj['unit'] =  project_month_prescriptions.project[a].unit
-              obj['project_id'] =  project_month_prescriptions.project[a].project_id
-              count = count +  project_month_prescriptions.project[a].count
-              price = price +   project_month_prescriptions.project[a].price
+              obj['medical_code'] = project_month_prescriptions.project[a].project.medical_code
+              obj['unit'] = project_month_prescriptions.project[a].unit
+              obj['project_id'] = project_month_prescriptions.project[a].project_id
+              count = count + project_month_prescriptions.project[a].count
+              // price = price + project_month_prescriptions.project[a].price
+              obj['price'] = parseFloat(project_month_prescriptions.project[a].price)
+
             }
           }
-          obj['price'] = price
           obj['total'] = count
           projects.push(obj)
         }
 
-
-        for (let i = 0; i < additions_ids.length; i++){
+        for (let i = 0; i < additions_ids.length; i++) {
           let obj = {}
-          let price = 0
           let count = 0
-          for (let a = 0; a < addition_month_prescriptions.addition.length; a++){
-            if(project_ids[i] ==  addition_month_prescriptions.addition[a].item_id){
-              obj['item_name'] = addition_month_prescriptions.addition[a].item_name
-              obj['id'] = addition_month_prescriptions.addition[a].id
-              obj['item_id'] =  addition_month_prescriptions.addition[a].item_id
-              count = count +  addition_month_prescriptions.addition[a].count
-              price = price +   addition_month_prescriptions.addition[a].price
+          console.log(addition_month_prescriptions.addition)
+          if (addition_month_prescriptions.addition) {
+            for (let a = 0; a < addition_month_prescriptions.addition.length; a++) {
+              if (project_ids[i].price == addition_month_prescriptions.addition[a].price) {
+                obj['item_name'] = addition_month_prescriptions.addition[a].item_name
+                obj['id'] = addition_month_prescriptions.addition[a].id
+                obj['item_id'] = addition_month_prescriptions.addition[a].item_id
+                count = count + addition_month_prescriptions.addition[a].count
+                obj['price'] = parseFloat(addition_month_prescriptions.addition[a].price)
+              }
             }
+            obj['count'] = count
+            additions.push(obj)
           }
-          obj['price'] = price
-          obj['count'] = count
-          additions.push(obj)
         }
 
+        console.log(drugs)
+        console.log(projects)
+        console.log(additions)
 
         let p1 = {
           name: '处方' + 1,
           advices: drugs,
           project: [],
-          type:1,
-          addition: additions,
+          type: 1,
+          addition: additions
         }
         let p2 = {
           name: '处方' + 2,
-          type:2,
+          type: 2,
           project: projects,
           advices: [],
+          addition: []
+
         }
+
         this.month_prescriptions.push(p1)
         this.month_prescriptions.push(p2)
 
+        this.curMonthPrescriptions = this.month_prescriptions[0]
+
       },
+
+      // setMonthPrescription(month_prescriptions){
+      //   let drug_month_prescriptions = {
+      //     advices:[],
+      //   }
+      //   let drug_ids=[]
+      //   let project_month_prescriptions ={
+      //     project:[],
+      //
+      //   }
+      //   let project_ids=[]
+      //
+      //   let addition_month_prescriptions ={
+      //     addtions:[],
+      //
+      //   }
+      //   let additions_ids=[]
+      //
+      //
+      //   for (let i = 0; i < month_prescriptions.length; i++){
+      //     if(month_prescriptions[i].type == 1){ //药品
+      //       for (let a = 0; a < month_prescriptions[i].advices.length; a++){
+      //         drug_ids.push(month_prescriptions[i].advices[a].drug_id)
+      //         drug_month_prescriptions.advices.push(month_prescriptions[i].advices[a])
+      //       }
+      //
+      //     }else if(month_prescriptions[i].type == 2){ //项目
+      //       for (let a = 0; a < month_prescriptions[i].project.length; a++){
+      //         project_ids.push(month_prescriptions[i].project[a].project_id)
+      //         project_month_prescriptions.project.push(month_prescriptions[i].project[a])
+      //       }
+      //     }
+      //     //附加收费
+      //     for (let a = 0; a < month_prescriptions[i].addition.length; a++) {
+      //       additions_ids.push(month_prescriptions[i].addition[a].item_id)
+      //       addition_month_prescriptions.addtions.push(month_prescriptions[i].addition[a])
+      //     }
+      //
+      //   }
+      //
+      //
+      //
+      //
+      //   const obj = {}
+      //   const obj1 = {}
+      //   const obj2 = {}
+      //
+      //   drug_ids = drug_ids.reduce((cur, next) => {
+      //     obj[next] ? '' : obj[next] = true && cur.push(next)
+      //     return cur
+      //   }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      //   project_ids = project_ids.reduce((cur, next) => {
+      //     obj1[next] ? '' : obj1[next] = true && cur.push(next)
+      //     return cur
+      //   }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      //   additions_ids = additions_ids.reduce((cur, next) => {
+      //     obj2[next] ? '' : obj2[next] = true && cur.push(next)
+      //     return cur
+      //   }, []) // 设置cur默认类型为数组，并且初始值为空的数组
+      //
+      //
+      //
+      //
+      //
+      //   let drugs =[]
+      //   let projects =[]
+      //   let additions =[]
+      //
+      //
+      //   for (let i = 0; i < drug_ids.length; i++){
+      //     let obj = {}
+      //     let price = 0
+      //     let count = 0
+      //     for (let a = 0; a < drug_month_prescriptions.advices.length; a++){
+      //       if(drug_ids[i] ==  drug_month_prescriptions.advices[a].drug_id){
+      //         obj['drug_name'] = drug_month_prescriptions.advices[a].advice_name
+      //         obj['single_dose'] = drug_month_prescriptions.advices[a].single_dose
+      //         obj['delivery_way'] = drug_month_prescriptions.advices[a].delivery_way
+      //         obj['execution_frequency'] = drug_month_prescriptions.advices[a].execution_frequency
+      //         obj['day'] = drug_month_prescriptions.advices[a].day
+      //         // obj['prescribing_number'] =  obj['prescribing_number']  + drug_month_prescriptions.advices[a].prescribing_number
+      //         obj['prescribing_number_unit'] =  drug_month_prescriptions.advices[a].prescribing_number_unit
+      //         obj['medical_insurance_number'] =  drug_month_prescriptions.advices[a].drug.medical_insurance_number
+      //         obj['id'] =  drug_month_prescriptions.advices[a].drug_id
+      //         // obj['retail_price'] = obj['retail_price'] +  drug_month_prescriptions.advices[a].drug.retail_price
+      //
+      //
+      //         count = count +  drug_month_prescriptions.advices[a].prescribing_number
+      //         price = price +   drug_month_prescriptions.advices[a].price
+      //
+      //       }
+      //     }
+      //     obj['retail_price'] = price
+      //     obj['prescribing_number'] = count
+      //     drugs.push(obj)
+      //   }
+      //
+      //
+      //
+      //
+      //   for (let i = 0; i < project_ids.length; i++){
+      //     let obj = {}
+      //     let price = 0
+      //     let count = 0
+      //     for (let a = 0; a < project_month_prescriptions.project.length; a++){
+      //       if(project_ids[i] ==  project_month_prescriptions.project[a].project_id){
+      //         obj['project_name'] = project_month_prescriptions.project[a].project.project_name
+      //         obj['statistical_classification'] = project_month_prescriptions.project[a].project.statistical_classification
+      //         obj['single_dose'] = project_month_prescriptions.project[a].single_dose
+      //         obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
+      //         obj['execution_frequency'] = project_month_prescriptions.project[a].execution_frequency
+      //         obj['number_days'] = project_month_prescriptions.project[a].day
+      //         obj['medical_code'] =  project_month_prescriptions.project[a].project.medical_code
+      //         obj['unit'] =  project_month_prescriptions.project[a].unit
+      //         obj['project_id'] =  project_month_prescriptions.project[a].project_id
+      //         count = count +  project_month_prescriptions.project[a].count
+      //         price = price +   project_month_prescriptions.project[a].price
+      //       }
+      //     }
+      //     obj['price'] = price
+      //     obj['total'] = count
+      //     projects.push(obj)
+      //   }
+      //
+      //
+      //   for (let i = 0; i < additions_ids.length; i++){
+      //     let obj = {}
+      //     let price = 0
+      //     let count = 0
+      //     for (let a = 0; a < addition_month_prescriptions.addition.length; a++){
+      //       if(project_ids[i] ==  addition_month_prescriptions.addition[a].item_id){
+      //         obj['item_name'] = addition_month_prescriptions.addition[a].item_name
+      //         obj['id'] = addition_month_prescriptions.addition[a].id
+      //         obj['item_id'] =  addition_month_prescriptions.addition[a].item_id
+      //         count = count +  addition_month_prescriptions.addition[a].count
+      //         price = price +   addition_month_prescriptions.addition[a].price
+      //       }
+      //     }
+      //     obj['price'] = price
+      //     obj['count'] = count
+      //     additions.push(obj)
+      //   }
+      //
+      //
+      //   let p1 = {
+      //     name: '处方' + 1,
+      //     advices: drugs,
+      //     project: [],
+      //     type:1,
+      //     addition: additions,
+      //   }
+      //   let p2 = {
+      //     name: '处方' + 2,
+      //     type:2,
+      //     project: projects,
+      //     advices: [],
+      //   }
+      //   this.month_prescriptions.push(p1)
+      //   this.month_prescriptions.push(p2)
+      //
+      // },
       getList() {
         let params = {
           'record_date': this.record_date,