打印单

src/api/advice.js

@@ -498,7 +498,7 @@ export function GetLastOrNextDoctorAdvice(params) {
 }
 
 export function getSchedualDoctors (params) {
-  console.log("params-----",params)
+  
   return request({
     url: '/api/schedule/advices',
     method: 'get',
@@ -506,6 +506,15 @@ export function getSchedualDoctors (params) {
   })
 }
 
+export function getDoctorAdviceCount(params){
+  
+  return request({
+    url:"/api/schedule/getdoctoradvicecount",
+    method:"get",
+    params:params
+  })
+}
+
 
 
 

src/api/dialysis.js

@@ -290,5 +290,3 @@ export function GetDialysisGoodStatistics(params) {
 
   })
 }
-
-

src/api/schedule.js

@@ -1,16 +1,18 @@
 import request from '@/utils/request'
 
-export function getWeekPanels(t) {
+export function getWeekPanels(t,patitionId) {
+  console.log("params33333",t,patitionId)
   return request({
-    url: '/api/schedule/weekpanel?data=' + t,
+    url: '/api/schedule/weekpanel?data=' + t+"&patitionid="+patitionId,
     method: 'get'
   })
 }
 
-export function getSchedules(week) {
+export function getSchedules(params) {
   return request({
-    url: '/api/schedule/schedules?weekTime=' + week,
-    method: 'get'
+    url: '/api/schedule/schedules',
+    method: 'get',
+    params:params,
   })
 }
 

src/utils/tools.js

@@ -153,11 +153,7 @@ export function uParseTime(time, cFormat) {
 }
 
 export function calculateAnticoagulantZL(type, shouji, shichang, weichi) {
-  console.log('类型',type)
-  console.log('首剂', shouji)
-  console.log('时长', shichang)
-  console.log('维持', weichi)
-
+ 
   var t = 0.5
   if (type == 1) {
     t = 0.5

src/xt_pages/dialysis/components/allSummary.vue

@@ -438,7 +438,7 @@ export default {
 
               }
               }
-              console.log("list22222",this.list)
+              // console.log("list22222",this.list)
              }
           })
         },

src/xt_pages/dialysis/components/dialysisDrugs.vue

@@ -36,34 +36,273 @@
           </ul>
           </div>
         </div>
+
+        
         <div>
             <!-- <el-button size="small" icon="el-icon-printer" type="primary">打印</el-button> -->
             <el-button size="small" type="primary" @click="statistics">统计表</el-button>
         </div>
+      </div>
+        <div class="cell clearfix" style="justify-content: space-between;">
+        <div class="cell clearfix">
+          <label class="title"> <span class="name">给药途径</span> : </label>
+          <div class="time">
+            <ul class>
+              <li
+                :class="item.id == delivery_way ? 'active' : ''"
+                @click="selectDeliveryWay(item.id)"
+                v-for="item in deliveryWay"
+                :key="item.id"
+              >
+                {{ item.name }}
+              </li>
+            </ul>
+          </div>
+        </div>
       </div>
       <div>
