提交代码

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -80,12 +80,16 @@
 
         <div class="mainCell fixedCell" style="margin-bottom:10px;">
 
-          <div v-if="org_id == 10340">
+          <div v-if="org_id == 10454">
             <el-button  size="small"
-                        @click="openZb(4)"
+                        @click="openZb(1)"
                         v-if=" this.order.id == 0"
                         type="primary">记账
             </el-button>
+            <el-button   size="small"
+                         @click="openZb(2)"
+                         type="primary">撤销记账
+            </el-button>
           </div>
 
           <div  v-if="org_id != 10340">
@@ -99,10 +103,7 @@
             <!--                       type="primary">记账-->
             <!--            </el-button>-->
 
-            <!--            <el-button   size="small"-->
-            <!--                       @click="openZb(3)"-->
-            <!--                       type="primary">撤销记账-->
-            <!--            </el-button>-->
+
 
             <el-button v-loading="loadingone" size="small"
                        @click="open(40)"
@@ -966,7 +967,6 @@
     </el-dialog>
 
   </div>
-
 </template>
 
 
@@ -2889,179 +2889,29 @@ export default {
       }
     }, openZb(index) {
       switch (index) {
-        // case 1:
-        //   if(this.patientInfo.id == 0){
-        //     this.$message.error("请需要选择挂号的患者")
-        //     return
-        //   }
-        //   if(this.big_prescriptions.length == 0){
-        //     this.$message.error("处方不能为空")
-        //     return
-        //   }
-        //   if(this.form.diagnosis.length == 0){
-        //     this.$message.error("诊断不能为空")
-        //     return
-        //   }
-        //   var that = this
-        //   let obj = {
-        //     patient_id: this.patientInfo.id,
-        //     diagnosis_time: this.form.diagnosis_time,
-        //     record_date: this.record_date,
-        //     admin_user_id: this.$store.getters.xt_user.user.id,
-        //     org_id: this.$store.getters.xt_user.org_id
-        //
-        //   }
-        //   axios.get(process.env.BASE_API +'/coordinate/register', {
-        //     params: obj
-        //   })
-        //       .then(function(response) {
-        //         if (response.data.state == 0) {
-        //           that.$message.error(response.data.msg)
-        //           that.loadingtwo = false
-        //           return false
-        //         } else {
-        //           if (response.data.data.failed_code == -10) {
-        //             that.$confirm(response.data.data.msg, '医保错误信息', {
-        //               confirmButtonText: '确 定',
-        //               type: 'warning'
-        //             }).then(() => {
-        //
-        //             }).catch(() => {
-        //             })
-        //
-        //           } else {
-        //             that.radio = 1
-        //             that.changeRadioAndPatient(1)
-        //             that.$message({ message: '登记成功', type: 'success', duration: 5000 })
-        //           }
-        //
-        //         }
-        //       })
-        //       .catch(function(error) {
-        //
-        //       })
-        //
-        //   break
-        // case 2:
-        //   var that = this
-        //   var obj2 = {
-        //     id: this.patientInfo.id,
-        //     record_time: this.record_date,
-        //     his_patient_id: this.hisPatientInfo.id,
-        //     org_id: this.$store.getters.xt_user.org_id,
-        //     p_type:14,
-        //
-        //   }
-        //   obj2['diagnosis'] = this.form.diagnosis.join(',')
-        //   obj2['sick_type'] = this.form.sick_type
-        //   if (this.activeName == 'first') {
-        //     obj2['settle_accounts_type'] = 1
-        //   } else if (this.activeName == 'second') {
-        //     obj2['start_time'] = this.other_start_time
-        //     obj2['end_time'] = this.other_end_time
-        //     obj2['settle_accounts_type'] = 2
-        //   }
-        //   axios.get(process.env.BASE_API  + '/coordinate/opKeepAccounts', {
-        //     params: obj2
-        //   })
-        //       .then(function(response) {
-        //         if (response.data.state == 0) {
-        //           that.$message.error(response.data.msg)
-        //           that.loadingtwo = false
-        //           return false
-        //         } else {
-        //           if (response.data.data.failed_code == -10) {
-        //             that.$confirm(response.data.data.msg, '医保错误信息', {
-        //               confirmButtonText: '确 定',
-        //               type: 'warning'
-        //             }).then(() => {
-        //
-        //             }).catch(() => {
-        //             })
-        //
-        //           } else {
-        //             that.radio = 1
-        //             that.changeRadioAndPatient(1)
-        //             that.$message({ message: '记账成功', type: 'success', duration: 5000 })
-        //           }
-        //
-        //         }
-        //       })
-        //       .catch(function(error) {
-        //
-        //       })
-        //
-        //   break
-        // case 3:
-        //   var that = this
-        //   let obj3 = {
-        //     order_id:this.order.id,
-        //     admin_user_id: this.$store.getters.xt_user.user.id,
-        //     org_id: this.$store.getters.xt_user.org_id
-        //   }
-        //   axios.get(process.env.BASE_API + '/coordinate/opCancelKeepAccounts', {
-        //     params: obj3
-        //   })
-        //       .then(function(response) {
-        //         if (response.data.state == 0) {
-        //           that.$message.error(response.data.msg)
-        //           that.loadingtwo = false
-        //           return false
-        //         } else {
-        //           if (response.data.data.failed_code == -10) {
-        //             that.$confirm(response.data.data.msg, '医保错误信息', {
-        //               confirmButtonText: '确 定',
-        //               type: 'warning'
-        //             }).then(() => {
-        //
-        //             }).catch(() => {
-        //             })
-        //
-        //           } else {
-        //             that.radio = 1
-        //             that.changeRadioAndPatient(1)
-        //             that.$message({ message: '撤销记账成功', type: 'success', duration: 5000 })
-        //           }
-        //
-        //         }
-        //       })
-        //       .catch(function(error) {
-        //
-        //       })
-        //
-        //   break
-        case 4:
-          if(this.patientInfo.id == 0){
-            this.$message.error("请需要选择挂号的患者")
+        case 1:
+          if (this.patientInfo.id == 0) {
+            this.$message.error("请选择需要记账的患者")
             return
           }
-          if(this.big_prescriptions.length == 0){
+          if (this.prescriptions.length == 0) {
             this.$message.error("处方不能为空")
             return
           }
-          if(this.form.diagnosis.length == 0){
+          if (this.form.diagnosis.length == 0) {
             this.$message.error("诊断不能为空")
             return
           }
+          var that = this
           let obj = {
             patient_id: this.patientInfo.id,
             diagnosis_time: this.form.diagnosis_time,
             record_date: this.record_date,
             admin_user_id: this.$store.getters.xt_user.user.id,
-            his_patient_id: this.hisPatientInfo.id,
-            p_type:14
-          }
-          obj['diagnosis'] = this.form.diagnosis.join(',')
-          obj['sick_type'] = this.form.sick_type
-          if (this.activeName == 'first') {
-            obj['settle_accounts_type'] = 1
-          } else if (this.activeName == 'second') {
-            obj['start_time'] = this.other_start_time
-            obj['end_time'] = this.other_end_time
-            obj['settle_accounts_type'] = 2
+            org_id: this.$store.getters.xt_user.org_id
+
           }
-          var that = this
-          axios.get("http://127.0.0.1:9532"  + '/coordinate/settleAccount', {
+          axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/settleAccount', {
             params: obj
           })
             .then(function(response) {
@@ -3082,7 +2932,7 @@ export default {
                 } else {
                   that.radio = 1
                   that.changeRadioAndPatient(1)
-                  that.$message({ message: '记账成功', type: 'success', duration: 5000 })
+                  that.$message({ message: '登记成功', type: 'success', duration: 5000 })
                 }
 
               }
@@ -3090,9 +2940,44 @@ export default {
             .catch(function(error) {
 
             })
-
           break
+        case 2:
+          var that = this
+          let obj3 = {
+            order_id:this.order.id,
+            admin_user_id: this.$store.getters.xt_user.user.id,
+          }
+          axios.get("http://127.0.0.1:9532" + '/nmg/coordinate/settleAccount/cancel', {
+            params: obj3
+          })
+            .then(function(response) {
+              if (response.data.state == 0) {
+                that.$message.error(response.data.msg)
+                that.loadingtwo = false
+                return false
+              } else {
+                if (response.data.data.failed_code == -10) {
+                  that.$confirm(response.data.data.msg, '医保错误信息', {
+                    confirmButtonText: '确 定',
+                    type: 'warning'
+                  }).then(() => {
+
+                  }).catch(() => {
+                  })
 
+                } else {
+                  that.radio = 1
+                  that.changeRadioAndPatient(1)
+                  that.$message({ message: '撤销记账成功', type: 'success', duration: 5000 })
+                }
+
+              }
+            })
+            .catch(function(error) {
+
+            })
+
+          break
       }
     },openZF(index){
 

src/xt_pages/outpatientCharges/summary.vue

@@ -124,10 +124,10 @@
           <!--          </el-button-->
           <!--          >-->
 
-           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>
+<!--           <el-button size="small" type="primary" @click="export_detail_three">报表下载12</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_four">报表下载3</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_five">报表下载3</el-button>-->
-           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>
+<!--           <el-button size="small" type="primary" @click="export_detail_six">报表下载9</el-button>-->
           <!-- <el-button size="small" type="primary" @click="export_detail_tenone">报表下载10</el-button>-->
           <!--  <el-button size="small" type="primary" @click="export_detail_seven">报表下载4</el-button>-->
 
@@ -2677,6 +2677,7 @@ export default {
               治疗费:0,
               材料费:0,
               中成药费:0,
+              护理费:0,
               备注: "就诊日期:" + this.getTimes(order.settle_accounts_date) + " 医保报销: "+order.fund_pay_sumamt + " 现金:"+order.psn_cash_pay,
             }
             let xiyaoPrice = 0
@@ -2685,6 +2686,8 @@ export default {
             let zhiLiaoPrice = 0
             let cailiaoPrice = 0
             let zhongchengyaoPrice = 0
+            let huliPrice = 0
+
 
               for (let b = 0; b < order.info.length; b++) {
                 if(order.info[b].med_chrgitm_type ==  '09'){
@@ -2705,6 +2708,10 @@ export default {
                 if(order.info[b].med_chrgitm_type ==  '11'){
                   zhongchengyaoPrice = zhongchengyaoPrice + order.info[b].det_item_fee_sumamt
                 }
+
+                if(order.info[b].med_chrgitm_type ==  '07'){
+                  huliPrice = huliPrice + order.info[b].det_item_fee_sumamt
+                }
               }
             obj.西药费 = xiyaoPrice
             obj.化验费 = huaYanPrice
@@ -2712,6 +2719,8 @@ export default {
             obj.治疗费 = zhiLiaoPrice
             obj.材料费 = cailiaoPrice
             obj.中成药费 = zhongchengyaoPrice
+            obj.护理费 = huliPrice
+
 
 
             list.push(obj)
@@ -2727,6 +2736,8 @@ export default {
               "治疗费",
               "材料费",
               "中成药费",
+              "护理费",
+
               "备注",
             ];
             const filterVal = [
@@ -2738,6 +2749,7 @@ export default {
               "治疗费",
               "材料费",
               "中成药费",
+              "护理费",
               "备注",
             ];
             const data = this.formatJson(filterVal, list);