8月15日

src/api/dialysis_record.js

@@ -47,7 +47,7 @@ export function editMonitor(patient_id, schedule_date, data, mode) {
   })
 }
 
-export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date) {
+export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_drawing, puncture_nurse_id, start_time, schedual_type, mode, washpipe_nurse, change_nurse, difficult_puncture_nurse, new_fistula_nurse, blood_drawing, quality_nurse, puncture_needle, puncture_way, dialysis_dialyszers, dialysis_irrigation, blood_access_id, nuclein_date, schedule_remark, order_remark) {
   var params = {
     patient_id: patient_id,
     date: schedule_date,
@@ -69,7 +69,9 @@ export function startDialysis(patient_id, schedule_date, nurse_id, bed_id, lood_
     dialysis_dialyszers: dialysis_dialyszers,
     dialysis_irrigation: dialysis_irrigation,
     blood_access_id: blood_access_id,
-    nuclein_date: nuclein_date
+    nuclein_date: nuclein_date,
+    schedule_remark: schedule_remark,
+    order_remark: order_remark
   }
   console.log('params', params)
   return request({

src/api/schedule.js

@@ -134,6 +134,14 @@ export function getNextScheduleWeekDay(params) {
   })
 }
 
+export function getNextScheduleWeekDayOne(params) {
+  return request({
+    url: '/api/schedule/getnextscheduleweekdayone',
+    method: 'get',
+    params: params
+  })
+}
+
 export function getThreeWeekList(params) {
   return request({
     url: '/api/schedule/getthreeweeklist',

src/router/modules/dialysis.js

@@ -38,24 +38,24 @@ export default {
     //     noCache: true
     //   }
     // },
-    // {
-    //   path: '/dialysis/dialysisDoctorAdvice',
-    //   component: () => import('@/xt_pages/dialysis/dialysisDoctorAdvice'),
-    //   name: '透析医嘱',
-    //   meta: {
-    //     title: '透析医嘱',
-    //     noCache: true
-    //   }
-    // },
     {
       path: '/dialysis/dialysisDoctorAdvice',
-      component: () => import('@/xt_pages/dialysis/newDoctorAdvice'),
+      component: () => import('@/xt_pages/dialysis/dialysisDoctorAdvice'),
       name: '透析医嘱',
       meta: {
         title: '透析医嘱',
         noCache: true
       }
     },
+    // {
+    //   path: '/dialysis/dialysisDoctorAdvice',
+    //   component: () => import('@/xt_pages/dialysis/newDoctorAdvice'),
+    //   name: '透析医嘱',
+    //   meta: {
+    //     title: '透析医嘱',
+    //     noCache: true
+    //   }
+    // },
     {
       path: '/dialysis/doctorAdvicePrint',
       component: () => import('@/xt_pages/dialysis/doctorAdvicePrint'),

src/router/modules/workforce.js

@@ -113,6 +113,17 @@ export default {
       noCache: true
     }
   },
+  {
+    path: '/schedule/remind/print/setting/one',
+    component: () => import('@/xt_pages/workforce/remind_print_setting_one'),
+    name: 'remind_print_setting_one',
+    hidden: true,
+    is_menu: false,
+    meta: {
+      title: 'remind_print_setting_one',
+      noCache: true
+    }
+  },
   {
     path: '/scheduleTablePrint',
     component: () => import('@/xt_pages/workforce/scheduleTablePrint'),

src/xt_pages/dialysis/batch_print/batch_print_order_fortyOne.vue

@@ -543,6 +543,15 @@
                                 <span v-if="record.prescription.anticoagulant == 7"
                                     >&nbsp;低分子肝素钠</span
                                 >
+                                <span v-if="record.prescription.anticoagulant == 8">&nbsp;依诺肝素</span>
+                                <span v-if="record.prescription.anticoagulant == 9">&nbsp;达肝素</span>
+                                 <span v-if="record.prescription.anticoagulant == 10">&nbsp;体外抗凝</span>
+                                 <span v-if="record.prescription.anticoagulant == 11">&nbsp;那屈肝素</span>
+                                 <span v-if="record.prescription.anticoagulant == 12">&nbsp;无抗凝剂</span>
+                                <span v-if="record.prescription.anticoagulant == 13">&nbsp;那屈肝素钙</span>
+                                
+                               
+                             
                                 </div>
                             </div>
                             <div class="inline_block" style="margin-left:20px;" v-if="record.prescription.anticoagulant != 5">

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

@@ -128,6 +128,16 @@
           ></el-date-picker>
         </el-form-item>
 
+      
+        <el-form-item label="上机备注:" style="width:300px"  v-if="isShowFiled('上机备注')">
+          <el-input style="width:200px" v-model="form.order_remark"></el-input>
+        </el-form-item>
+
+         <el-form-item label="排班备注:" style="width:300px"  v-if="isShowFiled('排班备注')">
+          <el-input style="width:200px" v-model="form.schedule_remark"></el-input>
+        </el-form-item>
+
+
 
         <el-form-item label="上机时间 :" style="width:300px"  v-if="isShowFiled('上机时间')">
           <el-date-picker
@@ -199,6 +209,8 @@
           dialysis_irrigation:"",
           blood_access_id:"",
           nuclein_date:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+          schedule_remark:"",
+          order_remark:"",
         },
         blood_access_option:[],
         schedual_type: 0,
@@ -264,7 +276,7 @@
       this.form.nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.start_nurse
       this.form.puncture_nurse_id = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.puncture_nurse
       this.form.washpipe_nurse = this.dialysis_order.id == 0 ? this.$store.getters.xt_user.user.id : this.dialysis_order.washpipe_nurse
-
+  
 
       if (this.form.puncture_nurse_id == 0) {
         this.form.puncture_nurse_id = this.$store.getters.xt_user.user.id
@@ -290,12 +302,16 @@
       this.form.dialysis_dialyszers = this.dialysis_order.dialysis_dialyszers
       this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation
       this.form.blood_access_id = this.dialysis_order.blood_access_id
+      this.form.schedule_remark = this.dialysis_order.schedule_remark
+      this.form.order_remark = this.dialysis_order.order_remark
       this.punctureNeedleOptions = getDataConfig('hemodialysis', 'puncture_needle')
       this.puncture_ways = getDataConfig('hemodialysis', 'puncture_method')
       this.blood_access_option = getDataConfig(
           'hemodialysis',
           'vascular_access_desc'
         )
+      this.form.schedule_remark = this.dialysis_order.schedule_remark
+      this.form.order_remark = this.dialysis_order.order_remark
     },
     watch: {
       patient:{
@@ -321,6 +337,8 @@
         this.form.dialysis_irrigation = this.dialysis_order.dialysis_irrigation
         this.form.blood_access_id = this.dialysis_order.blood_access_id
         this.form.nuclein_date = this.dialysis_order.id == 0?this.getTimeOne(this.lastOrder.nuclein_date): this.getTimeOne(this.dialysis_order.nuclein_date)
+        this.form.schedule_remark = this.dialysis_order.id == 0?this.lastOrder.schedule_remark:this.dialysis_order.schedule_remark
+        this.form.order_remark = this.dialysis_order.id == 0?this.lastOrder.order_remark:this.dialysis_order.order_remark
         var nowDate = new Date()
         var nowYear = nowDate.getFullYear()
         var nowMonth = nowDate.getMonth() + 1
@@ -481,6 +499,8 @@
         var nowMinutes = nowDate.getMinutes()
         var nowSeconds = nowDate.getSeconds()
         this.form.nuclein_date = this.dialysis_order.id == 0?this.getTimeOne(lastOrder.nuclein_date): this.getTimeOne(this.dialysis_order.nuclein_date)
+        this.form.schedule_remark = this.dialysis_order.id == 0?this.lastOrder.schedule_remark: this.dialysis_order.schedule_remark
+        this.form.order_remark = this.dialysis_order.id == 0?this.lastOrder.order_remark: this.dialysis_order.order_remark
         if (this.dialysis_order.id != 0) {
           this.form.start_time = this.getTime(this.dialysis_order.start_time, '{y}-{m}-{d} {h}:{i}')
         } else {
@@ -537,7 +557,7 @@
         console.log("质控护士",this.form.quality_nurse_id)
         console.log("this.form.nuclein_date",this.form.nuclein_date)
        
-        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse,blood_drawing,this.form.quality_nurse_id,this.form.puncture_needle,this.form.puncture_way,this.form.dialysis_dialyszers,this.form.dialysis_irrigation,this.form.blood_access_id,this.form.nuclein_date).then(rs => {
+        startDialysis(this.patient_id, this.schedule_date ? parseTime(this.schedule_date, '{y}-{m}-{d}') : parseTime(new Date(), '{y}-{m}-{d}'), this.form.nurse_id, this.form.bed_id, this.form.lood_drawing, this.form.puncture_nurse_id, this.form.start_time, this.schedual_type, mode,this.form.washpipe_nurse,this.form.change_nurse,this.form.difficult_puncture_nurse,this.form.new_fistula_nurse,blood_drawing,this.form.quality_nurse_id,this.form.puncture_needle,this.form.puncture_way,this.form.dialysis_dialyszers,this.form.dialysis_irrigation,this.form.blood_access_id,this.form.nuclein_date,this.form.schedule_remark,this.form.order_remark).then(rs => {
           this.loading = false
           var resp = rs.data
           if (resp.state == 1) {
@@ -580,6 +600,8 @@
         ParamsQuery["blood_access_id"] = this.form.blood_access_id
         ParamsQuery["nuclein_date"] = this.form.nuclein_date
         ParamsQuery['mode'] = "2"
+        ParamsQuery["schedule_remark"] = this.form.schedule_remark
+        ParamsQuery["order_remark"] = this.form.order_remark
         if (this.dialysis_order.creator != this.$store.getters.xt_user.user.id) {
           ParamsQuery['mode'] = "3"
         }

src/xt_pages/dialysis/details/dialysisComputer.vue

@@ -74,6 +74,18 @@
           <span class="content">{{getTimeOne(this.record.nuclein_date)}}</span>
         </li>
       </ul>
+      <ul>
+        <li v-if="isShow('排班备注')">
+          <label>排班备注 : </label>
+          <span class="content">{{this.record.schedule_remark}}</span>
+        </li>
+      </ul>
+      <ul>
+        <li v-if="isShow('上机备注')">
+          <label>上机备注 : </label>
+          <span class="content">{{this.record.order_remark}}</span>
+        </li>
+      </ul>
       <ul>
         <li v-if="isShow('上机时间')">
           <label>上机时间 : </label>

src/xt_pages/dialysis/details/index.vue

@@ -386,6 +386,178 @@
     </el-dialog>
 
 
+
+  
+      <el-dialog
+                :visible.sync="endVisibility"
+                :close-on-click-modal="false"
+                :close-on-press-escape="false"
+                :show-close="false"
+                width="30%"
+        >
+         <el-button
+            size="small"
+            icon="el-icon-printer"
+            type="primary"
+            @click="printAction"
+            style="float:right"
+            >打印</el-button
+          >
+       <div id="print_content">
+        <div class="print_main_content">
+          <div class="table_panel">
+             <div v-for="(main_collection,index) in printList" :key="index">
+              <div class="signPrint" style="width: 360px;font-size:16px;">
+                <div style="margin-left:50px;">姓名:
+                  <span>{{main_collection.patient.name}} </span>
+                  （{{ main_collection.patient.dialysis_no }}，{{getNewAge(main_collection.patient.id_card_no)  }}岁）
+                </div>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">
+                    床号：{{ main_collection.number.number }}
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
+                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span>
+                  </span>
+                  <span style="display: block;width: 50%;">{{ printDate }}</span>
+                </div>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                   <span style="display: block;width: 50%;">干体重：{{main_collection.assessmentbefor.dry_weight}}Kg</span>
+                    <span style="display: block;width: 50%;">抗凝剂：{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name : ''}}</span>
+
+                </div>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">净重值：{{ main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.additional_weight }}Kg</span>
+                  
+                  <span style="display: block;width: 50%;">
+                    首剂： <span v-if="main_collection.dialysissolution.anticoagulant == 1">{{main_collection.dialysissolution.anticoagulant_shouji}} mg</span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                   {{main_collection.dialysissolution.anticoagulant_shouji}}mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                   {{main_collection.dialysissolution.anticoagulant_shouji}} mg
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                   </span>
+                    </span> 
+                 
+                </div>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">体重增加：{{ (main_collection.assessmentbefor.weight_before - assessmentAfterDislysis.weight_after).toFixed(2) }}Kg</span>
+                 <span style="display: block;width: 50%;">
+                     维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                   iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                    mg/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                    mg/h
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                   iu/h
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                    iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                    iu/h
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                    iu/h
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    iu/h
+                   </span>
+                  </span>
+                
+                </div>
+                <div class="printCell" style="display:flex;justify-content: space-around;">
+                  <span style="display: block;width: 50%;">处方脱水量：{{ main_collection.prescription.target_ultrafiltration }}
+                    <span v-if="$store.getters.xt_user.org.id == 10278 || $store.getters.xt_user.org.id == 10138">ml</span> 
+                    <span v-else>L</span>
+                  </span>
+                  <span style="display: block;width: 50%;">
+                    总量：{{main_collection.dialysissolution.anticoagulant_zongliang}}
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                    mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                    iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                   mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                    mg
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                    iu
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                     iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                   iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                    iu
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                   iu
+                   </span>
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="endVisibility = false">取 消</el-button>
+      </span>
+    </el-dialog>
+
+
     </div>
     <div style="width:75%" v-show="!showView">
       <div style="margin-left:60px;color:#34495e">
@@ -867,6 +1039,7 @@ export default {
       preparestock:[],
       his_doctor_advices:[],
       startVisibility:false,
+      endVisibility:false,
       printList:[],
       anticoagulants_confit:null,
       printDate:'',

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -743,15 +743,45 @@ export default {
                 console.log("hh3oo1o3o123o3oo312o132o312o31o132o",resp.data.hisAdvices)
               }
             }
+
+
+
            
            if(config.is_open == 0 || config.is_open == 2){
             var schedules = resp.data.scheduals
+
+
+           
+           var newList = []
+           if(this.is_sort == 0){
+              newList = schedules
+           }
+           if(this.is_sort == 1){
+              schedules.map(item => {
+                  item.is_sort = item.device_number.sort
+                  item.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
+              })
+              
+               newList = schedules.sort(this.compare('is_sort'))
+              
+    
+
+            }
+            if(this.is_sort == 2){
+              schedules.map(item => {
+                  item.is_sort = item.device_number.sort
+                  item.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
+              })
+               newList = schedules.sort(this.compare('assess_time'))
+            }
+
             this.show = true
             this.showOne = false
             let arr = []
             let newArr = []
             let newSchedules = []
-            schedules.map(item => {
+          
+            newList.map(item => {
              item.doctor_advice.map(it =>{
                 it.name = item.patient.name
                     if(item.prescription != null){
@@ -766,10 +796,17 @@ export default {
                     it.number = item.device_number.number
                     it.zone_name = item.device_number.zone.name
                     it.sort = item.device_number.sort,
-                    it.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
+                   
                     arr.push(it)
                 })
+                item.is_sort = item.device_number.sort
+                item.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
             })
+
+            console.log("schedules9999999998888888888",schedules)
+           
+
+          
            
             if(this.schedulType == 0){
                 newSchedules = arr
@@ -808,26 +845,12 @@ export default {
                 }
             })
             this.indexInfoList = newArr
-            
-            if(this.is_sort == 1){
-              var newList = []
-               newList =  this.scheduleMap.sort(this.compare('sort'))
-              
-               this.scheduleMap = []
-               this.scheduleMap = newList
-            }
-            if(this.is_sort == 2){
-              var newList = []
-               newList =  this.scheduleMap.sort(this.compare('assess_time'))
-               this.scheduleMap = []
-               this.scheduleMap = newList
-            }
             console.log("this.scheduleMap", this.scheduleMap)
+        
+           
            }
 
-
            if(config.is_open == 1){
-           
              this.show = false
              this.showOne  = true
             var schedules =  resp.data.hisAdvices
@@ -835,7 +858,29 @@ export default {
             let arr = []
             let newArr = []
             let newSchedules = []
-            schedules.map(item => {
+           var newList = []
+           if(this.is_sort == 0){
+              newList = schedules
+           }
+           if(this.is_sort == 1){
+              schedules.map(item => {
+                  item.is_sort = item.device_number.sort
+                  item.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
+              })
+              
+               newList = schedules.sort(this.compare('is_sort'))
+              
+    
+
+            }
+            if(this.is_sort == 2){
+              schedules.map(item => {
+                  item.is_sort = item.device_number.sort
+                  item.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
+              })
+               newList = schedules.sort(this.compare('assess_time'))
+            }
+            newList.map(item => {
              item.doctor_advice.map(it =>{
                 it.name = item.patient.name
                     if(item.prescription != null){
@@ -850,9 +895,11 @@ export default {
                     it.number = item.device_number.number
                     it.zone_name = item.device_number.zone.name
                     it.sort = item.device_number.sort,
-                    it.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
+                   
                     arr.push(it)
                 })
+              item.is_sort = item.device_number.sort
+              it.assess_time = item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
             })
             if(this.schedulType == 0){
                 newSchedules = arr
@@ -891,24 +938,6 @@ export default {
                 }
             })
             this.indexInfoList = newArr
-            console.log("this.scheduleMap2222", this.scheduleMap)
-
-             if(this.is_sort == 1){
-            
-               var newList = []
-               newList =  this.scheduleMap.sort(this.compare('sort'))
-              
-               this.scheduleMap = []
-               this.scheduleMap = newList
-
-            }
-            if(this.is_sort == 2){
-              var newList = []
-               newList =  this.scheduleMap.sort(this.compare('assess_time'))
-              
-               this.scheduleMap = []
-               this.scheduleMap = newList
-            }
            }
          }
          
@@ -1233,6 +1262,7 @@ export default {
        this.requestSchedualDoctors(this.time)
      },
      toExcution(){
+       
        if(this.selecting_schs.length ==0){
          this.$message.error("请勾选需要执行的医嘱")
          return false
@@ -1247,7 +1277,7 @@ export default {
      },
 
      excutionDoctorAdvice(){
-
+  
        if (this.execTime.length == 0) {
           this.$message.error('请选择执行时间！')
           return false
@@ -1283,12 +1313,9 @@ export default {
             this.exceLoading = false
             this.execTimeDialogVisible = false
             this.requestSchedualDoctors(this.time)
-           }else{
-            var msg = response.data.data.msg
-            this.$message.success("执行成功!")
-            this.exceLoading = false
-            this.execTimeDialogVisible = false
-            this.requestSchedualDoctors(this.time)
+           }
+           if(response.data.data.msg == 3){
+             this.$message.error("执行人和核对人不能是同一个人,执行失败!")
            }
          
           }
@@ -1404,13 +1431,17 @@ export default {
             this.exceLoading = false
             this.execTimeDialogVisibleOne = false
             this.requestSchedualDoctors(this.time)
-           }else{
+           }
+           if(response.data.data.msg == 1){
             var msg = response.data.data.msg
             this.$message.success("执行成功!")
             this.exceLoading = false
             this.execTimeDialogVisibleOne = false
             this.requestSchedualDoctors(this.time)
            }
+           if(response.data.data.msg == 3){
+             this.$message.error("执行人与核对人不能是同一个人,执行失败!")
+           }
         }
       })
     }

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

@@ -571,18 +571,19 @@ export default {
     },
 
      exportList(){
-      
+        console.log("表哥",this.tablePrint)
+        
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
           this.tablePrint[i].ctime = this.getTime(this.tablePrint[i].ctime)
         }
         for(let i=0;i<this.tablePrint.length;i++){
-           if(this.org_id == 9919){
-
-             this.tablePrint[i].count = this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child)
-             this.tablePrint[i].total_price = this.getCountSenven(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
+           if(this.org_id == 9919 || this.org_id == 9671){
+             this.tablePrint[i].min_price = this.tablePrint[i].price
+             this.tablePrint[i].count = parseInt((this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child))/this.tablePrint[i].min_number)
+             this.tablePrint[i].total_price =  ((parseInt((this.getCountSix(this.tablePrint[i].drug_id,this.tablePrint[i].child))/this.tablePrint[i].min_number))*this.tablePrint[i].price).toFixed(2)
              this.tablePrint[i].unit = this.tablePrint[i].dose + this.tablePrint[i].dose_unit + "*" + this.tablePrint[i].min_number +this.tablePrint[i].min_unit +"/"+this.tablePrint[i].max_unit
-             this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)
+             this.tablePrint[i].total = this.getCountSenvenOne(this.tablePrint.drug_id,this.tablePrint[i].child,this.tablePrint[i].price)/this.tablePrint[i].min_number
            }else{
               this.tablePrint[i].count = this.getCount(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_unit,this.tablePrint[i].min_number)
               this.tablePrint[i].total_price = this.getTotalPrice(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price)
@@ -832,12 +833,13 @@ export default {
         }
         return count
       },
-      getCountSenven(drug_id,val,price){
+      getCountSenven(drug_id,val,price,min_number){
+        console.log("min_number232333223",min_number)
         var count = 0
         for(let i=0;i<val.length;i++){
           count+= val[i].count
         }
-        return (count*price).toFixed(2)
+        return (parseInt(count/min_number)*price).toFixed(2)
       },
       getCountSenvenOne(drug_id,val,price){
         var count = 0

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -42,7 +42,7 @@
               </td>
 
               <td style="line-height: 50px">
-                <span v-if="org_id == 9671 || org_id == 9919">{{getCountSix(item.drug_id,item.child)}}</span>
+                <span v-if="org_id == 9671 || org_id == 9919">{{parseInt(getCountSix(item.drug_id,item.child)/item.min_number)}}</span>
                 <span v-else>{{getCount(item.child,item.max_unit,item.min_unit,item.min_number)}}</span>
               </td>
               <td style="line-height:50px">
@@ -50,7 +50,7 @@
                   <span v-else>{{item.min_price}}</span>
               </td>
               <td style="line-height:50px">
-                <span v-if="org_id ==9671 || org_id == 9919">{{(getCountSenven(item.drug_id,item.child,item.price))}}</span>
+                <span v-if="org_id ==9671 || org_id == 9919">{{((parseInt(getCountSix(item.drug_id,item.child)/item.min_number))*item.price).toFixed(2)}}</span>
                 <span v-else>{{(getCountOne(item.child,item.max_unit,item.min_unit,item.min_number)*item.min_price).toFixed(2)}}</span>
               </td>
               <td style="line-height: 50px">

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -659,7 +659,27 @@ export default {
       this.getNextScheduleWeekDay()
     },
     signPrint() {
-        var zone = this.zone
+        
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+         var zone = this.zone
+          var newArr = []
+          for(let i=0;i<this.zoneList.length;i++){
+            newArr.push(this.zoneList[i].id)
+          }
+          var arr = newArr.join(",")
+          var str = ""
+          if(this.zone == 0){
+            str = arr
+          }
+          if(zone != 0){
+            str = zone.join(",")
+          }
+          this.$router.push({
+            path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
+          })
+          }
+        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340){
+          var zone = this.zone
         var newArr = []
         for(let i=0;i<this.zoneList.length;i++){
            newArr.push(this.zoneList[i].id)
@@ -675,6 +695,8 @@ export default {
         this.$router.push({
           path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
         })
+        }
+       
     },
     getTime(val) {
       if(val == ""){

src/xt_pages/workforce/components/tableWeeks.vue

@@ -887,23 +887,46 @@
       }
       ,
       signPrint() {
-        var zone = this.zone
-        console.log("zone23232",zone)
-        var newArr = []
-        for(let i=0;i<this.zoneList.length;i++){
-           newArr.push(this.zoneList[i].id)
-        }
-        var arr = newArr.join(",")
-        var str = ""
-        if(this.zone == 0){
-           str = arr  
-        }
-        if(zone != 0){
-          str = zone.join(",")
-        }
-        this.$router.push({
-          path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
-        })
+
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+         var zone = this.zone
+          console.log("zone23232",zone)
+          var newArr = []
+          for(let i=0;i<this.zoneList.length;i++){
+            newArr.push(this.zoneList[i].id)
+          }
+          var arr = newArr.join(",")
+          var str = ""
+          if(this.zone == 0){
+            str = arr  
+          }
+          if(zone != 0){
+            str = zone.join(",")
+          }
+          this.$router.push({
+            path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
+          })
+        }
+        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340){
+          var zone = this.zone
+          console.log("zone23232",zone)
+          var newArr = []
+          for(let i=0;i<this.zoneList.length;i++){
+            newArr.push(this.zoneList[i].id)
+          }
+          var arr = newArr.join(",")
+          var str = ""
+          if(this.zone == 0){
+            str = arr  
+          }
+          if(zone != 0){
+            str = zone.join(",")
+          }
+          this.$router.push({
+            path: '/schedule/remind/print/setting?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
+          })
+         }
+      
       }
       ,
       compare(property) {

src/xt_pages/workforce/remind_print_setting.vue

@@ -85,7 +85,8 @@
                 <div style="margin-left:50px;">姓名:
                   <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
                   <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
-                  （{{ main_collection.patient.dialysis_no }}，{{ main_collection.patient.age }}岁）
+                  <span v-if="type ==1 && printObj.name == 1">（{{ main_collection.patient.dialysis_no }}，{{getNewAge(main_collection.patient.id_card_no) }}岁）</span> 
+                  <span v-if="type ==2 && printObj.name == 1">（{{ main_collection.dialysis_no }}，{{getNewAge(main_collection.id_card_no) }}岁）</span> 
                 </div>
                 <div class="printCell">
                   <span>
@@ -136,7 +137,7 @@
                  
                 </div>
                 <div class="printCell">
-                  <span>体重增加：{{ (main_collection.assessmentbefor.weight_before - main_collection.lastafterweight.weight_after).toFixed(2) }}Kg</span>
+                  <span>体重增加：{{ (main_collection.assessmentbefor.weight_before - main_collection.lastafterweight?main_collection.lastafterweight.weight_after:0).toFixed(2) }}Kg</span>
                   维持：{{main_collection.dialysissolution.anticoagulant_weichi}}
                    <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                     mg/h
@@ -221,7 +222,7 @@
 </template>
 
 <script>
-  import { getScheduleList,getPrintList,getNextScheduleWeekDay } from '@/api/schedule'
+  import { getScheduleList,getPrintList,getNextScheduleWeekDayOne } from '@/api/schedule'
   import { parseTime } from '@/utils'
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
@@ -532,7 +533,7 @@
         //   week_time:this.week_time,
         // }
       console.log("params",params)
-      getNextScheduleWeekDay(params).then(response => {
+      getNextScheduleWeekDayOne(params).then(response => {
         this.scheduleData = [];
         if (response.data.state == 1) {
           var scheduleData = response.data.data.schedule;
@@ -599,7 +600,21 @@
         } 
        }
        return name
-     }
+     },
+      getNewAge(UUserCard) {
+      if (UUserCard != null && UUserCard != '') {
+        // 获取年龄
+        var myDate = new Date()
+        var month = myDate.getMonth() + 1
+        var day = myDate.getDate()
+        var age = myDate.getFullYear() - UUserCard.substring(6, 10) - 1
+        if (UUserCard.substring(10, 12) < month || UUserCard.substring(10, 12) == month && UUserCard.substring(12, 14) <= day) {
+          age++
+        }
+        return age
+      }
+    },
+
     }
   }
 </script>