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/details/dialog/DoctorAdviceDialog.vue

     methods: {
       //调试
       lili(index,row){
-        // console.log("==index==",index)
-        // console.log("==row==",row)
         console.log("==doctor_advices==",this.doctor_advices)
         console.log("==this.form==",this.form)
       },
       },
       submitEditAdvice() {
         // console.log()
-        console.log("==this.form==",this.form)
-        console.log("==this.src_type==",this.src_type)
         if (this.form.advice_name.length == 0) {
           this.$message.error('请填写医嘱名称')
           return
                     }
                   }
                   this.execTimeDialogVisible = false
+                  
                   return false
               }
 
         }
         let mode = '1'
 
-        console.log("==this.form==",this.form)
-        console.log("==this.src_type==",this.src_type)
-
        if(this.src_type == ""){
           this.form.way = 1
        }
           this.form.advice_name = arr[0]
        }
 
-
         CreateDoctorAdvice(this.patient.id, this.form, mode).then(response => {
-          console("保存!!!!!!!!!!!!!!!this.form",this.form)
             this.loading = false
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
               this.currentRow = null
               this.setCurrent()
               this.hideForm()
-              console.log("保存",this.form.parent_id)
               if (this.form.parent_id > 0) {
                 var spliceIndex = -1
                 for (let index = this.doctor_advices.length - 1; ; index--) {
-                  console.log("====this.doctor_advices[index].origin====",this.doctor_advices[index].origin)
                   if (this.doctor_advices[index].parent_id === this.form.parent_id) {
                     spliceIndex = index
                     break
           })
           .catch(() => {
           })
-        // this.handleSpanTempArr()
       }
       ,
       openDelete(index, row) {
             }
           }
         })
-
-        // this.handleSpanTempArr()
-        // this.handleStyle()
       }
       ,
       getXuserName(id) {
       }
       ,
       show(his_is_open,is_advice_open) {
-        console.log("this.doctor_advices",this.doctor_advices)
-        console.log("++++his_is_open++++++",his_is_open)
-        console.log("++++is_advice_open++++++",is_advice_open)
         this.his_is_open = his_is_open
         this.is_advice_open = is_advice_open
         this.isVisibility = true
                  this.doctor_advices.push(his_advices[i])
               }
             }
+
+            this.$notify({
+              title: '成功',
+              message: '新增医嘱成功',
+              type: 'success',
+              duration: 2000
+            })
+
+            this.currentIndex = -1
+            this.currentRow = null
+            this.setCurrent()
+            this.hideForm()
+
           }
         })
       }

src/xt_pages/hospitalStation/components/chargeDialog.vue

           <el-form-item class="specialFormItem">
             <div style="display: flex">
               <!--            这里不要改成el-input，因为使用el-input会导致一个奇怪的bug，千万不要改！！！！！！！！！！！！！！！！！！！！-->
-              <el-input v-model="form.tmp_decimal" onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @change="lilili">
-
-              </el-input>元
+              <input  v-model="form.tmp_decimal" class="input_style" onkeyup="this.value = this.value.replace(/[^\d.]/g,'');" @change="lilili">元
             </div>
           </el-form-item>
         </span>
       </el-form-item>
 
 
-      <el-form-item label="付款金额：" prop="id_card" :validate-event="is_Name">
+      <el-form-item label="付款金额：" prop="id_card">
         <el-input
           style="color: black"
           type="number"
       </el-form-item>
 
 
-      <el-form-item label="付款卡号：" prop="id_card" :validate-event="is_Name">
+      <el-form-item label="付款卡号：" prop="id_card">
         <el-input v-model="form.pay_card_no"></el-input>
       </el-form-item>
 
             this.form.acct_pay = this.order.acct_pay
             this.form.psn_pay = this.order.psn_cash_pay
             this.form.total = this.order.medfee_sumamt
-            this.form.pay_price = this.order.medfee_sumamt
+            this.form.pay_price = (this.order.medfee_sumamt).toFixed(2)
             this.form.medical_insurance_price = this.order.fund_pay_sumamt
             this.form.private_price = this.order.psn_part_amt
           }
     width: 50%;
   }
 }