-          <el-table
-            :data="tableData"
-            height="350"
-            border
-            style="width: 100%">
-            <el-table-column
-            align="center"
-            type="selection"
-            width="55">
-            </el-table-column>
-            <el-table-column
-            align="center"
-            prop="name"
-            label="姓名"
-            width="180">
-            </el-table-column>
-            <el-table-column
-            align="center"
-            prop="address"
-            label="地址">
-            </el-table-column>
-        </el-table>
+        <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+        @selection-change="handleSelectionChange"
+        :row-class-name="tableRowClassName"
+        :span-method="objectSpanMethod"
+        :cell-class-name="adviceNameShow"
+        :modal-append-to-body="false"
+        v-show="show">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="date" label="姓名" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+            <br>
+            ({{ scope.row.parent_id == 0 ? scope.row.dialysis_no : ""}})
+            <br>
+            <span v-if="scope.row.mode_id == 1">(HD)</span>
+            <span v-if="scope.row.mode_id == 2">(HDF)</span>
+            <span v-if="scope.row.mode_id == 3">(HD+HP)</span>
+            <span v-if="scope.row.mode_id == 4">(HP)</span>
+            <span v-if="scope.row.mode_id == 5">(HF)</span>
+            <span v-if="scope.row.mode_id == 6">(SCUF)</span>
+            <span v-if="scope.row.mode_id == 7">(IUF)</span>
+            <span v-if="scope.row.mode_id == 8">(HFHD)</span>
+            <span v-if="scope.row.mode_id == 9">(HFHD+HP)</span>
+            <span v-if="scope.row.mode_id == 10">(PHF)</span>
+            <span v-if="scope.row.mode_id == 11">(HFR)</span>
+            <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
+            <span v-if="scope.row.mode_id == 13">(CRRT)</span>
+            <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="透析器" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
+          <template slot-scope="scope">
+            <span>
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
+          <template slot-scope="scope">
+            <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
+              <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
+                {{ getAdviceContent(scope.row, 1)}}
+              </span>
+            </el-dropdown>
+
+            <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
+              <span class="el-dropdown-link">
+                &emsp;{{ getAdviceContent(scope.row, 2)}}
+              </span>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="start_time"
+          align="center"
+          min-width="30px"
+          label="执行时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.execution_time != 0">
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.execution_staff)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checker" align="center" min-width="30px" label="校对护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.checker)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="check_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.check_time != 0">
+              {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="created_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.created_time != 0">
+              {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+      </el-table>
+         <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+        @selection-change="handleSelectionChange"
+        :row-class-name="tableRowClassName"
+        :span-method="objectSpanMethod"
+        :cell-class-name="adviceNameShow"
+        :modal-append-to-body="false"
+        v-show="showOne">
+        <el-table-column type="selection" width="55" align="center"></el-table-column>
+        <el-table-column prop="date" label="姓名" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.name }}</span>
+            <br>
+            ({{ scope.row.parent_id == 0 ? scope.row.dialysis_no : ""}})
+            <br>
+            <span v-if="scope.row.mode_id == 1">(HD)</span>
+            <span v-if="scope.row.mode_id == 2">(HDF)</span>
+            <span v-if="scope.row.mode_id == 3">(HD+HP)</span>
+            <span v-if="scope.row.mode_id == 4">(HP)</span>
+            <span v-if="scope.row.mode_id == 5">(HF)</span>
+            <span v-if="scope.row.mode_id == 6">(SCUF)</span>
+            <span v-if="scope.row.mode_id == 7">(IUF)</span>
+            <span v-if="scope.row.mode_id == 8">(HFHD)</span>
+            <span v-if="scope.row.mode_id == 9">(HFHD+HP)</span>
+            <span v-if="scope.row.mode_id == 10">(PHF)</span>
+            <span v-if="scope.row.mode_id == 11">(HFR)</span>
+            <span v-if="scope.row.mode_id == 12">(HDF+HP)</span>
+            <span v-if="scope.row.mode_id == 13">(CRRT)</span>
+            <span v-if="scope.row.mode_id == 14">(腹水回输)</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="透析器" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ scope.row.dialyzer_perfusion_apparatus }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
+          <template slot-scope="scope">
+            <span>
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="advice_name" min-width="50px" label="医嘱内容" align="center">
+          <template slot-scope="scope">
+            <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
+              <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
+                {{ getAdviceContent(scope.row, 1)}}
+              </span>
+            </el-dropdown>
+
+            <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
+              <span class="el-dropdown-link">
+                &emsp;{{ getAdviceContent(scope.row, 2)}}
+              </span>
+            </el-dropdown>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="start_time"
+          align="center"
+          min-width="30px"
+          label="执行时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.execution_time != 0">
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.execution_staff)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="checker" align="center" min-width="30px" label="校对护士">
+          <template slot-scope="scope">
+            <span v-if="scope.row.parent_id == 0">
+              {{getXuserName(scope.row.checker)}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="check_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.check_time != 0">
+              {{scope.row.check_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
+          <template slot-scope="scope">
+            <span>{{ getXuserName(scope.row.advice_doctor) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="created_time"
+          align="center"
+          min-width="30px"
+          label="校对时间"
+          sortable
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.created_time != 0">
+              {{scope.row.created_time | parseTime('{m}-{d} {h}:{i}')}}
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
+      </el-table>
       </div>
 
       <dialysis-drugs-dialog ref="dialysisDrugs"></dialysis-drugs-dialog>
@@ -72,7 +311,9 @@
 
 
 <script>
+const moment = require('moment')
 import { GetAllZone } from "@/api/dialysis";
+import { getSchedualDoctors } from '@/api/advice'
 import dialysisDrugsDialog from './dialysisDrugsDialog'
 export default {
     components:{
@@ -90,19 +331,34 @@ export default {
             selected_date:new Date(),
             partitionArr:[],
             partitionType: 0,
-            tableData: []
+            tableData: [],
+            deliveryWay:[],
+            deliver_way:0,
+            search_input:"",
+            show:true,
+            showOne:false,
+            deliveryWay:[],
+            delivery_way:0,
+            scheduleMap:[],
+            selecting_schs: [],
         }
     },
     created(){
         this.getAllZone()
-        
+        this.getlist()
     },
     methods:{
         selectSchedulType(scheduleType) {
-            this.schedulType = scheduleType;
+           this.schedulType = scheduleType;
+           this.getlist()
         },
         selectPartitionType(partitionType) {
-            this.partitionType = partitionType;
+          this.partitionType = partitionType;
+          this.getlist()
+        },
+        selectDeliveryWay(val){
+         this.delivery_way = val
+         this.getlist()
         },
         getAllZone: function() {
             GetAllZone().then(response => {
@@ -112,13 +368,298 @@ export default {
                 } else {
                 this.partitionArr = response.data.data.zone;
                 this.partitionArr.unshift({ id: 0, name: "全部" });
+                var dics  =  response.data.data.dics
+                var obj = {id:0,name:"全部"}
+                this.deliveryWay.push(obj)
+                this.deliveryWay.push(...dics)
                 }
             });
         },
         statistics(){
             this.$refs.dialysisDrugs.show();
+        },
+        getlist(){
+          var name = ""
+         for(let i=0;i<this.deliveryWay.length;i++){
+              if(this.delivery_way == this.deliveryWay[i].id){
+                name = this.deliveryWay[i].name
+              }
         }
-    }
+        if(name == '全部'){
+          name = ""
+        }
+
+        let newTime =  moment(this.selected_date).format('YYYY-MM-DD')
+        getSchedualDoctors({ date: newTime,patient_type: 0,advice_type: 2,delivery_way:name}).then(rs => {
+        var resp = rs.data
+        if (resp.state == 1) {
+            this.admin_users = resp.data.adminUser
+            var schedules = resp.data.scheduals
+            console.log("数据多少2223333333",schedules)
+            var config = resp.data.config
+           if(config.is_open == 0){
+            this.show = true
+            this.showOne = false
+            let arr = []
+            let newArr = []
+            let newSchedules = []
+            schedules.map(item => {
+             item.doctor_advice.map(it =>{
+                it.name = item.patient.name
+                    if(item.prescription != null){
+                       it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                    }
+                    it.schedule_type = item.schedule_type
+                    it.zoneId = item.device_number.zone.id
+                    it.dialysis_no = item.patient.dialysis_no
+                    it.mode_id = item.mode_id
+                    arr.push(it)
+                })
+            })
+            if(this.schedulType == 0){
+                newSchedules = arr
+            }else{
+                arr.map(item => {
+                    if (item.schedule_type == this.schedulType) {
+                        newSchedules.push(item)
+                    }
+                })
+            }
+            
+            
+            if(this.partitionType == 0){
+                this.scheduleMap = newSchedules
+            }else {
+                let a = []
+                arr.map(item => {
+                    if(this.partitionType == item.zoneId){
+                        a.push(item)
+                    }
+                })
+                this.scheduleMap = a
+            }
+            this.scheduleMap.map(ele => {
+                let firstIndex = this.scheduleMap.findIndex(item => {
+                  return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
+                })
+                if (this.scheduleMap.findIndex(item => { return item.patient_id === firstIndex}) === -1) {
+                    newArr.push({
+                    length: this.scheduleMap.filter(item => {
+                        return item.patient_id === ele.patient_id    //利用数组的filter方法，过滤出相同category的数组的长度。数组长度-即为跨多少行
+                    }).length,
+                    firstIndex: firstIndex    // firstIndex 返回的是第一个catergory就满足的第一个Index,即为rowIndex开始于第几行。
+                    })
+                }
+            })
+            this.indexInfoList = newArr
+           }
+           if(config.is_open == 1 || config.is_open == 2){
+             this.show = false
+             this.showOne  = true
+            var schedules =  resp.data.hisAdvices
+          
+            let arr = []
+            let newArr = []
+            let newSchedules = []
+            schedules.map(item => {
+             item.doctor_advice.map(it =>{
+                it.name = item.patient.name
+                    if(item.prescription != null){
+                       it.dialyzer_perfusion_apparatus = item.prescription.dialyzer_perfusion_apparatus
+                    }
+                    it.schedule_type = item.schedule_type
+                    it.zoneId = item.device_number.zone.id
+                    it.dialysis_no = item.patient.dialysis_no
+                    it.mode_id = item.mode_id
+                    arr.push(it)
+                })
+            })
+            if(this.schedulType == 0){
+                newSchedules = arr
+            }else{
+                arr.map(item => {
+                    if (item.schedule_type == this.schedulType) {
+                        newSchedules.push(item)
+                    }
+                })
+            }
+            
+            
+            if(this.partitionType == 0){
+                this.scheduleMap = newSchedules
+            }else {
+                let a = []
+                arr.map(item => {
+                    if(this.partitionType == item.zoneId){
+                        a.push(item)
+                    }
+                })
+                this.scheduleMap = a
+            }
+            this.scheduleMap.map(ele => {
+                let firstIndex = this.scheduleMap.findIndex(item => {
+                  return item.patient_id === ele.patient_id   // 当category相同的时候，返回第一个相同的Index 赋值给 firstIndex
+                })
+                if (this.scheduleMap.findIndex(item => { return item.patient_id === firstIndex}) === -1) {
+                    newArr.push({
+                    length: this.scheduleMap.filter(item => {
+                        return item.patient_id === ele.patient_id    //利用数组的filter方法，过滤出相同category的数组的长度。数组长度-即为跨多少行
+                    }).length,
+                    firstIndex: firstIndex    // firstIndex 返回的是第一个catergory就满足的第一个Index,即为rowIndex开始于第几行。
+                    })
+                }
+            })
+            this.indexInfoList = newArr
+            console.log("过年9999999999",this.scheduleMap)
+           }
+         
+  
+         }
+         })
+      },
+      searchAction(){
+
+      },
+      handleScheduleDateChange(){
+        
+      },
+     handleSelectionChange(val) {
+      this.selecting_schs = val;
+     },
+      adviceNameShow({ row, column, rowIndex, columnIndex }) {
+          if (columnIndex == 2) {
+            return 'dialysisadvicenamedisplay'
+          } else {
+            return ''
+          }
+      },
+      tableRowClassName({ row, rowIndex }) {
+     
+     },
+     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+        if (columnIndex === 0) {
+            let index = this.indexInfoList.findIndex(item => {  //遍历数组
+                return item.firstIndex === rowIndex
+            })
+            if (index > -1) {
+                return {
+                    rowspan: this.indexInfoList[index].length,
+                    colspan: 1
+                }
+            } else {
+                return {
+                    rowspan: 0,
+                    colspan: 0
+                }
+            }
+        }
+        
+        if (columnIndex === 1) {
+            let index = this.indexInfoList.findIndex(item => {  //遍历数组
+                return item.firstIndex === rowIndex
+            })
+            if (index > -1) {
+                return {
+                    rowspan: this.indexInfoList[index].length,
+                    colspan: 1
+                }
+            } else {
+                return {
+                    rowspan: 0,
+                    colspan: 0
+                }
+            }
+        }
+        if (columnIndex === 2) {
+            let index = this.indexInfoList.findIndex(item => {  //遍历数组
+                return item.firstIndex === rowIndex
+            })
+            if (index > -1) {
+                return {
+                    rowspan: this.indexInfoList[index].length,
+                    colspan: 1
+                }
+            } else {
+                return {
+                    rowspan: 0,
+                    colspan: 0
+                }
+            }
+        }
+     },
+     getAdviceContent(row, isChild) {
+        let tempSingleDoseDesc = ''
+        let tempDrugSpecDesc = ''
+        let tempPrescribingNumberDesc = ''
+
+        if (row.prescribing_number) {
+          tempPrescribingNumberDesc =
+            row.prescribing_number + '' + row.prescribing_number_unit
+        }
+
+        if (row.single_dose) {
+          if (this.template_id != 6) {
+            tempSingleDoseDesc =
+              ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
+          } else {
+            tempSingleDoseDesc = row.single_dose + '' + row.single_dose_unit
+          }
+        }
+
+        if (row.advice_desc) {
+          tempDrugSpecDesc = '(' + row.advice_desc + row.drug_spec_unit + ')'
+        }
+
+        if (isChild == 1) {
+          // 不是子药
+
+          return (
+            row.advice_name +
+            tempDrugSpecDesc +
+            ' ' +
+            tempPrescribingNumberDesc +
+            tempSingleDoseDesc +
+            ' ' +
+            row.delivery_way +
+            ' ' +
+            row.execution_frequency
+          )
+        } else {
+          // 是子药
+          return (
+            row.advice_name +
+            tempDrugSpecDesc +
+            ' ' +
+            tempPrescribingNumberDesc +
+            tempSingleDoseDesc
+          )
+        }
+      },
+      getXuserName(id) {
+        if (id <= 0) {
+          return ''
+        }
+        var name = ''
+        if (
+          this.admin_users == null ||
+          typeof this.admin_users.length === 'undefined'
+        ) {
+          return name
+        }
+        var leng = this.admin_users.length
+        if (leng == 0) {
+          return name
+        }
+        for (let index = 0; index < leng; index++) {
+          if (this.admin_users[index].id == id) {
+            name = this.admin_users[index].name
+            break
+          }
+        }
+        return name
+      },
+    },
+   
 }
 </script>
 

src/xt_pages/dialysis/components/dialysisDrugsDialog.vue

@@ -10,65 +10,61 @@
         style="width:140px;margin-right:10px"
         v-model="startTime"
         type="date"
-        placeholder="选择日期">
+        placeholder="选择日期"
+        @change="changeStartTime">
         </el-date-picker>
         <el-date-picker
         style="width:140px;margin-right:10px"
         v-model="endTime"
         type="date"
-        placeholder="选择日期">
+        placeholder="选择日期"
+        @change="changeEndTime">
         </el-date-picker>
-        <el-select style="width:140px;margin-right:10px" v-model="schedulType" placeholder="请选择">
+        <el-select style="width:140px;margin-right:10px" v-model="delive_way" placeholder="请选择">
             <el-option
-            v-for="item in schedulArr"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value">
-            </el-option>
-        </el-select>
-        <el-select style="width:140px;margin-right:10px" v-model="partitionType" placeholder="请选择">
-            <el-option
-            v-for="item in partitionArr"
+            v-for="item in deliveryWay"
             :key="item.id"
             :label="item.name"
             :value="item.id">
             </el-option>
         </el-select>
-        <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button>
+        <!-- <el-button icon="el-icon-printer" type="primary" @click="toPrint">打印</el-button> -->
         
     </div>
     <div style="margin-top:10px;">
         <el-table :data="tableData" border style="width: 100%" height="300">
-            <el-table-column
-            align="center"
-            prop="address"
-            label="地址">
+            <el-table-column align="center" prop="address" label="药品名称">
+              <template slot-scope="scope">
+                 {{scope.row.advice_name}}
+              </template>
+            </el-table-column>
+             <el-table-column align="center" prop="address" label="药品规格">
+               <template slot-scope="scope">
+                  {{scope.row.advice_desc}}
+               </template>
             </el-table-column>
-            <el-table-column
-            align="center"
-            prop="name"
-            label="姓名"
-            width="100">
+            <el-table-column align="center" prop="name" label="数量" width="100">
+                <template slot-scope="scope">
+                   {{scope.row.Total}}
+                </template>
             </el-table-column>
         </el-table>
     </div>
-    <!-- <div slot="footer" class="dialog-footer">
-      <el-button @click="hide">取 消</el-button>
-      <el-button type="primary" @click="submitAction()">保 存</el-button>
-    </div> -->
   </el-dialog>
 </template>
 
 
 
 <script>
+const moment = require('moment')
 import { GetAllZone } from "@/api/dialysis";
+import { getDoctorAdviceCount } from "@/api/advice"
 export default {
     data(){
         return{
             visible: false,
-            startTime:'',
-            endTime:'',
+            startTime:new Date(),
+            endTime:new Date(),
             schedulArr: [
                 {value: 0, label: '全部班'},
                 {value: 1, label: '上午'},
@@ -78,27 +74,14 @@ export default {
             schedulType: 0,
             partitionArr:[],
             partitionType: 0,
-            tableData: [{
-                date: '2016-05-02',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1518 弄'
-                }, {
-                date: '2016-05-04',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1517 弄'
-                }, {
-                date: '2016-05-01',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1519 弄'
-                }, {
-                date: '2016-05-03',
-                name: '王小虎',
-                address: '上海市普陀区金沙江路 1516 弄'
-            }]
+            deliveryWay:[],
+            tableData: [],
+            delive_way:""
         }
     },
     created(){
         this.getAllZone()
+        this.getlist()
     },
     methods:{
         _close: function(done) {
@@ -115,6 +98,10 @@ export default {
                 } else {
                 this.partitionArr = response.data.data.zone;
                 this.partitionArr.unshift({ id: 0, name: "全部分区" });
+                var dics  =  response.data.data.dics
+                var obj = {id:0,name:"全部"}
+                this.deliveryWay.push(obj)
+                this.deliveryWay.push(...dics)
                 }
             });
         },
@@ -123,7 +110,35 @@ export default {
                 path: '/dialysis/dialysisDrugs_print',
                 // query: { date: date }
             })
-        }
+        },
+       getlist(){
+
+           let newTimeStart =  moment(this.startTime).format('YYYY-MM-DD')
+           let newTimeEnd = moment(this.endTime).format('YYYY-MM-DD')
+           var params = {
+              start_time:newTimeStart,
+              end_time:newTimeEnd,
+              delive_way:this.delive_way,
+           }
+         
+         getDoctorAdviceCount(params).then(response=>{
+            if(response.data.state == 1){
+              var list =  response.data.data.list
+              console.log("list",list)
+              this.tableData = list
+            }
+         })  
+       },
+      changeStartTime(val){
+       var start =  moment(val).format('YYYY-MM-DD')
+       this.startTime = start
+       this.getlist()
+      },
+      changeEndTime(val){
+       var end = moment(val).format('YYYY-MM-DD')
+       this.endTime = end
+       this.getlist()
+      }
     }
 }
 </script>

