长沙南雅打印单问题修改

src/router/modules/dialysis.js

@@ -67,6 +67,17 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/doctorAdvicePrint/one',
+      component: () => import('@/xt_pages/dialysis/doctorAdvicePrintOne'),
+      name: '透析医嘱打印',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: '透析医嘱打印',
+        noCache: true
+      }
+    },
 
     // {
     //   path: '/dialysis/doctorAdviceStaticPrint',

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -95,7 +95,7 @@
                         <td width="40">透析备注:</td>
                         <td width="500">
                             <div class="under-line">
-                            {{ record.prescription.dialysis_remark ? record.prescription.dialysis_remark : '' }}
+                            {{ record.prescription.dialysis_remark ? record.prescription.dialysis_remark : record.prescription.remark}}
                             </div>
                         </td>
                         </tr>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -551,6 +551,32 @@
             <span class="unit"  v-else>{{ reduce_amount != "0" ? "iu" : "" }}</span>
           </span>
         </li>
+
+        <li v-if="isShow('开药数量')">
+          <label>开药数量(支): </label>
+          <span class="content">{{this.prescription.prescribing_number}}</span>
+        </li>
+
+        <li v-if="isShow('处方钠')">
+          <label>处方钠: </label>
+          <span class="content">{{this.prescription.prescription_sodium}}</span>
+        </li>
+
+        <li v-if="isShow('开始钠')">
+          <label>开始钠: </label>
+          <span class="content">{{this.prescription.start_sodium}}</span>
+        </li>
+
+        <li v-if="isShow('钠曲线')">
+          <label>钠曲线: </label>
+          <span class="content">{{this.prescription.sodium_curve}}</span>
+        </li>
+
+        <li v-if="isShow('病情处理')">
+          <label>病情处理: </label>
+          <span class="content">{{this.prescription.treatment_remark}}</span>
+        </li>
+
        
       </ul>
     </div>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -40,7 +40,7 @@
         <li v-if="isShow('实际置换量')">
           <label>实际置换量 : </label>
           <span class="content">{{ actual_displacement }}</span>
-          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 13 || this.$store.getters.xt_user.template_info.template_id != 40">ml</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 40">ml</span>
           <span class="unit" v-else>L</span>
         </li>
         <li v-if="isShow('压迫后内瘘震颤')">

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

@@ -442,7 +442,7 @@
         <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShow('实际置换量')">
-          <el-form-item v-if="this.template_id == 20 || this.template_id == 21 || this.template_id == 13" label="实际置换量(ml): ">
+          <el-form-item v-if="this.template_id == 20 || this.template_id == 21" label="实际置换量(ml): ">
             <el-input v-model="form.actual_displacement"></el-input>
           </el-form-item>
           <el-form-item v-else label="实际置换量(L): ">

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

@@ -490,6 +490,13 @@
 
                     </el-col>
 
+                    <el-col :span="8"
+                            v-if="isShows('开药数量')">
+                        <el-form-item label="开药数量(支)：">
+                            <el-input type="number" v-model="dialysisPrescription.prescribing_number"></el-input>
+                        </el-form-item>
+                    </el-col>
+
 
                     <el-col :span="8"
                             v-if="isShows('置换量') && ((this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 46 || this.$store.getters.xt_user.template_info.template_id == 53)&& this.$store.getters.xt_user.template_info.org_id!=10441)"
@@ -974,6 +981,52 @@
                   </el-col>
               </el-row>
 
+              <el-row :gutter="20">
+                    <el-col :span="8">
+                        <el-form-item label="处方钠： ">
+                            <el-input
+                                  
+                                    v-model="dialysisPrescription.prescription_sodium"
+                                    :rows="5"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="开始钠： ">
+                            <el-input
+                                 
+                                    v-model="dialysisPrescription.start_sodium"
+                                    :rows="5"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8">
+                        <el-form-item label="钠曲线： ">
+                            <el-input
+                                  
+                                    v-model="dialysisPrescription.sodium_curve"
+                                    :rows="5"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+              <el-row :gutter="20">
+                    <el-col :span="24">
+                        <el-form-item label="病情处理： ">
+                            <el-input
+                                    type="textarea"
+                                    v-model="dialysisPrescription.treatment_remark"
+                                    :rows="5"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+               
+
+
+
                 <el-row :gutter="20">
                     <el-col :span="24">
                         <el-form-item label="备注： ">