-
-.input_style{
+.input_style {
   border-radius: 5px;
-  border: 1px solid #dbdbdb;
+  border: 1px solid #dddddd;
+}
+.input_style:focus {
+outline:none;
+border: 1px solid #66b1ff;
 }
 </style>

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

         <div>
             <span>
             <span style="position: absolute;top:280px;left:40px">合计金额（大写）：</span>
-            <span  style="position: absolute;top:280px;left:180px">
+            <!-- <span  style="position: absolute;top:280px;left:180px">
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
                     {{ zhongwen.substring(0,1) }}十万
                 </span>
             </span>
             <span style="position: absolute;top:280px;left:350px">
                 <span v-if="zhongwen.indexOf('拾') > -1">
-<!--                    {{ // zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}拾-->
-                        {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
+                {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
 
                 </span>
                 <span v-else>零拾</span>
                     {{ zhongwen.substring(zhongwen.indexOf('分') - 1,zhongwen.indexOf('分')) }}分
                 </span>
                 <span v-else>零分</span>
-            </span>
+            </span> -->
+            <span style="position: absolute;top:280px;left:190px;letter-spacing: 20px;">{{zhongwen}}</span>
             </span>
             <span style="position: absolute;top:280px;left:510px">合计：{{ list.order.medfee_sumamt }}</span>
         </div>

src/xt_pages/outpatientCharges/components/chargeDialog.vue

           this.form.acct_pay = this.order.acct_pay
           this.form.psn_pay = this.order.psn_cash_pay
           this.form.total = this.order.medfee_sumamt
-          this.form.pay_price = this.order.medfee_sumamt
+          this.form.pay_price = (this.order.medfee_sumamt).toFixed(2)
           this.form.medical_insurance_price = this.order.fund_pay_sumamt
           this.form.private_price =  this.order.psn_part_amt
         }
         }
         this.form.reality_price = parseInt(this.form.total) - parseInt(val) - parseInt(this.form.discount_price)
       }
-    },mounted() {
+    },
+    mounted() {
       var nowDate = new Date()
       var nowYear = nowDate.getFullYear()
       var nowMonth = nowDate.getMonth() + 1

src/xt_pages/outpatientTool/components/detailStatistics.vue

       list:[],
       his_patient:{},
       id:0,
+      start_time:"",
+      end_time:"",
     }
   },
   methods: {
      this.getHisSummaryDetailList()
     },
     changeDate() {
+      this.start_time = this.chargeDate[0]
+      this.end_time = this.chargeDate[1]
       this.getHisSummaryDetailList()
     },
     changeItem(id) {
     getHisSummaryDetailList() {
       let start_time = this.chargeDate[0]
       let end_time = this.chargeDate[1]
+      
       let params = {
         patient_id:this.patient_id,
         start_time: start_time,
             obj.total_price += (this.tableData[i].cnt * this.tableData[i].pric)  
           }
           obj.total_price = (obj.total_price).toFixed(2)
-          // this.tableData.push(obj)cccc
-          // console.log("tabledata23233232233232",this.tableData)
+          
           var new_arr = []
-       
+           
+        
           if(this.keywords!=""){
             for(let i=0;i<this.tableData.length;i++){
               if(this.tableData[i].index!="合计"){
             }
             var objs = {index:"合计",total_price:0,record_date:"0"}
             objs.total_price = this.getPrice(new_arr)
-            // new_arr.push(objs)
-            
             this.tableData = new_arr
           }
 
             }
             this.tableData = []
             obj.total_price = this.getPrice(new_arr)
-            // new_arr.push(obj)
-            // console.log("new_arr2332323232",new_arr)
             this.tableData = new_arr
-          }          
+          }      
+          
+          console.log("hh233223233232323232322332",this.tableData)
        }
      })
     },
       return maf_pay
     },
     toPrint(){
-      this.$router.push({path:"/hisTool/detailPrint?patient_id="+this.patient_id+"&start_time="+this.chargeDate[0]+"&end_time="+this.chargeDate[1]+"&type="+this.item_type +"&keyword="+this.keywords+"&id="+this.id+"&balance_accounts_type="+this.his_patient.balance_accounts_type})
+      this.$router.push({path:"/hisTool/detailPrint?patient_id="+this.patient_id+"&start_time="+this.start_time+"&end_time="+this.end_time+"&type="+this.item_type +"&keyword="+this.keywords+"&id="+this.id+"&balance_accounts_type="+this.his_patient.balance_accounts_type})
     },
     getPrice(val){
       var total_price = 0
 
   },
   created() {
+    this.start_time = this.chargeDate[0]
+    this.end_time = this.chargeDate[1]
     this.getHisSummaryDetailList()
   },
   watch:{

src/xt_pages/outpatientTool/components/gatherStatistics.vue

               v-loading="detail_loading"
               highlight-current-row>
       <el-table-column type="index" label="序号" width="60px" align="center">
-           <template slot-scope="scope">{{scope.row.index}}</template>
+           <template slot-scope="scope">
+           {{scope.row.index}}
+           </template>
       </el-table-column>
       <el-table-column align="center" label="处方日期">
         <template slot-scope="scope">
     </el-table>
      <div>
       <div class="listInfo">
-            <!-- <div>西药：{{westernMedicineCostTotal}}</div> -->
             <div>西药：{{getWesternMedicineCostTotal()}}</div>
             <div>中成药：{{getChineseTraditionalMedicineCostTotal()}}</div>
             <div>中草药：{{getChineseTotal()}}</div>
       balanceAccountsType:0,
       medicalInsuranceLevelList:[],
       id:0,
+      start_time:"",
+      end_time:"",
     }
   },
   methods: {
         }
         var obj ={index:"合计",is_total:1,total:0}
         obj.total = this.getPrice(new_arr)
