1

src/views/layout/Layout.vue

@@ -123,7 +123,7 @@ export default {
   },
   created(){
     console.log('permission_routers',this.permission_routers);
-    let menzhen = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord','hospitalStation'];
+    let menzhen = ['hospitalStation','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord',];
     let bingli = ['User','createPatient'];
     let touxi = ['home','workforce', 'dialysisrecord', 'dialysis', 'medicalScheduling', 'signIndex', 'qcd', 'device', 'quality_control'];
     let kucun = ['stockManage','stockDrugs','selfPreparedMedicine','otherManagement'];

src/views/layout/components/Sidebar/index.vue

@@ -69,7 +69,7 @@ export default {
     navTitle:{
       handler(newVal,oldVal){
         if(newVal == '门诊管理'){
-          let nameArr = ['outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord','hospitalStation'];
+          let nameArr = ['hospitalStation','outpatientRegistration','outpatientDoctorStation','outpatientCharges','outpatientPharmacy','outpatientRecord',];
           // console.log('permission_routers',this.permission_routers)
           let routerArr = [];
           this.permission_routers.map(item => {

src/xt_pages/outpatientCharges/listPrint.vue

@@ -464,4 +464,4 @@
   .newContainer::-webkit-scrollbar {
     height: 15px !important;
   }
-</style>
+</style>

src/xt_pages/outpatientCharges/summary.vue

@@ -85,7 +85,9 @@
           <template slot-scope="scope">{{scope.row.department_name}}</template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费日期">
-          <template slot-scope="scope"> {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}</template>
+          <template slot-scope="scope">
+            {{scope.row.setl_time?scope.row.setl_time:getTimes(scope.row.settle_accounts_date)}}
+          </template>
         </el-table-column>
         <el-table-column align="center" prop="name" label="收费员">
           <template slot-scope="scope">{{ getName(scope.row.creator) }}</template>
@@ -104,6 +106,10 @@
                        v-if="(scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9504) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9919) ||  ($store.getters.xt_user.org_id == 10106) ||  (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 4) || (scope.row.order_status == 2 && $store.getters.xt_user.org_id == 9990)">
               结算单
             </el-button>
+            <el-button size="mini" type="primary" @click="uploadInfo(scope.row)"
+                       v-if="scope.row.order_status == 2&& scope.row.result.id == 0">
+              上传结算清单
+            </el-button>
             <el-button size="mini" type="primary"
                        v-if="scope.row.order_status == 2 && $store.getters.xt_user.org_id == 10106"
                        @click="settlementPrint(scope.row)">结算单
@@ -235,6 +241,40 @@
       }
     },
     methods: {
+      uploadInfo(row) {
+        var that = this;
+        axios.get('http://127.0.0.1:9532/api/settlelist/get', {
+          params: {
+            order_id: row.id,
+            admin_user_id: this.$store.getters.xt_user.user.id
+          }
+        }).then(function (response) {
+          if (response.data.state == 0) {
+            that.$message.error(response.data.msg);
+            return false
+          } else {
+
+            if (response.data.data.failed_code == -10) {
+              // that.$message.error(response.data.data.msg)
+              that.$confirm(response.data.data.msg, '医保错误信息', {
+                confirmButtonText: '确 定',
+                type: 'warning'
+              }).then(() => {
+
+              }).catch(() => {
+              })
+
+            } else {
+              that.$message.success("上传成功");
+              row.result.id = response.data.data.result.id
+            }
+
+
+          }
+        }).catch(function (error) {
+        })
+      },
+
       fetchAllAdminUsers() {
         fetchAllAdminUsers().then(response => {
           if (response.data.state == 1) {
@@ -431,6 +471,22 @@
                 time = this.getTimes(order.settle_accounts_date)
               }
 
+              var hifmi_pay = 0.00;
+
+              if(order.setl_detail.length > 0){
+                var jsonObj = JSON.parse(order.setl_detail);
+                for (let i = 0; i < jsonObj.length; i++) {
+                  if (order.insutype == '310') {
+                    if (jsonObj[i].fund_pay_type == '310300') {
+                      hifmi_pay = jsonObj[i].fund_payamt
+                    }
+
+                  } else if (order.insutype == '390')
+                    if (order.fund_pay_type == '390200') {
+                      hifmi_pay = jsonObj[i].fund_payamt
+                    }
+                }
+              }
 
               let obj = {
                 '就诊号': order.mdtrt_id,
@@ -441,7 +497,7 @@
                 '实收金额': order.medfee_sumamt,
                 '医保统筹金额': order.fund_pay_sumamt,
                 '大额基金金额': order.hifob_pay,
-                '大病基金金额': order.hifmi_pay,
+                '大病基金金额': hifmi_pay,
                 '补充保险基金金额': order.hifes_pay,
                 '医疗救助基金金额': order.maf_pay,
                 '公务员基金': order.cvlserv_pay,
@@ -461,11 +517,12 @@
                 '收费状态': order_status,
                 '退费日期': ''
               };
+
               list.push(obj)
             }
             import('@/vendor/Export2Excel').then(excel => {
-              const tHeader = ['就诊号', '患者姓名', '开处时间','险种类型', '应收金额', '实收金额', '医保统筹金额', '大额基金金额', '大病基金金额', '补充保险基金金额', '医疗救助基金金额', '公务员基金', '个人支付基金', '个人账户支付金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费时间', '收费状态', '退费日期'];
-              const filterVal = ['就诊号', '患者姓名','开处时间','险种类型', '应收金额', '实收金额', '医保统筹金额', '大额基金金额', '大病基金金额', '补充保险基金金额', '医疗救助基金金额', '公务员基金', '个人支付基金', '个人账户支付金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费时间', '收费状态', '退费日期'];
+              const tHeader = ['就诊号', '患者姓名', '开处时间', '险种类型', '应收金额', '实收金额', '医保统筹金额', '大额基金金额', '大病基金金额', '补充保险基金金额', '医疗救助基金金额', '公务员基金', '个人支付基金', '个人账户支付金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费时间', '收费状态', '退费日期'];
+              const filterVal = ['就诊号', '患者姓名', '开处时间', '险种类型', '应收金额', '实收金额', '医保统筹金额', '大额基金金额', '大病基金金额', '补充保险基金金额', '医疗救助基金金额', '公务员基金', '个人支付基金', '个人账户支付金额', '科室', '医生姓名', '收费类别', '收费者姓名', '总金额', '现金支付', '账户支付', '支付宝支付', '微信支付', '其他支付', '收费时间', '收费状态', '退费日期'];
               const data = this.formatJson(filterVal, list);
               excel.export_json_to_excel({
                 header: tHeader,

src/xt_pages/workforce/remind_print.vue

@@ -83,7 +83,7 @@
                 </td>
                 <td :width="td_4_width" style="text-align:left"  v-if="printObj.doctor_advice == 1">
                   <span style="white-space: pre" v-if="main_collection.doctoradvice.length>0">{{getAdvice(main_collection.doctoradvice)}}</span>
-                   <span v-if="main_collection.hisdoctoradviceinfo.length>0">{{ getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
+                   <span style="white-space: pre" v-if="main_collection.hisdoctoradviceinfo.length>0">{{ getAdviceOne(main_collection.hisdoctoradviceinfo)}}</span>
                 </td>
               </tr>
               </tbody>
@@ -121,7 +121,8 @@
         currentDate:'',
         org_id:0,
         printObj:{},
-        zone:"",
+        week_time:0,
+        zone:0,
       }
     },
     components: {
@@ -129,7 +130,7 @@
     },
     created() {
       this.getPrintList()
-     this.org_id = this.$store.getters.xt_user.org.id
+      this.org_id = this.$store.getters.xt_user.org.id
     //  this.currentDate = this.getCurrentDate()
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
@@ -149,8 +150,9 @@
               list[i].sort = list[i].number.sort
            }
            var arr = list.sort(this.compare('sort'))
-             console.log("888888",list)
+            
              this.scheduleData = arr
+            
              let a = response.data.data.day
               console.log("a",a)
               var myDate = new Date(a);
@@ -266,6 +268,7 @@
 
           name = name + doctor_advice[i].advice_name + " " + drug_spec + " " + prescribing_number + " " + single_dose + " " + doctor_advice[i].delivery_way + " " + doctor_advice[i].execution_frequency + " " + doctor_advice[i].remark + "\n"
 
+        
         }
           return name
 
@@ -273,6 +276,7 @@
         }
 
       },
+     
       printAction: function() {
         const style = '@media print { .print_main_content { background-color: white; width:960px;  margin:0 auto; padding: 0 0 20px 0; } .order_title_panl { text-align: center; } .main_title { font-size: 18px; line-height: 40px; font-weight: 500; } .table_panel { } .table { width: 100%; border: 1px solid; border-collapse: collapse; padding: 2px; } thead tr td { border: 1px solid; text-align: center; font-size: 20px; padding: 15px 5px; } tbody tr td { border: 1px solid; text-align: center; font-size: 18px; padding: 10px 5px; } .proj { padding: 5px 0; text-align: left; } .proj_title { font-size: 16px; font-weight: 500; line-height: 25px; } .proj_item { font-size: 15px; line-height: 20px; } .zone_name { font-weight: 500; } }'
 
@@ -356,7 +360,6 @@
       getPrintList().then(response=>{
          if(response.data.state == 1){
            var list = response.data.data.list
-           console.log("list222222222",list)
            this.printObj = list
          }
       })

src/xt_pages/workforce/remind_print_setting.vue

@@ -45,7 +45,7 @@
 </template>
 
 <script>
-  import { getNextScheduleWeekDay,getPrintList } from '@/api/schedule'
+  import { getScheduleList,getPrintList } from '@/api/schedule'
   import { parseTime } from '@/utils'
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -92,54 +92,56 @@
       this.week_time  = this.$route.query.week_time
       this.zone = this.$route.query.zone
       this.pre_status = this.$route.query.prestatus
-      const params = {
+     const params = {
           week_type:this.week_type,
           week_time:this.week_time,
-          start_time:this.start_time,
-          end_time:this.end_time,
           zone:this.zone,
         }
-      getNextScheduleWeekDay(params).then(rs => {
-        var resp = rs.data
-        console.log(resp)
-        if (resp.state == 1) {
-         var scheduleData = resp.data.schedule
-
-          if(this.pre_status == 0){
-              for(let i=0;i<scheduleData.length;i++){
-              scheduleData[i].sort = scheduleData[i].number.sort
-            }
-            var arr = scheduleData.sort(this.compare('sort'))
-            this.scheduleData = arr
-            console.log("数据类型",this.scheduleData)
-          }
-          if(this.pre_status == 1){
-            var newList = []
-            for(let i=0;i<scheduleData.length;i++){
-              if(scheduleData.prescription.id > 0){
-                 newList.push(scheduleData[i])
-              } 
-            }
-            var arr = newList.sort(this.compare('sort'))
-            this.scheduleData = arr
+       console.log("params",params)
+       getScheduleList(params).then(response=>{
+         if(response.data.state ==1){
+           var list = response.data.data.list
+           for(let i=0;i<list.length;i++){
+              list[i].sort = list[i].number.sort
+           }
+           var arr = list.sort(this.compare('sort'))
+            
+             this.scheduleData = arr
+            
+             let a = response.data.data.day
+              console.log("a",a)
+              var myDate = new Date(a);
+              var year = myDate.getFullYear(); //年
+              var month = myDate.getMonth() + 1; //月
+              var day = myDate.getDate(); //日
+              var days = myDate.getDay();
+              switch(days) {
+              case 1:
+                days = '星期一';
+                break;
+              case 2:
+                days = '星期二';
+                break;
+              case 3:
+                days = '星期三';
+                break;
+              case 4:
+                days = '星期四';
+                break;
+              case 5:
+                days = '星期五';
+                break;
+              case 6:
+                days = '星期六';
+                break;
+              case 0:
+                days = '星期日';
+                break;
           }
-
-          if(this.pre_status == 2){
-            var newList = []
-            for(let i=0;i<scheduleData.length;i++){
-              if(scheduleData.prescription.id == 0){
-                 newList.push(scheduleData[i])
-              } 
-            }
-            var arr =   newList.sort(this.compare('sort'))
-            this.scheduleData = arr
+          var str = year + "年" + month + "月" + day + "日  " + days;
+          this.currentDate = str
           }
-        } else {
-          this.$message.error(resp.msg)
-        }
-      }).catch(err => {
-        this.$message.error(err)
-      })
+       })
 
       var now_time = parseInt(this.week_type) * 86400 + this.start_time
       console.log("now",now_time)