8月15日

src/api/advice.js

@@ -559,3 +559,11 @@ export function settleNewDoctorAdvice(params) {
     params: params
   })
 }
+
+export function excutionDoctorAdviceById(params) {
+  return request({
+    url: '/api/schedule/excutiondoctoradvicebyid',
+    method: 'get',
+    params: params
+  })
+}

src/utils/tools.js

@@ -152,6 +152,14 @@ export function uParseTime(time, cFormat) {
   return time_str
 }
 
+export function replacementFlow(bloodflowvolume) {
+  bloodflowvolume = parseFloat(bloodflowvolume)
+  if (isNaN(bloodflowvolume)) {
+    return 0
+  }
+  return bloodflowvolume * 0.25
+}
+
 export function calculateAnticoagulantZL(type, shouji, shichang, weichi, add_amount, reduce_amount) {
   console.log('t', type)
   var t = 0.5

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

@@ -957,6 +957,12 @@
               this.showAdviceForm = false
               this.showAdvicePanel = true
               var advice = response.data.data.advice
+              var single_dose_unit = ""
+              if(advice.single_dose_unit > 0){
+                single_dose_unit = this.getUnit(advice.single_dose_unit)
+              }else{
+                single_dose_unit = advice.single_dose_unit
+              }
               this.doctor_advices[this.currentIndex].drug_spec = advice.drug_spec
               this.doctor_advices[this.currentIndex].drug_spec_unit =
                 advice.drug_spec_unit
@@ -968,8 +974,7 @@
                 advice.advice_desc
               this.doctor_advices[this.currentIndex].single_dose =
                 advice.single_dose
-              this.doctor_advices[this.currentIndex].single_dose_unit =
-                advice.single_dose_unit
+              this.doctor_advices[this.currentIndex].single_dose_unit = single_dose_unit
               this.doctor_advices[this.currentIndex].delivery_way =
                 advice.delivery_way
               this.doctor_advices[this.currentIndex].execution_frequency =
@@ -2575,14 +2580,28 @@
               this.schedulePatient = schedulePatient
            }
        })
