hah阿凡达

src/api/dialysis.js

@@ -145,17 +145,20 @@ export function getDialysisRecord(params) {
 }
 
 export function postPrescription(params) {
-   if(params.patient > 0){
-       params.patient_id = params.patient
+   
+ 
+   if(params.patient_id == undefined){
+    if(params.patient > 0){
+      params.patient_id = params.patient
+     }
    }
-  console.log('params+++++++++++++++++', params)
   return request({
     url: '/api/dialysis/prescription',
     method: 'Post',
     params: params,
-    // headers: {
-    //   'Permission': 2
-    // }
+    headers: {
+      'Permission': 2
+    }
   })
 }
 

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -661,6 +661,52 @@
           <span class="content">{{this.prescription.warsh_count}}</span>
         </li>
 
+        <li v-if="isShow('灭菌注射用水')&& this.prescription.mode_id == 13">
+          <label>灭菌注射用水(ml): </label>
+          <span class="content">{{this.prescription.sterilization_water}}</span>
+        </li>
+
+        <li v-if="isShow('5%葡萄糖注射液')&& this.prescription.mode_id == 13">
+          <label>5%葡萄糖注射液(ml): </label>
+          <span class="content">{{this.prescription.five_glucose}}</span>
+        </li>
+
+        <li v-if="isShow('50%葡萄糖注射液')&& this.prescription.mode_id == 13">
+          <label>50%葡萄糖注射液(ml): </label>
+          <span class="content">{{this.prescription.fifty_glucose}}</span>
+        </li>
+
+        <li v-if="isShow('25%硫酸镁针')&& this.prescription.mode_id == 13">
+          <label>25%硫酸镁针(ml): </label>
+          <span class="content">{{this.prescription.magnesium_sulfate_injection}}</span>
+        </li>
+
+        <li v-if="isShow('10%葡萄糖酸钙')&& this.prescription.mode_id == 13">
+          <label>10%葡萄糖酸钙(ml): </label>
+          <span class="content">{{this.prescription.calcium_gluconate}}</span>
+        </li>
+
+        <li v-if="isShow('15%氯化钾针')&& this.prescription.mode_id == 13">
+          <label>15%氯化钾针(ml): </label>
+          <span class="content">{{this.prescription.five_potassium_chloride_injection}}</span>
+        </li>
+
+        <li v-if="isShow('10%氯化钾针')&& this.prescription.mode_id == 13">
+          <label>10%氯化钾针(ml): </label>
+          <span class="content">{{this.prescription.ten_potassium_chloride_injection}}</span>
+        </li>
+
+        <li v-if="isShow('5%碳酸氢钠注射液')&& this.prescription.mode_id == 13">
+          <label>5%碳酸氢钠注射液(ml): </label>
+          <span class="content">{{this.prescription.five_sodium_bicarbonate_injection}}</span>
+        </li>
+
+        
+        <li v-if="isShow('NS')">
+          <label>NS(ml): </label>
+          <span class="content">{{this.prescription.new_sty}}</span>
+        </li>
+
        
       </ul>
     </div>

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

@@ -736,6 +736,7 @@ import dialysis from '../../../../router/modules/dialysis';
                 list[i].advice_spc =""
                 list[i].advice_spc_one = ""
                 list[i].advice_spc_three = ""
+                list[i].advice_spc_two=""
                  list[i].advice_spc_four = ""
                   list[i].advice_spc_five = ""
                  for(let j=0;j<list[i].advice.length;j++){

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

@@ -150,7 +150,7 @@
                 <td width="100" v-if="dialysisSett.dialysis_irrigation ==1">
                      <span>{{item.dialysis_solution.dialysis_irrigation}}</span>
                 </td>
-                <td width="100" v-if="dialysisSett.dialysis_irrigation ==1">
+                <td width="100" v-if="dialysisSett.dialysis_strainer_set ==1">
                      <span>{{item.dialysis_solution.dialysis_strainer}}</span>
                 </td>
                 <td width="100"  v-if="dialysisSett.displace_liqui_part==1">
@@ -306,6 +306,7 @@
                 list[i].advice_spc_three = ""
                 list[i].advice_spc_four = ""
                 list[i].advice_spc_five = ""
+                list[i].advice_spc_two=""
                 for(let j=0;j<list[i].advice.length;j++){
                     total_two +=parseInt(list[i].advice[j].prescribing_number) 
                     if((list[i].advice[j].advice_name).indexOf("促红")!=-1){

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

@@ -2107,7 +2107,7 @@
       show(his_is_open,is_advice_open) {
 
        
-        if(this.org_id == 0 || this.org_id == 10744){
+        if(this.org_id == 0 || this.org_id == 10164){
           var newArr = []
           if(this.doctor_advices!=null && this.doctor_advices.length>0){
             for(let i=0;i<this.doctor_advices.length>0;i++){

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

@@ -1214,9 +1214,67 @@
                         </el-form-item>
                     </el-col>
 
+                    <el-col :span="8" v-if="isShows('灭菌注射用水') && dialysisPrescription.mode_id == 13">
+                        <el-form-item label="灭菌注射用水(ml)">
+                            <el-input  v-model="dialysisPrescription.sterilization_water"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8" v-if="isShows('5%葡萄糖注射液')&& dialysisPrescription.mode_id == 13">
+                        <el-form-item label="5%葡萄糖注射液(ml)">
+                            <el-input  v-model="dialysisPrescription.five_glucose"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8" v-if="isShows('50%葡萄糖注射液')&& dialysisPrescription.mode_id == 13">
+                        <el-form-item label="50%葡萄糖注射液(ml)" :label-width="'185px'">
+                            <el-input  v-model="dialysisPrescription.fifty_glucose" style="width:200px;"></el-input>
+                        </el-form-item>
+                    </el-col>
 
+                    <el-col :span="8" v-if="isShows('25%硫酸镁针')&& dialysisPrescription.mode_id == 13">
+                        <el-form-item label="25%硫酸镁针(ml)">
+                            <el-input  v-model="dialysisPrescription.magnesium_sulfate_injection"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8" v-if="isShows('10%葡萄糖酸钙')&& dialysisPrescription.mode_id == 13">
+                        <el-form-item label="10%葡萄糖酸钙(ml)">
+                            <el-input  v-model="dialysisPrescription.calcium_gluconate"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8" v-if="isShows('15%氯化钾针')&& dialysisPrescription.mode_id == 13">
+                        <el-form-item label="15%氯化钾针(ml)">
+                            <el-input  v-model="dialysisPrescription.five_potassium_chloride_injection"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="8" v-if="isShows('10%氯化钾针')&& dialysisPrescription.mode_id == 13">
+                        <el-form-item label="10%氯化钾针(ml)">
+                            <el-input  v-model="dialysisPrescription.ten_potassium_chloride_injection"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                   
+                    <el-col :span="8" v-if="isShows('NS')&& dialysisPrescription.mode_id == 13">
+                        <el-form-item label="NS(ml):">
+                            <el-input  v-model="dialysisPrescription.new_sty"></el-input>
+                        </el-form-item>
+                    </el-col>
+
+                   
                 </el-row>
 
+                <el-row :gutter="20">
+                  <el-col :span="10" v-if="isShows('5%碳酸氢钠注射液')&& dialysisPrescription.mode_id == 13">
+                        <el-form-item label="5%碳酸氢钠注射液(ml):" :label-width="'180px'">
+                            <el-input  v-model="dialysisPrescription.five_sodium_bicarbonate_injection" style="width:200px;"></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+
                 <el-row :gutter="20">
                   <el-col :span="24" v-if="isShows('透析备注') && (dialysisPrescription.mode_id == 2 || dialysisPrescription.mode_id == 3 || dialysisPrescription.mode_id == 4)">
                     <el-form-item label="透析备注：" prop="value" :rules="isCheckmust('透析备注')">
@@ -1945,7 +2003,16 @@
           dialyzate:"",
           first_super:0,
           is_sequential:0,
-          conduct:""
+          conduct:"",
+          sterilization_water:"",
+          five_glucose:'',
+          fifty_glucose:"",
+          magnesium_sulfate_injection:"",
+          calcium_gluconate:"",
+          five_potassium_chloride_injection:"",
+          ten_potassium_chloride_injection:"",
+          five_sodium_bicarbonate_injection:"",
+          new_sty:"",
         },
 
         anticoagulant: {
@@ -2436,7 +2503,7 @@ mu
             }
           }
         } else {
-          if (schedual.mode_id == 2  || schedual.mode_id == 5 || schedual.mode_id == 12) {
+          if (schedual.mode_id == 2  || schedual.mode_id == 5 || schedual.mode_id == 12|| schedual.mode_id == 13) {
             this.zhiShow = true
             this.huShow = true
             this.totalShow = true
@@ -3348,7 +3415,7 @@ mu
         }
         // console.log('this.dialysisPrescription.mode_id', this.dialysisPrescription.mode_id)
         // console.log('this.schedual', schedual.mode_id)
-        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 0 || schedual.mode_id == 37 || schedual.mode_id == 36 || schedual.mode_id == 35 || schedual.mode_id == 34|| schedual.mode_id == 41) {
+        if (pre.mode_id == 2 || pre.mode_id == 5 || pre.mode_id == 12 || pre.mode_id == 13 || schedual.mode_id == 2 || schedual.mode_id == 5 || schedual.mode_id == 12 || schedual.mode_id == 13 || schedual.mode_id == 0 || schedual.mode_id == 37 || schedual.mode_id == 36 || schedual.mode_id == 35 || schedual.mode_id == 34|| schedual.mode_id == 41) {
           this.zhiShow = true
           this.huShow = true
           this.totalShow = true
@@ -3361,7 +3428,6 @@ mu
           pre.mode_id == 8 ||
           pre.mode_id == 9 ||
           pre.mode_id == 11 ||
-          pre.mode_id == 13 ||
           pre.mode_id == 14 ||
           pre.mode_id == 19
         ) {
@@ -4923,7 +4989,7 @@ mu
       }
     },
     changePrescription(id) {
-      if(id != 2 && id!=5 && id!= 12&&id!=34 &&id!=35&&id!=35&&id!=36&&id!=37){
+      if(id != 2 && id!=5 && id!= 12&& id!= 13&&id!=34 &&id!=35&&id!=35&&id!=36&&id!=37){
         this.dialysisPrescription.displace_liqui_value = ""
         this.dialysisPrescription.displace_liqui_part = ""
         this.dialysisPrescription.replacement_total = ""
@@ -5071,7 +5137,6 @@ mu
         id === 8 ||
         id === 9 ||
         id === 11 ||
-        id === 13 ||
         id === 14 ||
         id === 15 ||
         id === 16 ||
@@ -5999,6 +6064,7 @@ mu
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
+   
     .el-checkbox,
     .el-checkbox__input {
         vertical-align: middle;
@@ -6032,4 +6098,5 @@ mu
     }
 
     }
+ 
 </style>

src/xt_pages/dialysis/details/index.vue

@@ -297,7 +297,7 @@
                   <span>{{main_collection.patient.name}} </span>
                   （{{ main_collection.patient.dialysis_no }}，{{getNewAge(main_collection.patient.id_card_no)  }}岁<span v-if="main_collection.patient.height>0">,{{ main_collection.patient.height }}cm</span>）
                 </div>
-                <div class="printCell" style="display:flex;" v-if="org_id ==10598 ">
+                <div class="printCell" style="display:flex;" v-if="org_id ==10598 || org_id == 10345">
                   <div style="">透析模式:
                    <span>{{getModeName(main_collection.prescription.mode_id)  }}</span>
                   </div>

src/xt_pages/dialysis/doctorAdvicePrint.vue

@@ -305,7 +305,7 @@ export default {
                     this.project = resp.data.project
                     resp.data.hisAdvices.map((item,index) => {
                     item.new_advice = item.new_advice ? item.new_advice : []
-                      if(this.org_id!=9671 && this.org_id!= 10318 && this.org_id!=0 && this.org_id!=10633){
+                      if(this.org_id!=9671 && this.org_id!= 10318 && this.org_id!=10633){
                         if(this.project[index].project.length > 0){
                             this.project[index].project.map(it => {
                             let obj = {

src/xt_pages/dialysis/signPrint.vue

@@ -30,7 +30,7 @@
                                 规格:{{it.advice_desc }} {{ it.drug_spec_unit }}
                             </div> 
                             <div v-if="(org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617 || org_id ==10598) && org_id!=10278">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
-                            <div v-if="org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{it.execution_frequency}} &nbsp;&nbsp;<span v-if="org_id ==10740">{{it.delivery_way}}</span></div>  
+                            <div v-if="org_id!=10278 && org_id!=10138 && org_id!=10223 && org_id!=10610">执行频率:{{it.execution_frequency}} &nbsp;&nbsp;<span v-if="org_id ==10740">{{it.delivery_way}}</span></div>  
                             <div v-if="org_id!=10278 && org_id !=10740">给药途径:{{it.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
                                 <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
@@ -52,7 +52,7 @@
                             
                             </div>  
                             <div v-if=" org_id ==0 || org_id==10440 || org_id == 10478 || org_id ==10571 || org_id ==10223 || org_id ==10617 || org_id ==10598">单次用量:{{its.single_dose}}{{its.single_dose_unit }}</div>  
-                            <div v-if="org_id!=10278 && org_id!=10138 && org_id!=10223">执行频率:{{its.execution_frequency}} &nbsp;&nbsp;<span v-if="org_id ==10740">{{its.delivery_way}}</span></div>  
+                            <div v-if="org_id!=10278 && org_id!=10138 && org_id!=10223 && org_id!=10610">执行频率:{{its.execution_frequency}} &nbsp;&nbsp;<span v-if="org_id ==10740">{{its.delivery_way}}</span></div>  
                             <div v-if="org_id !=10740">给药途径:{{its.delivery_way}}</div>  
                             <div v-if="org_id == 0 || org_id==10223">
                                 <span>执行者:</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -4513,7 +4513,13 @@ export default {
             }
           }
           this.new_doctor_advice_list = []
+          
           this.new_doctor_advice_list = docArr
+
+          if(this.org_id == 10744 || this.org_id == 0){
+          
+            this.new_doctor_advice_list.sort((a, b) => a.execution_time - b.execution_time)
+          }
         }
 
        

src/xt_pages/hospitalStation/treatTemplate/printOne.vue

@@ -271,7 +271,12 @@
           birth.substr(4, 2) +
           '-' +
           birth.substr(6, 2)
-        return jsGetAge(births, '-')
+        if(jsGetAge(births, '-')>0){
+          return jsGetAge(births, '-')
+        }else{
+          return patient.age
+        }
+      
 
       },
       printThisPage() {

src/xt_pages/hospitalStation/treatTemplate/printTwo.vue

@@ -255,7 +255,12 @@ export default {
          birth.substr(4, 2) +
          '-' +
          birth.substr(6, 2)
-       return jsGetAge(births, '-')
+      if( jsGetAge(births, '-')>0){
+        return jsGetAge(births, '-')
+      }else{
+        return patient.age
+      }
+      
 
      },
      printThisPage() {

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -343,7 +343,12 @@ export default {
           birth.substr(4, 2) +
           "-" +
           birth.substr(6, 2);
-        return jsGetAge(births, "-");
+        if(jsGetAge(births, "-")>0){
+          return jsGetAge(births, "-");
+        }else {
+          return patient.age
+        }
+        
 
       }
 

src/xt_pages/user/Informed/components/Bring_informed.vue

@@ -226,7 +226,11 @@ export default{
           birth.substr(6, 2)
 
         var age = jsGetAge(birthtwo, '-')
-        return age
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
     },
     bianji(){
       this.dialogVisible=true

src/xt_pages/user/Informed/components/CRRT_informed.vue

@@ -193,8 +193,12 @@ export default{
           '-' +
           birth.substr(6, 2)
 
-        var age = jsGetAge(birthtwo, '-')
-        return age
+          var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
     },
     bianji(){
       this.dialogVisible=true

src/xt_pages/user/Informed/components/Death_informed.vue

@@ -182,8 +182,12 @@ export default{
           '-' +
           birth.substr(6, 2)
 
-        var age = jsGetAge(birthtwo, '-')
-        return age
+          var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
     },
     show(val){
       console.log("val--------------",val)

src/xt_pages/user/Informed/components/Disease_diagnosis.vue

@@ -242,8 +242,12 @@ const content =`
           '-' +
           birth.substr(6, 2)
 
-        var age = jsGetAge(birthtwo, '-')
-        return age
+          var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
       },
     }
   }

src/xt_pages/user/Informed/components/Falloutbedprint.vue

@@ -200,6 +200,7 @@ export default{
           })
       },
       getAge: function(val) {
+        
         if (val.id_card_no == undefined) {
           return false
         }
@@ -218,7 +219,12 @@ export default{
           birth.substr(6, 2)
 
         var age = jsGetAge(birthtwo, '-')
-        return age
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
+       
       },
       bianji(){
         this.dialogVisible =true

src/xt_pages/user/Informed/components/Filter_informed.vue

@@ -276,7 +276,11 @@ export default{
           birth.substr(6, 2)
 
         var age = jsGetAge(birthtwo, '-')
-        return age
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
       },
       bianji(){
         this.dialogVisible=true

src/xt_pages/user/Informed/components/Highrisk_informed.vue

@@ -196,7 +196,11 @@ export default{
           birth.substr(6, 2)
 
         var age = jsGetAge(birthtwo, '-')
-        return age
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
       },
       printThisPage(){
           const style = '@media print {.content p{font-size: 16px;font-family: 新宋体; padding-left: 20px; margin-bottom: 5px;}}'

src/xt_pages/user/Informed/components/Surrender_informed.vue

@@ -197,8 +197,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+        var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       bianji(){
         this.dialogVisible=true

src/xt_pages/user/Informed/components/Terminate_informed.vue

@@ -200,8 +200,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+        var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       bianji(){
         this.dialogVisible=true

src/xt_pages/user/Informed/components/anticoagulation_informed.vue

@@ -294,7 +294,11 @@ export default{
           birth.substr(6, 2)
 
         var age = jsGetAge(birthtwo, '-')
-        return age
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
     },
     bianji(){
       this.dialogVisible=true

src/xt_pages/user/Informed/components/arteriovenous_informed.vue

@@ -236,7 +236,11 @@ export default{
           birth.substr(6, 2)
 
         var age = jsGetAge(birthtwo, '-')
-        return age
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
     },
     bianji(){
       this.dialogVisible=true

src/xt_pages/user/Informed/components/catheterization_informed.vue

@@ -265,7 +265,11 @@ export default{
           birth.substr(6, 2)
 
         var age = jsGetAge(birthtwo, '-')
-        return age
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
     },
     bianji(){
       this.dialogVisible =true

src/xt_pages/user/Informed/components/critical_informed.vue

@@ -207,8 +207,12 @@ export default{
           '-' +
           birth.substr(6, 2)
 
-        var age = jsGetAge(birthtwo, '-')
-        return age
+          var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
     },
     bianji(){
       this.dialogVisible=true

src/xt_pages/user/Informed/components/criticalpatient_informed.vue

@@ -202,8 +202,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+         var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       show(val){
        if(val!=null){

src/xt_pages/user/Informed/components/criticalpatient_informed2.vue

@@ -179,8 +179,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+        var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       show(val){
        if(val!=null){

src/xt_pages/user/Informed/components/dialyzer_informed.vue

@@ -193,8 +193,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+        var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       bianji(){
         this.dialogVisible=true

src/xt_pages/user/Informed/components/heal_informed.vue

@@ -174,8 +174,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+         var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       bianji(){
         this.dialogVisible=true

src/xt_pages/user/Informed/components/hemodialysis.vue

@@ -264,8 +264,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+        var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       bianji(){
         this.dialogVisible=true

src/xt_pages/user/Informed/components/hemoperfusion_informed.vue

@@ -230,7 +230,11 @@ export default{
           birth.substr(6, 2)
 
         var age = jsGetAge(birthtwo, '-')
-        return age
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
     },
     getlist(){
 

src/xt_pages/user/Informed/components/informef_Twentyfive.vue

@@ -129,8 +129,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+         var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       bianji(){
         this.dialogVisible=true

src/xt_pages/user/Informed/components/informef_Twentyfour.vue

@@ -135,8 +135,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+        var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       bianji(){
         this.dialogVisible=true

src/xt_pages/user/Informed/components/informef_Twentysevre.vue

@@ -132,8 +132,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+         var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       bianji(){
         this.dialogVisible=true

src/xt_pages/user/Informed/components/informef_Twentysix.vue

@@ -124,8 +124,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+         var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       bianji(){
         this.dialogVisible=true

src/xt_pages/user/Informed/components/nonheparin_informed.vue

@@ -251,7 +251,11 @@ export default{
           birth.substr(6, 2)
 
         var age = jsGetAge(birthtwo, '-')
-        return age
+        if (age > 0) {
+          return age
+        }else{
+          return  val.age
+        }
     },
     bianji(){
       this.dialogVisible=true

src/xt_pages/user/Informed/components/profunda_informed.vue

@@ -210,8 +210,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+        var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       bianji(){
         this.dialogVisible=true

src/xt_pages/user/Informed/components/therapy_informed.vue

@@ -250,8 +250,12 @@ export default{
             '-' +
             birth.substr(6, 2)
 
-          var age = jsGetAge(birthtwo, '-')
+         var age = jsGetAge(birthtwo, '-')
+        if (age > 0) {
           return age
+        }else{
+          return  val.age
+        }
       },
       bianji(){
         this.dialogVisible=true

src/xt_pages/user/dialysisSolution.vue

@@ -254,6 +254,39 @@
           <el-col :span="6"  v-if="isShows('吸氧') && current_solution.oxygen_uptake == 1"><div class="grid-content bg-purple">吸氧流量(L/分):{{current_solution.oxygen_flow}}</div></el-col>
           <el-col :span="6"  v-if="isShows('吸氧') && current_solution.oxygen_uptake == 1"><div class="grid-content bg-purple">吸氧时长(h):{{current_solution.oxygen_time}}</div></el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" v-if="isShows('灭菌注射用水')">
+            灭菌注射用水(ml) : {{ current_solution.sterilization_water }}
+          </el-col>
+          <el-col :span="6" v-if="isShows('5%葡萄糖注射液')">
+            5%葡萄糖注射液(ml) : {{ current_solution.five_glucose }}
+          </el-col>
+          <el-col :span="6" v-if="isShows('50%葡萄糖注射液')">
+            50%葡萄糖注射液(ml) : {{ current_solution.fifty_glucose }}
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" v-if="isShows('25%硫酸镁针')">
+            25%硫酸镁针(ml) : {{ current_solution.magnesium_sulfate_injection }}
+          </el-col>
+          <el-col :span="6" v-if="isShows('10%葡萄糖酸钙')">
+            10%葡萄糖酸钙(ml) : {{ current_solution.calcium_gluconate }}
+          </el-col>
+          <el-col :span="6" v-if="isShows('15%氯化钾针')">
+            15%氯化钾针(ml) : {{ current_solution.five_potassium_chloride_injection }}
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="6" v-if="isShows('10%氯化钾针')">
+            10%氯化钾针(ml) : {{ current_solution.ten_potassium_chloride_injection }}
+          </el-col>
+          <el-col :span="6" v-if="isShows('5%碳酸氢钠注射液')">
+            5%碳酸氢钠注射液(ml) : {{ current_solution.five_sodium_bicarbonate_injection }}
+          </el-col>
+          <el-col :span="6" v-if="isShows('NS')">
+            NS(ml) : {{ current_solution.new_sty }}
+          </el-col>
+        </el-row>
         <el-row :gutter="20">
           <el-col :span="6"><div class="grid-content bg-purple">备注:{{current_solution.remark}}</div></el-col>
         </el-row>
@@ -817,6 +850,59 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="isShows('灭菌注射用水') && addPlan.mode == 13">
+            <el-form-item label="灭菌注射用水(ml)">
+              <el-input v-model="addPlan.sterilization_water"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('5%葡萄糖注射液')&& addPlan.mode == 13">
+            <el-form-item label="5%葡萄糖注射液(ml)">
+              <el-input v-model="addPlan.five_glucose"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('50%葡萄糖注射液')&& addPlan.mode == 13">
+            <el-form-item label="50%葡萄糖注射液(ml)">
+              <el-input v-model="addPlan.fifty_glucose"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('25%硫酸镁针')&& addPlan.mode == 13">
+            <el-form-item label="25%硫酸镁针(ml)">
+              <el-input v-model="addPlan.magnesium_sulfate_injection"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('10%葡萄糖酸钙')&& addPlan.mode == 13">
+            <el-form-item label="10%葡萄糖酸钙(ml)">
+              <el-input v-model="addPlan.calcium_gluconate"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('15%氯化钾针')&& addPlan.mode == 13">
+            <el-form-item label="15%氯化钾针(ml)">
+              <el-input v-model="addPlan.five_potassium_chloride_injection"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('10%氯化钾针')&& addPlan.mode == 13">
+            <el-form-item label="10%氯化钾针(ml)">
+              <el-input v-model="addPlan.ten_potassium_chloride_injection"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('5%碳酸氢钠注射液')&& addPlan.mode == 13">
+            <el-form-item label="5%碳酸氢钠注射液(ml)">
+              <el-input v-model="addPlan.five_sodium_bicarbonate_injection"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8" v-if="isShows('NS')&& addPlan.mode == 13">
+            <el-form-item label="NS(ml)">
+              <el-input v-model="addPlan.new_sty"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
 
 
@@ -1153,6 +1239,15 @@
           dialysis_strainer:"",
           chaptalization:"",
           blood_access_part_id:"",
+          sterilization_water:"",
+          five_glucose:'',
+          fifty_glucose:"",
+          magnesium_sulfate_injection:"",
+          calcium_gluconate:"",
+          five_potassium_chloride_injection:"",
+          ten_potassium_chloride_injection:"",
+          five_sodium_bicarbonate_injection:"",
+          new_sty:"",
         },
         childPlan: {
           mode: '',
@@ -1799,7 +1894,46 @@
           anticoagulant_zongliang:
             this.current_solution.anticoagulant_zongliang != 0
               ? this.current_solution.anticoagulant_zongliang
-              : ''
+              : '',
+          sterilization_water:
+          this.current_solution.sterilization_water != 0
+              ? this.current_solution.sterilization_water
+              : '',
+         five_glucose:
+         this.current_solution.five_glucose != 0
+              ? this.current_solution.five_glucose
+              : '',
+        fifty_glucose:
+         this.current_solution.fifty_glucose != 0
+              ? this.current_solution.fifty_glucose
+              : '',
+        magnesium_sulfate_injection:
+         this.current_solution.magnesium_sulfate_injection != 0
+              ? this.current_solution.magnesium_sulfate_injection
+              : '',
+        calcium_gluconate:
+         this.current_solution.calcium_gluconate != 0
+              ? this.current_solution.calcium_gluconate
+              : '',
+
+         five_potassium_chloride_injection:
+         this.current_solution.five_potassium_chloride_injection != 0
+              ? this.current_solution.five_potassium_chloride_injection
+              : '',
+         ten_potassium_chloride_injection:
+         this.current_solution.ten_potassium_chloride_injection != 0
+              ? this.current_solution.ten_potassium_chloride_injection
+              : '',
+        five_sodium_bicarbonate_injection:
+         this.current_solution.five_sodium_bicarbonate_injection != 0
+              ? this.current_solution.five_sodium_bicarbonate_injection
+              : '',
+
+        new_sty:
+         this.current_solution.new_sty != 0
+              ? this.current_solution.new_sty
+              : '',
+
         }
       },
       handleDelete(index, row) {
@@ -2045,9 +2179,19 @@
                 this.current_solution.epo_count = response.data.data.solution.epo_count
                 this.current_solution.max_ultrafiltration_rate = response.data.data.solution.max_ultrafiltration_rate
                 this.current_solution.remark = response.data.data.solution.remark
-                this.current_solution.dialysis_strainer = response.data.data.dialysis_strainer
-
-                this.current_solution.chaptalization = response.data.data.chaptalization
+                this.current_solution.dialysis_strainer = response.data.data.solution.dialysis_strainer
+
+                this.current_solution.sterilization_water = response.data.data.solution.sterilization_water
+                this.current_solution.five_glucose = response.data.data.solution.five_glucose
+                this.current_solution.fifty_glucose = response.data.data.solution.fifty_glucose
+                this.current_solution.magnesium_sulfate_injection = response.data.data.solution.magnesium_sulfate_injection
+                this.current_solution.calcium_gluconate = response.data.data.solution.calcium_gluconate
+                this.current_solution.five_potassium_chloride_injection = response.data.data.solution.five_potassium_chloride_injection
+                this.current_solution.ten_potassium_chloride_injection = response.data.data.solution.ten_potassium_chloride_injection
+                this.current_solution.five_sodium_bicarbonate_injection = response.data.data.solution.five_sodium_bicarbonate_injection
+                this.current_solution.new_sty = response.data.data.solution.new_sty
+
+                this.current_solution.chaptalization = response.data.data.solution.chaptalization
                 this.FindePatientDialysisLongSolutions()
                 return false
               }
@@ -2068,7 +2212,7 @@
             this.addPlan.dialysis_irrigation = this.dialysis_irrigation
             this.addPlan.dialysis_strainer = this.dialysis_strainer
             this.addPlan.mode_id = parseInt(this.addPlan.mode_id)
-         
+
             console.log("add",this.addPlan)
             createPatientDialysisSolution(
               this.patientID,
@@ -2304,6 +2448,16 @@
         this.addPlan.chaptalization = row.chaptalization
         this.addPlan.blood_access_part_id = row.blood_access_part_id  
 
+        this.addPlan.sterilization_water = row.sterilization_water
+        this.addPlan.five_glucose = row.five_glucose
+        this.addPlan.fifty_glucose = row.fifty_glucose
+        this.addPlan.magnesium_sulfate_injection = row.magnesium_sulfate_injection
+        this.addPlan.calcium_gluconate = row.calcium_gluconate
+        this.addPlan.five_potassium_chloride_injection = row.five_potassium_chloride_injection
+        this.addPlan.ten_potassium_chloride_injection = row.ten_potassium_chloride_injection
+        this.addPlan.five_sodium_bicarbonate_injection = row.five_sodium_bicarbonate_injection
+        this.addPlan.new_sty = row.new_sty
+
       },
       isShows(name) {
         var filedList = store.getters.xt_user.fileds
@@ -2385,6 +2539,17 @@
           plasma_separator:"",
           bilirubin_adsorption_column:"",
           chaptalization:"",
+
+          sterilization_water:"",
+          five_glucose:'',
+          fifty_glucose:"",
+          magnesium_sulfate_injection:"",
+          calcium_gluconate:"",
+          five_potassium_chloride_injection:"",
+          ten_potassium_chloride_injection:"",
+          five_sodium_bicarbonate_injection:"",
+          new_sty:"",
+
         }
         this.addPlanTypeChange()
 

src/xt_pages/workforce/remind_print_setting.vue

@@ -74,7 +74,7 @@
                   <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>
                 </div>
-                <div class="printCell">
+                <div class="printCell" v-if="org_id!=0 && org_id!=10610">
                   <span>
                     床号：{{ main_collection.number.number }}
                     <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
@@ -83,14 +83,71 @@
                   </span>
                 </div>
                 <div v-if="printObj.anticoagulant == 1">抗凝剂:
-                  <span v-if="org_id == 10138 || org_id == 0 || org_id == 10278">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
-                  <span v-else >
+                  <span v-if="org_id == 10138 || org_id == 10278">{{ main_collection.dialysissolution.anticoagulant ? anticoagulants_confit[main_collection.dialysissolution.anticoagulant].name + ' 5000iu/瓶' : ''}}</span>
+                  <span v-if="org_id ==0 || org_id == 10610" >
                    <span>{{getAnticoagulant(main_collection.dialysissolution.anticoagulant)}}</span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
+                   {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 2">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 3">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 4">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 5">
+                     {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 6">
+                   {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 7">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 8">
+                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 9">
+                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                  </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 10">
+                     {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                    </span>
+                  <span v-if="main_collection.dialysissolution.anticoagulant == 11">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 12">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 13">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 14">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 15">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 16">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 17">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 18">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
+                   <span v-if="main_collection.dialysissolution.anticoagulant == 19">
+                    {{main_collection.dialysissolution.anticoagulant_zongliang}}iu
+                   </span>
                   </span>
                 </div>
                <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675||org_id ==10571">首剂:{{main_collection.dialysissolution.anticoagulant_shouji}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675 || org_id ==10571">维持:{{main_collection.dialysissolution.anticoagulant_weichi}}</div>
-                <div v-if="printObj.anticoagulant_zongliang == 1">
+                <div v-if="printObj.anticoagulant_zongliang == 1 && org_id!=0 && org_id!=10610">
                   用量:
                   <span v-if="main_collection.dialysissolution.anticoagulant == 1">
                    {{main_collection.dialysissolution.anticoagulant_zongliang}}mg
@@ -151,7 +208,7 @@
                    </span>
                 </div>
 
-                <div v-if="org_id==0 || org_id ==10460">
+                <div v-if="org_id ==10460">
                   目标超滤量:
                   <span>
                    {{main_collection.prescription.target_ultrafiltration}}ml
@@ -160,7 +217,7 @@
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">干体重:{{main_collection.assessmentbefor.dry_weight}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">透前体重:{{main_collection.assessmentbefor.weight_before}}</div>
                 <div v-if="org_id == 10188 || org_id == 10217 || org_id == 10340 || org_id == 9671 || org_id == 9675">体重增加:{{(main_collection.assessmentbefor.weight_before - main_collection.assessmentbefor.dry_weight).toFixed(2)}}</div>
-                <div v-if="org_id!=10278 && org_id!=10600">用法:静脉注射</div>
+                <div v-if="org_id!=10278 && org_id!=10600 && org_id!=0">用法:静脉注射</div>
                 <!-- 透析器灌流器 -->
                
                  <div>