@@ -1501,6 +1554,11 @@
           add_amount:"",
           reduce_amount:"",
           dialysis_remark:"",
+          prescribing_number:"",
+          treatment_remark:"",
+          prescription_sodium:"",
+          start_sodium:"",
+          sodium_curve:"",
         },
 
         anticoagulant: {
@@ -2334,6 +2392,8 @@ mu
               this.dialysisPrescription.sodium = 138
               this.dialysisPrescription.bicarbonate = 31.1
               this.dialysisPrescription.dialysate_flow = 500
+              this.dialysisPrescription.dialysate_temperature = 36.5
+              this.dialysisPrescription.prescribing_number = 1
             }
             if(this.$store.getters.xt_user.org.id == 10447){
               this.dialysisPrescription.dialysate_flow = 500
@@ -2358,7 +2418,10 @@ mu
             this.dialysisPrescription.package = last.package
             this.dialysisPrescription.a_liquid = last.a_liquid
             this.zongliang = last.anticoagulant_zongliang
-            this.remark = last.remark
+            if(this.$store.getters.xt_user.template_info.org_id!=10013  && this.$store.getters.xt_user.template_info.org_id!=10014){
+              this.remark = last.remark
+            }
+           
             weight_before = 0
 
           }

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1088,7 +1088,17 @@ export default {
         if(name == '全部'){
           name = ""
        }
-      this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
+      
+       if(this.org_id == 9671 || this.org_id == 10340 || this.org_id == 0){
+        this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name} });
+       }
+
+       if(this.org_id != 9671 && this.org_id != 10340 && this.org_id!=0){
+        this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
+       }
+
+
+    
 
     },
     signPrintAction:function(){

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -80,7 +80,7 @@
              <td width="40">透析备注:</td>
              <td width="500">
                <div class="under-line">
-                {{prescription.dialysis_remark?prescription.dialysis_remark:"" }}
+                 {{prescription.dialysis_remark?prescription.dialysis_remark:prescription.remark }}
               </div>
              </td>
            

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2400,7 +2400,7 @@ export default {
                 }
               }
 
-la
+
 
               let prescription = []
 

src/xt_pages/outpatientTool/components/settle.vue

@@ -66,6 +66,11 @@
             {{scope.row.id_card_no}}
           </template>
         </el-table-column>
+        <el-table-column align="center" prop="item_name" label="就诊号">
+          <template slot-scope="scope">
+            {{scope.row.mdtrt_id}}
+          </template>
+        </el-table-column>
         <el-table-column align="center" prop="item_name" label="治疗日期">
           <template slot-scope="scope">
             {{getTimes(scope.row.settle_accounts_date)}}
@@ -233,6 +238,7 @@ import { uParseTime } from '@/utils/tools'
                 let order = data[i].orders[b]
                 order['other_name'] = data[i].name
                 order['id_card_no'] = data[i].id_card_no
+                order['mdtrt_id'] =order.mdtrt_id
 
                 total = parseFloat((parseFloat(total.toString()) + parseFloat(data[i].orders[b].medfee_sumamt.toString())).toFixed(2).toString())
               }
