Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/patient.js

@@ -803,4 +803,13 @@ export function getPatientDetailInformedconsent(id,params){
     method:"get",
     params:params,
   })
+}
+
+export function getExportList(params){
+  
+  return request({
+    url:"/api/patient/getexportlist",
+    metod:"get",
+    params:params,
+  })
 }

src/api/schedule.js

@@ -38,6 +38,15 @@ export function getSchedulesTwo(params) {
   })
 }
 
+export function getSchedulesThree(params){
+  
+  return request({
+    url:"/api/schedule/getschedulethreeone",
+    method:"Get",
+    params:params,
+  })
+}
+
 export function getSchedulePatients(params) {
   return request({
     url: '/api/schedule/patients',

src/router/modules/workforce.js

@@ -223,5 +223,16 @@ export default {
   //     noCache: true
   //   }
   // }
+  {
+    path: '/scheduleTablePrintSix',
+    component: () => import('@/xt_pages/workforce/scheduleTablePrintSix'),
+    name: 'scheduleTablePrintSix',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'scheduleTablePrintSix',
+      noCache: true
+    }
+  },
   ]
 }

src/xt_pages/dialysis/details/consumable/dialysisParameter.vue

@@ -197,6 +197,13 @@
              <span>{{scope.row.dialysis_solution.dialysis_irrigation}}</span>
            </template>
         </el-table-column>
+
+        <el-table-column align="center" label="滤过器"  v-if="dialysisSett.dialysis_irrigation ==1">
+           <template slot-scope="scope">
+             <span>{{scope.row.dialysis_solution.dialysis_strainer}}</span>
+           </template>
+        </el-table-column>
+        
         
         <el-table-column align="center" label="置换液" v-if="dialysisSett.displace_liqui_part==1">
            <template slot-scope="scope">

src/xt_pages/dialysis/details/consumable/dialysisParameterPrint.vue

@@ -16,7 +16,7 @@
             <span class="main_title"> &nbsp;
               透析参数
             </span>
-            <span  style="float:right;">打印日期: &nbsp;
+            <span  style="float:left;">打印日期: &nbsp;
                {{$route.query.schedule_date}}
             </span>
           </div>
@@ -41,6 +41,7 @@
                 <td width="100" v-if="dialysisSett.dialyzer_perfusion_apparatus == 1">透析器/灌流器</td>
                 <td width="100"  v-if="dialysisSett.dialysis_dialyszers == 1">透析器</td>
                 <td width="100" v-if="dialysisSett.dialysis_irrigation ==1">灌流器</td>
+                <td width="100" v-if="dialysisSett.dialysis_irrigation ==1">滤过器</td>
                  <td width="100" v-if="dialysisSett.displace_liqui_part==1">置换液</td>
                 <td width="100"  v-if="dialysisSett.displace_liqui_value==1">置换液总量</td>
                 <td width="100" v-if="dialysisSett.kalium==1">钾</td>
@@ -51,8 +52,8 @@
                 <td width="100" v-if="dialysisSett.sealing_fluid_dispose == 1">封管液</td>
                 <td width="100"  v-if="dialysisSett.glucose==1">葡萄糖</td>
                 <td width="100"  v-if="dialysisSett.blood_flow_volume==1">血流量</td>
-                <td>封管液</td>
-                <td>促红</td>
+                <td v-if="org_id!=10587 && org_id!=0">封管液</td>
+                <td v-if="org_id!=10587 && org_id!=0">促红</td>
               </tr>
               </thead>
               <tbody>
@@ -140,6 +141,9 @@
                 <td width="100" v-if="dialysisSett.dialysis_irrigation ==1">
                      <span>{{item.dialysis_solution.dialysis_irrigation}}</span>
                 </td>
+                <td width="100" v-if="dialysisSett.dialysis_irrigation ==1">
+                     <span>{{item.dialysis_solution.dialysis_strainer}}</span>
+                </td>
                 <td width="100"  v-if="dialysisSett.displace_liqui_part==1">
                   <span>{{getDisplaceLiquiPart(item.dialysis_solution.displace_liqui_part)}}</span>
                 </td>
@@ -171,13 +175,13 @@
                    <span>{{item.dialysis_solution.blood_flow_volume?item.dialysis_solution.blood_flow_volume:""}}</span> 
                 </td>
                 
-                <td>
+                <td v-if="org_id!=10587 && org_id!=0">
                   <span v-if="getBloodAccessOption(item.dialysis_solution.blood_access).indexOf('导管')!==-1">1</span>
                   <span v-else></span>
                 </td>
                 
                 
-                <td>
+                <td v-if="org_id!=10587&& org_id!=0">
                   {{ item.advice_spc }}
                 </td>
                </tr>

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

@@ -1749,7 +1749,7 @@ export default {
           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585){
+      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587){
         var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

@@ -2694,6 +2694,28 @@ mu
             var hours = date.getHours()
             var minites = date.getMinutes()
 
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+           }else if (this.$store.getters.xt_user.org.id == 10587){
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
             if (month < 10) {
               month = '0' + month
             }

src/xt_pages/dialysis/details/index.vue

@@ -2238,7 +2238,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id ==10579 || this.org_id == 0){
+        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0
@@ -2417,7 +2417,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id == 0 || this.org_id == 10579){
+        if(this.org_id == 0 || this.org_id == 10579 || this.org_id ==10587){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0

src/xt_pages/dialysis/details/indexs.vue

@@ -1419,7 +1419,7 @@ export default {
           newArr.sort(this.compare('created_time'))
         }
 
-        if(this.org_id ==10579 || this.org_id == 0){
+        if(this.org_id ==10579 || this.org_id == 0 || this.org_id ==10587){
           if(newArr!=null && newArr.length>0){
             for(let i=0;i<newArr.length;i++){
               newArr[i].sort =0

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -842,7 +842,7 @@
                         style="width: 100px; text-align: center"
                       >
                         <span v-if="org_id == 10290 || org_id == 10318">{{
-                          lastafterdialysis.weight_after
+                          lastafterdialysis.weight_after?lastafterdialysis.weight_after:"/"
                         }}</span>
                         <span v-if="org_id != 10290 && org_id != 10318">{{
                           predialysis.weight_after_last_transparency

src/xt_pages/outpatientTool/components/detail.vue

@@ -33,7 +33,7 @@
                       value-format="yyyy-MM-dd"
                       range-separator="至"
                       start-placeholder="开始日期"
-                      @change="handleDateChangetwo"
+                      @change="handleDateChange"
                       end-placeholder="结束日期">
               </el-date-picker>
               <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
@@ -105,7 +105,7 @@ import BreadCrumb from '@/xt_pages/components/bread-crumb'
 import { GetSummaryDetail } from '@/api/his/his'
 import { uParseTime } from '@/utils/tools'
 import axios from 'axios'
-
+import pako from 'pako';
 // import NewStatementPrint from './newStatementPrint'
 const moment = require('moment')
 export default {
@@ -176,20 +176,22 @@ export default {
     },
 
     handleDateChange(value) {
-      let start_time = this.chargeDate[0]
-      let end_time = this.chargeDate[1]
-      const dateObj1 = new Date(start_time);
-      const dateObj2 = new Date(end_time);
-
-      // 计算两个日期之间的月份差
-      const monthDifference = (dateObj2.getFullYear() - dateObj1.getFullYear()) * 12 +
-        (dateObj2.getMonth() - dateObj1.getMonth());
-      if (monthDifference >= 1){
-        this.$message.error("时间间隔不能超出一个月")
-        return
-      }else{
-        this.getSummaryDetailListtwo()
-      }
+      // let start_time = this.chargeDate[0]
+      // let end_time = this.chargeDate[1]
+      // const dateObj1 = new Date(start_time);
+      // const dateObj2 = new Date(end_time);
+      //
+      // // 计算两个日期之间的月份差
+      // const monthDifference = (dateObj2.getFullYear() - dateObj1.getFullYear()) * 12 +
+      //   (dateObj2.getMonth() - dateObj1.getMonth());
+      // if (monthDifference >= 1){
+      //   this.$message.error("时间间隔不能超出一个月")
+      //   return
+      // }else{
+      //   this.getSummaryDetailListtwo()
+      // }
+      this.getSummaryDetailList()
+
 
     },
     Action(){
@@ -276,15 +278,19 @@ export default {
       const res = new Map()
       return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
     },
+    uniquepid(arr) {
+      const res = new Map()
+      return arr.filter((arr) => !res.has(arr.p_id) && res.set(arr.p_id, 1))
+    },
     changeDate() {
-      this.getSummaryDetailListtwo()
+      this.getSummaryDetailList()
     },
     changeItem() {
-      this.getSummaryDetailListtwo()
+      this.getSummaryDetailList()
     },
     searchAction() {
       this.item_type = '0'
-      this.getSummaryDetailListtwo()
+      this.getSummaryDetailList()
 
     },  getSummaryDetailListtwo() {
       this.detail_loading = true
@@ -395,32 +401,35 @@ export default {
           this.$message.error(response.data.msg)
           return false
         } else {
+
+
           this.detail_loading = false
 
           this.tableData = []
           let tempPatients = []
           let tempPatientsTwo = []
-
-          let tempData = response.data.data.patients
-          let data = response.data.data.patients
-          let orders = this.unique(tempData)
-
+          //
+          let tempData = response.data
+          let allData =  response.data
+           tempData = this.uniquepid(tempData)
+          //
           let order_infos = []
-
-          for (let i = 0; i < orders.length; i++) {
+          //
+          for (let i = 0; i < tempData.length; i++) {
             let obj = {
-              patient_id: orders[i].id,
-              name: orders[i].name,
+              patient_id: tempData[i].p_id,
+              name: tempData[i].p_name,
               orders: []
             }
-            for (let b = 0; b < data.length; b++) {
-              if (orders[i].id == data[b].id) {
-                obj.orders = obj.orders.concat(data[b].orders)
+            for (let b = 0; b < allData.length; b++) {
+              if (tempData[i].p_id == allData[b].p_id) {
+                obj.orders = obj.orders.concat(allData[b])
               }
             }
             tempPatients.push(obj)
           }
-
+          console.log(tempPatients)
+          //
           for (let i = 0; i < tempPatients.length; i++) {
             let obj = {
               patient_id: tempPatients[i].patient_id,
@@ -429,50 +438,49 @@ export default {
             }
             let orders = tempPatients[i].orders
 
-            for (let b = 0; b < orders.length; b++) {
-              for (let c = 0; c < orders[b].order_info.length; c++) {
+            for (let c = 0; c < orders.length; c++) {
                 let newObj = {}
+                newObj['count'] = orders[c].cnt
+                newObj['price'] = orders[c].pric
+                newObj['item_total'] = orders[c].det_item_fee_sumamt
 
-                newObj['count'] = orders[b].order_info[c].cnt
-                newObj['price'] = orders[b].order_info[c].pric
-                newObj['item_total'] = orders[b].order_info[c].det_item_fee_sumamt
-
-                if (orders[b].order_info[c].advice_id > 0 && orders[b].order_info[c].project_id == 0) {
+                if (orders[c].advice_id > 0 && orders[c].project_id == 0) {
                   newObj['type'] = 1
-                  newObj['item_name'] = orders[b].order_info[c].advice.advice_name
-                  newObj['item_id'] = orders[b].order_info[c].advice.drug_id
+                  newObj['item_name'] = orders[c].item_name
+                  newObj['item_id'] = orders[c].item_id
 
-                  if (orders[b].order_info[c].advice.drug.min_unit != orders[b].order_info[c].advice.drug.dose_unit) {
-                    newObj['item_spec'] =  orders[b].order_info[c].advice.drug.dose + orders[b].order_info[c].advice.drug.dose_unit + '*' + orders[b].order_info[c].advice.drug.min_number + orders[b].order_info[c].advice.drug.min_unit + '/' + orders[b].order_info[c].advice.drug.max_unit
+                  if (orders[c].min_unit != orders[c].dose_unit) {
+                    newObj['item_spec'] =  orders[c].dose + orders[c].dose_unit + '*' + orders[c].min_number + orders[c].min_unit + '/' + orders[c].max_unit
                   } else {
 
                     newObj['item_spec'] = ''
                   }
 
                 }
-                if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
+                if (orders[c].advice_id == 0 && orders[c].project_id > 0) {
                   newObj['type'] = 2
-                  newObj['item_id'] = orders[b].order_info[c].project.project_id
+                  newObj['item_id'] = orders[c].item_id
 
-                  if (orders[b].order_info[c].project.type == 2) {
+                  if (orders[c].p_type == 2) {
                     newObj['item_spec'] =""
-                    newObj['item_name'] = orders[b].order_info[c].project.project.project_name
+                    newObj['item_name'] = orders[c].item_name
 
 
-                  } else if (orders[b].order_info[c].project.type == 3) {
-                    newObj['item_spec'] =    orders[b].order_info[c].project.good_info.specification_name
-                    newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name
+                  } else if (orders[c].p_type == 3) {
+                    newObj['item_spec'] =  orders[c].specification_name
+                    newObj['item_name'] = orders[c].item_name
 
 
                   }
                 }
                 obj.order_info.push(newObj)
-                order_infos.push(orders[b].order_info)
+                order_infos.push(orders.order_info)
               }
-            }
             tempPatientsTwo.push(obj)
           }
+          console.log(tempPatientsTwo)
 
+          //
           for (let d = 0; d < tempPatientsTwo.length; d++) {
             tempPatientsTwo[d]['new_order_info'] = []
             let project = []
@@ -533,7 +541,6 @@ export default {
             }
 
           }
-
           for (let i = 0; i < tempPatientsTwo.length; i++) {
             let total = 0
             for (let b = 0; b < tempPatientsTwo[i].new_order_info.length; b++) {
@@ -582,9 +589,12 @@ export default {
                   this.tableData.push(obj)
 
 
+
+
               }
             }
           }
+          console.log( this.tableData)
           this.handleSpanTempArr()
           // this.tableData = tempPatientsTwo
 
@@ -609,7 +619,6 @@ export default {
             }
           }
 
-
         }
 
 
@@ -810,7 +819,7 @@ export default {
     }
   },
   created() {
-    this.getSummaryDetailListtwo()
+    this.getSummaryDetailList()
 
   }
 }

src/xt_pages/outpatientTool/components/gather.vue

@@ -14,24 +14,24 @@
         <el-select size="small" v-model="item_type" placeholder="请选择"
                    style="width:150px;margin-left:10px;" @change="changeItem">
           <el-option
-              label="全部"
-              value="0">
+            label="全部"
+            value="0">
           </el-option>
           <el-option
-              v-for="item,index in items"
-              :key="index"
-              :label="item.name"
-              :value="item.id">
+            v-for="item,index in items"
+            :key="index"
+            :label="item.name"
+            :value="item.id">
           </el-option>
         </el-select>
         <el-date-picker
-            v-model="chargeDate"
-            type="daterange"
-            value-format="yyyy-MM-dd"
-            range-separator="至"
-            start-placeholder="开始日期"
-            @change="changeDatetwo"
-            end-placeholder="结束日期">
+          v-model="chargeDate"
+          type="daterange"
+          value-format="yyyy-MM-dd"
+          range-separator="至"
+          start-placeholder="开始日期"
+          @change="changeDate"
+          end-placeholder="结束日期">
         </el-date-picker>
         <!--<el-radio v-model="radio" label="1">明细</el-radio>-->
         <!--<el-radio v-model="radio" label="2">汇总</el-radio>-->
@@ -47,9 +47,6 @@
 
         </el-popover> -->
         <el-button size="small" type="primary" @click="export_detail">报表下载</el-button>
-
-        <el-button size="small" type="primary" @click="export_detail_Two">报表下载2</el-button>
-
       </div>
     </div>
     <el-table :data="tableData" border :row-style="{ color: '#303133' }" ref="tables"
@@ -69,14 +66,14 @@
       <!--</el-table-column>-->
 
       <el-table-column align="center" prop="item_name" label="项目类别">
-        <template slot-scope="scope">{{ scope.row.item_name }}</template>
+        <template slot-scope="scope">{{scope.row.item_name}}</template>
       </el-table-column>
       <el-table-column align="center" prop="price" label="费用">
-        <template slot-scope="scope">{{ scope.row.price.toFixed(2) }}</template>
+        <template slot-scope="scope">{{scope.row.price.toFixed(2)}}</template>
       </el-table-column>
       <el-table-column align="center" prop="sum" label="费用总额">
         <template slot-scope="scope">
-          <div>{{ scope.row.sum.toFixed(2) }}</div>
+          <div>{{scope.row.sum.toFixed(2)}}</div>
         </template>
       </el-table-column>
 
@@ -87,9 +84,8 @@
 
 <script>
 import BreadCrumb from '@/xt_pages/components/bread-crumb'
-import {getExportChargeData, GetSummaryDetail} from '@/api/his/his'
-import {uParseTime} from "@/utils/tools";
-
+import { GetSummaryDetail } from '@/api/his/his'
+import { uParseTime } from '@/utils/tools'
 // import NewStatementPrint from './newStatementPrint'
 const moment = require('moment')
 export default {
@@ -99,20 +95,20 @@ export default {
   },
   data() {
     return {
-      gather_loading: false,
+      gather_loading:false,
       crumbs: [],
       tempArr: [],
       sameRowArr: [],
       keywords: '',
-      pos: 0,
+      pos:0,
 
       tableData: [],
       chargeDate: [moment(new Date()).add('year', 0).format('YYYY-MM-DD'), moment(new Date()).add('year', 0).format('YYYY-MM-DD')],
       item_type: '0',
       items: [
-        {id: 1, name: '药品'},
-        {id: 2, name: '项目'},
-        {id: 3, name: '耗材'},
+        { id: 1, name: '药品' },
+        { id: 2, name: '项目' },
+        { id: 3, name: '耗材' },
 
       ]
 
@@ -120,7 +116,7 @@ export default {
   },
   methods: {
 
-    objectSpanMethod({row, column, rowIndex, columnIndex}) {
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0) {
         if (rowIndex % 2 === 0) {
           return {
@@ -139,125 +135,19 @@ export default {
       const res = new Map()
       return arr.filter((arr) => !res.has(arr.id) && res.set(arr.id, 1))
     },
-    uniqueTwo(arr) {
-      const res = new Map()
-      return arr.filter((arr) => !res.has(arr) && res.set(arr, 1))
-    },  changeDatetwo() {
-      // console.log(this.chargeDate)
-      this.$confirm('提示', '接口优化升级，如有数据需要，请联系客服！', {
-        confirmButtonText: '确 定',
-        cancelButtonText: '取 消',
-        type: 'warning'
-      }).then(() => {
-
-
-      }).catch(() => {
-      })
-    },
     changeDate() {
       // console.log(this.chargeDate)
-      this.getSummaryDetailListtwo()
+      this.getSummaryDetailList()
     },
     changeItem() {
-      this.getSummaryDetailListtwo()
+      this.getSummaryDetailList()
+    }, uniquepid(arr) {
+      const res = new Map()
+      return arr.filter((arr) => !res.has(arr.p_id) && res.set(arr.p_id, 1))
     },
     searchAction() {
       this.item_type = '0'
-      this.getSummaryDetailListtwo()
-    },getSummaryDetailListtwo() {
-      this.gather_loading = true
-      let start_time = this.chargeDate[0]
-      let end_time = this.chargeDate[1]
-      let params = {
-        start_time: start_time,
-        end_time: end_time,
-        type: this.item_type,
-        keyword: this.keywords
-      }
-      GetSummaryDetail(params).then(response => {
-        if (response.data.state == 0) {
-          this.gather_loading = false
-
-          this.$message.error(response.data.msg)
-          return false
-        } else {
-          this.gather_loading = false
-
-          this.$confirm('提示', '接口优化升级，如有数据需要，请联系客服！', {
-            confirmButtonText: '确 定',
-            cancelButtonText: '取 消',
-            type: 'warning'
-          }).then(() => {
-
-
-          }).catch(() => {
-          })
-
-
-
-
-          // this.tableData = tempPatientsTwo
-
-          // console.log(tempPatientsTwo.length)
-          //
-
-        }
-        //
-        // console.log('去重前')
-        // console.log(advice)
-        // console.log(project)
-        // //
-        // //
-
-        // //
-        // console.log('去重后')
-        //
-        // console.log(advice.length)
-        // console.log(project.length)
-        //
-        // for (let i = 0; i < project.length; i++) {
-        //   let obj = {}
-        //   let count = 0
-        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
-        //     if (project[i].patient_id == tempPatientsTwo[a].patient_id && project[i].item_id == tempPatientsTwo[a].item_id && project[i].price == tempPatientsTwo[a].price) {
-        //       count = count + tempPatientsTwo[a].count
-        //       obj['count'] = count
-        //
-        //     }
-        //     obj['price'] = project[i].price
-        //     obj['type'] = project[i].type
-        //     obj['item_name'] = project[i].item_name
-        //     obj['item_id'] = project[i].item_id
-        //     obj['name'] = project[i].name
-        //     obj['patient_id'] = project[i].patient_id
-        //     obj['count'] = count
-        //     this.tableData.push(obj)
-        //   }
-        // }
-        //
-        //
-        // for (let i = 0; i < advice.length; i++) {
-        //   let obj = {}
-        //   let count = 0
-        //   for (let a = 0; a < tempPatientsTwo.length; a++) {
-        //     if (advice[i].patient_id == tempPatientsTwo[a].patient_id && advice[i].item_id == tempPatientsTwo[a].item_id && advice[i].price == tempPatientsTwo[a].price) {
-        //       count = count + tempPatientsTwo[a].count
-        //       obj['count'] = count
-        //
-        //     }
-        //     obj['price'] = advice[i].price
-        //     obj['type'] = advice[i].type
-        //     obj['item_name'] = advice[i].item_name
-        //     obj['item_id'] = advice[i].item_id
-        //     obj['name'] = advice[i].name
-        //     obj['patient_id'] = advice[i].patient_id
-        //     this.tableData.push(obj)
-        //   }
-        // }
-        // console.log(this.tableData.length)
-        // this.tableData = this.sort(this.tableData)
-
-      })
+      this.getSummaryDetailList()
     },
     getSummaryDetailList() {
       this.gather_loading = true
@@ -276,39 +166,30 @@ export default {
           this.$message.error(response.data.msg)
           return false
         } else {
-
-          this.$confirm('提示', '接口优化升级，如有数据需要，请联系客服！', {
-            confirmButtonText: '确 定',
-            cancelButtonText: '取 消',
-            type: 'warning'
-          }).then(() => {
-
-
-          }).catch(() => {
-          })
-
-
           this.gather_loading = false
 
           let tempPatients = []
           let tempPatientsTwo = []
           this.tableData = []
-          let tempData = response.data.data.patients
-          let data = response.data.data.patients
-          let orders = this.unique(tempData)
+          let tempData = response.data
+          let data = response.data
+          let orders = this.uniquepid(tempData)
+          console.log(orders)
+
           for (let i = 0; i < orders.length; i++) {
             let obj = {
-              patient_id: orders[i].id,
-              name: orders[i].name,
+              patient_id: orders[i].p_id,
+              name: orders[i].p_name,
               orders: []
             }
             for (let b = 0; b < data.length; b++) {
-              if (orders[i].id == data[b].id) {
-                obj.orders = obj.orders.concat(data[b].orders)
+              if (orders[i].p_id == data[b].p_id) {
+                obj.orders = obj.orders.concat(data[b])
               }
             }
             tempPatients.push(obj)
           }
+          console.log(tempPatients)
 
           for (let i = 0; i < tempPatients.length; i++) {
             let obj = {
@@ -317,31 +198,29 @@ export default {
               order_info: []
             }
             let orders = tempPatients[i].orders
-            for (let b = 0; b < orders.length; b++) {
-              for (let c = 0; c < orders[b].order_info.length; c++) {
+              for (let c = 0; c < orders.length; c++) {
                 let newObj = {}
 
-                newObj['count'] = orders[b].order_info[c].cnt
-                newObj['price'] = orders[b].order_info[c].pric
-                if (orders[b].order_info[c].advice_id > 0 && orders[b].order_info[c].project_id == 0) {
+                newObj['count'] = orders[c].cnt
+                newObj['price'] = orders[c].pric
+                if (orders[c].advice_id > 0 && orders[c].project_id == 0) {
                   newObj['type'] = 1
-                  newObj['item_name'] = orders[b].order_info[c].advice.advice_name
-                  newObj['item_id'] = orders[b].order_info[c].advice.drug_id
+                  newObj['item_name'] = orders[c].item_name
+                  newObj['item_id'] = orders[c].item_id
 
                 }
-                if (orders[b].order_info[c].advice_id == 0 && orders[b].order_info[c].project_id > 0) {
-                  newObj['item_id'] = orders[b].order_info[c].project.project_id
-                  if (orders[b].order_info[c].project.type == 2) {
+                if (orders[c].advice_id == 0 && orders[c].project_id > 0) {
+                  newObj['item_id'] = orders[c].item_id
+                  if (orders[c].p_type == 2) {
                     newObj['type'] = 2
-                    newObj['item_name'] = orders[b].order_info[c].project.project.project_name
-                  } else if (orders[b].order_info[c].project.type == 3) {
+                    newObj['item_name'] = orders[c].item_name
+                  } else if (orders[c].p_type == 3) {
                     newObj['type'] = 3
-                    newObj['item_name'] = orders[b].order_info[c].project.good_info.good_name
+                    newObj['item_name'] = orders[c].item_name
                   }
                 }
                 obj.order_info.push(newObj)
               }
-            }
             tempPatientsTwo.push(obj)
           }
           console.log(tempPatientsTwo)
@@ -377,10 +256,12 @@ export default {
               }
             }
 
+
             for (let i = 0; i < advice.length; i++) {
               price2 = parseFloat(price2.toString()) + parseFloat((parseFloat(advice[i].count.toString()) * parseFloat(advice[i].price.toString()).toFixed(2)).toString())
             }
 
+
             switch (parseInt(this.item_type)) {
               case 0:
 
@@ -433,6 +314,8 @@ export default {
 
             }
 
+
+
           }
 
           this.handleSpanTempArr()
@@ -559,7 +442,7 @@ export default {
         }
       })
       this.sameRowArr = sameRowArr
-    }, merge({row, column, rowIndex, columnIndex}) {
+    }, merge({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 0 || columnIndex === 3) {
         const _row = this.tempArr[rowIndex]
         const _col = _row > 0 ? 1 : 0
@@ -569,7 +452,7 @@ export default {
         }
       }
     }, getTotal(param) {
-      const {columns, data} = param
+      const { columns, data } = param
       const sums = []
       columns.forEach((column, index) => {
         if (index === 0) {
@@ -594,106 +477,7 @@ export default {
       })
 
       return sums
-    }, export_detail_Two() {
-      let start_time = this.chargeDate[0]
-      let end_time = this.chargeDate[1]
-      let params = {
-        start_time: start_time,
-        end_time: end_time,
-      }
-      getExportChargeData(params).then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
-        } else {
-          let list = []
-          let tempData = response.data.data.patients
-          for (let i = 0; i < tempData.length; i++) {
-           let data =  this.handleData(tempData[i].order_info)
-            for (let b = 0; b < data.length; b++) {
-              let obj = {
-                remark: "",
-                name:tempData[i].patient.name,
-                id_card_no:tempData[i].patient.id_card_no,
-                item_name: data[b].name,
-                price: data[b].price,
-              }
-              if (b == 0) {
-                obj.remark = "就诊日期:"+this.getTimes(tempData[i].settle_accounts_date) +" 医保报销:"+tempData[i].fund_pay_sumamt + " 现金:"+tempData[i].psn_cash_pay
-              } else {
-                obj.remark = ""
-              }
-              list.push(obj)
-            }
-          }
-          console.log(list)
-
-          var  tarList = []
-          for (let i = 0; i < list.length; i++) {
-            if(list[i].price > 0) {
-              let obj = {
-                "姓名": list[i].name,
-                "身份证号": list[i].id_card_no,
-                "收费项目": list[i].item_name,
-                "金额": list[i].price,
-                "备注": list[i].remark,
-              }
-              tarList.push(obj)
-            }
-          }
-
-          import("@/vendor/Export2Excel").then((excel) => {
-            const tHeader = [
-              "姓名",
-              "身份证号",
-              "收费项目",
-              "金额",
-              "备注",
-
-            ];
-            const filterVal = [
-              "姓名",
-              "身份证号",
-              "收费项目",
-              "金额",
-              "备注",
-            ];
-            const data = this.formatJson(filterVal, tarList);
-            excel.export_json_to_excel({
-              header: tHeader,
-              data,
-              filename: "消费明细",
-            });
-          });
-
-        }
-      })
-    }, getTimes(time) {
-      return uParseTime(time, "{y}-{m}-{d}");
-    }, handleData(order_info) {
-     let data = []
-     let med_chrgitm_types = []
-      for (let i = 0; i < order_info.length; i++) {
-        med_chrgitm_types.push(order_info[i].med_chrgitm_type)
-      }
-      med_chrgitm_types = this.uniqueTwo(med_chrgitm_types)
-
-      for (let i = 0; i < med_chrgitm_types.length; i++) {
-        let obj = {}
-        let price = 0
-        for (let a = 0; a < order_info.length; a++) {
-          if (med_chrgitm_types[i] == order_info[a].med_chrgitm_type) {
-            price = price + order_info[a].det_item_fee_sumamt
-          }
-        }
-        obj['price'] = price
-        obj['name'] = this.getType(med_chrgitm_types[i])
-        data.push(obj)
-      }
-      return data
-    },
-
-    export_detail() {
+    }, export_detail() {
 
       let list = []
       for (let i = 0; i < this.tableData.length; i++) {
@@ -703,93 +487,33 @@ export default {
         let pay_sumamt = order.price.toFixed(2)
         let total = order.sum.toFixed(2)
 
+
         let obj = {
           '患者姓名': name,
           '项目类别': item_name,
           '费用': pay_sumamt,
-          '费用总额': total,
+          '费用总额':total,
         }
         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_excel1({
           header: tHeader,
           data,
           filename: '汇总',
-          ref: this.$refs['tables'].$el
+          ref:this.$refs['tables'].$el
         })
       })
 
     }, formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]))
-    },      getType(med_chrgitm_type) {
-      switch (med_chrgitm_type) {
-        case '01':
-          return '床位费'
-          break
-        case '02':
-          return '诊察费'
-
-          break
-        case '03':
-          return '检查费'
-
-          break
-        case '04':
-          return '化验费'
-          break
-        case '05':
-          return '治疗费'
-
-          break
-        case '06':
-          return '手术费'
-
-          break
-        case '07':
-          return '护理费'
-
-          break
-        case '08':
-          return '材料费'
-
-          break
-        case '09':
-          return '西药费'
-
-          break
-        case '10':
-          return '中药饮片费'
-
-          break
-        case '11':
-          return '中成药费'
-
-          break
-        case '12':
-          return '一般诊疗费'
-
-          break
-        case '13':
-          return '挂号费'
-          break
-        case '14':
-          return '其他费'
-          break
-        case '0':
-          return '其他费'
-          break
-
-      }
-
-    },
-
+    }
   },
   created() {
-    this.getSummaryDetailListtwo()
+    this.getSummaryDetailList()
 
   }
 }

src/xt_pages/role/admin.vue

@@ -25,12 +25,12 @@
         >医药师登记</el-button>
 
 
-        <!-- <el-button
+        <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toJiaBan">加班</el-button> -->
+          @click="toJiaBan">加班</el-button>
        
 
          <!-- <el-button

src/xt_pages/user/components/PatientDetail.vue

@@ -282,6 +282,12 @@
               </el-form-item>
              </el-col>
 
+             <el-col :span="8">
+                <el-form-item label="工作单位 : " prop="work">
+                  <el-input v-model="form.work" disabled></el-input>
+                </el-form-item>
+              </el-col>
+
              <el-col :span="24">
               <el-form-item label="病历号 : " prop="record_number">
                 <el-input
@@ -750,11 +756,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="工作单位 : " prop="work">
-                  <el-input v-model="form.work" disabled></el-input>
-                </el-form-item>
-              </el-col>
+          
               <el-col :span="8">
                 <el-form-item label="单位地址 : " prop="unit_address">
                   <el-input v-model="form.unit_address" disabled></el-input>

src/xt_pages/user/components/PatientForm.vue

@@ -333,6 +333,13 @@
                 </el-checkbox-group>
               </el-form-item>
             </el-col>
+
+            <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
+                <el-form-item label="工作单位 : " prop="work">
+                  <el-input v-model="form.work"></el-input>
+                </el-form-item>
+            </el-col>
+
             
             <el-col :span="24">
               <el-form-item label="病历号 : " prop="record_number">
@@ -343,6 +350,7 @@
               </el-form-item>
              </el-col>
 
+            
              <el-col :span="24">
               <el-form-item label="主管护士 : " prop="record_number">
                 <el-select v-model="form.nurse" style="width:200px">
@@ -791,11 +799,7 @@
                     </el-select>
                   </el-form-item>
                 </el-col>
-                <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
-                  <el-form-item label="工作单位 : " prop="work">
-                    <el-input v-model="form.work"></el-input>
-                  </el-form-item>
-                </el-col>
+                
                 <el-col :span="8" :style="isEdit ? 'width:360px' : ''">
                   <el-form-item label="单位地址 : " prop="unit_address">
                     <el-input v-model="form.unit_address"></el-input>

src/xt_pages/user/patients.vue

@@ -352,6 +352,7 @@
       
   
         <el-button type="primary" size="small" style="float:right" @click="toExport">导出</el-button>
+        <el-button type="primary" size="small" style="float:right" @click="toExportOne">导出2</el-button>
       </div>
       <div  class="cell clearfix">
 
@@ -740,7 +741,7 @@
 
 <script>
   import { fetchAllAdminUsers } from "@/api/doctor";
-  import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients,GetRemind,getPatientAllagic } from '@/api/patient'
+  import { code, EditLapseto, fetchList, getMaxDialysisNo, OpenView, postExportPatients,GetRemind,getPatientAllagic,getExportList } from '@/api/patient'
   import { generateLog } from '@/api/config'
   import QRCode from 'qrcodejs2'
   import Vue from 'vue'
@@ -922,7 +923,9 @@
           patient_end_time:"",
           nurse:"0"
         },
-        adminUserOptions:[]
+        adminUserOptions:[],
+        scheduleList:[],
+        patientsList:[]
       }
     },
     created() {
@@ -942,9 +945,18 @@
       //获取
       this.GetRemindPatientList()
       this.fetchAllAdminUsers();
+      this.getExportList()
     },
 
     methods: {
+      getExportList(){
+        getExportList(this.listQuery).then(response=>{
+           if(response.data.state ==1){
+             this.scheduleList =  response.data.data.schedule
+             this.patientsList = response.data.data.patientsList
+           }
+        })
+      },
       fetchAllAdminUsers() {
         fetchAllAdminUsers().then((response) => {
           if (response.data.state === 1) {
@@ -1513,26 +1525,31 @@
         this.schedulType = scheduleType
         this.listQuery.schedul_type = scheduleType
         this.getList()
+        this.getExportList()
       },
       selectSystemType(systemType) {
         this.systemType = systemType
         this.listQuery.binding_state = systemType
         this.getList()
+        this.getExportList()
       },
       selectLapseTo(lapseto) {
         this.lapsetoType = lapseto
         this.listQuery.lapseto = lapseto
         this.getList()
+        this.getExportList()
       },
       selectSource(source) {
         this.sourceType = source
         this.listQuery.source = source
         this.getList()
+        this.getExportList()
       },
       selectPatientSource(source){
         this.patientSoureType = source
         this.listQuery.patientSoureType = source
         this.getList()
+        this.getExportList()
       },
       changeTimeOne(val) {
         var time = this.getTimestamp(val) - this.end_time
@@ -1541,6 +1558,7 @@
           this.listQuery.start_time = ''
         } else {
           this.getList()
+          this.getExportList()
           this.startTime = this.getTimestamp(val)
         }
       },
@@ -1551,6 +1569,7 @@
           this.listQuery.end_time = ''
         } else {
           this.getList()
+          this.getExportList()
           this.end_time = this.getTimestamp(val)
         }
       },
@@ -1580,7 +1599,7 @@
             console.log("wowowowo",this.tableData)
             this.pageTotal = this.tableData.length
             this.total = response.data.data.total
-
+          
           }
         })
       },
@@ -1800,6 +1819,31 @@
     formatJson(filterVal, jsonData) {
       return jsonData.map(v => filterVal.map(j => v[j]));
     },
+
+    toExportOne(){
+      import('@/vendor/Export2Excel').then(excel => {
+
+        console.log("hhhh323223",this.scheduleList)
+        for(let i=0;i<this.scheduleList.length;i++){
+          this.scheduleList[i].name = ""
+          this.scheduleList[i].wort_unit = ""
+            this.scheduleList[i].name = this.GetPatientName(this.scheduleList[i].patient_id)
+            this.scheduleList[i].wort_unit = this.GetPatientWorkUnit(this.scheduleList[i].patient_id)
+        }
+
+        const tHeader = ['姓名', '工作单位']
+        const filterVal = ['name', 'wort_unit']
+        console.log("table",this.scheduleList)
+
+        const data = this.formatJson(filterVal, this.scheduleList)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: '今日透析记录'
+        })
+        this.downloadLoading = false
+     })
+    },
     tranAge(val) {
       if(val.birthday){
         var birth = uParseTime(val.birthday, '{y}-{m}-{d}');
@@ -1814,6 +1858,25 @@
           this.patientAllgicList = list
         }
       })
+    },
+    GetPatientName(id){
+       var name = ""
+       for(let i=0;i<this.patientsList.length;i++){
+          if(id == this.patientsList[i].id){
+             name = this.patientsList[i].name
+          }
+       }
+       return name
+    },
+    GetPatientWorkUnit(id){
+      console.log("HHAHAHAH",this.patientsList)
+      var work_unit =""
+      for(let i=0;i<this.patientsList.length;i++){
+          if(id == this.patientsList[i].id){
+            work_unit = this.patientsList[i].work_unit
+          }
+       }
+       return work_unit
     }
     }
   }

src/xt_pages/workforce/appointment.vue

@@ -68,6 +68,7 @@
       <div style="display:flex;align-items:center">
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleAction" v-if="activeName !='historyWeek'">打印排班</el-button>
         <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleActionOne" v-if="activeName == 'historyWeek'">打印排班</el-button>
+        <el-button type="primary" size="small" icon="el-icon-printer" @click="printScheduleActionTwo">治疗签到</el-button>
         <!-- <schedule-upload-excel style="margin-right:10px;" :on-success='handleSuccess' v-if="is_edit"></schedule-upload-excel> -->
         <!-- <el-button @click="printTable" type="primary" size="small">打印排班</el-button> -->
         <el-button v-if="isShow()" type="primary" size="small" @click="export_file()" :loading="downloadLoading">
@@ -123,7 +124,7 @@
         <table-data ref="tableData"  :week-time="activeName" :partitions-prop="partitions"
                     :schedule-zone-row-prop="scheduleZoneRow"
                     :schedule-zone-prop="scheduleZone" title="" @event1="changePartition"
-                    @event2="changeSchedule"  @event3="changeWeekDay" v-show="showtableOne">
+                    @event2="changeSchedule"  @event3="changeWeekDay" @event6="changeScheduleType" v-show="showtableOne">
         </table-data>
       </div>
       <!-- 编辑 -->
@@ -369,6 +370,7 @@ export default {
       newDay: [],
       templateObj: {},
       week_date:""
+      
     }
   },
   components: {
@@ -971,6 +973,7 @@ export default {
       console.log("whhwhwhwhwhwh",date)
       console.log("this.templateObj.template_id == 1",this.templateObj.template_id)
       console.log("week2333333333333333",this.week_date)
+      console.log("woowowowow",this.schedule_type)
       if (this.templateObj.template_id == 1) {
         this.$router.push({path: '/workforce/schedule/print', query: {date: date}})
       }
@@ -1003,6 +1006,20 @@ export default {
 
       this.$router.push({path:'/scheduleTablePrintThree?partition_id='+partition_id+"&weekTime="+nextTwoWeek+"&week_date="+week_date+"&start_time="+start_time+"&end_time="+end_time})
     },
+    printScheduleActionTwo:function(){
+      var date = new Date().getTime()
+      if(this.activeName == 'historyWeek'){
+        date = date - 14 * 24 * 60 * 60 * 1000
+      }else if (this.activeName == 'lastWeek') {
+        date = date - 7 * 24 * 60 * 60 * 1000
+      } else if (this.activeName == 'nextWeek') {
+        date = date + 7 * 24 * 60 * 60 * 1000
+      } else if (this.activeName == 'nextTwoWeek') {
+        date = date + 14 * 24 * 60 * 60 * 1000
+      }
+       this.$router.push({path: '/scheduleTablePrintSix?partition_id=' + this.partition_id + "&weekTime=" + this.activeName+"&week_date="+this.week_date+"&schedule_type="+this.schedule_type})
+      
+    },
     isShow() {
       let isShow = false
       if (Object.keys(this.partitions).length != 0) {
@@ -2984,6 +3001,10 @@ export default {
       this.week_date = str
     },
 
+    changeScheduleType(val){
+      this.schedule_type = val
+    },
+
     changeWeek(val) {
       this.start_time = ""
       this.end_time = ""

src/xt_pages/workforce/components/tableData.vue

@@ -920,7 +920,8 @@ export default {
       isShowXiaWu:true,
       isShowWanShang:true,
       schedulesGroup:[],
-      count_num:null
+      count_num:null,
+      schedule_type:0
     };
   },
 
@@ -1084,6 +1085,9 @@ export default {
         this.isShowXiaWu = true
         this.isShowWanShang = true
       }
+      this.schedule_type =val
+      this.$emit('event6', val)
+
     },
     switchThis(flag){
       if(this.value1==false){