-     }
+     },
+      getDataConfig(module, filed_name) {
+        return getDataConfig(module, filed_name)
+      },
+      getUnit(id){
+         var name = ""
+         for(let i=0;i<this.unitsOption.length;i++){
+           if(id == this.unitsOption[i].id){
+              name = this.unitsOption[i].name
+           }
+         }
+         console.log("nam e23233232322323wo",name)
+         return name
+      }
     },
     created() {
+    
       var date = this.$route.query && this.$route.query.date
       this.record_date = uParseTime(date, '{y}-{m}-{d}')
       this.form.advice_date = this.record_date
       this.getAdviceConfig()
-      this.unitsOption = getDataConfig('hemodialysis', 'units')
+      this.unitsOption = this.getDataConfig('hemodialysis', 'units')
       this.template_id = this.$store.getters.xt_user.template_info.template_id
       this.org_id = this.$store.getters.xt_user.org.id
       this.patientid = this.$route.query.patient_id

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

@@ -161,8 +161,10 @@
                 <template slot-scope="scope">
 <!--                  //从1到20-->
                   <span v-if="scope.row.single_dose != 0" @click="lili(scope.row)">
-<!--                    {{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}-->
-                    <span v-if="scope.row.single_dose_unit == 1" >{{ scope.row.single_dose}}g</span>
+                   {{ scope.row.single_dose}}
+                   <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span> 
+                   <span v-else>{{ scope.row.single_dose_unit }}</span> 
+                    <!-- <span v-if="scope.row.single_dose_unit == 1" >{{ scope.row.single_dose}}g</span>
                     <span v-else-if="scope.row.single_dose_unit == 2" >{{ scope.row.single_dose}}mg</span>
                     <span v-else-if="scope.row.single_dose_unit == 3" >{{ scope.row.single_dose}}u</span>
                     <span v-else-if="scope.row.single_dose_unit == 4" >{{ scope.row.single_dose}}ml</span>
@@ -182,7 +184,7 @@
                     <span v-else-if="scope.row.single_dose_unit == 18" >{{ scope.row.single_dose}}瓶</span>
                     <span v-else-if="scope.row.single_dose_unit == 19" >{{ scope.row.single_dose}}瓶(袋)</span>
                     <span v-else-if="scope.row.single_dose_unit == 20" >{{ scope.row.single_dose}}次</span>
-                    <span v-else >{{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}</span>
+                    <span v-else >{{ scope.row.single_dose}}{{ scope.row.single_dose_unit }}</span> -->
                   </span>
 
 
@@ -569,7 +571,7 @@ import {
   getDoctorAdviceList,
   StopDoctorAdvice
 } from "@/api/advice";
-
+import { getDataConfig } from '@/utils/data'
 import {getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
 import { duration } from 'moment';
 export default {
@@ -653,6 +655,7 @@ export default {
       drug_name_id:"",
       src_type:"",
       private_drug_config:{},
+      units:[],
     };
   },
   props: {
@@ -1802,6 +1805,18 @@ export default {
       },
       handleSelect1(){
 
+      },
+      getDataConfig(module, filed_name) {
+        return getDataConfig(module, filed_name)
+      },
+      getUnit(id){
+         var name = ""
+         for(let i=0;i<this.units.length;i++){
+           if(id == this.units[i].id){
+              name = this.units[i].name
+           }
+         }
+         return name
       }
   },
   watch: {
@@ -1810,7 +1825,9 @@ export default {
     }
   },
   created(){
-    //获取自备药
+    this.units =  this.getDataConfig('hemodialysis','units')
+    console.log("单位32322323232我的",this.units)
+   //获取自备药
     this.getSelfMedicalList()
 
   }

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

@@ -149,10 +149,13 @@
                 align="center"
               >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.single_dose != 0"
+                  <!-- <span v-if="scope.row.single_dose != 0"
                     >{{ scope.row.single_dose
                     }}{{ scope.row.single_dose_unit }}</span
-                  >
+                  > -->
+                 {{ scope.row.single_dose}}
+                <span v-if="scope.row.single_dose_unit >0"> {{getUnit(scope.row.single_dose_unit )}}</span> 
+                <span v-else>{{ scope.row.single_dose_unit }}</span> 
                 </template>
               </el-table-column>
               <el-table-column
@@ -276,6 +279,7 @@
                   >{{ scope.row.single_dose
                   }}{{ scope.row.single_dose_unit }}</span
                 >
+               
               </template>
             </el-table-column>
             <el-table-column
@@ -574,6 +578,7 @@ import {
   StopDoctorAdvice,
   SaveEditAdvices
 } from "@/api/advice";
+import { getDataConfig } from '@/utils/data'
 import { jsGetAge, uParseTime } from "@/utils/tools";
 import { getSelfMedicalList,getDrugDescByDrugName } from "@/api/drug/drug"
 export default {
@@ -658,6 +663,7 @@ export default {
       drug_id: 0,
       src_type:"",
       drug_name_id:0,
+      units:[],
     };
   },
   props: {
@@ -896,6 +902,13 @@ export default {
       this.$refs[formName].validate(valid => {
         if (valid) {
           if (_this.nameForm.isEdit) {
+            var single_dose_unit = ""
+            if(_this.nameForm.single_dose_unit > 0){
+               single_dose_unit = this.getUnit(_this.nameForm.single_dose_unit)
+            }else{
+              single_dose_unit = _this.nameForm.single_dose_unit
+            }
+            console.log("single_dose_unit332323223",single_dose_unit)
             var submitForm = {
               advice_type: _this.groupForm.advice_type,
               advice_date: _this.groupForm.advice_date,
@@ -904,7 +917,7 @@ export default {
               advice_name: _this.nameForm.advice_name,
               advice_desc: _this.nameForm.advice_desc,
               single_dose: "" + _this.nameForm.single_dose,
-              single_dose_unit: _this.nameForm.single_dose_unit,
+              single_dose_unit: single_dose_unit,
               drug_spec: "" + _this.nameForm.drug_spec,
               drug_spec_unit: _this.nameForm.drug_spec_unit,
               prescribing_number: "" + _this.nameForm.prescribing_number,
@@ -2471,6 +2484,18 @@ export default {
         console.log('results',results)
         cb(results);
       },
+     getDataConfig(module, filed_name) {
+        return getDataConfig(module, filed_name)
+    },
+     getUnit(id){
+         var name = ""
+         for(let i=0;i<this.units.length;i++){
+           if(id == this.units[i].id){
+              name = this.units[i].name
+           }
+         }
+         return name
+      }
   },
   watch: {
     "selectedTemp.list": function() {
@@ -2478,6 +2503,8 @@ export default {
     }
   },
   created(){
+    this.units =  this.getDataConfig('hemodialysis','units')
+    console.log("32322323232我的",this.units)
      //获取自备药
     this.getSelfMedicalList()
   }

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

@@ -61,6 +61,18 @@
                         </el-form-item>
                     </el-col>
 
+                   <el-col :span="8" v-if="isShows('置换流量') &&  this.$store.getters.xt_user.template_info.org_id != 10340">
+                        <el-form-item label="置换流量(L/h)：">
+                            <el-input v-model="dialysisPrescription.replacement_flow"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8" v-if="isShows('置换流量')  &&  this.$store.getters.xt_user.template_info.org_id == 10340">
+                        <el-form-item label="置换流量(ml/min)：">
+                            <el-input v-model="dialysisPrescription.replacement_flow"></el-input>
+                        </el-form-item>
+                    </el-col>
+
 
                     <el-col :span="8"
                             v-if="isShows('预冲量') && (this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 36 ||  this.$store.getters.xt_user.template_info.org_id == 10345)">
@@ -245,7 +257,7 @@
                   <el-col :span="8" v-if="isShows('减肝素量')">
                        <el-form-item v-if="dialysisPrescription.anticoagulant == 2" :label="'减肝素量(mg) : '">
                                 <el-input type="number" v-if="dialysisPrescription.anticoagulant != 1"
-                                          v-model="dialysisPrescription.reduce_amount" v-on:input="searchReduceAmount"></el-input>
+                                          v-model="dialysisPrescription.calculateAnticoagulantZL" v-on:input="searchReduceAmount"></el-input>
                                 <el-input type="number" disabled v-if="dialysisPrescription.anticoagulant == 1"
                                           v-model="dialysisPrescription.reduce_amount" v-on:input="searchReduceAmount"></el-input>
                             </el-form-item>
@@ -810,17 +822,7 @@
                     </el-col>
 
 
-                    <el-col :span="8" v-if="isShows('置换流量') &&  this.$store.getters.xt_user.template_info.org_id != 10340">
-                        <el-form-item label="置换流量(L/h)：">
-                            <el-input v-model="dialysisPrescription.replacement_flow"></el-input>
-                        </el-form-item>
-                    </el-col>
-
-                    <el-col :span="8" v-if="isShows('置换流量')  &&  this.$store.getters.xt_user.template_info.org_id == 10340">
-                        <el-form-item label="置换流量(ml/min)：">
-                            <el-input v-model="dialysisPrescription.replacement_flow"></el-input>
-                        </el-form-item>
-                    </el-col>
+               
 
                     <el-col :span="8" v-if="isShows('吸氧')">
                         <el-form-item label="吸氧：">
@@ -1091,7 +1093,7 @@
 <script>
   import { CreateGroupAdvice, GetSolution, postPrescription, postSoulution } from '@/api/dialysis'
   import { getDataConfig } from '@/utils/data'
-  import { calculateAnticoagulantZL, uParseTime } from '@/utils/tools'
+  import { calculateAnticoagulantZL, uParseTime,replacementFlow } from '@/utils/tools'
   import store from '@/store'
   import MsgTip from './MsgTip'
   import request from '@/utils/request'
@@ -2276,9 +2278,11 @@
           last_weight_after = this.last_record.weight_after
         }
         console.log("last2323232323232332wode",this.predialysis)
-        if(this.dialysisPrescription!=null && this.dialysisPrescription.id == 0){
+        if(this.predialysis!=null && this.predialysis.id == 0){
             if(this.$store.getters.xt_user.org.id == 9671 || this.$store.getters.xt_user.org.id == 9675 || this.$store.getters.xt_user.org.id == 10340 ){
               this.dialysisPrescription.sodium = 138
+              this.dialysisPrescription.bicarbonate = 31.1
+              this.dialysisPrescription.dialysate_flow = 500
             }
         }
         if (this.predialysis == null || this.predialysis.id == 0) {
@@ -3513,6 +3517,15 @@
                     response.data.data.solution[key]
                 }
               }
+               if (this.$store.getters.xt_user.template_info.org_id== 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 || this.$store.getters.xt_user.template_info.org_id == 10340) {
+                console.log('抠门；哦啊', response.data.data.dialysisPrescription.remark)
+                this.dialysisPrescription.sodium = 138
+                this.dialysisPrescription.bicarbonate = 31.1
+                this.dialysisPrescription.dialysate_flow = 500
+                if (this.last_prescription != null && response.data.data.dialysisPrescription != null) {
+                  this.dialysisPrescription.remark = response.data.data.dialysisPrescription.remark
+                }
+              }
             } else {
               if (response.data.data.prescription != null) {
                 // 临时处方不为空
@@ -3546,13 +3559,30 @@
                 }
                 this.dialysisPrescription.mode_id = id
               }
+               if (this.$store.getters.xt_user.template_info.org_id == 9671 ||this.$store.getters.xt_user.template_info.org_id == 9675 ||this.$store.getters.xt_user.template_info.org_id== 10340) {
+                this.dialysisPrescription.sodium = 138
+                this.dialysisPrescription.bicarbonate = 31.1
+                this.dialysisPrescription.dialysate_flow = 500
+                if (this.last_prescription != null && response.data.data.system_prescription != null && response.data.data.system_prescription.remark == '') {
+                  this.dialysisPrescription.remark = response.data.data.system_prescription.remark
+                }
+              }
             }
 
             if(response.data.data.dialysisPrescription!=null){
                this.dialysisPrescription.remark =  response.data.data.dialysisPrescription.remark 
             }
           }
-
+         if (response.data.data.solution == null) {
+              if (this.$store.getters.xt_user.template_info.org_id== 9671 || this.$store.getters.xt_user.template_info.org_id == 9675 ||this.$store.getters.xt_user.template_info.org_id== 10340) {
+                this.dialysisPrescription.sodium = 138
+                this.dialysisPrescription.bicarbonate = 31.1
+                this.dialysisPrescription.dialysate_flow = 500
+                if (this.last_prescription != null) {
+                  this.dialysisPrescription.remark = this.last_prescription.remark
+                }
+              }
+            }
           if (
             this.dialysisPrescription.dialysis_duration_hour === '' ||
             this.dialysisPrescription.dialysis_duration_minute === ''
@@ -3667,6 +3697,9 @@
     },
 
     watch: {
+      'dialysisPrescription.blood_flow_volume': function () {
+        this.dialysisPrescription.replacement_flow = replacementFlow(this.dialysisPrescription.blood_flow_volume)
+      },
       'dialysisPrescription.dialysis_duration_hour': function() {
         let dialysis_duration_minute = 0
         let dialysis_duration_hour = 0

src/xt_pages/dialysis/details/index.vue

@@ -238,7 +238,7 @@
               <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 }}，{{ main_collection.patient.age }}岁）
+                  （{{ 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%;">
@@ -920,6 +920,8 @@ export default {
     this.getInitData()
 
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
+
+
   },
   beforeMount() {
     if (this.websocket) {
@@ -1084,6 +1086,19 @@ export default {
     this.websocketSend(unObj)
   },
   methods: {
+     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
+      }
+    },
     adviceFunc() {
       this.getScheduleDetail()
     },

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -62,12 +62,13 @@
         <label class="title">
           <span class="name">排序:</span>
         </label>
-        <el-select v-model="sort" placeholder="请选择">
+        <el-select v-model="sort" placeholder="请选择" @change="selectSortType">
           <el-option
             v-for="item in options"
             :key="item.name"
             :label="item.name"
-            :value="item.id">
+            :value="item.id"
+            >
           </el-option>
         </el-select>
       </div>
@@ -151,7 +152,7 @@
           </ul>
         </div>
       </div>
-      <div>
+      <div style="margin-top: 10px;margin-left:600px;margin-bottom:10px">
         <el-button type="primary" size="small" @click="toExcution">执行医嘱</el-button>
         <el-button type="primary" size="small" @click="toCheck">医嘱核对</el-button>
         <el-button type="primary" size="small" @click="toSettle">收费</el-button>
@@ -160,11 +161,13 @@
 
       <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">
+        highlight-current-row
+        @current-change="handleCurrentChangeList"
+        v-show="show"
+        @row-click="handleRowClick">
         <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">
@@ -201,6 +204,7 @@
             <span v-if="scope.row.dialysis_irrigation!=''">{{scope.row.dialysis_irrigation}}</span>
           </template>
         </el-table-column>
+      
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
           <template slot-scope="scope">
             <span>
@@ -286,12 +290,32 @@
             <span v-else></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.is_settle == 1">
+              已收费
+            </span>
+            <span v-if="scope.row.is_settle == 2 || scope.row.is_settle == 0">
+              未收费
+            </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'}"
+
+
+     <el-table :data="scheduleMap" border :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"
         @selection-change="handleSelectionChangeOne"
-        :row-class-name="tableRowClassName"
+        @current-change="handleCurrentChangeList"
         :span-method="objectSpanMethod"
         :cell-class-name="adviceNameShow"
+        highlight-current-row
         :modal-append-to-body="false"
         v-show="showOne">
         <el-table-column type="selection" width="55" align="center"></el-table-column>
@@ -412,6 +436,24 @@
             <span v-else></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.is_settle == 1">
+              已收费
+            </span>
+            <span v-if="scope.row.is_settle == 2 || scope.row.is_settle == 0">
+              未收费
+            </span>
+            <span v-else></span>
+          </template>
+        </el-table-column>
       </el-table>
 
      <el-dialog
@@ -429,11 +471,32 @@
         style="width:100%"
       ></el-date-picker>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="closeTimePanel" :loading="exceLoading">取 消</el-button>
+        <el-button @click="execTimeDialogVisible = false">取 消</el-button>
         <el-button type="primary" @click="excutionDoctorAdvice" :loading="exceLoading">保 存</el-button>
       </span>
     </el-dialog>
 
+
+   <el-dialog
+      title="选择执行时间"
+      :visible.sync="execTimeDialogVisibleOne"
+      width="400px"
+      :modal-append-to-body="false"
+    >
+      <el-date-picker
+        v-model="execTime"
+        format="yyyy-MM-dd HH:mm:00"
+        value-format="yyyy-MM-dd HH:mm:00"
+        type="datetime"
+        placeholder="选择执行时间"
+        style="width:100%"
+      ></el-date-picker>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="execTimeDialogVisibleOne = false">取 消</el-button>
+        <el-button type="primary" @click="excutionDoctorAdviceOne" :loading="exceLoading">保 存</el-button>
+      </span>
+    </el-dialog>
+
     </div>
 
   </div>
@@ -445,7 +508,7 @@ import { getSchedualPatient, GetAllZone } from "@/api/dialysis";
 import { parseTime } from "@/utils";
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import { getPrintTemplate } from "@/api/data";
-import { getNewSchedualDoctors,excutionDoctorAdvice,checkNewDoctorAdvice,settleNewDoctorAdvice } from '@/api/advice'
+import { getNewSchedualDoctors,excutionDoctorAdvice,checkNewDoctorAdvice,settleNewDoctorAdvice,excutionDoctorAdviceById } from '@/api/advice'
 import { PostSearch } from '@/api/patient'
 export default {
   name: "Patient",
@@ -514,6 +577,11 @@ export default {
       execTime: '',
       execTimeDialogVisible:false,
       exceLoading:false,
+      is_sort:0,
+      hoverOrderArr:[],
+      is_status:0,
+      execTimeDialogVisibleOne:false,
+      current_row:{},
     };
   },
   created() {
@@ -619,7 +687,7 @@ export default {
          var schedule_type = this.listQuery.schedul_type
          var partition_type = this.listQuery.partition_type
 
-        getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way}).then(rs => {
+        getNewSchedualDoctors({date: newTime,patient_type: 0,advice_type: 2,delivery_way:name,schedule_type:schedule_type,partition_type:partition_type,patient_id:this.patient_id,excution_way:this.excution_way,cost_type:this.costType}).then(rs => {
         var resp = rs.data
         if (resp.state == 1) {
             this.admin_users = resp.data.adminUser
@@ -664,7 +732,9 @@ export default {
                         id:it.id,
                         patient_id:it.patient_id,
                         parent_id:0,
-                        groupno:0
+                        groupno:0,
+                        sort:item.device_number.sort,
+                        assess_time:item.dialysisassesmentbefor?item.dialysisassesmentbefor.created_time:"3753619200"
                       }
                       item.doctor_advice.push(obj)
                     })
@@ -695,6 +765,8 @@ export default {
                     it.mode_id = item.mode_id
                     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)
                 })
             })
@@ -736,7 +808,24 @@ 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
@@ -760,6 +849,8 @@ export default {
                     it.mode_id = item.mode_id
                     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)
                 })
             })
@@ -800,12 +891,38 @@ 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
+            }
            }
          }
          
         })
         
     },