@@ -324,7 +330,7 @@ import { uParseTime } from '@/utils/tools'
         })
         this.sameRowArr = sameRowArr
       }, merge({ row, column, rowIndex, columnIndex }) {
-        if (columnIndex === 0 || columnIndex === 1 || columnIndex === 15) {
+        if (columnIndex === 0 || columnIndex === 1  || columnIndex === 15) {
           const _row = this.tempArr[rowIndex]
           const _col = _row > 0 ? 1 : 0
           return {

src/xt_pages/stock/drugs/components/drugQuery.vue

@@ -1053,10 +1053,9 @@ export default {
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
 
           this.tableList[i].stock_in_count = this.getStockIn(this.tableList[i].drug_stock_count, this.tableList[i].max_unit, this.tableList[i].min_unit,this.tableList[i].min_number);
-
-          this.tableList[i].stock_out_count = this.getStockOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number,this.tableList[i].drug_cancel_stock_info)
+          this.tableList[i].stock_out_count =  this.getActCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
           this.tableList[i].cancle_out_count = this.getCancleOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-          this.tableList[i].act_cout =  this.getActCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+          this.tableList[i].act_cout =  this.getStockOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number,this.tableList[i].drug_cancel_stock_info)
           this.tableList[i].over_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
           this.tableList[i].sum_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
         }

src/xt_pages/workforce/components/editTableData.vue

@@ -2754,7 +2754,7 @@ export default {
                   } else {
                     let obj = {
                       week_type:this.weeks[b].week_type,
-                      order_id:schedules[i].order.id,
+                      order_id:sch[i].order.id,
                     }
                     this.first_weeks.push(obj)
                     this.weeks[b].is_edit = false;

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -344,6 +344,9 @@ export default {
           return value1 - value2;
       }
      },
+     getTimestamp(time) { //把时间日期转成时间戳
+      return (new Date(time)).getTime()
+    },
     getNextScheduleWeekDay() {
        this.loading = true
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
@@ -363,22 +366,19 @@ export default {
           str = zone.join(",")
         }
 
-        var now_time = parseInt(this.week_type) * 86400 + this.start_time
-        
+       
         let weekOfDay = parseInt(moment().format('E'))
         let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
-        console.log("卡 is h2323233232",new Date(next_monday))
+        
         let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
-        console.log("下周日",next_sunday.valueOf())
-        // const params = {
-        //   start_time:moment().week(moment().week() + 1).startOf('week').unix(),
-        //   end_time:moment().week(moment().week() + 1).endOf('week').unix(),
-        //   week_type:this.week_type,
-        //   week_time:this.week_time,
-        //   zone:str,
-        //   record_date:this.getTime(now_time)
-        // }
 
+        console.log("开始时间++++++++",(this.getTimestamp(next_monday)/1000)-28800)
+
+        var now_time = parseInt(this.week_type - 1)*86400 + (this.getTimestamp(next_monday)/1000 -28800)
+        console.log("now_time------------------",now_time)
+
+       
+      
        const params = {
           start_time:next_monday,
           end_time:next_sunday,
@@ -665,7 +665,7 @@ export default {
     },
     signPrint() {
         
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 0){
          var zone = this.zone
           var newArr = []
           for(let i=0;i<this.zoneList.length;i++){

src/xt_pages/workforce/next_remind_print.vue

@@ -155,74 +155,84 @@
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = this.$route.query.week_type
-      var now_time = parseInt(this.week_type) * 86400 + this.start_time
-      // console.log("now_time23233232322323",now_time)
-      this.now_time = now_time
+      // var now_time = parseInt(this.week_type) * 86400 + this.start_time
+      // // console.log("now_time23233232322323",now_time)
+      // this.now_time = now_time
       this.week_time  = this.$route.query.week_time
       this.zone = this.$route.query.zone
       this.pre_status = this.$route.query.prestatus
       this.loading = true;
-      let weekOfDay = parseInt(moment().format('E'))
-      let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
-      let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
-      const params = {
-          week_type:this.week_type,
-          week_time:this.week_time,
-          start_time:next_monday,
-          end_time:next_sunday,
-          zone:this.zone,
-          record_date:this.getTime(now_time)
-        }
-    //  console.log("下周打印时间",params)
-      getNextScheduleWeekDay(params).then(rs => {
-        var resp = rs.data
-        console.log(resp)
-        if (resp.state == 1) {
-         var scheduleData = resp.data.schedule
-
-          if(this.pre_status == 0){
-              for(let i=0;i<scheduleData.length;i++){
-              scheduleData[i].sort = scheduleData[i].number.sort
-            }
-            var arr =   scheduleData.sort(this.compare('sort'))
-           
-            this.scheduleData = arr
+
+      this.getNextScheduleWeekDay()
+
+    
+    },
+    methods: {
+      getTimestamp(time) { //把时间日期转成时间戳
+        return (new Date(time)).getTime()
+      },
+      getNextScheduleWeekDay(){
+        let weekOfDay = parseInt(moment().format('E'))
+        let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
+        let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
+        var now_time = parseInt(this.week_type - 1)*86400 + (this.getTimestamp(next_monday)/1000 -28800)
+        const params = {
+            week_type:this.week_type,
+            week_time:this.week_time,
+            start_time:next_monday,
+            end_time:next_sunday,
+            zone:this.zone,
+            record_date:this.getTime(now_time)
           }
-          if(this.pre_status == 1){
-            var newList = []
-            for(let i=0;i<scheduleData.length;i++){
-              if(scheduleData.prescription.id > 0){
-                 newList.push(scheduleData[i])
+      console.log("下周打印时间",params)
+        getNextScheduleWeekDay(params).then(rs => {
+          var resp = rs.data
+          console.log(resp)
+          if (resp.state == 1) {
+          var scheduleData = resp.data.schedule
+
+            if(this.pre_status == 0){
+                for(let i=0;i<scheduleData.length;i++){
+                scheduleData[i].sort = scheduleData[i].number.sort
               }
+              var arr =   scheduleData.sort(this.compare('sort'))
+            
+              this.scheduleData = arr
             }
-            var arr =   newList.sort(this.compare('sort'))
-           
-            this.scheduleData = arr
-          }
-
-          if(this.pre_status == 2){
-            var newList = []
-            for(let i=0;i<scheduleData.length;i++){
-              if(scheduleData.prescription.id == 0){
-                 newList.push(scheduleData[i])
+            if(this.pre_status == 1){
+              var newList = []
+              for(let i=0;i<scheduleData.length;i++){
+                if(scheduleData.prescription.id > 0){
+                  newList.push(scheduleData[i])
+                }
               }
+              var arr =   newList.sort(this.compare('sort'))
+            
+              this.scheduleData = arr
             }
-            var arr =   newList.sort(this.compare('sort'))
-           
-            this.scheduleData = arr
+
+            if(this.pre_status == 2){
+              var newList = []
+              for(let i=0;i<scheduleData.length;i++){
+                if(scheduleData.prescription.id == 0){
+                  newList.push(scheduleData[i])
+                }
+              }
+              var arr =   newList.sort(this.compare('sort'))
             
+              this.scheduleData = arr
+              
+            }
+            this.loading = false
+          } else {
+            this.$message.error(resp.msg)
           }
-          this.loading = false
-        } else {
-          this.$message.error(resp.msg)
-        }
-      }).catch(err => {
-        this.$message.error(err)
-      })
+        }).catch(err => {
+          this.$message.error(err)
+        })
 
-    
-    },
-    methods: {
+      },
+   
       getAdvice:function(doctor_advice) {
         if (doctor_advice != null) {
 

src/xt_pages/workforce/remind_print_setting.vue

@@ -501,6 +501,9 @@
          }
       })
      },
+     getTimestamp(time) { //把时间日期转成时间戳
+        return (new Date(time)).getTime()
+    },
     getNextScheduleWeekDay() {
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
         const end = moment().weekday(7).format('YYYY-MM-DD')
@@ -517,7 +520,10 @@
         // if(zone != 0){
         //   str = zone.join(",")
         // }
-        var now_time = parseInt(this.week_type) * 86400 + this.start_time
+        // var now_time = parseInt(this.week_type) * 86400 + this.start_time
+        let weekOfDay = parseInt(moment().format('E'))
+        let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
+        var now_time = parseInt(this.week_type - 1)*86400 + (this.getTimestamp(next_monday)/1000 -28800)
         const params = {
           start_time:moment().week(moment().week() + 1).startOf('week').unix(),
           end_time:moment().week(moment().week() + 1).endOf('week').unix(),

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -154,7 +154,7 @@
                     <span>上次脱水量：{{ main_collection.prescription.target_ultrafiltration }}ml</span>
                 </div>
                 <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
-                    <span>上次透析时长：{{ main_collection.lastafterweight.actual_treatment_hour }}小时{{ main_collection.lastafterweight.actual_treatment_minute }}分钟</span>
+                    <span v-if="main_collection.lastafterweight!=undefined">上次透析时长：{{ main_collection.lastafterweight.actual_treatment_hour }}小时{{ main_collection.lastafterweight.actual_treatment_minute }}分钟</span>
                 </div>
                 <div class="printCell">身份证:
                     <span v-if="type ==1">{{main_collection.patient.id_card_no}} </span>
@@ -498,6 +498,12 @@
         // if(zone != 0){
         //   str = zone.join(",")
         // }
+        const loading = this.$loading({
+          lock: true,
+          text: "加载中...",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
         var now_time = parseInt(this.week_type) * 86400 + this.start_time
 
         const weekOfDay = parseInt(moment().format('E'))
@@ -524,6 +530,7 @@
         getNextScheduleWeekDayOne(params).then(response => {
           this.scheduleData = []
           if (response.data.state == 1) {
+            loading.close()
             var scheduleData = response.data.data.schedule
 
             for (let i = 0; i < scheduleData.length; i++) {