-        // new_arr.push(obj)
         this.tableList = []
         this.tableList = new_arr
       }else{
       return total_price.toFixed(2)
     },
     changeDate() {
+      this.start_time = this.chargeDate[0]
+      this.end_time = this.chargeDate[1]
       this.getGatherDetailList()
     },
     changeItem(id) {
             this.his_hospital = response.data.data.his_hospital
 
             var order_info = response.data.data.order_info
+
             if(order_info!=null){
               for(let i=0;i<order_info.length;i++){
                 order_info[i].med_chrgitm_type = this.getType(order_info[i].med_chrgitm_type)
                 order_info[i].chrgitm_lv  = this.getMedicineInsuranceType(order_info[i].chrgitm_lv)
              }
-              var prescription = response.data.data.prescription
+             var prescription = response.data.data.prescription
+            //  console.log("prescription2332232323233223",prescription)
               this.setMonthPrescription(prescription)
             }
+            // console.log("order_info233232323232323232",order_info)
             this.order_info_list = order_info
-          
+             
             this.balanceAccountsType = response.data.data.balanceAccountsType
 
             this.medicalInsuranceLevelList = response.data.data.medicalInsuranceLevelList
              
     
           }
-
+ 
            if(this.id == 1){
              var new_arr = []
              for(let i=0;i<this.tableList.length;i++){
              this.tableList = []
              this.tableList = new_arr
             }
+          
+            var new_arr_two = []
+            for(let i=0;i<this.tableList.length;i++){
+                if(this.tableList[i].advice_id > 0){
+                  this.tableList[i].const_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
+                }
+                if(this.tableList[i].project_id > 0){
+                  this.tableList[i].const_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
+                }
+               
+               if(this.tableList[i].const_type!=''){
+                  new_arr_two.push(this.tableList[i])
+               }
+
+             }
+           
+            this.tableList = []
+            this.tableList = new_arr_two
+          
+            console.log("分解死23232332332323223322332323232",this.tableList)
+            let dataInfo = {}
+            this.tableList.forEach((item, index) => {
+              let { item_id } = item
+              if (!dataInfo[item_id]) {
+                dataInfo[item_id] = {
+                  item_id,
+                  child: [],
+                  count_number:0,
+                  name:item.name,
+                  price:item.price,
+                  record_date:item.record_date,
+                }
+              }
+              dataInfo[item_id].child.push(item)
+            })
+            
+            let list = Object.values(dataInfo)
+            
+
+            list.forEach((it,index)=>{
+              for(let i=0;i<this.tableList.length;i++){
+                if(it.item_id == this.tableList[i].item_id){
+                    it.child.push(this.tableList[i])
+                }
+              }
+            })
+           console.log("list23232332323223322323",list)
+           for(let i=0;i<list.length;i++){
+            for(let j=0;j<list[i].child.length;j++){
+                list[i].count_number += list[i].child[j].count
+            }
+           }
+
+            console.log("我的list23223233223322323",list)
+             
         }
      })
     },
      return project_name
     },
     setNewData(details) {
-     
         let drug_ids = []
         let project_ids = []
 
         for (let i = 0; i < details.length; i++) {
           if (details[i].advice && details[i].advice.id > 0 && details[i].advice.prescription && details[i].advice.prescription.type == 1) { //药品
+            
             let obj = {
               id: details[i].advice.drug_id,
               price: details[i].advice.price,
           }
 
         }
+        
         let new_drug_ids = this.unique(drug_ids)
         let new_project_ids = this.unique(project_ids)
         let list = []
-       
+         
+         console.log("new_drug_ids232323323232332332233223",new_drug_ids)
         if (new_drug_ids.length > 0 && new_project_ids.length == 0) {
           for (let i = 0; i < new_drug_ids.length; i++) {
             let obj = {}
             list.push(obj)
 
           }
+          console.log("list23323232233232",list)
+
+          // let dataInfo = {}
+          // list.forEach((item, index) => {
+          //   let { name } = item
+          //   if (!dataInfo[name]) {
+          //     dataInfo[name] = {
+          //       name,
+          //       child: []
+          //     }
+          //   }
+          // })
+          // let listOne = Object.values(dataInfo)
+          // listOne.forEach((item,index)=>{
+          //   for(let i=0;i<list.length;i++){
+          //      if(listOne[i].name == list[i].name){
+          //          listOne[i].child.push(list[i])
+          //      }
+          //   }
+          // })
+          // console.log("listONE2322323322323",listOne)
+         
         }
         if (new_drug_ids.length == 0 && new_project_ids.length > 0) {
           for (let i = 0; i < new_project_ids.length; i++) {
        }
      },
      toPrint(){
-        this.$router.push({path:"/hisTool/gatherPrint?patient_id="+this.patient_id+"&start_time="+this.chargeDate[0]+"&end_time="+this.chargeDate[1]+"&type="+this.item_type +"&keyword="+this.keywords+"&id="+this.id})
+        this.$router.push({path:"/hisTool/gatherPrint?patient_id="+this.patient_id+"&start_time="+this.start_time+"&end_time="+this.end_time+"&type="+this.item_type +"&keyword="+this.keywords+"&id="+this.id})
      },
      toPrintInvoice(){
-       this.$router.push({path:"/hisTool/gatherPrintInvoice?patient_id="+this.patient_id+"&start_time="+this.chargeDate[0]+"&end_time="+this.chargeDate[1]+"&type="+this.item_type +"&keyword="+this.keywords})
+       this.$router.push({path:"/hisTool/gatherPrintInvoice?patient_id="+this.patient_id+"&start_time="+this.start_time+"&end_time="+this.end_time+"&type="+this.item_type +"&keyword="+this.keywords})
      },
      setMonthPrescription(month_prescriptions) {
       let drug_month_prescriptions = {
             obj['is_total'] = 2
             obj['chrgitm_lv'] =  drug_month_prescriptions.advices[a].drug.medical_insurance_level 
             obj['unit'] = drug_month_prescriptions.advices[a].prescribing_number_unit
+            obj['item_id'] = drug_ids[i].id + "/" + drug_ids[i].price
             count = count + drug_month_prescriptions.advices[a].prescribing_number
 
           }
         obj['count'] = count
         this.tableList.push(obj)
       }
-
       for (let i = 0; i < project_ids.length; i++) {
         let obj = {}
         let count = 0
               obj['spec'] =  project_month_prescriptions.project[a].project.project_name
               obj['unit'] = project_month_prescriptions.project[a].unit
               obj['chrgitm_lv'] =  project_month_prescriptions.project[a].project.medical_coverage
+              obj['item_id'] = project_ids[i].id +"/"+ project_ids[i].price
             }else if (project_month_prescriptions.project[a].type == 3){
               obj['project_id'] = project_month_prescriptions.project[a].id
               obj['name'] = project_month_prescriptions.project[a].good_info.good_name
               obj['spec'] = project_month_prescriptions.project[a].good_info.specification_name
               obj['unit'] = project_month_prescriptions.project[a].good_info.packing_unit
               obj['chrgitm_lv'] =  project_month_prescriptions.project[a].good_info.medical_insurance_level
+              obj['item_id'] = project_ids[i].id + "/" + project_ids[i].price
             }
             obj['single_dose'] = project_month_prescriptions.project[a].single_dose
             obj['delivery_way'] = project_month_prescriptions.project[a].delivery_way
         }
         obj['count'] = count
         this.tableList.push(obj)
-
       }