+    compare:function (k) {
+          return function (a, b) {
+              var M = a[k];
+              var N = b[k];
+              return M - N;      // 从低向高排
+              // return N - M;   // 从高向低排
+          }
+      },
     getValue: function(val) {
       if (val != undefined) {
         return val.value;
@@ -934,19 +1051,19 @@ export default {
         return value1 - value2
       }
     },
-    tableRowClassName({ row, rowIndex }) {
-        // if (row.stop_state == 1 || row.execution_state == 1) {
-        //     return 'stoped-row';
-        // }
-        // return 'success-rows'
-        // row.index = rowIndex
-        // const arr = this.hoverOrderArr
-        // for (let i = 0; i < arr.length; i++) {
-        //   if (rowIndex == arr[i]) {
-        //     return 'success-row'
-        //   }
-        // }
-    },
+    // tableRowClassName({ row, rowIndex }) {
+    //     if (row.stop_state == 1 || row.execution_state == 1) {
+    //         return 'stoped-row';
+    //     }
+    //     return 'success-rows'
+    //     row.index = rowIndex
+    //     const arr = this.hoverOrderArr
+    //     for (let i = 0; i < arr.length; i++) {
+    //       if (rowIndex == arr[i]) {
+    //         return 'success-row'
+    //       }
+    //     }
+    // },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
         if (columnIndex === 0) {
             let index = this.indexInfoList.findIndex(item => {  //遍历数组
@@ -1082,12 +1199,14 @@ export default {
         }
     },
     handleSelectionChange(val){
-      console.log("val23323232",val)
+      console.log("val88888888",val)
       this.selecting_schs = val;
+      this.is_status = 1
     },
     handleSelectionChangeOne(val){
-      console.log("val888888",val)
       this.selecting_schs = val;
+      this.is_status = 1
+      console.log("val32323323223",val)
     },
 
     querySearchAsync(keyword, cb) {
@@ -1118,8 +1237,15 @@ export default {
          this.$message.error("请勾选需要执行的医嘱")
          return false
        }
-      this.execTimeDialogVisible = true
+       console.log("hhhahhhahhh",this.is_status)
+       if(this.is_status == 1){
+         this.execTimeDialogVisible = true
+       }
+       if(this.is_status == 2){
+         this.execTimeDialogVisibleOne = true
+        }
      },
+
      excutionDoctorAdvice(){
 
        if (this.execTime.length == 0) {
@@ -1137,7 +1263,7 @@ export default {
 
        var params = {
         str:str,
-        advice_date: moment(time).format('YYYY-MM-DD'),
+        advice_date: moment(this.time).format('YYYY-MM-DD'),
         is_open:this.config.is_open,
         exec_time:execTime
        }
@@ -1155,17 +1281,37 @@ export default {
             var str = drug_name + " "+dose+dose_unit +"*"+min_number +max_unit +"/"+min_unit
             this.$message.error(str +"库存不足,执行失败!")
             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)
            }
-           var msg = response.data.data.msg
-           this.$message.success("保存成功!")
-           this.exceLoading = false
+         
           }
        })
      },
      toCheck(){
+
+      if(this.selecting_schs.length ==0){
+         this.$message.error("请勾选需要执行的医嘱")
+         return false
+       }
+
+    
+       var ids=[]
+       if(this.selecting_schs!=null && this.selecting_schs.length >0){
+          for(let i=0;i<this.selecting_schs.length;i++){
+             ids.push(this.selecting_schs[i].patient_id)
+          }
+       }
+       var str = ids.join(",")
       var params = {
         str:str,
-        advice_date: moment(time).format('YYYY-MM-DD'),
+        advice_date: moment(this.time).format('YYYY-MM-DD'),
         is_open:this.config.is_open,
        }
        checkNewDoctorAdvice(params).then(response=>{
@@ -1173,23 +1319,101 @@ export default {
             if(response.data.data.msg == 2){
               var advice = response.data.data.advice
               this.$message.error(advice.advice_name +"执行人和核对人不能是同一个人,核对失败!")
+              this.requestSchedualDoctors(this.time)
+            }else{
+              this.$message.success("核对成功!")
+              this.requestSchedualDoctors(this.time)
             }
-            this.$message.error("核对成功!")
+           
           }
        })
      },
      toSettle(){
+       if(this.selecting_schs.length ==0){
+         this.$message.error("请勾选需要执行的医嘱")
+         return false
+       }
+       var ids=[]
+       if(this.selecting_schs!=null && this.selecting_schs.length >0){
+          for(let i=0;i<this.selecting_schs.length;i++){
+             ids.push(this.selecting_schs[i].patient_id)
+          }
+       }
+       var str = ids.join(",")
        var params = {
         str:str,
-        advice_date: moment(time).format('YYYY-MM-DD'),
+        advice_date: moment(this.time).format('YYYY-MM-DD'),
         is_open:this.config.is_open,
        }
        settleNewDoctorAdvice(params).then(response=>{
           if(response.data.state == 1){
             this.$message.success("收费成功!")
+            this.requestSchedualDoctors(this.time)
           }
        })
-     }
+     },
+     selectSortType(id){
+       this.is_sort = id
+       this.requestSchedualDoctors(this.time);
+     },
+    handleRowClick (row) {
+     console.log("row232323232",row)
+    },
+    tableRowClassName({row, rowIndex}) {
+        row.index = rowIndex
+        if(row.index = rowIndex){
+         return 'success-row'
+        }
+       
+      },
+    handleCurrentChangeList(row){
+      console.log("row233232232332",row)
+      this.selecting_schs.push(row)
+      this.current_row= row
+      this.is_status = 2
+    
+    },
+    excutionDoctorAdviceOne(){
+      if(this.current_row.execution_state == 1){
+        this.$message.error("所选医嘱已核对,无需再核对!")
+        return false
+      }
+     if (this.execTime.length == 0) {
+          this.$message.error('请选择执行时间！')
+          return false
+        }
+       var execTime = Math.round(new Date(this.execTime).getTime() / 1000)
+      console.log("param2332323",this.current_row)
+      var params= {
+        advice_id:this.current_row.id,
+        advice_date: moment(this.time).format('YYYY-MM-DD'),
+        exec_time:execTime,
+      }
+      console.log("prams232323",params)
+      excutionDoctorAdviceById(params).then(response=>{
+        if(response.data.state == 1){
+          if(response.data.data.msg == 2){
+            var drug_name = response.data.data.drug.drug_name
+            var dose = response.data.data.drug.dose
+            var dose_unit = response.data.data.drug.dose_unit
+            var min_number = response.data.data.drug.min_number
+            var max_unit = response.data.data.drug.max_unit
+            var min_unit = response.data.data.drug.min_unit
+            var str = drug_name + " "+dose+dose_unit +"*"+min_number +max_unit +"/"+min_unit
+            this.$message.error(str +"库存不足,执行失败!")
+            this.exceLoading = false
+            this.execTimeDialogVisibleOne = false
+            this.requestSchedualDoctors(this.time)
+           }else{
+            var msg = response.data.data.msg
+            this.$message.success("执行成功!")
+            this.exceLoading = false
+            this.execTimeDialogVisibleOne = false
+            this.requestSchedualDoctors(this.time)
+           }
+        }
+      })
+    }
   },
   components: {
     BreadCrumb

src/xt_pages/outpatientCharges/allListPrint.vue

@@ -82,7 +82,7 @@
             this.admin = response.data.data.admin_info
             this.his_hospital = response.data.data.his_hospital
             var order_info = response.data.data.order_info
-            
+
             if(this.$store.getters.xt_user.org_id == 10215 || this.$store.getters.xt_user.org_id == 0){
               //获取所有项目类型进行去重
               let med_chrgitm_types = []
@@ -209,7 +209,7 @@
                 obj['name'] = details[a].advice.advice_name
                 // obj['spec'] = details[a].advice.drug.drug_spec
                 obj['spec'] =   details[a].advice.drug.dose +   details[a].advice.drug.dose_unit+"*" +  details[a].advice.drug.min_number +   details[a].advice.drug.min_unit+"/"+ details[a].advice.drug.max_unit
-                obj['unit'] = details[a].advice.drug.min_unit
+                obj['unit'] = details[a].advice.prescribing_number_unit
                 obj['medicine_insurance_kind'] = this.getMedicineInsuranceType(details[a].chrgitm_lv)
                 obj['med_chrgitm_type'] = this.getType(details[a].med_chrgitm_type)
                 obj['price'] = parseFloat(details[a].pric)
@@ -362,7 +362,7 @@
           '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;}.allListTable tr td {padding: 0 5px;}.tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
          const style1 =
           '@media print {.allListTitle{font-size: 24px;text-align: center;font-weight: bold;margin-bottom: 10px;}.allListInfo{display: flex;font-size: 16px;justify-content: space-between;margin: 10px 0;} .allListTable{width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable tr td {padding: 0 5px;} .allListTable .allListTable_1{border: none;width: 100%;text-align: center;border-collapse: collapse;line-height: 20px;font-size: 14px;border-color: #000;text-align:left;} .allListTable_1 tr{page-break-inside:avoid;} .allListTable_1 tr td {padding: 0 5px;border: 1px solid #000;} .tableBottom{font-size: 16px;display: flex;margin-top: 20px;}.tableBottomOne{margin-right: 40px;}}'
-        
+
         if(this.org_id == 10215 || this.org_id == 0 ||this.org_id == 9675){
           printJS({
           printable: 'allList-print',
@@ -379,8 +379,8 @@
         })
         }
 
-        
-        
+
+
 
         // if (this.org_template_info.template_id == 1) {
         //   printJS({

src/xt_pages/outpatientCharges/costComparison.vue

@@ -208,7 +208,7 @@ c<template>
                     </el-select>
                   </el-form-item>
 
-                  <el-form-item label="清算类别" :label-width="formLabelWidth" v-if="this.$store.getters.xt_user.org.id == 9919">
+                  <el-form-item label="清算类别" :label-width="formLabelWidth" >
                     <el-select v-model="clr_type" placeholder="请选择" style="width: 200px;">
                       <el-option
                           v-for="item in clrOptions"

src/xt_pages/outpatientCharges/invoiceTemplate/printEight.vue

@@ -1,66 +1,66 @@
 <template>
-  <div id='invoice-print'>
-    <div style="display:flex;">
-      <!-- <div style="position: absolute;top:70px;left:70px;">{{ list.order_number }}</div> -->
-      <!-- <div>{{ list.id_card_no }}</div> -->
-    </div>
-    <!-- <div style="display:flex;justify-content: space-between;">
-        <div>{{ list.department_name }}</div>
-        <div  style="position: absolute;top:70px;left:300px">{{ list.number }}</div>
-        <div></div>
-        <div  style="position: absolute;left:560px;top:70px;">
-            <span>{{ printDate.slice(0,4) }}</span>
-            <span>{{ printDate.slice(5,7) }}</span>
-            <span>{{ printDate.slice(8,11) }}</span>
+    <div id='invoice-print'>
+        <div style="display:flex;">
+            <!-- <div style="position: absolute;top:70px;left:70px;">{{ list.order_number }}</div> -->
+            <!-- <div>{{ list.id_card_no }}</div> -->
         </div>
-    </div> -->
-    <div style="display:flex;justify-content: space-between;">
-      <div style="position: absolute;top:90px;left:40px;"> {{ paramsObj.name }}</div>
-      <div  style="position: absolute;top:90px;left:340px">{{ list.number }}</div>
-      <!-- <div style="position: absolute;top:90px;left:240px;">√</div> -->
-      <!-- <div>{{ list.pay_way }}</div> -->
-      <!-- <div style="position: absolute;top:70px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
-      <div style="position: absolute;top:70px;left:560px;">{{ paramsObj.setl_time.split(' ')[0] }}</div> -->
-    </div>
-    <!-- <div style="display:flex;justify-content: space-between;">
+        <!-- <div style="display:flex;justify-content: space-between;">
+            <div>{{ list.department_name }}</div>
+            <div  style="position: absolute;top:70px;left:300px">{{ list.number }}</div>
+            <div></div>
+            <div  style="position: absolute;left:560px;top:70px;">
+                <span>{{ printDate.slice(0,4) }}</span>
+                <span>{{ printDate.slice(5,7) }}</span>
+                <span>{{ printDate.slice(8,11) }}</span>
+            </div>
+        </div> -->
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:90px;left:40px;"> {{ paramsObj.name }}</div>
+            <div  style="position: absolute;top:90px;left:340px">{{ list.number }}</div>
+            <!-- <div style="position: absolute;top:90px;left:240px;">√</div> -->
+            <!-- <div>{{ list.pay_way }}</div> -->
+            <!-- <div style="position: absolute;top:70px;left:460px;">{{ paramsObj.setl_time.split(' ')[0] }}</div>
+            <div style="position: absolute;top:70px;left:560px;">{{ paramsObj.setl_time.split(' ')[0] }}</div> -->
+        </div>
+        <!-- <div style="display:flex;justify-content: space-between;">
 
-        <div style="position: absolute;top:110px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
-        <div style="position: absolute;top:110px;left:440px;">{{ list.psn_cash_money }}</div>
-        <div style="position: absolute;top:110px;left:580px;">门慢结算</div>
-    </div> -->
-    <div style="display:flex;justify-content: space-between;">
-      <div style="position: absolute;top:160px;left:40px">西药</div>
-      <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
-      <div style="position: absolute;top:160px;left:180px">检查费</div>
-      <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
-      <div style="position: absolute;top:160px;left:340px">治疗费</div>
-      <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>
-      <div style="position: absolute;top:160px;left:500px">床位费</div>
-      <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>
-    </div>
-    <div style="display:flex;justify-content: space-between;">
-      <div style="position: absolute;top:190px;left:40px">中成药</div>
-      <div style="position: absolute;top:190px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
-      <div style="position: absolute;top:190px;left:180px">化验费</div>
-      <div style="position: absolute;top:190px;left:260px">{{ list.laboratoryCostTotal }}</div>
-      <div style="position: absolute;top:190px;left:340px">手术费</div>
-      <div style="position: absolute;top:190px;left:420px">{{ list.operationCostTotal }}</div>
-      <div style="position: absolute;top:190px;left:500px">其他费</div>
-      <div style="position: absolute;top:190px;left:580px">{{ list.otherCostTotal }}</div>
-    </div>
-    <div style="display:flex;justify-content: space-between;">
-      <div style="position: absolute;top:210px;left:40px"></div>
-      <div style="position: absolute;top:210px;left:110px"></div>
-      <div style="position: absolute;top:210px;left:180px"></div>
-      <div style="position: absolute;top:210px;left:260px"></div>
-      <div style="position: absolute;top:210px;left:340px">材料费</div>
-      <div style="position: absolute;top:210px;left:420px">{{ list.materialCostTotal }}</div>
-      <div style="position: absolute;top:210px;left:500px"></div>
-      <div style="position: absolute;top:210px;left:580px"></div>
-    </div>
-    <div>
-      <span style="position: absolute;top:240px;left:180px">{{ totalPrice }}</span>
-      <span>
+            <div style="position: absolute;top:110px;left:260px;">{{ totalPrice - list.psn_cash_money }}</div>
+            <div style="position: absolute;top:110px;left:440px;">{{ list.psn_cash_money }}</div>
+            <div style="position: absolute;top:110px;left:580px;">门慢结算</div>
+        </div> -->
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:160px;left:40px">西药</div>
+            <div style="position: absolute;top:160px;left:110px">{{ list.westernMedicineCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:180px">检查费</div>
+            <div style="position: absolute;top:160px;left:260px">{{ list.checkCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:340px">治疗费</div>
+            <div style="position: absolute;top:160px;left:420px">{{ list.treatCostTotal }}</div>
+            <div style="position: absolute;top:160px;left:500px">床位费</div>
+            <div style="position: absolute;top:160px;left:580px">{{ list.bedCostTotal }}</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:190px;left:40px">中成药</div>
+            <div style="position: absolute;top:190px;left:110px">{{ list.chineseTraditionalMedicineCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:180px">化验费</div>
+            <div style="position: absolute;top:190px;left:260px">{{ list.laboratoryCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:340px">手术费</div>
+            <div style="position: absolute;top:190px;left:420px">{{ list.operationCostTotal }}</div>
+            <div style="position: absolute;top:190px;left:500px">其他费</div>
+            <div style="position: absolute;top:190px;left:580px">{{ list.otherCostTotal }}</div>
+        </div>
+        <div style="display:flex;justify-content: space-between;">
+            <div style="position: absolute;top:210px;left:40px"></div>
+            <div style="position: absolute;top:210px;left:110px"></div>
+            <div style="position: absolute;top:210px;left:180px"></div>
+            <div style="position: absolute;top:210px;left:260px"></div>
+            <div style="position: absolute;top:210px;left:340px">材料费</div>
+            <div style="position: absolute;top:210px;left:420px">{{ list.materialCostTotal }}</div>
+            <div style="position: absolute;top:210px;left:500px"></div>
+            <div style="position: absolute;top:210px;left:580px"></div>
+        </div>
+        <div>
+            <span style="position: absolute;top:240px;left:180px">{{ totalPrice.toFixed(2) }}</span>
+            <span>
             <span  style="position: absolute;top:260px;left:180px">
                 <span v-if="zhongwen.indexOf('万') > -1 && zhongwen.indexOf('拾') > -1 && zhongwen.indexOf('拾') == 1">
                     {{ zhongwen.substring(0,1) }}
@@ -110,129 +110,129 @@
                 <span v-else>零</span>
             </span>
             </span>
-    </div>
-    <!-- <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div> -->
-    <!-- <div>
-        <div style="position: absolute;top:340px;left:120px">{{ org_name }}</div>
-        <div v-if="org_id == 9990" style="position: absolute;top:340px;left:300px">钱玉玲</div>
-        <div v-if="org_id == 9990" style="position: absolute;top:340px;left:420px">陈国杰</div>
-    </div> -->
+        </div>
+        <!-- <div style="position: absolute;top:300px;left:460px">现金：{{ list.psn_cash_money }}</div> -->
+        <!-- <div>
+            <div style="position: absolute;top:340px;left:120px">{{ org_name }}</div>
+            <div v-if="org_id == 9990" style="position: absolute;top:340px;left:300px">钱玉玲</div>
+            <div v-if="org_id == 9990" style="position: absolute;top:340px;left:420px">陈国杰</div>
+        </div> -->
 
-    <div style="position: absolute;left:60px;top:300px;">
-      <span style="padding-right:20px;">{{ printDate.slice(0,4) }}</span>
-      <span style="padding-right:20px;">{{ printDate.slice(5,7) }}</span>
-      <span>{{ printDate.slice(8,11) }}</span>
+           <div style="position: absolute;left:60px;top:300px;">
+                <span style="padding-right:20px;">{{ printDate.slice(0,4) }}</span>
+                <span style="padding-right:20px;">{{ printDate.slice(5,7) }}</span>
+                <span>{{ printDate.slice(8,11) }}</span>
+            </div>
+            <div style="position: absolute;top:300px;left:300px">{{'罗佳菊'}}</div>
     </div>
-    <div style="position: absolute;top:300px;left:300px">{{'罗佳菊'}}</div>
-  </div>
 </template>
 
 
 <script>
-  import { getInvoice } from '@/api/project/project'
-  export default {
+import { getInvoice } from '@/api/project/project'
+export default {
     props:{
-      paramsObj:Object
+        paramsObj:Object
     },
     data(){
-      return{
-        list:{},
-        printDate:'',
-        zhongwen:'',
-        totalPrice:0.0,
-        org_id:'',
-        org_name:''
-      }
+        return{
+            list:{},
+            printDate:'',
+            zhongwen:'',
+            totalPrice:0.0,
+            org_id:'',
+            org_name:''
+        }
     },
     created(){
-      console.log('paramsObj',this.paramsObj)
-      let params = {
-        order_id: this.paramsObj.order_id,
-        patient_id: this.paramsObj.patient_id,
-        number: this.paramsObj.number,
-      }
-      this.getInvoice(params)
-      // var data = new Date();
-      // var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
-      // var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
-      // this.printDate = data.getFullYear() + "-" + month + "-" + date;
-      // this.smalltoBIG(982732.21)
-      this.org_id = this.$store.getters.xt_user.org_id
-      this.org_name = this.$store.getters.xt_user.org.org_name
+        console.log('paramsObj',this.paramsObj)
+        let params = {
+            order_id: this.paramsObj.order_id,
+            patient_id: this.paramsObj.patient_id,
+            number: this.paramsObj.number,
+        }
+        this.getInvoice(params)
+        // var data = new Date();
+        // var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+        // var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+        // this.printDate = data.getFullYear() + "-" + month + "-" + date;
+        // this.smalltoBIG(982732.21)
+        this.org_id = this.$store.getters.xt_user.org_id
+        this.org_name = this.$store.getters.xt_user.org.org_name
     },
     methods:{
-      getInvoice(params){
-        getInvoice(params).then((res) => {
-          console.log('res',res)
-          this.list = res.data.data
-          this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
-            this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
-          this.smalltoBIG(this.totalPrice)
-          var data = new Date(res.data.data.date * 1000);
-          var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
-          var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
-          this.printDate = data.getFullYear() + "-" + month + "-" + date;
-        })
-      },
-      smalltoBIG(n) {
-        // let fraction = ['角', '分'];
-        // let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
-        // let unit = [['元.', '万,', '亿,'], ["元",'拾', '佰', '仟']];
-        // let head = price < 0 ? '欠' : '';
-        // price = Math.abs(price);
-        // let upper = '';
-        // for (let i = 0; i < fraction.length; i++) {
-        // upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
-        // }
-        // upper = upper || '整';
-        // price = Math.floor(price);
-        // for (let i = 0; i < unit[0].length && price > 0; i++) {
-        // let p = '';
-        // for (let j = 0; j < unit[1].length && price > 0; j++) {
-        //     p = digit[price % 10] + unit[1][j] + p;
-        //     price = Math.floor(price / 10);
-        // }
-        // upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
-        // }
-        // this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
-        // console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
-        if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
-          return "数据非法";  //判断数据是否大于0
-        }
+        getInvoice(params){
+            getInvoice(params).then((res) => {
+                console.log('res',res)
+                this.list = res.data.data
+                this.totalPrice = this.list.westernMedicineCostTotal + this.list.checkCostTotal + this.list.treatCostTotal + this.list.bedCostTotal + this.list.chineseTraditionalMedicineCostTotal +
+                                    this.list.laboratoryCostTotal + this.list.operationCostTotal + this.list.otherCostTotal + this.list.materialCostTotal
+                this.smalltoBIG(this.totalPrice)
+                var data = new Date(res.data.data.date * 1000);
+                var month =data.getMonth() < 9 ? "0" + (data.getMonth() + 1) : data.getMonth() + 1;
+                var date = data.getDate() <= 9 ? "0" + data.getDate() : data.getDate();
+                this.printDate = data.getFullYear() + "-" + month + "-" + date;
+            })
+        },
+        smalltoBIG(n) {
+            // let fraction = ['角', '分'];
+            // let digit = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
+            // let unit = [['元.', '万,', '亿,'], ["元",'拾', '佰', '仟']];
+            // let head = price < 0 ? '欠' : '';
+            // price = Math.abs(price);
+            // let upper = '';
+            // for (let i = 0; i < fraction.length; i++) {
+            // upper += (digit[Math.floor(price * 10 * Math.pow(10, i)) % 10] + fraction[i]).replace(/零./, '');
+            // }
+            // upper = upper || '整';
+            // price = Math.floor(price);
+            // for (let i = 0; i < unit[0].length && price > 0; i++) {
+            // let p = '';
+            // for (let j = 0; j < unit[1].length && price > 0; j++) {
+            //     p = digit[price % 10] + unit[1][j] + p;
+            //     price = Math.floor(price / 10);
+            // }
+            // upper = p.replace(/(零.)*零$/, '').replace(/^$/, '零') + unit[0][i] + upper;
+            // }
+            // this.zhongwen = head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整')
+            // console.log('6666',head + upper.replace(/(零.)*零圆/, '圆').replace(/(零.)+/g, '零').replace(/^整$/, '零圆整'))
+            if (!/^(0|[1-9]\d*)(\.\d+)?$/.test(n)){
+                return "数据非法";  //判断数据是否大于0
+            }
 
-        var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
-        n += "00";
+            var unit = "仟佰拾亿仟佰拾万仟佰拾元角分", str = "";
+            n += "00";
 
-        var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
+            var indexpoint = n.indexOf('.');  // 如果是小数，截取小数点前面的位数
 
-        if (indexpoint >= 0){
+            if (indexpoint >= 0){
 
-          n = n.substring(0, indexpoint) + n.substr(indexpoint+1, 2);   // 若为小数，截取需要使用的unit单位
-        }
+                n = n.substring(0, indexpoint) + n.substr(indexpoint+1, 2);   // 若为小数，截取需要使用的unit单位
+            }
 
-        unit = unit.substr(unit.length - n.length);  // 若为整数，截取需要使用的unit单位
-        for (var i=0; i < n.length; i++){
-          str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
-        }
+            unit = unit.substr(unit.length - n.length);  // 若为整数，截取需要使用的unit单位
+            for (var i=0; i < n.length; i++){
+                str += "零壹贰叁肆伍陆柒捌玖".charAt(n.charAt(i)) + unit.charAt(i);  //遍历转化为大写的数字
+            }
 
-        this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
-        console.log(this.zhongwen)
-      },
+            this.zhongwen =  str.replace(/零(仟|佰|拾|角)/g, "零").replace(/(零)+/g, "零").replace(/零(万|亿|元)/g, "$1").replace(/(亿)万|壹(拾)/g, "$1$2").replace(/^元零?|零分/g, "").replace(/元$/g, "元整");
+            console.log(this.zhongwen)
+        },
 
     },
     watch:{
-      paramsObj:{//深度监听，可监听到对象、数组的变化
-        handler(val, oldVal){
-          let params = {
-            order_id: val.order_id,
-            patient_id: val.patient_id,
-            number: val.number,
-          }
-          this.getInvoice(params)
+        paramsObj:{//深度监听，可监听到对象、数组的变化
+            handler(val, oldVal){
+                let params = {
+                    order_id: val.order_id,
+                    patient_id: val.patient_id,
+                    number: val.number,
+                }
+                this.getInvoice(params)
 
-        },
-        deep:true
-      }
+            },
+            deep:true
+        }
     }
-  }
+}
 </script>

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -342,7 +342,7 @@
               <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 }}，{{ main_collection.patient.age }}岁）
+                  （{{ 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%;">
@@ -5227,6 +5227,20 @@ export default {
         scanStyles: false
       })
     },
+    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
+      }
+    },
+
   },
   created() {
     this.anticoagulants_confit = this.$store.getters.anticoagulants_confit