src/xt_pages/dialysis/consumableDrugs.vue

@@ -8,9 +8,9 @@
                 <el-tab-pane label="透析耗材" name="1">
                     <consumables></consumables>
                 </el-tab-pane>
-                <!-- <el-tab-pane label="透析药品" name="second">
+                <el-tab-pane label="透析药品" name="second">
                     <dialysis-drugs></dialysis-drugs>
-                </el-tab-pane> -->
+                </el-tab-pane>
                 <el-tab-pane label="透析参数" name="2">
                     <dialysis-parameters></dialysis-parameters>
                 </el-tab-pane>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -161,15 +161,15 @@
           }}</span>
         </li>
 
-        <li v-if="isShow('血流量')">
-          <label>血流量 : </label>
-          <span class="content">{{
-            blood_flow_volume != "0" ? blood_flow_volume : ""
-          }}</span>
-          <span class="unit">{{
-            blood_flow_volume != "0" ? "ml/min" : ""
-          }}</span>
-        </li>
+<!--        <li v-if="isShow('血流量')">-->
+<!--          <label>血流量 : </label>-->
+<!--          <span class="content">{{-->
+<!--            blood_flow_volume != "0" ? blood_flow_volume : ""-->
+<!--          }}</span>-->
+<!--          <span class="unit">{{-->
+<!--            blood_flow_volume != "0" ? "ml/min" : ""-->
+<!--          }}</span>-->
+<!--        </li>-->
       </ul>
 
       <ul>

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