+     console.log("表格 2323323232323323323232323232323",this.tableList)
+           
       var objOne = {index:"合计",is_total:1,total:0}
       objOne.total = this.getTotalPrice(this.tableList)
       for(let i=0;i<this.tableList.length;i++){
         this.tableList[i].index = i + 1
         this.tableList[i].total_all = (this.tableList[i].count * this.tableList[i].price).toFixed(2)
-        // console.log(this.tableList[i].count,'opop')
       }
-      // this.tableList.push(objOne)
     },
 
     getTotalPrice(val){
         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
          }
-         console.log("化验23233223322323",this.tableList[i].drug_type)
          if(this.tableList[i].drug_type == "化验费"){
             total_price += this.tableList[i].count * this.tableList[i].price
          }
 
   },
   created() {
+    this.start_time = this.chargeDate[0]
+    this.end_time = this.chargeDate[1]
     this.tableList = []
     this.getGatherDetailList()
 

src/xt_pages/outpatientTool/detailPrint.vue

       <div class="listInfo">
         <div>患者姓名：{{ patient.name }}</div>
         <div>性别：{{ patient.gender == 1 ? "男" : "女" }}</div>
-        <div>结算类别：{{ getType(his_patient.balance_accounts_type) }}</div>
+        <div>结算类别：
+          {{ getType(his_patient.balance_accounts_type) }}
+          {{getType(his_record_patient.balance_accounts_type)}}
+        </div>
         <div style="min-width:300px;">发票号码：{{order.fa_piao_number}}</div>
       </div>
       <div class="listInfo">
-        <div>住院/门诊号：{{his_patient.number}}</div>
-        <div>科室：{{ getDepartment(his_patient.departments) }}</div>
-        <div style="min-width:350px;">就诊流水号：{{ his_patient.number }}</div>
+        <div>住院/门诊号：
+          {{his_patient.number}}
+          {{his_record_patient.ipt_otp_no}}
+        </div>
+        <div>科室：
+          {{ getDepartment(his_patient.departments) }}
+          {{ getDepartment(his_record_patient.departments) }}
+        </div>
+        <div style="min-width:350px;">就诊流水号：
+          {{ his_patient.number }}
+          {{his_record_patient.number}}
+        </div>
       </div>
       <div class="listInfo">
         <div>总费用：{{ getAllPice() }}</div>
         <div>个人支付：
-          <span v-if="this.$route.query.balance_accounts_type == 2">{{ getAllPice() }}</span>
-          <span v-if="this.$route.query.balance_accounts_type != 2">{{ getActPay() }}</span>
+          <span v-if="this.$route.query.balance_accounts_type == 2 && his_patient.id >0">{{ getAllPice() }}</span>
+          <span v-if="this.$route.query.balance_accounts_type != 2 && his_patient.id >0">{{ getActPay() }}</span>
+          
+          <span v-if="his_record_patient.balance_accounts_type == 2">{{ getAllPice() }}</span>
+          <span v-if="his_record_patient.balance_accounts_type != 2">{{ getActPay() }}</span>
 
         </div>
         <div>基金支付记账：{{ getFundPaySumamt() }}</div>
         { value: 8, label: "医保自费" },
       ],
       order:{},
+      his_record_patient:{},
     };
   },
   methods: {
           this.patient = response.data.data.patient;
 
           this.his_patient = response.data.data.his_patient;
-
+         
+         this.his_record_patient = response.data.data.his_record_patient
 
           this.hisDepatment = response.data.data.hisDepatment;
 

src/xt_pages/outpatientTool/gatherPrint.vue

     methods:{
       printtpage() {
       const style =
-        '@media print {.list-print{width:960px;margin:0 auto} .listTitle {font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo {display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;}.listTable {width: 100%;text-align: center;border-collapse: collapse;line-height: 25px;font-size: 14px;border-color: #000;text-align: left;} .listTable tr td {padding: 0 5px;}.tableBottom {font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne {margin-right: 40px;}';
+        '@media print {.list-print{width:960px;margin:0 auto} .listTitle {font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.listInfo {display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .listInfo div{width:400px;} .listTable {width: 100%;text-align: center;border-collapse: collapse;line-height: 25px;font-size: 14px;border-color: #000;text-align: left;} .listTable tr td {padding: 0 5px;}.tableBottom {font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne {margin-right: 40px;}';
       printJS({
         printable: "list-print",
         type: "html",
           this.tableList = []
           this.tableList = new_arr
         }
+
+      
+        var new_arr_two = []
+        for(let i=0;i<this.tableList.length;i++){
+            if(this.tableList[i].advice_id > 0){
+              this.tableList[i].const_type = this.getAdviceMedChrgintmType(this.tableList[i].name)
+            }
+            if(this.tableList[i].project_id > 0){
+              this.tableList[i].const_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
+            }
+            
+            if(this.tableList[i].const_type!=''){
+              new_arr_two.push(this.tableList[i])
+            }
+
+          }
+          this.tableList = []
+          this.tableList = new_arr_two
      })
     },
      getAdviceName(id){
     justify-content: space-between;
     margin: 10px 0;
     div{
-      width: 200px;
+      width: 400px;
     }
 }
 .listTable{

src/xt_pages/outpatientTool/gatherPrintInvoice.vue

         if(this.tableList[i].project_id > 0){
            this.tableList[i].drug_type = this.getProjectMedChrgintmType(this.tableList[i].project_id)
          }
-         console.log("化验23233223322323",this.tableList[i].drug_type)
          if(this.tableList[i].drug_type == "化验费"){
             total_price += this.tableList[i].count * this.tableList[i].price
          }