@@ -1307,27 +1307,30 @@
         this.InnerDialogProps.visibility = true
         switch (val) {
           case '5': // 透析器/灌流器
-             var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
-             var newArr =  arr.split(",")
-            console.log("透析器/灌流器",newArr)
-            var Arr = []
-            for(let i=0;i<newArr.length;i++){
-              for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
-                 var newarr = newArr[i].toUpperCase()
-
-                 var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
-
-                 if(newarr == dialy){
-                    Arr.push(this.dialyzerPerfusionApparatus[j].name)
-                 }
-              }
-            }
-            var arrtwo = Arr.join(",")
-            console.log("Arr",arrtwo)
+            // var arr = this.dialysisPrescription.dialyzer_perfusion_apparatus
+            // console.log("arr333333",arr)
+            // var newArr =  arr.split(",")
+            // console.log("透析器/灌流器",newArr)
+            // var Arr = []
+            // for(let i=0;i<newArr.length;i++){
+            //   for(let j=0;j<this.dialyzerPerfusionApparatus.length;j++){
+            //      var newarr = newArr[i].toUpperCase()
+
+            //      var dialy = this.dialyzerPerfusionApparatus[j].name.toUpperCase()
+
+            //      if(newarr == dialy){
+            //         Arr.push(this.dialyzerPerfusionApparatus[j].name)
+            //      }
+            //   }
+            // }
+            // var arrtwo = Arr.join(",")
+            // console.log("Arr",arrtwo)
             this.InnerDialogProps.values = this.dialyzerPerfusionApparatus
             this.InnerDialogProps.titles = '透析器/灌流器'
             this.InnerDialogProps.type = 'dialyzer_perfusion_apparatus'
-            this.InnerDialogProps.selected = arrtwo
+
+            
+            this.InnerDialogProps.selected = this.dialysisPrescription.dialyzer_perfusion_apparatus
             this.InnerDialogProps.isShowTextArea = false
             break
 
@@ -3312,7 +3315,7 @@
         if (isNaN(this.dialysisPrescription.anticoagulant_zongliang)) {
           this.dialysisPrescription.anticoagulant_zongliang = ''
         }
-
+        console.log("首季",this.dialysisPrescription.anticoagulant_zongliang)
       
       },
       'prescription.id': {

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

@@ -964,7 +964,10 @@ export default {
       }
 
       getTodayMonitor(params).then(rs => {
+        console.log("机构ID",this.org_id)
+        
         var resp = rs.data.data
+       
         this.form.operate_time = resp.monitor.operate_time ? (resp.monitor.operate_time + 3600) * 1000 : Date.parse(new Date())
         this.form.temperature = '' // this.last_monitor_record.pulse_frequency;
 
@@ -973,11 +976,21 @@ export default {
         this.form.systolic_bp = '' // this.last_monitor_record.systolic_blood_pressure;
         this.form.diastolic_bp = '' // this.last_monitor_record.diastolic_blood_pressure;
         this.form.blood_flow_volume = resp.monitor.blood_flow_volume ? resp.monitor.blood_flow_volume : ''
-        this.form.venous_pressure = '' // this.last_monitor_record.venous_pressure;
+        // 静脉压
+        if(this.org_id == 10060){
+          this.form.venous_pressure = resp.monitor.venous_pressure
+        }else{
+          this.form.venous_pressure = '' // this.last_monitor_record.venous_pressure;
+        }
+        
         this.form.venous_pressure_type = resp.monitor.venous_pressure_type ? resp.monitor.venous_pressure_type : 1
         this.form.arterial_pressure = resp.monitor.arterial_pressure ? resp.monitor.arterial_pressure : '' // this.last_monitor_record.arterial_pressure;
         this.form.arterial_pressure_type = resp.monitor.arterial_pressure_type ? resp.monitor.arterial_pressure_type : 1
-        this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
+        if(this.org_id == 10060){
+          this.form.transmembrane_pressure = resp.monitor.transmembrane_pressure;
+        }else{
+          this.form.transmembrane_pressure = '' // this.last_monitor_record.transmembrane_pressure;
+        }
         this.form.transmembrane_pressure_type = resp.monitor.transmembrane_pressure_type ? resp.monitor.transmembrane_pressure_type : 1
         this.form.ultrafiltration_rate = resp.monitor.ultrafiltration_rate ? resp.monitor.ultrafiltration_rate : ''
         this.form.ultrafiltration_volume = resp.monitor.ultrafiltration_volume ? resp.monitor.ultrafiltration_volume : ''
@@ -1103,6 +1116,7 @@ export default {
     },
 
     submitAction: function() {
+      
       // TODO loading
       var is_new = this.form.id
       this.form.operate_time = parseInt(this.form.operate_time / 1000)

src/xt_pages/dialysis/dialysisDoctorAdvice.vue

@@ -425,7 +425,7 @@ export default {
     },
 
     selectSchedulType(scheduleType) {
-      // alert(scheduleType);/
+     
       this.schedulType = scheduleType;
       this.listQuery.schedul_type = scheduleType;
       this.requestSchedualDoctors(this.time);

src/xt_pages/medicalScheduling/index.vue

@@ -7,7 +7,7 @@
                 <el-button type="primary" @click="DeleteStaffSchedule">清除</el-button>
                 <el-button type="primary" @click="copyStaffSchedule">复制</el-button>
                 <el-button type="primary" icon="el-icon-printer" @click="toPrint">打印</el-button>
-                <!-- <el-button type="primary" icon="el-icon-printer" @click="toPrint">导出</el-button> -->
+                <el-button type="primary" icon="el-icon-printer" @click="exportList">导出</el-button>
             </div>
         </div>
         <div class="app-container">
@@ -319,19 +319,26 @@
         </div>
 
 
-        <el-dialog
+        <!-- <el-dialog
             title="导出排班"
             :visible.sync="exportDialogVisible"
-            width="30%"
-            :before-close="handleClose">
+            width="30%">
             <span>
-
+             <div class="block">
+               <span class="demonstration">月份：</span>
+               <el-date-picker
+                v-model="value1"
+                type="week"
+                format="yyyy 第 WW 周"
+                placeholder="选择周">
+             </el-date-picker>
+             </div>
             </span>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                <el-button type="primary" @click="exportList">确 定</el-button>
             </span>
-        </el-dialog>    
+        </el-dialog>     -->
     </div>
 </template>
 
@@ -402,7 +409,8 @@ export default {
            radio:'1',
            nurseTableData:[],
            doctorTableData:[],
-           exportDialogVisible:false
+           exportDialogVisible:false,
+           month_time:""
         }
     },
     methods:{
@@ -944,9 +952,10 @@ export default {
                     data.push(...newNurse)
                     data.push(...newDoctor)
                     data.push(obj)
+                    
                     this.tableData = data
 
-
+                   console.log("表哥3333333333",this.tableData)
                 }
             })
         },
@@ -1911,7 +1920,48 @@ export default {
               this.getDoctorList()
             }
          })
-       }
+       },
+
+       toExport(){
+         this.exportDialogVisible = true
+
+       },
+
+     getTimestamp(time) { //把时间日期转成时间戳
+          return (new Date(time)).getTime() / 1000
+       },
+       exportList(){
+         import('@/vendor/Export2Excel').then(excel => {
+         for(let i=0;i<this.tableData.length;i++){
+           this.tableData[i].monday  = this.getClass(this.tableData[i].user_name,1)
+           this.tableData[i].tuesday  = this.getClass(this.tableData[i].user_name,2)
+           this.tableData[i].wednesday = this.getClass(this.tableData[i].user_name,3)
+           this.tableData[i].thursday = this.getClass(this.tableData[i].user_name,4)
+           this.tableData[i].friday = this.getClass(this.tableData[i].user_name,5)
+           this.tableData[i].saturday = this.getClass(this.tableData[i].user_name,6)
+           this.tableData[i].weekday = this.getClass(this.tableData[i].user_name,0)
+         }
+         console.log("this.table",this.tableData)
+         const tHeader = ['医护姓名', '周一'+"("+this.weekDayArr[0]+")" ,  '周二'+"("+this.weekDayArr[1]+")", '周三'+"("+this.weekDayArr[2]+")" , '周四'+"("+this.weekDayArr[3]+")" ,  '周五'+"("+this.weekDayArr[4]+")" ,  '周六'+"("+this.weekDayArr[5]+")",'周日'+"("+this.weekDayArr[6]+")"]
+         const filterVal = ['user_name', 'monday', 'tuesday','wednesday','thursday','friday','saturday','weekday'] 
+         
+         const data = this.formatJson(filterVal,this.tableData)
+         console.log("data",data)
+       
+         excel.export_json_to_excel({
+           header: tHeader,
+           data,
+           filename: '医护排班'
+         })
+          this.downloadLoading = false
+    
+        })
+       },
+       formatJson(filterVal, jsonData) {
+        return jsonData.map(v => filterVal.map(j => v[j]))
+       },
+    
+    
     },
     created(){
         //获取医护人员
@@ -1949,8 +1999,8 @@ export default {
         }
       var now = moment().locale('zh-cn').format('YYYY-MM-DD 00:00:00')
       this.timeNow = this.getTimestamp(now)
-
-
+     
+   
     }
 }
 </script>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -81,7 +81,7 @@
           <el-button v-if="this.info.prescription_status >= 2" size="small" @click="open(9)" type="primary"
           >结算单
           </el-button>
-
+<!-- 
           <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(10)" type="primary">
           &gt;退号
           </el-button>
@@ -89,7 +89,7 @@
           <el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919"
                      size="small" @click="open(11)" type="primary"
           &gt;撤销明细>
-          </el-button>
+          </el-button> -->
 
 
           <!--<el-button v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919" size="small" @click="open(12)" type="primary"-->

src/xt_pages/stock/stockInOrder.vue

@@ -586,6 +586,7 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
     nowDate.setMonth(nowDate.getMonth() - 1);
+    nowYear = nowDate.getFullYear();
     nowMonth = nowDate.getMonth() + 1;
     nowDay = nowDate.getDate();
     this.start_time =
@@ -595,6 +596,8 @@ export default {
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
      
+
+
      
 
       // this.warehousing_time =

src/xt_pages/user/dialysisSolution.vue

@@ -1260,6 +1260,7 @@ export default {
       this.fetchPatientDialysisSolutions()
     },
     openEdit(index, row) {
+     
       this.current_index = index
 
       this.addPlan.id = row.id

src/xt_pages/user/patients.vue

@@ -679,7 +679,7 @@
         ],
         sourceType: 0,
         sourceID: 0,
-        lapsetoType: 0,
+        lapsetoType: 1,
         sourceArr: [
           { value: 0, label: '全部', source: 0, lapseto: 0 },
           // { value: 1, label: "转出", source: 0, lapseto: 2 },
@@ -728,7 +728,7 @@
           limit: 10,
           schedul_type: 0,
           binding_state: 0,
-          lapseto: 0,
+          lapseto: 1,
           source: 0,
           start_time: '',
           end_time: '',

src/xt_pages/workforce/appointment.vue

@@ -234,11 +234,12 @@
       getWeekPanels() {
         // this.scheduleZoneRow = []
         // this.scheduleZone = []
-        getWeekPanels(1).then(response => {
+        getWeekPanels(1,this.partition_id).then(response => {
           if (response.data.state == 0) {
             return false
           }
           var partitions = response.data.data.partitions
+          console.log("分区",partitions)
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
           this.theWeek.thisWeek = response.data.data.theWeek
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
@@ -414,6 +415,7 @@
                   total: 0
                 }
                 that.scheduleZone.push(thisPa)
+                
               })
             })
           }
@@ -2052,10 +2054,8 @@
                 }
                 i++
               }
-              console.log("list2021444444x",list)  
-              for(let i=0;i<list.length;i++){
-                console.log("list9999999999",list[i])
-              }
+             
+             
                const start_time = moment().weekday(1).format('YYYY-MM-DD'); //本周一
                var start = this.getTimestamp(start_time)
                console.log("start",start)
@@ -2100,7 +2100,7 @@
             if(this.export_type == 1){
                 week = scheduleList
              }
-             console.log("week88888888888",week)
+           
              if(week.length > 0){
               for(let i=0;i<list.length;i++){
                for(let j=0;j<week.length;j++){
@@ -2414,11 +2414,13 @@
        changePartition(val){
          this.partition_id = val
          this.getThreeWeekList()
+         this.getWeekPanels()
        },
 
        changeSchedule(val){
          this.schedule_type = val
          this.getThreeWeekList()
+         this.getWeekPanels()
        },
 
        changeWeek(val){

src/xt_pages/workforce/components/tableData.vue

@@ -760,7 +760,8 @@ export default {
       ],
       partition_id:"",
       schedule_type:"",
-      zones:[{id:0,name:"全部"}]
+      zones:[{id:0,name:"全部"}],
+      theType:""
     };
   },
 
@@ -768,11 +769,13 @@ export default {
     weekTime: function() {
       var theType = this.weekType(this.weekTime);
       console.log("999999999",theType)
-      this.getSchedules(theType);
+      this.theType = theType
+      this.getSchedules();
     },
     scheduleZoneRow: function() {
       var theType = this.weekType(this.weekTime);
-      this.getSchedules(theType);
+      this.theType = theType
+      this.getSchedules();
     },
     tableHeight(val) {
       if (!this.timer) {
@@ -901,16 +904,24 @@ export default {
       this.$refs.singleTable.setCurrentRow(row);
       this.currentData.patient_id = 0;
     },
-    getSchedules(weekType) {
-      
-      getSchedules(weekType).then(response => {
+    getSchedules() {
+        const params = {
+          weekTime:this.theType,
+          partition_id:this.partition_id,
+          schedule_type:this.schedule_type,
+        }
+      getSchedules(params).then(response => {
         if (response.data.state == 1) {
           this.weekTitle = response.data.data.weekTitle;
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
+          
+          console.log("中国4444444444444",this.scheduleZone)
+        
           var that = this;
           this.scheduleZone.forEach(function(zone, index) {
+           
             that.scheduleZone[index].Mon_M = {
               mode_id: 0,
               mode_name: "",
@@ -1041,6 +1052,7 @@ export default {
 
             if (response.data.data.schdules.length > 0) {
               theSchedules.forEach(function(schedule, sindex) {
+
                 if (zone.jihao_id == schedule.bed_id) {
                   // if(zone.zone_id == schedule.partition_id && zone.jihao_id == schedule.bed_id) {
                   var weekPath = that.weekPath(
@@ -1272,6 +1284,7 @@ export default {
 
       this.currentData.type_name = this.dayType(week[1]);
       this.currentData.zone_name = row.area;
+      
       this.currentData.bed_name = row.cut;
       this.currentData.partition_type = row.zone_type;
 
@@ -1993,10 +2006,12 @@ export default {
     changePartiton(val){
      this.$emit('event1', val)
       this.partition_id = val
+      this.getSchedules()
     },
     changeSchedule_type(val){
      this.$emit('event2', val)
      this.schedule_type = val
+     this.getSchedules()
     }
   },
   components: {
@@ -2041,6 +2056,7 @@ export default {
         }
       });
     }
+  
     this.scheduleZoneRow = this.scheduleZoneRowProp;
     
 
@@ -2048,7 +2064,7 @@ export default {
     if (this.weekday == 0) {
       this.weekday = 7;
     }
-  //  this.getAllZones()
+    this.getAllZones()
   }
 };
 </script>