Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "2999.999.1315"
+  "version": "2999.999.1316"
 }

src/api/drug/drug.js

@@ -934,4 +934,24 @@ export function getInventoryRecordPrintList(params){
     method:"Get",
     params:params,
   })
+}
+
+export function getPatientAdviceList(params){
+ 
+  return request({
+    url:"/api/drug/getpatientadvicelist",
+    method:"Get",
+    params:params,
+  })
+}
+
+
+
+export function getPatientAdviceListDetail(params){
+
+  return request({
+    url:"/api/drug/getpatientadvicelistdetail",
+    method:"Get",
+    params:params
+  })
 }

src/api/pharmacy.js

@@ -191,3 +191,12 @@ export function changeDrugCode(params){
     params:params,
   })
 }
+
+export function getDrugTocalCount(params){
+
+  return request({
+    url:"/api/pharmacy/getdrugtocalcount",
+    method:"get",
+    params:params
+  })
+}

src/router/modules/dialysis.js

@@ -74,6 +74,15 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/patient/patientAdvice',
+      component: () => import('@/xt_pages/dialysis/patientAdviceList'),
+      name: '患者医嘱',
+      meta: {
+        title: '患者医嘱',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/doctorlongAdvicePrint',
       component: () => import('@/xt_pages/dialysis/longDoctorAdvicePrint'),
@@ -1178,6 +1187,18 @@ export default {
         noCache: true
       }
     },
+    {//83
+      path: '/dialysis/print/batch/eightythree',
+      component: () =>
+        import('@/xt_pages/dialysis/batch_print/batch_print_order_eightythree'),
+      hidden: true,
+      is_menu: false,
+      name: 'batch_print_order_eightythree',
+      meta: {
+        title: '批量打印',
+        noCache: true
+      }
+    },
     {
       path: '/dialysis/flow',
       component: () => import('@/xt_pages/dialysis/dialysisFlow'),

src/xt_pages/Dialysisanalysis/new_otherIndicators/components/Total_table.vue

@@ -252,54 +252,54 @@ export default {
         time_way:this.date_mode,
       }
       Getdialysisdetail(params).then(response =>{
-        console.log('00000',response);
+        console.log('00000透析总量分析',response.data.data.list);
         if(response.data.state == 1){
           const list = response.data.data.list
           this.patientTableData = list
-          // this.tableData = list
           var column = []
-          column = Object.keys(response.data.data.list[0]).map(key => ({
-              prop: key,
-              label: key // 可以自定义表头名称
-            }));
-            // this.tableData = response.data.data.list
-            for(let i in column){
-              if(column[i].label == '日期'){
-                column.splice(i,1)
-              }
-
-            }
-            const arr={
-              label:'日期',
-              prop:'日期'
-            }
-            for(let i in column){
-              if(column[i].label == '合计'){
-                column.splice(i,1)
-              }
+          var column2 = []
+          list.forEach((v,i)=>{                  
+              Object.keys(v).forEach(v=>{
+                  column2.push(v)
+              })
+          })
+          column2= [...new Set(column2)]
+          for(let i in column2){
+            let obj ={
+              prop:column2[i],
+              label:column2[i]
             }
-            const arr1={
-              label:'合计',
-              prop:'合计'
+            column.push(obj)
+          }
+          for(let i in column){
+            if(column[i].label == '日期'){
+              column.splice(i,1)
             }
-            column.unshift(arr)
-            column.push(arr1)
-            this.columns = column
 
-            const detil = []
-            for(let i in this.columns){
-              detil.push(this.columns[i].label)
+          }
+          const arr={
+            label:'日期',
+            prop:'日期'
+          }
+          for(let i in column){
+            if(column[i].label == '合计'){
+              column.splice(i,1)
             }
-            this.detilarr = detil
-            // this.tableData = response.data.data.list.map(row => {
-            //   let newRow = {};
-            //   for (let key in row) {
-            //     newRow[key] = row[key] === 0 ? '' : row[key];
-            //   }
-            //   return newRow;
-            // });
-            // console.log('tttt',this.tableData);
-            console.log('hhhhh',this.columns);
+          }
+          const arr1={
+            label:'合计',
+            prop:'合计'
+          }
+          column.unshift(arr)
+          column.push(arr1)
+          this.columns = column
+
+          const detil = []
+          for(let i in this.columns){
+            detil.push(this.columns[i].label)
+          }
+          this.detilarr = detil
+          console.log('hhhhh',this.columns);
         }
 
       })

src/xt_pages/Pharmacy/PatientDispensing.vue

@@ -228,7 +228,7 @@
             </el-table-column>
             <el-table-column label="药品追溯码" width="162" align="center">
               <template slot-scope="scope">
-                <div @click="getDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode,scope.$index)"><el-input style="width: 100;" v-model="scope.row.DrugCode"></el-input></div>
+                <div @click="getDrugCode(scope.row.ID,scope.row.DataSources,scope.row.DrugCode,scope.$index,scope.row.DrugId)"><el-input style="width: 100;" v-model="scope.row.DrugCode"></el-input></div>
               </template>
             </el-table-column>
             <el-table-column label="开立医生" width="150" align="center">
@@ -354,7 +354,8 @@ import {
   drugwithdrawal,
   getpartitionlist,
   changeDrugCode,
-  changeZeroFlag
+  changeZeroFlag,
+  getDrugTocalCount
 
 } from "@/api/pharmacy";
 import dataDruguse from "../../router/modules/dataDruguse";
@@ -415,8 +416,10 @@ export default {
       currentIndex:0,
       is_drug_open:"2",
       textarea:"",
-      patientList:[]
-
+      patientList:[],
+      drug_id:0,
+      total_count:0,
+      newArrList:[]
     };
   },
   watch: {},
@@ -1238,20 +1241,98 @@ export default {
        }
        return spc
     },
-    getDrugCode(id,DataSources,DrugCode,index){
-      this.id = id
-      var is_source =0
-       if (DataSources == "his处方"){
-        is_source = 1
-       }
-       if (DataSources == "临时医嘱"){
-         is_source = 2
-       }
-       this.is_source = is_source
-       this.textarea = DrugCode
-       this.currentIndex = index
+    getDrugCode(id,DataSources,DrugCode,index,DrugId){
       
-       this.dialogVisibleOne = true
+     // 针对百霖
+       if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id == 0){
+          var params = {
+            drug_id:DrugId,
+            start_time:moment().subtract(15, 'days').format("YYYY-MM-DD")
+          }
+          console.log("params-------------",params)
+         getDrugTocalCount(params).then(response=>{
+           if(response.data.state == 1){
+             
+            var adviceList = response.data.data.adviceList
+
+            var str = ""
+            if(adviceList!=null && adviceList.length>0){
+              for(let i=0;i<adviceList.length;i++){
+                if(adviceList[i].drug_code!=""){
+                  str+=adviceList[i].drug_code 
+                }
+               
+              }
+            }
+            var new_arr = str.split(",");
+
+            console.log("adviceList==========",new_arr)
+
+            if(new_arr!=null && new_arr.length>0){
+               
+               let dataInfo = {}
+               new_arr.forEach((item, index) => {
+                if (!dataInfo[item]) {
+                    dataInfo[item] = {
+                    drug_code:item,
+                    child: [], 
+                  }
+                 }
+               })
+               let arr = Object.values(dataInfo)
+
+               if(arr!=null && arr.length>0){
+                
+                 for(let i=0;i<arr.length;i++){
+                   for(let j=0;j<new_arr.length;j++){
+                      if(arr[i].drug_code == new_arr[j]){
+                         arr[i].child.push(new_arr[j])
+                      }
+                   }
+                 }
+               }
+               
+               this.newArrList = []
+               this.newArrList = arr
+
+
+            }
+              
+            this.drug_id = DrugId
+            this.id = id
+            var is_source =0
+            if (DataSources == "his处方"){
+              is_source = 1
+            }
+            if (DataSources == "临时医嘱"){
+              is_source = 2
+            }
+            this.is_source = is_source
+            this.textarea = DrugCode
+            this.currentIndex = index
+            
+            this.dialogVisibleOne = true
+           }
+         })
+       }else{
+        
+        this.drug_id = DrugId
+        this.id = id
+        var is_source =0
+        if (DataSources == "his处方"){
+          is_source = 1
+        }
+        if (DataSources == "临时医嘱"){
+          is_source = 2
+        }
+        this.is_source = is_source
+        this.textarea = DrugCode
+        this.currentIndex = index
+        
+        this.dialogVisibleOne = true
+       }
+
+     
 
     },
     saveTextArea(){
@@ -1274,6 +1355,7 @@ export default {
       })
     },
     changeText(event){
+
      
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
@@ -1281,30 +1363,118 @@ export default {
         var textarea = ""
         textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
          
-      
-
         if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id==0){
+
+          var drugindentificaitoncode = this.getDrugIdentificationCode(this.drug_id)
+          console.log("drugindentification===================",drugindentificaitoncode)
+
+          var scan_code = this.getDrugScanCode(this.drug_id)
+          
+          console.log("scan_code============",scan_code)
+
+          var total_one = 0
+          var total_two = 0
+
+          console.log("newArr-------------",this.newArrList)
+
+         
+
           var arr= []
           arr = textarea.split(",")
+          var arrList = []
+          if(arr!=null && arr.length>0){
+            let dataInfo = {}
+               arr.forEach((item, index) => {
+                if (!dataInfo[item]) {
+                    dataInfo[item] = {
+                    drug_code:item,
+                    child: [], 
+                  }
+                 }
+               })
+               let new_arr = Object.values(dataInfo)
+
+               if(new_arr!=null && new_arr.length>0){
+                
+                 for(let i=0;i<new_arr.length;i++){
+                   for(let j=0;j<arr.length;j++){
+                      if(new_arr[i].drug_code == arr[j]){
+                         new_arr[i].child.push(arr[j])
+                      }
+                   }
+                 }
+               }
+            arrList = new_arr
+            
+          }
+
           var is_err_check = false
           var i_index = ""
+          var drug_code = ""
+       
           if(arr!=null && arr.length>0){
             for(let i=0;i<arr.length;i++){
+
                if(arr[i]!=""){
+                 drug_code = arr[i]
+                 i_index = i
                  if(arr[i].length!=20){
                    this.$message.error("药品追溯码长度没有满足20位!")
                    is_err_check = true
-                   i_index = i
                  }
+                 if(drugindentificaitoncode>0){
+                  if(arr[i].substring(0,7)!= drugindentificaitoncode){
+                    this.$message.error("药品标识码格式不正确,请重新扫码")
+                    is_err_check = true
+                  }
+                 }
+                
+
                }
 
             }
           }
-          console.log("is_err_check+++++++++++++",is_err_check)
           if(is_err_check == true){
               arr.splice(i_index,1)
           }
-          console.log("arr-------------------------",arr)
+         
+          for(let i=0;i<this.newArrList.length;i++){
+             if(drug_code == this.newArrList[i].drug_code){
+                 total_one = this.newArrList[i].child.length
+             }
+          }
+
+          for(let i=0;i<arrList.length;i++){
+             if(drug_code == arrList[i].drug_code){
+                 total_two = arrList[i].child.length
+             }
+          }
+
+
+          console.log("数量1--------------",total_one)
+          console.log("数量2---------------",total_two)
+        
+          console.log("scan_code=====",scan_code)
+          
+          if(scan_code>0){
+            if((total_one + total_two)>scan_code){
+              this.$message.error("扫码次数已经超过限制!")
+              arr.splice(i_index,1)
+            }
+          }
+         
+
+
+
+         var is_arr = this.hasDuplicates(arr)
+
+         if(is_arr == true){
+           this.$message.error("药品追溯码已经存在,不能重复扫码!")
+           arr.splice(i_index,1)
+         }
+
+         console.log("is_arr-=--------------",is_arr)
+
           this.textarea = arr.join(",")
         }else{
 
@@ -1317,6 +1487,31 @@ export default {
 
 
     },
+    
+    hasDuplicates(arr) {
+      const uniqueNumbers = [...new Set(arr)];
+      return uniqueNumbers.length !== arr.length;
+    },
+    getDrugIdentificationCode(id){
+       
+      var drug_identification_code = ""
+      for(let i=0;i<this.baseList.length;i++){
+          if(id == this.baseList[i].id){
+            drug_identification_code = this.baseList[i].drug_identification_code
+          }
+      }
+      return drug_identification_code
+    },
+    getDrugScanCode(drug_id){
+      var scan_code = ""
+      for(let i=0;i<this.baseList.length;i++){
+       if(drug_id == this.baseList[i].id){
+          scan_code = this.baseList[i].scan_code
+       }
+      }
+      return scan_code
+    }
+
 
 
   },

src/xt_pages/data/druguseTemplate.vue

@@ -2863,6 +2863,7 @@
                 obj.delivery_way = medicalList[i].delivery_way
                 obj.execution_frequency = medicalList[i].execution_frequency
                 obj.single_dose = medicalList[i].single_dose
+                obj.single_dose_unit  = medicalList[i].dose_unit
                 obj.prescribing_number = medicalList[i].prescribing_number
                 obj.type_id = medicalList[i].id
                 obj.type = 2
@@ -2900,6 +2901,7 @@
                 obj.delivery_way = base_drug_list[i].delivery_way
                 obj.execution_frequency = base_drug_list[i].execution_frequency
                 obj.single_dose = base_drug_list[i].single_dose
+                obj.single_dose_unit = base_drug_list[i].dose_unit
                 obj.prescribing_number = base_drug_list[i].prescribing_number
                 obj.type_id = base_drug_list[i].id
                 obj.type = 1
@@ -2917,6 +2919,7 @@
     changeDrugName(name){
        this.current_drug_name = name
        this.templateForm.advice_desc = ''
+       console.log("all_drug=============",this.all_drug)
       this.drugSpec = []
       for (let i = 0; i < this.all_drug.length; i++) {
         if (this.all_drug[i].drug_name == name) {
@@ -3031,15 +3034,15 @@
        return a.sort - b.sort
      },
      hangleSelectChange(val){
-        console.log("==val==",val)
+      console.log("==val==",val)
        var tmp = val.drug_specs[0]
        console.log("tmp",tmp)
        this.templateForm.advice_desc=this.drugSpec[0].drug_spec
-       this.templateForm.drug_spec_unit=this.drugSpec[0].min_unit
+       this.templateForm.drug_spec_unit= this.drugSpec[0].min_unit
        this.templateForm.prescribing_number=this.drugSpec[0].prescribing_number
        this.templateForm.prescribing_number_unit=this.drugSpec[0].prescribing_number_unit
-       this.templateForm.single_dose=this.drugSpec[0].single_dose
-       this.templateForm.single_dose_unit=this.drugSpec[0].min_unit
+       this.templateForm.single_dose= this.drugSpec[0].single_dose
+       this.templateForm.single_dose_unit= val.single_dose_unit
        this.templateForm.delivery_way=this.drugSpec[0].delivery_way
        this.templateForm.execution_frequency=this.drugSpec[0].execution_frequency
        this.templateForm.advice_desc=tmp.dose+tmp.dose_unit+"*"+tmp.min_number+tmp.min_unit+"/"//药品规格

src/xt_pages/dialysis/PatientBox.vue

@@ -161,19 +161,41 @@
         </p>
 
 
-        <p v-if="$store.getters.xt_user.org.id!=9675 && $store.getters.xt_user.org.id!=10340">
+        <p v-if="$store.getters.xt_user.org.id!=9675 && $store.getters.xt_user.org.id!=10340 && $store.getters.xt_user.org.id!=0&& $store.getters.xt_user.org.id!=10742">
           透析器/灌流器:{{schedule.prescription? schedule.prescription.dialyzer_perfusion_apparatus: ""}}
           <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_dialyszers: ""}}</span>
           <span v-if="schedule.prescription != null &&schedule.prescription.dialysis_irrigation != ''">/</span>
           <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_irrigation: ""}}</span>
         </p>
+
+        <p v-if="$store.getters.xt_user.org.id ==0 ||  $store.getters.xt_user.org.id ==10742">
+          透析器/灌流器/滤过器:
+        
+          <span v-if="schedule.prescription != null">
+            <span v-if="schedule.prescription.id > 0">
+              {{schedule.prescription? schedule.prescription.dialysis_dialyszers: ""}}
+            </span>
+            <span v-if="schedule.prescription != null &&schedule.prescription.dialysis_irrigation != ''">/</span>
+            <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_irrigation: ""}}</span>
+          </span>
+
+          <span v-if="schedule.prescription== null && schedule.dialysis_solution!=null">
+             <span v-if="schedule.dialysis_solution.id>0">
+                {{ schedule.dialysis_solution.dialysis_dialyszers }} 
+               <span v-if="schedule.dialysis_solution.dialysis_dialyszers!=''"> {{ schedule.dialysis_solution.dialysis_irrigation }}</span>
+               <span v-if="schedule.dialysis_solution.dialysis_strainer!=''"> {{ schedule.dialysis_solution.dialysis_strainer }}</span>
+             </span>
+          </span>
+        
+        </p>
+
         <p v-if="$store.getters.xt_user.org.id==9675 || $store.getters.xt_user.org.id==10340">
              透析器/灌流器:
              <span v-if="schedule.dialysis_order!=null">{{schedule.dialysis_order.dialysis_dialyszers}}</span>
              <span v-if="schedule.dialysis_order!=null">{{schedule.dialysis_order.dialysis_irrigation}}</span>
              
         </p>
-        <p v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==10445">
+        <p v-if="$store.getters.xt_user.org.id==9671 || $store.getters.xt_user.org.id==10445 ||  $store.getters.xt_user.org.id==10579 ">
            滤过器:
            <span v-if="schedule.prescription != null">{{schedule.prescription? schedule.prescription.dialysis_strainer: ""}}</span>
         </p>

src/xt_pages/dialysis/batch_print/batch_print_order_seventyfour.vue

@@ -123,8 +123,9 @@
                   <tr>
                     <td colspan="2">
                       <div style="line-height:30px;">
-                      <span>处方脱水量: {{ record.prescription.prescription_water ? record.prescription.prescription_water : "" }} </span>ml &nbsp;&nbsp;
-                      <span>透析液流量: {{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }} </span>ml/h
+                        <span v-if="org_id != 9779">处方脱水量: {{ record.prescription.prescription_water ? record.prescription.prescription_water : "" }} ml &nbsp;&nbsp;</span>
+                        <span v-if="org_id == 9779">目标脱水量:{{ record.prescription.target_ultrafiltration ? record.prescription.target_ultrafiltration : "" }} L&nbsp;&nbsp;</span>
+                        <span>透析液流量: {{ record.prescription.dialysate_flow ? record.prescription.dialysate_flow : "" }} </span>ml/h
                       </div>
                     </td>
                     <td >
@@ -144,7 +145,7 @@
               <table border="1" class="table-box" style="border-collapse: collapse;width: 100%;">
                 <tr>
                   <td style="width: 20%; line-height: 30px;">透析机：
-                    {{record.assessment_before_dislysis.machine_type ? record.assessment_before_dislysis.machine_type : " "}}
+                    {{record.assessment_before_dislysis.machine_type ? record.assessment_before_dislysis.machine_type : "/"}}
                   </td>
                   <td style="width: 30%;line-height: 30px;">
                     透析(滤)器:
@@ -177,14 +178,14 @@
                   <td colspan="3">
                     <div style="display: inline-block;line-height: 30px;">
                       血管通路:
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='长期静脉导管'?true :false" showValue="长期静脉导管"></label-box>&nbsp;
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)=='临时静脉导管'?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
-                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='内瘘' &&
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='长期静脉导管' &&
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!='临时静脉导管' &&
-                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id)!=''?true :false" showValue="其它">
+                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('内瘘')!=-1?true :false" showValue="内瘘"></label-box>&nbsp;
+                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('长期静脉导管')!=-1?true :false" showValue="长期静脉导管"></label-box>&nbsp;
+                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('临时静脉导管')!=-1?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
+                      <label-box :isChecked="QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('内瘘')==-1 &&
+                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('长期静脉导管') &&
+                                  QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id).indexOf('临时静脉导管') ?true :false" showValue="其它">
                       </label-box>
+                      {{ QueryPartById(record.assessment_before_dislysis.blood_access_part_opera_id) }}
                     </div>&nbsp;&nbsp;
                     <div style="display: inline-block;line-height: 30px;">
                       穿刺者:

src/xt_pages/dialysis/batch_print/batch_print_order_seventythree.vue

@@ -339,7 +339,6 @@
                         体重增加：
                         <div class="under_line" style=" width: 50%;text-align: center; white-space: normal;">
                           {{ record.assessment_before_dislysis.weight_before > 0 && 
-                          record.assessment_before_dislysis.additional_weight > 0 && 
                           record.assessment_before_dislysis.dry_weight >0 ? 
                           parseFloat(record.assessment_before_dislysis.weight_before - record.assessment_before_dislysis.additional_weight - record.assessment_before_dislysis.dry_weight).toFixed(2): "/" 
                           }}

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1017,6 +1017,13 @@
                               ? record.prescription.dialysis_dialyszers
                               : "/"
                           }}
+                          <span v-if="org_id ==10740">
+                            {{
+                              record.prescription.dialysis_strainer
+                                ? record.prescription.dialysis_strainer
+                                : ""
+                            }}
+                          </span>
                         </div>
                       </div>
                       <div class="inline_block" style="flex: 1">
@@ -1098,9 +1105,7 @@
                       </div>
                     </div>
 
-                    <div
-
-                      class="row"
+                    <div class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <!-- <div class="inline_block" style="flex: 1"
@@ -1601,14 +1606,14 @@
                       >
                         <div
                           class="inline_block"
-                          style="flex: 1; display: inline-block"
+                          style="flex: 2; display: inline-block"
                           v-if="org_id!=9675 && org_id!=10447"
                         >
                           备注：
                           <div
                             class="under_line"
                             style="
-                              width: 860px;
+                              width: 80%;
                               line-height: 25px;
                               text-align: left;
                               margin-left: 2px;
@@ -1619,6 +1624,34 @@
                             {{ record.assessment_before_dislysis.remark ?record.assessment_before_dislysis.remark : "/" }}
                           </div>
                         </div>
+
+                        <div style="flex: 1;">
+                          医生签名:
+                          <div class="under_line">
+                            <span
+                              v-if=" setAdminUserES(
+                                  record.prescription, 'creater') == ''">
+                              {{
+                                getAdminUser(
+                                  record.prescription,
+                                  "creater"
+                                )
+                              }}</span
+                            >
+                            <img class="es-img"
+                              :src="
+                                setAdminUserES(
+                                  record.prescription,
+                                  'creater'
+                                )
+                              "
+                              alt=""
+                              srcset=""
+                              v-else
+                              style="height: 40px"
+                            />
+                          </div>
+                        </div>
                       </div>
                     </div>
 
@@ -1749,12 +1782,12 @@
                           置换液的速度<br />(ml/h)
                           </td>
                           <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
-                          <td width="50" v-if=" org_id ==0 || org_id ==10489 || org_id == 10735">超滤率<br />(ml/h)</td>
-                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10600 && org_id!=10683">超滤量<br />
+                          <td width="50" v-if=" org_id ==10600 || org_id ==10489 || org_id == 10735">超滤率<br />(ml/h)</td>
+                          <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id!=10683">超滤量<br />
                             <span v-if="org_id!=10471"> (ml)</span>
                             <span v-if="org_id==10471">L</span>
                           </td>
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0 || org_id == 10567 || org_id ==10724">超滤率<br />(ml/h)</td>
+                          <td width="50" v-if="org_id ==10683  || org_id == 10567 || org_id ==10724">超滤率<br />(ml/h)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
                             v-if="
@@ -1784,10 +1817,8 @@
                               org_id ==10600 ||
                               org_id ==10629 ||
                               org_id == 10510 ||
-                              org_id == 0 ||
                               org_id == 10598 ||
-                              org_id == 10567 ||
-                              org_id == 10724
+                              org_id == 10567 
 
                             "
                           >
@@ -1991,8 +2022,7 @@
                           <td width="50" v-if="org_id == 10375"><br />
                             {{ monitor_record.replacement_rate?monitor_record.replacement_rate:"0" }}
                           </td>
-                          <td width="50" v-if="org_id == 10489 || org_id ==0 || org_id == 10735"><br />
-
+                          <td width="50" v-if="org_id == 10489 || org_id ==10600 || org_id == 10735"><br />
                                    {{
                                      monitor_record.ultrafiltration_rate
                                        ? monitor_record.ultrafiltration_rate
@@ -2017,7 +2047,7 @@
 
                           </td>
 
-                          <td width="50" v-if="org_id == 10600 || org_id ==10683 || org_id ==0 || org_id == 10567 || org_id == 10724"><br />
+                          <td width="50" v-if="org_id ==10683 || org_id == 10567 || org_id == 10724"><br />
 
                                     {{
                                       monitor_record.ultrafiltration_rate
@@ -2065,10 +2095,8 @@
                               org_id == 10600 ||
                               org_id ==10629 ||
                               org_id ==10510 ||
-                              org_id== 0 ||
                               org_id ==10598 ||
-                              org_id == 10567 ||
-                              org_id == 10724
+                              org_id == 10567 
                             "
                           >
                             {{ monitor_record.ktv }}
@@ -3105,7 +3133,7 @@
                          </span>
 
                          <span v-if="org_id == 10551">{{
-                            record.assessment_after_dislysis && 
+                            record.assessment_after_dislysis &&
                             record.assessment_before_dislysis&&
                             record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after
                               ?record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after
@@ -3134,14 +3162,14 @@
                       >
 
                         <span v-if="org_id!=10460">
-                          透析中入量  (L)：
+                          透析中入量(L)：
                         </span>
                         <span v-if="org_id==10460">
-                          透析中入量  (ml)：
+                          透析中入量(ml)：
                         </span>
                         <div
                           class="under_line"
-                          style="width: 100px; text-align: center"
+                          style="width: 60px; text-align: center"
                         >
                           {{
                             record.assessment_after_dislysis &&
@@ -3170,7 +3198,7 @@
                           }}
                         </div>
                         <span v-if="org_id!=9675&&org_id!=10447 &&org_id!=10624 && org_id!=10471"> ml</span>
-                        <span v-if="org_id ==9675||org_id==10447 || org_id==10624 || org_id == 10471">L</span>
+                        <span v-if="org_id ==9675||org_id==10447 || org_id==10624 || org_id == 10471 ">L</span>
                       </div>
 
                       <div class="inline_block" style="flex: 1" v-if="org_id ==10598 || org_id == 0">

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -394,8 +394,7 @@
                         </div>
                       </div>
                     </div>
-                    <div
-                      class="row"
+                    <div class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
                       <div class="inline_block">
@@ -1172,18 +1171,17 @@
                         <span v-if="record.prescription.anticoagulant == 4"
                           >mg</span
                         >
-                        <span v-if="record.prescription.anticoagulant == 3"
+                        <span v-else-if="record.prescription.anticoagulant == 3"
                           >iu</span
                         >
-                        <span v-if="record.prescription.anticoagulant == 2"
+                        <span v-else-if="record.prescription.anticoagulant == 2"
                           >mg</span
                         >
-                        <span v-if="record.prescription.anticoagulant == 1"
-                          >mg</span
-                        >
-                        <span v-if="record.prescription.anticoagulant == 15"
+                        <span v-else-if="record.prescription.anticoagulant == 1"
                           >mg</span
                         >
+                        <span v-else-if="record.prescription.anticoagulant == 15">mg</span>
+                        <span v-else>iu</span>
                       </div>
                       <div class="inline_block" style="margin-left: 20px" v-if=" record.prescription.anticoagulant !=1">
                         维持：
@@ -1220,21 +1218,21 @@
                         <span v-if="record.prescription.anticoagulant == 5"
                           >ml/h</span
                         >
-                        <span v-if="record.prescription.anticoagulant == 4"
+                        <span v-else-if="record.prescription.anticoagulant == 4"
                           >mg/h</span
                         >
-                        <span v-if="record.prescription.anticoagulant == 3"
+                        <span v-else-if="record.prescription.anticoagulant == 3"
                           >iu/h</span
                         >
-                        <span v-if="record.prescription.anticoagulant == 2"
+                        <span v-else-if="record.prescription.anticoagulant == 2"
                           >mg/h</span
                         >
-                        <span v-if="record.prescription.anticoagulant == 1"
-                          >mg/h</span
-                        >
-                        <span v-if="record.prescription.anticoagulant == 15"
+                        <span v-else-if="record.prescription.anticoagulant == 1"
                           >mg/h</span
                         >
+                        <span v-else-if="record.prescription.anticoagulant == 15"
+                          >mg/h</span>
+                        <span v-else>iu/h</span>
                       </div>
                       <div class="inline_block" style="margin-left: 20px" v-if=" record.prescription.anticoagulant !=1">
                         总量：
@@ -1252,18 +1250,18 @@
                         <span v-if="record.prescription.anticoagulant == 4"
                           >mg</span
                         >
-                        <span v-if="record.prescription.anticoagulant == 3"
+                        <span v-else-if="record.prescription.anticoagulant == 3"
                           >iu</span
                         >
-                        <span v-if="record.prescription.anticoagulant == 2"
-                          >mg</span
-                        >
-                        <span v-if="record.prescription.anticoagulant == 1"
+                        <span v-else-if="record.prescription.anticoagulant == 2"
                           >mg</span
                         >
-                        <span v-if="record.prescription.anticoagulant == 15"
+                        <span v-else-if="record.prescription.anticoagulant == 1"
                           >mg</span
                         >
+                        <span v-else-if="record.prescription.anticoagulant == 15"
+                          >mg</span>
+                        <span v-else>iu</span>
                       </div>
 
                       <div class="inline_block" style="margin-left: 20px">

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -176,16 +176,10 @@
                         <table class="table-box">
                         <tbody>
                         <tr>
-                            <td width="70">导管口:</td>
+                            <td width="70">导管:</td>
                             <td width="240">
-                            <div style="display:flex;justify-content:space-between;">
-                                <label-box :isChecked="record.assessment_before_dislysis.catheter.indexOf('穿刺口-干洁') > -1 ? true : false" showValue="干洁"></label-box>
-                                &nbsp;
-                                <label-box :isChecked="record.assessment_before_dislysis.catheter.indexOf('穿刺口-红肿') > -1 ? true : false" showValue="红肿"></label-box>
-                                &nbsp;
-                                <label-box :isChecked="record.assessment_before_dislysis.catheter.indexOf('穿刺口-分泌物') > -1 ? true : false" showValue="分泌物"></label-box>
-                                &nbsp;
-                                <label-box :isChecked="record.assessment_before_dislysis.catheter.indexOf('穿刺口-渗血') > -1 ? true : false" showValue="渗血"></label-box>
+                            <div class="under-line" style="text-align: center;">
+                              {{ record.assessment_before_dislysis.catheter ? record.assessment_before_dislysis.catheter :'/' }}
                             </div>
                             </td>
                             <td width="40"></td>
@@ -220,7 +214,7 @@
                                 &nbsp;
                                 <label-box :isChecked="record.assessment_before_dislysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
                                 &nbsp;
-                                <label-box :isChecked="(record.assessment_before_dislysis.internal_fistula.indexOf('震颤-无') > -1 || record.assessment_before_dislysis.internal_fistula.indexOf('不存在') > -1) ? true : false" showValue="不存在"></label-box>
+                                <label-box :isChecked="(record.assessment_before_dislysis.internal_fistula.indexOf('不存在') > -1 || record.assessment_before_dislysis.internal_fistula.indexOf('不存在') > -1) ? true : false" showValue="不存在"></label-box>
                             </div>
                             </td>
                             <td width="30"></td>
@@ -711,15 +705,15 @@
                                 <div style="display:flex;justify-content:space-between;">
                                 <label-box :isChecked="record.assessment_after_dislysis.internal_fistula.indexOf('震颤-存在') > -1 ? true : false" showValue="存在"></label-box>
                                 <label-box :isChecked="record.assessment_after_dislysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
-                                <label-box :isChecked="record.assessment_after_dislysis.internal_fistula.indexOf('震颤-无') > -1 ? true : false" showValue="不存在"></label-box>
+                                <label-box :isChecked="record.assessment_after_dislysis.internal_fistula.indexOf('不存在') > -1 ? true : false" showValue="不存在"></label-box>
                                 </div>
                             </td>
                             <td width='30'></td>
                             <td width="40">导管:</td>
                             <td width='200'>
-                                <label-box showValue="通畅" :isChecked="record.assessment_after_dislysis.catheter.indexOf('通畅') > -1 ? true : false"></label-box>&nbsp;
-                                <label-box showValue="A堵塞" :isChecked="record.assessment_after_dislysis.catheter.indexOf('A堵塞') > -1 ? true : false"></label-box>&nbsp;
-                                <label-box showValue="V堵塞" :isChecked="record.assessment_after_dislysis.catheter.indexOf('V堵塞') > -1 ? true : false"></label-box>&nbsp;
+                              <div class="under-line" style="text-align: center;white-space: normal;">
+                                {{ record.assessment_after_dislysis.catheter ? record.assessment_after_dislysis.catheter :'/' }}
+                              </div>
                             </td>
                             <td></td>
                             </tr>
@@ -731,10 +725,11 @@
                             <tr>
                             <td width="130">拔针后穿刺点渗血:</td>
                             <td width="80">
-                                <div style="display:flex;justify-content:space-between;">
-                                <label-box :isChecked="record.assessment_after_dislysis.puncture_point_oozing_blood == 1 ? true : false" showValue="有"></label-box>
-                                <label-box :isChecked="record.assessment_after_dislysis.puncture_point_oozing_blood == 2 ? true : false" showValue="无"></label-box>
-                                </div>
+                              <div class="under-line" style="text-align: center;">
+                                <span v-if="record.assessment_after_dislysis.puncture_point_oozing_blood ==1">有</span>
+                                <span v-else-if="record.assessment_after_dislysis.puncture_point_oozing_blood ==2">无</span>
+                                <span v-else>/</span>
+                              </div>
                             </td>
                             <td width="10"></td>
                             <td width="85">穿刺处血肿:</td>

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -559,6 +559,16 @@
             >批量打印</el-button
           >
         </template>
+        <template v-if="this.template_id == 83">
+          <el-button
+            size="small"
+            icon="el-icon-printer"
+            :disabled="selecting_schs.length == 0"
+            @click="batchPrintAction"
+            type="primary"
+            >批量打印</el-button
+          >
+        </template>
       </div>
     </div>
     <div class="app-container">
@@ -1943,8 +1953,8 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          // if(this.org_id ==10206){
-          //   this.template_id = 80
+          // if(this.org_id ==10742 || this.org_id==0){
+          //   this.template_id = 83
           //   // this.template_id = 81
           //   console.log("templage-i233232323232322323233232323223",this.template_id)
           // }else{
@@ -2789,6 +2799,8 @@ export default {
         this.$router.push({ path: "/dialysis/print/batch/eightyone" });
       } else if (this.template_id == 82) {
         this.$router.push({ path: "/dialysis/print/batch/eightyTwo" });
+      } else if (this.template_id == 83) {
+        this.$router.push({ path: "/dialysis/print/batch/eightythree" });
       }
     },
     batchPrintActionOne: function() {

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

@@ -97,6 +97,8 @@
            </template>
         </el-table-column>
 
+       
+
         <el-table-column
           align="center"
           prop="name"
@@ -184,6 +186,12 @@
            </template>
         </el-table-column>
 
+        <el-table-column  align="center"  width="60" label="钙"  v-if="org_id ==10610 || org_id == 10610">
+           <template slot-scope="scope">
+            {{scope.row.dialysis_solution.calcium}}
+           </template>
+        </el-table-column>
+
         <el-table-column
           align="center"
           prop="name"

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

@@ -30,6 +30,7 @@
                 <td width="100">姓名</td>
                 <td width="100">透析号</td>
                 <td width="100">透析模式</td>
+               
                 <td width="200" v-for="(item,index) in rowList" :key="index">
                   {{item.filed_name_cn}} 
                 </td>
@@ -45,6 +46,7 @@
                  <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
                 <td>{{ getModeId(item.mode_id) }}</td>
+               
                 <td v-for="(it,index) in rowList" :key="index">
                   <!-- {{getName(item.rowList[index].filed_name_cn,item.dialysis_solution)}} -->
                   <span v-if="org_id !=10599">
@@ -68,6 +70,7 @@
                 <td width="100">姓名</td>
                 <td width="100">透析机号</td>
                 <td width="100">透析模式</td>
+                <td width="100" v-if="org_id == 10610 || org_id == 0">钙</td>
                 <td width="200" v-for="(item,index) in typeList" :key="index">
                   {{item.type_name}} 
                 </td>
@@ -82,6 +85,7 @@
                  <td>{{item.patient.name}}</td>
                 <td>{{item.patient.dialysis_no}}</td>
                 <td>{{ getModeId(item.mode_id) }}</td>
+                <td v-if="org_id == 0 || org_id == 10610">{{ item.dialysis_solution.calcium }}</td>
                 <td v-for="(it,index) in typeList" :key="index">
                   <span v-if="item.his_prescription_project.length>0"> {{getStr(item.typeList[index].id,item.his_prescription_project,item.patient_id)}}</span>
                   <span v-if="item.his_prescription_project.length==0">{{getStr(item.typeList[index].id,item.projectList,item.patient_id)}}</span>
@@ -105,6 +109,7 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
   import print from 'print-js'
   import { getDataConfig } from '@/utils/data'
+import org from '../../../../router/modules/org'
   export default {
     name: 'SchedulePrint',
     data() {

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

@@ -138,6 +138,7 @@
             {{scope.row.patient.dialysis_no}}
            </template>
         </el-table-column>
+      
         <el-table-column align="center" label="住院(门诊)号"  v-if="dialysisSett.admission_number==1">
            <template slot-scope="scope">
              {{scope.row.xt_receive_treatment_asses.admission_number}}

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

@@ -1749,7 +1749,7 @@ export default {
           }
       }
 
-      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597 || this.$store.getters.xt_user.org.id == 10551 || this.$store.getters.xt_user.org.id == 10679 || this.$store.getters.xt_user.org.id == 10693 ||  this.$store.getters.xt_user.org.id == 10694 || this.$store.getters.xt_user.org.id == 10702 || this.$store.getters.xt_user.org.id == 10495){
+      if(this.$store.getters.xt_user.org.id == 10579  || this.$store.getters.xt_user.org.id == 10585 || this.$store.getters.xt_user.org.id == 10587 || this.$store.getters.xt_user.org.id == 10597 || this.$store.getters.xt_user.org.id == 10551 || this.$store.getters.xt_user.org.id == 10679 || this.$store.getters.xt_user.org.id == 10693 ||  this.$store.getters.xt_user.org.id == 10694 || this.$store.getters.xt_user.org.id == 10702 || this.$store.getters.xt_user.org.id == 10495 || this.$store.getters.xt_user.org.id == 10742){
         var date = new Date()
           var year = date.getFullYear()
           var month = date.getMonth() + 1

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

@@ -3064,6 +3064,29 @@ mu
               minites = '0' + minites
             }
             this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+           }else if(this.$store.getters.xt_user.org.id == 10742){
+            var date = new Date()
+            var year = date.getFullYear()
+            var month = date.getMonth() + 1
+            var day = date.getDate()
+
+            var hours = date.getHours()
+            var minites = date.getMinutes()
+
+            if (month < 10) {
+              month = '0' + month
+            }
+            if (day < 10) {
+              day = '0' + day
+            }
+            if (hours < 10) {
+              hours = '0' + hours
+            }
+            if (minites < 10) {
+              minites = '0' + minites
+            }
+            this.start_time = year + '-' + month + '-' + day + ' ' + hours + ':' + minites
+
            }else if(this.$store.getters.xt_user.org.id == 10495){
 
             var date = new Date()

src/xt_pages/dialysis/dialysisPrintOrder.vue

@@ -1032,6 +1032,18 @@
         >
         </div>
       </template>
+      <template v-if="org_template_info.template_id == 83">
+        <div>
+          <el-button
+          :loading="loading"
+          size="small"
+          icon="el-icon-printer"
+          @click="printThisPage"
+          type="primary"
+          >打印</el-button
+        >
+        </div>
+      </template>
     </div>
     <div class="app-container" style="min-height: 0">
       <!--<div class="order-print-btn"-->
@@ -1561,6 +1573,9 @@
           <DialysisPrintOrdereightytwo  v-bind:childResponse="childResponse"
           v-if="org_template_info.template_id == 82">
           </DialysisPrintOrdereightytwo>
+          <DialysisPrintOrdereightythree v-bind:childResponse="childResponse"
+          v-if="org_template_info.template_id == 83">
+          </DialysisPrintOrdereightythree>
         </div>
       </el-container>
     </div>
@@ -1661,6 +1676,7 @@ import DialysisPrintOrderSeventynine from './template/DialysisPrintOrderSeventyn
 import DialysisPrintOrdereighty from './template/DialysisPrintOrdereighty'
 import DialysisPrintOrdereightyone from './template/DialysisPrintOrdereightyone'
 import DialysisPrintOrdereightytwo from './template/DialysisPrintOrdereightytwo'
+import DialysisPrintOrdereightythree from './template/DialysisPrintOrdereightythree'
 import DialysisPrintOrderZero from './template/DialysisPrintOrderZero'
 export default {
   name: "dialysisPrintOrder",
@@ -1747,6 +1763,7 @@ export default {
     DialysisPrintOrdereighty,
     DialysisPrintOrdereightyone,
     DialysisPrintOrdereightytwo,
+    DialysisPrintOrdereightythree,
     DialysisPrintOrderZero,
     LabelBox,
     BreadCrumb,
@@ -1964,6 +1981,9 @@ export default {
         '@media print {.dialysis-print-order{width:960px;margin:0 auto}.dialysis-print-order .order-yy-name{margin:auto;text-align:center;font-size:20px;letter-spacing:5px}.dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px 20px 20px 20px}.dialysis-print-order .table-box{width:100%;line-height:23px;font-size:14px}.dialysis-print-order .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:35px;font-size:14px}.dialysis-print-order .print-table-no{width:100%;text-align:center;border-collapse:collapse;font-size:14px}.dialysis-print-order .under-line{border-bottom:1px solid #999;width:95%;text-align:center;margin-left:2px}.dialysis-print-order .title-box{text-align:center;font-size:16px;border:1px solid #666}.dialysis-print-order .radio-lebel-box{font-weight:400;cursor:pointer}.dialysis-print-order .radio-no{opacity:0;outline:0;position:absolute;margin:0;width:0;height:0;z-index:-1}.dialysis-print-order .radio-inner{white-space:nowrap;cursor:pointer;outline:0;display:inline-block;line-height:1;position:relative;vertical-align:middle}.dialysis-print-order .radio-fang{display:inline-block;position:relative;border:1px solid #000;box-sizing:border-box;width:14px;height:14px;background-color:#fff;z-index:1;transition:border-color .25s cubic-bezier(.71,-.46,.29,1.46),background-color .25s cubic-bezier(.71,-.46,.29,1.46)}.dialysis-print-order .is-checked-radio::after{content:"√";font-size:15px}}.dialysis-print-order .print-table-no tr td { padding: 8px 5px; line-height: 25px; }.es-img{height: 20px; }.advice-name{text-align: left;}.advice-children{display:flex;} .dialysis-print-order .print-table tr td{padding: 0px 0px;} .print-template-two tr {line-height: 30px;}   .title-box-pro{border: 0 #fff;line-height: 40px;height: 40px;text-align: left;padding-left: 10px !important;}  .text-align-left{text-align: left !important;padding-left:10px !important;font-size: 14px !important;line-height: 25px;}';
       const style16 =
         '@media print {.dialysis-print-order{width:960px;margin:0 auto} .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{page-break-inside:avoid;} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{page-break-inside:avoid;} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 14px;line-height: 20px;padding: 5px;} .row1{ border-left: 1px solid black;padding: 5px 5px;} .row2{ border-left:1px solid black; border-right:1px solid black; border-bottom:1px solid black;} .inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr{page-break-inside:avoid;} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
+      const style17 =
+        // 防止分页错位问题：table设置border: none；.tr设置page-break-inside:avoid; // 防止table数据太多，tr分页错乱 td设置border: 1px solid #000;// 防止部分分页的tr边框线没有
+        '@media print {.dialysis-print-order{width:960px;margin:0 auto} .option_panel { margin: 0 5px 0 0; } .option_panel .check_box_panel { white-space: nowrap; outline: none; display: inline-block; line-height: 1; position: relative; vertical-align: middle; } .dialysis-print-order .order-title{margin:auto;font-weight:600;text-align:center;font-size:22px;padding:10px}.option_panel .check_box_panel .check_box { display: inline-block; position: relative; border: 1px solid #000; box-sizing: border-box; width: 14px; height: 12px; background-color: #fff; } .print-table{border: none} .print-table tr{} .print-table tr td{border: 1px solid #000;} .inside_table{border: none} .inside_table tr{} .inside_table tr td{border: 1px solid #000;} .check_box_panel .did_checked::after { content: "√"; font-size: 15px; } .print_page_main_content {background-color: white;width: 960px;margin: 0 auto 20px;padding: 0 0 0 0; page-break-after: always;}.print_page_main_content .order-yy-name {margin: auto;text-align: center;font-size: 20px;letter-spacing: 5px;}.print_page_main_content .order_title {text-align: center;font-size: 23px; line-height: 50px;font-weight: 500;} .row {font-size: 16px;line-height: 20px;padding: 5px 0;} .row1{ border-left: 1px solid black;padding: 5px 5px;} .row2{ border-left:1px solid black; border-right:1px solid black; border-bottom:1px solid black;} .inline_block { display: inline-block;}.under_line_two {display: inline-block;border-bottom: 1px solid #999;text-align: left;white-space: nowrap;width: 50%;}.under_line {display: inline-block;border-bottom: 1px solid #999;text-align: center;white-space: nowrap; width: 50%;}.flex {display: -webkit-box;display: -moz-box; display: -ms-flexbox; display: -webkit-flex;display: flex;align-items: center;-webkit-align-items: center;box-align: center;-moz-box-align: center;-webkit-box-align: center;text-align: center;-webkit-justify-content: space-between;justify-content: space-between;-moz-box-pack: space-between;-webkit--moz-box-pack: space-between;box-pack: space-between;}.print_page_main_content .proj_table {width: 100%;border: 1px solid;border-collapse: collapse;padding: 2px;} .print_page_main_content .proj_table tbody tr{} .print_page_main_content .proj_table tbody tr td {border: 1px solid;font-size: 16px;padding: 3px 8px;line-height: 30px;}.print_page_main_content .proj_table .inside_table {width: 100%;border: hidden; border-collapse: collapse;}.print_page_main_content .proj_table .inside_table tr td {border: 1px solid; text-align: center;font-size: 14px;padding: 6px 5px;line-height: 16px;}.print-table-no {width: 100%;text-align: center;border-collapse: collapse;font-size: 14px;}.es-img {height: 30px;}.advice-name {text-align: left !important;line-height: 16px !important;}.advice-children {display: flex;}}.margin-bottom-50{margin-bottom:50px;}.margin-bottom-300 {margin-bottom:450px;}.margin-bottom-600 {margin-bottom:600px;}.margin-bottom-900 {margin-bottom:900px;}.print-yema{ position: absolute;top: 920px;left: 50%;} .print-yema2{ position: absolute;top: 400px;left: 50%;}.print-yema3{position: absolute;top: 1230px;left: 50%;}.print-yema4{position: absolute;top: 1050px;left: 50%;}.check_box{width:15px !important;height:15px !important;}.did_checke::after {font-size: 8px;margin-left: 2px;margin-top: 12px !important;position: absolute;}.table-box1 {border: 1px solid #000;width: 100%;line-height: 30px;font-size: 14px;border-collapse: collapse;}.table-box1 tr {border-bottom: 1px solid #000;} .print-table{width:100%;text-align:center;border-collapse:collapse;line-height:25px;font-size:14px} ';
 
 
         if (this.org_template_info.template_id == 1) {
@@ -2481,6 +2501,13 @@ export default {
           style: style3,
           scanStyles: false,
         });
+      } else if (this.org_template_info.template_id == 83 ) {
+        printJS({
+          printable: "dialysis-print-box-1",
+          type: "html",
+          style: style17,
+          scanStyles: false,
+        });
       }
        else if (this.org_template_info.template_id == 199 ) {
         printJS({
@@ -2705,7 +2732,7 @@ export default {
             this.org_template_info = response.data.data.org_template_info;
           // }else{
           //   this.org_template_info = response.data.data.org_template_info;
-          //   this.org_template_info.template_id= 68
+          //   this.org_template_info.template_id= 83
           // }
 
 

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -64,8 +64,9 @@
             <el-button type="primary" @click="toSeachOne">搜索</el-button>
           </div>
           <div style="flex: 1;text-align: right;">
-            <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=10340">药品统计</el-button>
 
+            <el-button type="primary" size="small" @click="toPatientStatic">患者统计</el-button>
+            <el-button type="primary" size="small" @click="toStatic" v-if="org_id!=10340">药品统计</el-button>
             <el-button type="primary" size="small" @click="toStaticOne" v-if="org_id==10340">药品统计</el-button>
             <el-button type="primary" size="small" @click="toStaticThree">药品月统计</el-button>
 
@@ -1003,6 +1004,17 @@
       </span>
     </el-dialog>
 
+    <!-- <el-dialog
+      title="患者药品统计"
+      :visible.sync="patientDialogVisible"
+      width="50%">
+      <span>这是一段信息</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="patientDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="patientDialogVisible = false">确 定</el-button>
+      </span>
+    </el-dialog> -->
+
     </div>
   </div>
 </template>
@@ -1113,7 +1125,8 @@ export default {
       startMothdialogVisible:false,
       adviceMonthList:[],
       hisAdviceMonthList:[],
-      tableMonthList:[]
+      tableMonthList:[],
+      patientDialogVisible:false,
     };
   },
   created() {
@@ -1137,6 +1150,9 @@ export default {
     this.org_id = this.$store.getters.xt_user.template_info.org_id;
   },
   methods: {
+    toPatientStatic(){
+      this.$router.push({ path: "/dialysis/patient/patientAdvice"});
+    },
     getTemplateInfo() {
       getPrintTemplate().then(response => {
         if (response.data.state == 0) {

src/xt_pages/dialysis/patientAdviceList.vue

@@ -0,0 +1,436 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+            <bread-crumb :crumbs="crumbs"></bread-crumb>
+        </div>
+
+        <div class="app-container">
+            <div class="cell clearfix" style="margin-bottom:0px;">
+                <el-date-picker
+                v-model="start_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 160px;margin-right:10px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                @change="changeStartime"
+                ></el-date-picker>
+                -
+                <el-date-picker
+                v-model="end_time"
+                prefix-icon="el-icon-date"
+                :editable="false"
+                style="width: 160px;margin-right:10px;"
+                type="date"
+                placeholder="选择日期时间"
+                align="right"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                @change="changeEndtime"
+                ></el-date-picker>
+                 <el-autocomplete
+                  style="margin:16px 5px"
+                  popper-class="my-autocomplete"
+                  v-model.trim="search_input"
+                  :fetch-suggestions="querySearchAsync"
+                  :trigger-on-focus="false"
+                  placeholder="病人名字或者透析号"
+                  @select="handleSelect"
+                >
+                  <i class="el-icon-search el-input__icon" slot="suffix"> </i>
+                  <template slot-scope="{ item }">
+                    <div class="name">{{ item.name }}</div>
+                  </template>
+                </el-autocomplete>
+                <el-button type="primary" @click="toSeachPatient">搜索</el-button>
+            </div>
+            <el-container>
+                <div style="width:160px;">
+                    <div class="tablesTitle">患者列表</div>
+                    <el-table :data="tablePatient" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row
+                    @current-change="handleCurrentChange"  ref="monthlyPlanTable"
+                    >
+                        <el-table-column align="center" prop="dialysis_no" label="透析号" width="70">
+                            <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" label="姓名" width="90">
+                            <template slot-scope="scope">{{ scope.row.name }}</template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+                <div style="flex:1;margin-left:20px;">
+                    <!-- <div style="display:flex;justify-content: space-between;align-items: center;">
+                        <div class="tablesTitle">自备药列表</div>
+                        <div>
+                            
+                            <el-button type="primary" size="mini" @click="openForm(2)">打印</el-button>
+                            <el-button type="primary" size="mini" @click="openForm(3)">出库</el-button>
+                        </div>
+                    </div> -->
+                    <el-table :data="tableData" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                        <el-table-column align="center" prop="dialysis_no" label="药品名称">
+                            <template slot-scope="scope">
+                                {{ scope.row.advice_name }}
+                            </template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="name" label="规格名称">
+                            <template slot-scope="scope">{{ scope.row.specification_name }}</template>
+                        </el-table-column>
+                       
+                        <el-table-column align="center" prop="name" label="开药数量">
+                            <template slot-scope="scope">
+                              {{getTotal(scope.row.child)}}
+                            </template>
+                        </el-table-column>
+                        <el-table-column align="center" prop="dialysis_no" label="单位">
+                            <template slot-scope="scope">{{scope.row.prescribing_number_unit}}</template>
+                        </el-table-column>
+                       
+                       
+                        <el-table-column align="center" prop="name" label="操作">
+                            <template slot-scope="scope">
+                                <el-button size="mini" type="primary" @click="toDetail(scope.row.advice_name,scope.row.patient_id)">明细</el-button>
+                            </template>
+                        </el-table-column>
+                    </el-table>
+                </div>
+            </el-container>
+        </div>
+
+        <el-dialog
+         title="使用详情"
+        :visible.sync="adviceDialogVisible"
+        width="50%">
+        <span>
+         <el-table :data="tableList" border style="width: 100%;" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>
+                <el-table-column align="center" prop="dialysis_no" label="患者姓名">
+                    <template slot-scope="scope">
+                        {{getPatientName(scope.row.patient_id)}}
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="name" label="使用时间">
+                    <template slot-scope="scope">{{getTime(scope.row.advice_date)}}</template>
+                </el-table-column>
+                
+                <el-table-column align="center" prop="name" label="开药数量">
+                    <template slot-scope="scope">
+                        {{scope.row.prescribing_number}}
+                    </template>
+                </el-table-column>
+                <el-table-column align="center" prop="dialysis_no" label="单位">
+                    <template slot-scope="scope">{{scope.row.prescribing_number_unit}}</template>
+                </el-table-column>
+                
+                
+            </el-table> 
+        </span>
+        <span slot="footer" class="dialog-footer">
+            <el-button @click="adviceDialogVisible = false">取 消</el-button>
+            <el-button type="primary" @click="adviceDialogVisible = false">确 定</el-button>
+        </span>
+     </el-dialog>
+    </div>
+</template>
+
+
+<script>
+
+import BreadCrumb from "@/xt_pages/components/bread-crumb";
+const moment = require('moment')
+import { PostSearch } from '@/api/patient'
+import { getCurrentPatient,saveRadio,getPatientAdviceList,DeleteDrugNameById,getDrugSet,getPatientDetail,getPatientAdviceListDetail} from "@/api/drug/drug"
+import { TimeSelect } from "element-ui";
+import { uParseTime } from '@/utils/tools'
+export default {
+    components:{
+        BreadCrumb,
+    },
+    data(){
+        return{
+            crumbs: [
+                { path: false, name: "库存管理" },
+                { path: false, name: "自备药管理" },
+                { path: false, name: "自备药管理" },
+            ],
+            value: '',
+            tableData:[],
+            dialogVisible:false,
+            radio:'2',
+            tablePatient:[],
+            disableBtton:false,
+            currentRow: null,
+            patient_name:"",
+            patient_id:"",
+            start_time:moment().startOf('month').format('YYYY-MM-DD'),
+            end_time:moment().endOf('month').format('YYYY-MM-DD'),
+            search_input:"",
+            patient_id:0,
+            stockList:[],
+            outStocklist:[],
+            outList:[],
+            tableList:[],
+            adviceDialogVisible:false
+        }
+    },
+    methods:{
+        setting(){
+            this.dialogVisible = true
+        },
+        handleCurrentChange(val){
+          this.currentRow = val
+          this.patient_name = val.name
+          this.patient_id = val.id
+          if(val.name !=""){
+            this.disableBtton = true
+          }
+           
+          this.getlist()
+        },
+        changeStartime(){
+           this.getlist()
+        },
+        changeEndtime(){
+          this.getlist()
+        },
+        handleClose(){
+          this.dialogVisible = false
+        },
+        openForm(index){
+            if(index == 1){
+              if(this.disableBtton == true){
+                 this.$refs.addMedicine.show(this.patient_name,this.patient_id);
+              }
+              if(this.disableBtton == false){
+                 this.$message.error("请选择患者!")
+              }          
+            }else if(index == 2){
+                this.$refs.warehousing.show(this.patient_name,this.patient_id);
+            }else if(index == 3){
+                this.$refs.warehouseOut.show(this.patient_name,this.patient_id);
+            }
+            
+        },
+        toDetail(advice_name,patientid){
+            var params = {
+                advice_name:advice_name,
+                patient_id:patientid,
+                start_time:this.start_time,
+                end_time:this.end_time
+            }
+          getPatientAdviceListDetail(params).then(response=>{
+             if(response.data.state == 1){
+               var advicelist = response.data.data.adviceList
+               this.tableList = []
+               this.tableList = advicelist
+               console.log("hhhhhhhhhhhhhhhhhhhhhhh",this.tableList)
+               this.adviceDialogVisible = true
+             }
+          })
+        },
+
+        getCurrentPatient(){
+         getCurrentPatient().then(response=>{
+            if(response.data.state == 1){
+              this.tablePatient = response.data.data.patient
+            } 
+          })
+        },
+        searchAction(){
+          this.patient_id = 0
+          this.getlist()
+        },
+        saveRadio(){
+          const params = {
+            radio:this.radio
+          }
+         saveRadio(params).then(response=>{
+            if(response.data.state == 1){
+              var drugset = response.data.data.drugSet
+              this.$message.success("保存成功")
+              this.dialogVisible = false
+            } 
+          }) 
+        },
+        getlist(){
+            const params = {
+               patient_id:this.patient_id,
+               start_time:this.start_time,
+               end_time:this.end_time,
+               keyword:this.search_input,
+            }
+         
+          getPatientAdviceList(params).then(response=>{
+             if(response.data.state == 1){
+                
+               var advicelist = response.data.data.adviceList
+               
+               if(advicelist!=null && advicelist.length>0){
+                    let dataInfo = {}
+                    advicelist.forEach((item, index) => {
+                    let { advice_name } = item
+                    if (!dataInfo[advice_name]) {
+                        dataInfo[advice_name] = {
+                        advice_name:item.advice_name.replace(/\s+/g, ''),
+                        child: [],
+                        count:0,
+                        drug_id:item.drug_id,
+                        specification_name:item.advice_desc +item.drug_spec_unit,
+                        patient_id:item.patient_id,
+                        prescribing_number_unit:item.prescribing_number_unit,
+                      }
+                    }
+                    })
+                   let arr = Object.values(dataInfo)
+                   console.log("new_ar=====================",arr)
+                   for(let i=0;i<arr.length;i++){
+                     for(let j=0;j<advicelist.length;j++){
+                        if(arr[i].advice_name == advicelist[j].advice_name){
+                           arr[i].child.push(advicelist[j])
+                        }
+                     }
+                   }
+                   this.tableData = []
+                   this.tableData = arr
+                }
+              
+              }
+          })  
+        },
+    
+        getCount(patientid,drugname,drugspec){
+            var total = 0
+           for(let i=0;i<this.outStocklist.length;i++){
+              if(patientid == this.outStocklist[i].patient_id && drugname == this.outStocklist[i].drug_name && drugspec == this.outStocklist[i].drug_spec){
+                  total = this.outStocklist[i].Count
+              }
+           }
+           return total
+        },
+
+        getCountTwo(patientid,drugname,drugspec){
+           var total = 0
+           for(let i=0;i<this.outList.length;i++){
+             if(patientid == this.outList[i].patient_id && drugname == this.outList[i].drug_name && drugspec == this.outList[i].drug_spec){
+                  total += this.outList[i].outstore_number
+              }
+           }
+           return total
+        },
+
+        getDrugSet(){
+         getDrugSet().then(response=>{
+            if(response.data.state == 1){
+              var drugset =  response.data.data.drugSet
+              this.radio  = drugset.drug_start.toString()
+            }
+         })
+        },
+
+        getTotal(val){
+          var total = 0
+          for(let i=0;i<val.length;i++){
+             total +=  val[i].prescribing_number
+          }
+          return total
+        },
+        getRemarks(patientid,id){
+          var remarks = ""  
+           for(let i=0;i<this.stockList.length;i++){
+             if(patientid == this.stockList[i].patient_id && id == this.stockList[i].medic_id){
+                remarks = this.stockList[i].remarks
+             }
+          }
+          return remarks
+        },
+
+        querySearchAsync(keyword, cb) {
+          let key = ''
+          if (keyword != undefined) {
+            key = keyword
+          }
+          let searchArray = []
+          console.log("key",key)
+          PostSearch(key).then(response => {
+            if (response.data.state == 1) {
+              searchArray = response.data.data.patient
+              console.log("searchArray",searchArray)
+           
+              cb(searchArray)
+            }
+          })
+          return searchArray
+        },
+        handleSelect(val){   
+          this.search_input = val.name
+          for(let i=0;i<this.tablePatient.length;i++){
+             if(this.tablePatient[i].id == val.id){
+               this.$refs.monthlyPlanTable.setCurrentRow(this.tablePatient[i])
+             }
+          }
+          this.getlist()
+          this.getPatientDetail(val.id)
+        },
+
+        getPatientDetail(id){
+          getPatientDetail(id).then(response=>{
+             if(response.data.state == 1){
+               var patientDetail =  response.data.data.patientDetail
+               console.log("patientDetail",patientDetail)
+               var arr = []
+               arr.push(patientDetail)
+               this.tablePatient = arr
+             }
+          })
+        },
+        toSeachPatient(){
+          this.getCurrentPatient()
+        },
+        getPatientName(id){
+          var name = ""
+          for(let i=0;i<this.tablePatient.length;i++){
+            if(id == this.tablePatient[i].id){  
+               name = this.tablePatient[i].name
+            }
+          }
+          return name
+        },
+        getTime(val) {
+          if(val < 0){
+            return ""
+          }
+        if(val == ""){
+            return ""
+        }else {
+            return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
+
+    },
+    created(){
+      //获取当前机构下的所有患者
+      this.getCurrentPatient()
+      this.getDrugSet()
+    },
+    watch: {
+     tablePatient: function() {
+      this.$nextTick(function() {
+        this.$refs.monthlyPlanTable.setCurrentRow(this.tablePatient[0])
+      })
+    }
+  },
+}
+</script>
+
+
+<style lang="scss" scoped>
+.tablesTitle{
+    font-size: 16px;
+    color: #000;
+    font-weight: bold;
+    height: 40px;
+    line-height: 40px;
+}
+</style>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -1815,7 +1815,6 @@ export default {
 
     checkData() {
       console.log('new_date',this.new_date);
-
       var checkDate =[]
       var monearr = []
       // if(this.dialysisOrder != undefined && this.dialysisOrder.end_time > this.new_date){
@@ -1896,7 +1895,7 @@ export default {
           const obj21 = "体重减少"
           checkDate.push(obj21)
         }
-        if (this.prescription.target_ultrafiltration == 0) {
+        if (this.prescription.prescription_water == 0) {
           const obj22 = "处方脱水量"
           checkDate.push(obj22)
         } if (this.afterdialysis.actual_ultrafiltration == 0) {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1096,15 +1096,22 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
+                      <span v-if="org_id == 10740">
+                        {{prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : ''}}
+                      </span>
+                      <span v-if="org_id !=10740">
+
                         {{
                           prescription.dialyzer_perfusion_apparatus
                             ? prescription.dialyzer_perfusion_apparatus
-                            : ""
+                            : prescription.dialysis_dialyszers
                         }}
+                      </span>
+
                         <span v-if="prescription.dialyzer_perfusion_apparatus&&prescription.dialyzer_perfusion_apparatus!=''">/</span>
                         {{
-                          prescription.dialysis_dialyszers
-                            ? prescription.dialysis_dialyszers
+                          prescription.dialysis_strainer
+                            ? prescription.dialysis_strainer
                             : ""
                         }}
                       </div>
@@ -1271,7 +1278,7 @@
                       </div>
                       kg
                     </div>
-                    <div class="inline_block" style="flex: 1" v-if="org_id!=10469 && org_id!=0">
+                    <div class="inline_block" style="flex: 1" v-if="org_id!=10469 ">
                       <span v-if="org_id!=10683">计划超滤量：</span>
                       <span v-if="org_id==10683">预脱：</span>
                       <div
@@ -1746,21 +1753,19 @@
                       </div>
                     </div>
                   </div>
-                  <div
-                    class="row"
+                  <div class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                     v-if="org_id != 10223"
                   >
                     <div
                       class="inline_block"
-                      style="flex: 1; display: inline-block"
+                      style="flex: 2; display: inline-block"
                       v-if="org_id!=9675 && org_id!=10447"
                     >
                       备注：
-                      <div
-                        class="under_line"
+                      <div class="under_line"
                         style="
-                          width: 860px;
+                          width: 80%;
                           line-height: 25px;
                           text-align: left;
                           margin-left: 2px;
@@ -1771,6 +1776,23 @@
                         {{ predialysis.remark ? predialysis.remark : "/" }}
                       </div>
                     </div>
+                    <div v-if="org_id ==10600 || org_id ==0" style="flex: 1;">
+                      医生签名: 
+                      <div class="under_line">
+                        <span style="height: 30px; display: inline-block"
+                          v-if="setAdminUserES(prescription.creater) == ''"
+                        >
+                          {{ getAdminUser(prescription.creater) }}
+                        </span>
+                        <img
+                          style="height: 40px"
+                          :src="setAdminUserES(prescription.creater)"
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
                   </div>
                 </td>
               </tr>
@@ -1841,13 +1863,13 @@
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
                         <td width="50" v-if="org_id == 10375">置换率<br />(ml/h)</td>
-                        <td width="50" v-if="org_id ==10489 || org_id == 10735 || org_id == 0">超滤率<br/>(ml/h)</td>
-                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10600&& org_id != 10683">
+                        <td width="50" v-if="org_id ==10489 || org_id == 10735 || org_id==10600">超滤率<br/>(ml/h)</td>
+                        <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 10683">
                           超滤量<br />
                          <span v-if="org_id == 10471">L</span>
                          <span v-if="org_id != 10471"> (ml)</span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id ==10598 || org_id ==10683 || org_id ==10567 || org_id == 0 || org_id ==10724">超滤率<br/>(ml/h)</td>
+                        <td width="50" v-if="org_id ==10598 || org_id ==10683 || org_id ==10567 || org_id ==10724">超滤率<br/>(ml/h)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 ">累计超滤量<br />(ml)</td>
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=10402 && org_id!=10206" width="50">
                           <span v-if="org_id == 10683">置换液速度</span>
@@ -1860,13 +1882,13 @@
                           <span v-if="org_id==10598 || org_id == 10567 || org_id == 10724 || org_id == 10644 || org_id== 10353">(L)</span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">滤前压(mmHg)</td>
-                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598 || org_id == 10567 || org_id == 0 || org_id == 10724">KT/V</td>
+                        <td width="50" v-if="org_id == 9538 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id == 10580 || org_id == 10598 || org_id == 10567">KT/V</td>
                         <td width="50" v-if="org_id == 9919">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9671">在线尿素监测</td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id== 9671">血容量<br />(L)</td>
                         <td width="50" v-if="org_id == 10490 ">碳酸氢钠<br />(ml)</td>
                         <td width="50" v-if="org_id == 10598">护士签名</td>
-                        <td width="50" v-if="org_id == 9829 || org_id == 0">SpO₂<br />(%)</td>
+                        <td width="50" v-if="org_id == 9829 ">SpO₂<br />(%)</td>
                         <td width="200">病情变化及处理</td>
                       </tr>
 
@@ -1970,10 +1992,10 @@
                         <td v-if="org_id == 10375"><br />
                           {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
                         </td>
-                        <td v-if="org_id == 10489 || org_id == 10735 || org_id == 0"><br />
+                        <td v-if="org_id == 10489 || org_id == 10735 || org_id == 10600"><br />
                           {{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}
                         </td>
-                        <td v-if="org_id!=10600 && org_id!=10644  && org_id!=10683">
+                        <td v-if="org_id!=10644  && org_id!=10683">
                           <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
                           <span v-if="org_id==9671 || org_id==10440 || org_id ==10617">
                               <span v-if="org_id ==10617 && monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "/"}}</span>
@@ -1982,7 +2004,7 @@
                               <span v-if="org_id !=10617">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
                            </span>
                         </td>
-                        <td width="50" v-if="org_id == 10600 || org_id == 10598 || org_id==10644 || org_id == 10683 || org_id ==10567 || org_id == 0 || org_id == 10724"><br/>
+                        <td width="50" v-if="org_id == 10598 || org_id==10644 || org_id == 10683 || org_id ==10567 || org_id == 10724"><br/>
                            <span v-if="org_id!=10644 && org_id!=0">{{ monitor.ultrafiltration_rate? monitor.ultrafiltration_rate: ""}}</span>
                            <span v-if="org_id==10644 ">
                               <span v-if="monindex == 0">{{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
@@ -2036,7 +2058,7 @@
                           </span>
                         </td>
                         <td width="50" v-if="org_id == 3877 || org_id == 10449">{{ monitor.filter_pressure?monitor.filter_pressure:""}}</td>
-                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id ==10580 || org_id ==10598 || org_id == 10567 || org_id == 0 || org_id ==10724">
+                        <td width="50" v-if="org_id == 9919 || org_id == 9538 || org_id == 9671 || org_id ==10600 || org_id ==10629 || org_id ==10510 || org_id ==10580 || org_id ==10598 || org_id == 10567 ">
                           {{ monitor.ktv?monitor.ktv:"" }}
                         </td>
                         <td width="50" v-if="org_id == 9538 || org_id == 9919 || org_id == 9671">
@@ -2074,7 +2096,7 @@
                           />
                           </span>
                         </td>
-                        <td v-if="org_id == 0||org_id == 9829">
+                        <td v-if="org_id == 9829">
                           {{monitor.blood_oxygen_saturation? monitor.blood_oxygen_saturation: ""}}
                         </td>
 
@@ -2826,8 +2848,7 @@
                     </div>
                   </div>
 
-                  <div
-                    class="row"
+                  <div class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
                     <div class="inline_block" style="flex: 1">
@@ -2918,8 +2939,8 @@
                             : "/"
                         }}
                       </div>
-                      <span v-if="org_id!=9675&&org_id!=10447 &&org_id!=10624 && org_id!=10471"> ml</span>
-                      <span v-if="org_id ==9675||org_id==10447 || org_id==10624 || org_id == 10471">L</span>
+                      <span v-if="org_id!=9675&&org_id!=10447 &&org_id!=10624 && org_id!=10471 "> ml</span>
+                      <span v-if="org_id ==9675||org_id==10447 || org_id==10624 || org_id == 10471 ">L</span>
                     </div>
 
                     <div class="inline_block" style="flex: 1" v-if="org_id ==10598 || org_id == 0">
@@ -2938,8 +2959,7 @@
                     </div>
 
                   </div>
-                  <div
-                    class="row"
+                  <div class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                     v-if="org_id == 10223"
                   >
@@ -3001,8 +3021,7 @@
                       </div>
                     </div>
                   </div>
-                  <div
-                    class="row"
+                  <div class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                     v-if="org_id == 10223"
                   >
@@ -3043,7 +3062,6 @@
                     </div>
                   </div>
 
-
                    <div
                     v-if="org_id == 10440 || org_id == 0"
                     class="row"
@@ -4819,7 +4837,7 @@ export default {
          window.open(fileURL);//打开ppf文件
        }
      },
-   
+
 
      openPdf(blob) {
        const objectUrl = URL.createObjectURL(blob);

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -1052,23 +1052,20 @@
                             : "/"
                         }}
                       </div>
-
-
-
                     <span>
                       <span v-if="prescription.anticoagulant == 4">iu</span>
-                      <span v-if="prescription.anticoagulant == 3">iu</span>
-                      <span v-if="prescription.anticoagulant == 2">mg</span>
-                      <span v-if="prescription.anticoagulant == 5">ml</span>
-                      <span v-if="prescription.anticoagulant == 6">iu</span>
-                     <span v-if="prescription.anticoagulant == 7">iu</span>
-                     <span v-if="prescription.anticoagulant == 8">iu</span>
-                     <span v-if="prescription.anticoagulant == 9">iu</span>
-                     <span v-if="prescription.anticoagulant == 10">iu</span>
-                     <span v-if="prescription.anticoagulant == 11">iu</span>
-                     <span v-if="prescription.anticoagulant == 13||prescription.anticoagulant == 14">iu</span>
-                     <span v-if="prescription.anticoagulant == 15">mg</span>
-
+                      <span v-else-if="prescription.anticoagulant == 3">iu</span>
+                      <span v-else-if="prescription.anticoagulant == 2">mg</span>
+                      <span v-else-if="prescription.anticoagulant == 5">ml</span>
+                      <span v-else-if="prescription.anticoagulant == 6">iu</span>
+                      <span v-else-if="prescription.anticoagulant == 7">iu</span>
+                      <span v-else-if="prescription.anticoagulant == 8">iu</span>
+                      <span v-else-if="prescription.anticoagulant == 9">iu</span>
+                      <span v-else-if="prescription.anticoagulant == 10">iu</span>
+                      <span v-else-if="prescription.anticoagulant == 11">iu</span>
+                      <span v-else-if="prescription.anticoagulant == 13||prescription.anticoagulant == 14">iu</span>
+                      <span v-else-if="prescription.anticoagulant == 15">mg</span>
+                      <span v-else>iu</span>
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px" v-if="prescription.anticoagulant != 1">
@@ -1087,17 +1084,18 @@
 
                       <span>
                         <span v-if="prescription.anticoagulant == 2">mg/h</span>
-                          <span v-if="prescription.anticoagulant == 3">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 4">ml</span>
-                          <span v-if="prescription.anticoagulant == 5">ml/h</span>
-                          <span v-if="prescription.anticoagulant == 6">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 7">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 8">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 9">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 10">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 11">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 13 || prescription.anticoagulant == 14">iu/h</span>
-                          <span v-if="prescription.anticoagulant == 15">mg/h</span>
+                          <span v-else-if="prescription.anticoagulant == 3">iu/h</span>
+                          <span v-else-if="prescription.anticoagulant == 4">ml</span>
+                          <span v-else-if="prescription.anticoagulant == 5">ml/h</span>
+                          <span v-else-if="prescription.anticoagulant == 6">iu/h</span>
+                          <span v-else-if="prescription.anticoagulant == 7">iu/h</span>
+                          <span v-else-if="prescription.anticoagulant == 8">iu/h</span>
+                          <span v-else-if="prescription.anticoagulant == 9">iu/h</span>
+                          <span v-else-if="prescription.anticoagulant == 10">iu/h</span>
+                          <span v-else-if="prescription.anticoagulant == 11">iu/h</span>
+                          <span v-else-if="prescription.anticoagulant == 13 || prescription.anticoagulant == 14">iu/h</span>
+                          <span v-else-if="prescription.anticoagulant == 15">mg/h</span>
+                          <span v-else>iu/h</span>
                       </span>
                     </div>
                     <div
@@ -1154,17 +1152,18 @@
 
                     <span>
                        <span v-if="prescription.anticoagulant == 2">mg</span>
-                       <span v-if="prescription.anticoagulant == 3">iu</span>
-                       <span v-if="prescription.anticoagulant == 4">ml</span>
-                       <span v-if="prescription.anticoagulant == 5">ml</span>
-                       <span v-if="prescription.anticoagulant == 6">iu</span>
-                       <span v-if="prescription.anticoagulant == 7">iu</span>
-                       <span v-if="prescription.anticoagulant == 8">iu</span>
-                       <span v-if="prescription.anticoagulant == 9">iu</span>
-                       <span v-if="prescription.anticoagulant == 10">iu</span>
-                      <span v-if="prescription.anticoagulant == 11">iu</span>
-                      <span v-if="prescription.anticoagulant == 13 || prescription.anticoagulant == 14">iu</span>
-                      <span v-if="prescription.anticoagulant == 15">mg</span>
+                       <span v-else-if="prescription.anticoagulant == 3">iu</span>
+                       <span v-else-if="prescription.anticoagulant == 4">ml</span>
+                       <span v-else-if="prescription.anticoagulant == 5">ml</span>
+                       <span v-else-if="prescription.anticoagulant == 6">iu</span>
+                       <span v-else-if="prescription.anticoagulant == 7">iu</span>
+                       <span v-else-if="prescription.anticoagulant == 8">iu</span>
+                       <span v-else-if="prescription.anticoagulant == 9">iu</span>
+                       <span v-else-if="prescription.anticoagulant == 10">iu</span>
+                      <span v-else-if="prescription.anticoagulant == 11">iu</span>
+                      <span v-else-if="prescription.anticoagulant == 13 || prescription.anticoagulant == 14">iu</span>
+                      <span v-else-if="prescription.anticoagulant == 15">mg</span>
+                      <span v-else>iu</span>
                     </span>
                     </div>
                     <div class="inline_block" style="margin-left: 20px">
@@ -3140,8 +3139,8 @@ export default {
         const obj35 ='q'
         checkDate.push(obj35);
       } if(this.predialysis.remark ==''){
-        const obj35 ='备注'
-        checkDate.push(obj35);
+        const obj35_1 ='备注'
+        checkDate.push(obj35_1);
       } if (this.afterdialysis.temperature == 0) {
         const obj36 ='透后体温'
         checkDate.push(obj36);
@@ -3929,7 +3928,7 @@ export default {
         return age
       }
     },
-    
+
     getTimeOne(val) {
       return uParseTime(val, "{y}");
     },

src/xt_pages/dialysis/template/DialysisPrintOrderSop.vue

@@ -71,31 +71,31 @@
               <td colspan="3">
                 <div style="display: flex;line-height:30px;">
                   <span>治疗抗凝:</span>
-                  <span v-if="prescription.anticoagulant !='普通肝素' && prescription.anticoagulant!='无肝素' && prescription.anticoagulant!='枸橼酸'">
-                    {{ prescription.anticoagulant }} &nbsp;&nbsp;
+                  <span v-if="prescription.anticoagulant_name !='普通肝素' && prescription.anticoagulant_name!='无肝素' && prescription.anticoagulant_name!='枸橼酸'">
+                    {{ this.getanticoagulation(prescription.anticoagulant) }} &nbsp;&nbsp;
                     {{prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "0"}}
                   </span>U&nbsp;&nbsp;
                   <!-- <span v-if="prescription.anticoagulant !='普通肝素' && prescription.anticoagulant!='无肝素' && prescription.anticoagulant!='枸橼酸'">
 
                   </span>U &nbsp;&nbsp; -->
-                  <label-box :isChecked="prescription.anticoagulant=='普通肝素'?true :false" showValue="普通肝素:"></label-box>&nbsp;&nbsp;
+                  <label-box :isChecked="prescription.anticoagulant_name=='普通肝素'?true :false" showValue="普通肝素:"></label-box>&nbsp;&nbsp;
                   <div style="display: inline-block;">
                     首剂：
-                    <span v-if="prescription.anticoagulant=='普通肝素'">
+                    <span v-if="prescription.anticoagulant_name=='普通肝素'">
                       {{ prescription.anticoagulant_shouji ? prescription.anticoagulant_shouji : "0" }}
                     </span>mg &nbsp;&nbsp;
                     追加：
-                    <span v-if="prescription.anticoagulant=='普通肝素'">
+                    <span v-if="prescription.anticoagulant_name=='普通肝素'">
                       {{prescription.anticoagulant_weichi ? prescription.anticoagulant_weichi : "0"}}
                     </span>mg/h &nbsp;&nbsp;
                     总量：
-                    <span v-if="prescription.anticoagulant=='普通肝素'">
+                    <span v-if="prescription.anticoagulant_name=='普通肝素'">
                       {{ prescription.anticoagulant_zongliang ? prescription.anticoagulant_zongliang : "0"}}
                     </span>mg
                   </div>
                   &nbsp;&nbsp;
-                  <label-box :isChecked="prescription.anticoagulant=='无肝素'?true :false" showValue="无肝素"></label-box>&nbsp;&nbsp;
-                  <label-box :isChecked="prescription.anticoagulant=='枸橼酸'?true :false" showValue="枸橼酸"></label-box>
+                  <label-box :isChecked="prescription.anticoagulant_name=='无肝素'?true :false" showValue="无肝素"></label-box>&nbsp;&nbsp;
+                  <label-box :isChecked="prescription.anticoagulant_name=='枸橼酸'?true :false" showValue="枸橼酸"></label-box>
                 </div>
               </td>
             </tr>
@@ -103,7 +103,8 @@
             <tr>
               <td colspan="2">
                 <div style="line-height:30px;">
-                 <span>处方脱水量: {{ prescription.prescription_water ? prescription.prescription_water : "" }} </span>ml &nbsp;&nbsp;
+                 <span v-if="org_id != 9779">处方脱水量: {{ prescription.prescription_water ? prescription.prescription_water : "" }} ml&nbsp;&nbsp;</span> 
+                 <span v-if="org_id == 9779">目标脱水量:{{ prescription.target_ultrafiltration ? prescription.target_ultrafiltration : "" }} L&nbsp;&nbsp;</span>
                  <span>透析液流量: {{ prescription.dialysate_flow ? prescription.dialysate_flow : "" }} </span>ml/h
                 </div>
               </td>
@@ -123,15 +124,14 @@
         <table border="1" class="table-box" style="border-collapse: collapse;width: 99%;">
           <tr>
             <td style="width: 20%; line-height: 30px;">透析机：
-              {{predialysis.machine_type ? predialysis.machine_type : " "}}
+              {{predialysis.machine_type ? predialysis.machine_type : " /"}}
             </td>
             <td style="width: 30%;line-height: 30px;">
               透析(滤)器:
               {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : "" }}
 
               {{ prescription.dialysis_strainer ? prescription.dialysis_strainer : "" }}
-              <!-- {{ prescription.dialyzer_perfusion_apparatus ? prescription.dialyzer_perfusion_apparatus : ""}} &nbsp;
-              {{ prescription.dialysis_dialyszers ? prescription.dialysis_dialyszers : " "}} -->
+
             </td>
             <td style="">
               透析液:钾:
@@ -158,15 +158,14 @@
             <td colspan="3">
               <div style="display: inline-block;line-height: 30px;">
                 血管通路:
-                <label-box :isChecked="predialysis.blood_access_part_opera_name=='内瘘'?true :false" showValue="内瘘"></label-box>&nbsp;
-                <label-box :isChecked="predialysis.blood_access_part_opera_name=='长期静脉导管'?true :false" showValue="长期静脉导管"></label-box>&nbsp;
-                <label-box :isChecked="predialysis.blood_access_part_opera_name=='临时静脉导管'?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
-                <label-box :isChecked="predialysis.blood_access_part_opera_name!='内瘘' &&
-                            predialysis.blood_access_part_opera_name!='长期静脉导管' &&
-                            predialysis.blood_access_part_opera_name!='临时静脉导管' &&
-                            predialysis.blood_access_part_opera_name!=''?true :false" showValue="其它">
+                <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘')!=-1 ?true :false" showValue="内瘘"></label-box>&nbsp;
+                <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('长期静脉导管')!=-1?true :false" showValue="长期静脉导管"></label-box>&nbsp;
+                <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('临时静脉导管')!=-1?true :false" showValue="临时(颈、股)静脉导管"></label-box>&nbsp;
+                <label-box :isChecked="predialysis.blood_access_part_opera_name.indexOf('内瘘')==-1 &&
+                            predialysis.blood_access_part_opera_name.indexOf('长期静脉导管')==-1 &&
+                            predialysis.blood_access_part_opera_name.indexOf('临时静脉导管')==-1 ?true :false" showValue="其它">
                 </label-box>
-
+                <span>{{ predialysis.blood_access_part_opera_name }}</span>
               </div>&nbsp;&nbsp;
               <div style="display: inline-block;line-height: 30px;">
                 穿刺者:
@@ -721,7 +720,7 @@ export default {
           if (patientInfo.gender === 2) {
             patientInfo.gender = "女";
           }
-          console.log("patientInfo", patientInfo);
+          console.log("response.data.data", response.data.data);
           this.patientInfo = patientInfo;
           this.patientInfo.birth = uParseTime(
             this.patientInfo.birthday,
@@ -907,12 +906,6 @@ export default {
           this.doctorForm.url = doctorname.url;
           var prescription = response.data.data.dialysisPrescription;
           console.log("透析处方", prescription);
-          if (prescription.anticoagulant == 6) {
-            prescription.anticoagulant = "低分子肝素钙";
-          }
-          if (prescription.anticoagulant == 7) {
-            prescription.anticoagulant = "低分子肝素钠";
-          }
           if (prescription.blood_access === 1) {
             prescription.blood_access = "正常";
           }
@@ -949,21 +942,6 @@ export default {
           if (prescription.replacement_way === 4) {
             prescription.replacement_way = "混合置换";
           }
-          if (prescription.anticoagulant === 1) {
-            prescription.anticoagulant = "无肝素";
-          }
-          if (prescription.anticoagulant === 2) {
-            prescription.anticoagulant = "普通肝素";
-          }
-          if (prescription.anticoagulant === 3) {
-            prescription.anticoagulant = "低分子肝素";
-          }
-          if (prescription.anticoagulant === 4) {
-            prescription.anticoagulant = "阿加曲班";
-          }
-          if (prescription.anticoagulant === 5) {
-            prescription.anticoagulant = "枸橼酸钠";
-          }
           this.prescription = prescription;
           var receiverTreatmentAccess =
             response.data.data.receiverTreatmentAccess;
@@ -1281,6 +1259,16 @@ export default {
       }else{
         this.$message.success('核对完成')
       }
+    },
+    getanticoagulation(val){
+      const option = this.anticoagulantsConfit
+      if(val !=''){
+        for(let i in option){
+          if(option[i].id == val){
+            return option[i].name
+          }
+        }
+      }
     }
   },
   watch: {
@@ -1317,7 +1305,8 @@ export default {
     this.replacementWays = this.$store.getters.replacement_ways;
     this.perfusionApparatus = this.$store.getters.perfusion_apparatus;
     this.anticoagulantsConfit = this.$store.getters.anticoagulants_confit;
-
+    console.log('anticoagulantsConfit',this.anticoagulantsConfit);
+    
     this.way_arr = getDataConfig("hemodialysis", "way");
     this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");
     this.appetite_arr = getDataConfig("hemodialysis", "appetite");

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -211,16 +211,10 @@
               <table class="table-box">
                 <tbody>
                 <tr>
-                  <td width="70">导管口:</td>
+                  <td width="70">导管:</td>
                   <td width="240">
-                    <div style="display:flex;justify-content:space-between;">
-                      <label-box :isChecked="predialysis.catheter.indexOf('穿刺口-干洁') > -1 ? true : false" showValue="干洁"></label-box>
-                      &nbsp;
-                      <label-box :isChecked="predialysis.catheter.indexOf('穿刺口-红肿') > -1 ? true : false" showValue="红肿"></label-box>
-                      &nbsp;
-                      <label-box :isChecked="predialysis.catheter.indexOf('穿刺口-分泌物') > -1 ? true : false" showValue="分泌物"></label-box>
-                      &nbsp;
-                      <label-box :isChecked="predialysis.catheter.indexOf('穿刺口-渗血') > -1 ? true : false" showValue="渗血"></label-box>
+                    <div class="under-line" style="text-align: center;white-space: normal;">
+                      {{ predialysis.catheter ? predialysis.catheter :'/' }}
                     </div>
                   </td>
                   <td width="40"></td>
@@ -277,7 +271,7 @@
                       &nbsp;
                       <label-box :isChecked="predialysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
                       &nbsp;
-                      <label-box :isChecked="(predialysis.internal_fistula.indexOf('震颤-无') > -1 || predialysis.internal_fistula.indexOf('不存在') > -1) ? true : false" showValue="不存在"></label-box>
+                      <label-box :isChecked="(predialysis.internal_fistula.indexOf('不存在') > -1 || predialysis.internal_fistula.indexOf('不存在') > -1) ? true : false" showValue="不存在"></label-box>
                     </div>
                   </td>
                   <td width="30"></td>
@@ -476,6 +470,7 @@
                   <td width="10">ml</td>
                   <td width='70'>置换方式:</td>
                   <td width='130'>
+                    
                     <label-box :isChecked="prescription.displace_liqui_part == 1 ? true : false" showValue="前置换"></label-box>&nbsp;
                     <label-box :isChecked="prescription.displace_liqui_part == 2 ? true : false" showValue="后置换"></label-box>
                   </td>
@@ -780,15 +775,15 @@
                       <div style="display:flex;justify-content:space-between;">
                         <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-存在') > -1 ? true : false" showValue="存在"></label-box>
                         <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-减弱') > -1 ? true : false" showValue="减弱"></label-box>
-                        <label-box :isChecked="afterdialysis.internal_fistula.indexOf('震颤-无') > -1 ? true : false" showValue="不存在"></label-box>
+                        <label-box :isChecked="afterdialysis.internal_fistula.indexOf('不存在') > -1 ? true : false" showValue="不存在"></label-box>
                       </div>
                     </td>
                     <td width='30'></td>
                     <td width="40">导管:</td>
                     <td width='200'>
-                      <label-box showValue="通畅" :isChecked="afterdialysis.catheter.indexOf('通畅') > -1 ? true : false"></label-box>&nbsp;
-                      <label-box showValue="A堵塞" :isChecked="afterdialysis.catheter.indexOf('A堵塞') > -1 ? true : false"></label-box>&nbsp;
-                      <label-box showValue="V堵塞" :isChecked="afterdialysis.catheter.indexOf('V堵塞') > -1 ? true : false"></label-box>&nbsp;
+                      <div class="under-line" style="text-align: center;">
+                        {{ afterdialysis.catheter ? afterdialysis.catheter :'/' }}
+                      </div>
                     </td>
                     <td></td>
                   </tr>
@@ -800,9 +795,10 @@
                   <tr>
                     <td width="130">拔针后穿刺点渗血:</td>
                     <td width="80">
-                      <div style="display:flex;justify-content:space-between;">
-                        <label-box :isChecked="afterdialysis.puncture_point_oozing_blood == 1 ? true : false" showValue="有"></label-box>
-                        <label-box :isChecked="afterdialysis.puncture_point_oozing_blood == 2 ? true : false" showValue="无"></label-box>
+                      <div class="under-line" style="text-align: center;">
+                        <span v-if="afterdialysis.puncture_point_oozing_blood ==1">有</span>
+                        <span v-else-if="afterdialysis.puncture_point_oozing_blood ==2">无</span>
+                        <span v-else>/</span>
                       </div>
                     </td>
                     <td width="10"></td>
@@ -847,7 +843,6 @@
                         <label-box :isChecked="afterdialysis.complication.indexOf('抽搐') > -1 ? true : false" showValue="抽搐"></label-box>
                         <label-box :isChecked="afterdialysis.complication.indexOf('高血压') > -1 ? true : false" showValue="高血压"></label-box>
                         <label-box :isChecked="afterdialysis.complication.indexOf('心律失常') > -1 ? true : false" showValue="心律失常"></label-box>
-
                       </div>
                     </td>
                     <td width="40">其他:</td>
@@ -1434,6 +1429,8 @@ export default {
               this.patientInfo.birthday,
               '{y}-{m}-{d}'
             )
+            console.log('response.data.data',response.data.data);
+            
             // this.patientInfo.age = jsGetAge(this.patientInfo.birth, '-')
             if (response.data.data.patientInfo.first_dialysis_date != 0) {
               this.patientInfo.first_dialysis_date = uParseTime(
@@ -1445,12 +1442,12 @@ export default {
             }
             this.check = response.data.data.check
             this.predialysis = response.data.data.PredialysisEvaluation
-            console.log(11111111111111111111111, this.predialysis)
+            console.log('11111111122222s', this.predialysis)
             this.predialysis.blood_access_part_opera_name = this.bloodAccessParOperaName(
               this.predialysis.blood_access_part_opera_id
             )
             this.afterdialysis = response.data.data.AssessmentAfterDislysis
-            console.log(22222222222222222222222222, response.data.data)
+            console.log('全部', response.data.data)
             this.operators = response.data.data.operators
             this.dialysisOrder =
               response.data.data.dialysisOrder === null

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -166,7 +166,7 @@
                     v-else
                   />
                 </p>
-                <p v-if="org_id == 10510">
+                <p v-if="org_id == 10510 || org_id == 10265">
                   医师：
                   <span
                     style="width: 100px; display: inline-block"
@@ -188,7 +188,7 @@
                     v-else
                   />
                 </p>
-                <p v-if="org_id!=10217 && org_id!=10510">
+                <p v-if="org_id!=10217 && org_id!=10510 && org_id !=10265">
                   医师： {{ item.doctor ? item.doctor : "" }}
                 </p>
                 <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>
@@ -281,7 +281,7 @@
               v-else
             />
           </p>
-          <p v-if="org_id == 10510">
+          <p v-if="org_id == 10510  || org_id == 10265 || org_id ==0">
             医师：
             <span
               style="width: 100px; display: inline-block"
@@ -301,9 +301,13 @@
               alt=""
               srcset=""
               v-else
-            />
+            /> &nbsp;&nbsp;
+            <span v-if="org_id == 10265 || org_id ==0">
+              {{ item.doctor ? item.doctor : "" }}
+            </span>
+            
           </p>
-          <p v-if="org_id!=10217 && org_id!=10510">
+          <p v-if="org_id!=10217 && org_id!=10510 && org_id !=10265 && org_id !=0">
             医师： {{ item.doctor ? item.doctor : "" }}
           </p>
           <p>日期：{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}</p>

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -82,7 +82,30 @@
         @click="getAllQuery"
         >查询</el-button
       >
+    
+     
+
+    </div>
 
+    <div style="margin-bottom: 10px;">
+
+        <label class="title"><span class="name">耗材名称</span> : </label>
+        <el-autocomplete
+          class="checkSearch"
+          popper-class="my-autocomplete"
+          v-model="good_name"
+          :fetch-suggestions="querySearchAsync"
+          :trigger-on-focus="true"
+          placeholder="请输入耗材名称"
+          @select="handleSelect"
+          style="width:300px;"
+          :popper-append-to-body="true"
+        >
+          <i class="el-icon-search el-input__icon" slot="suffix"></i>
+        <template slot-scope="{ item }">
+          <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+        </template>
+        </el-autocomplete>
 
     </div>
 
@@ -202,7 +225,7 @@
 <script>
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
-import { deleteCancelStock, GetAllConfig, getStockDetail } from "@/api/stock";
+import { deleteCancelStock, GetAllConfig, getStockDetail,postSearchGoodList } from "@/api/stock";
 
 export default {
   name: "cancelStockDetail",
@@ -280,11 +303,55 @@ export default {
       storehouse_id:0,
       manufacturerList:[],
       dealerList:[],
-      patientsList:[]
+      patientsList:[],
+      good_name:"",
+      good_id:0,
         
     };
   },
   methods: {
+    handleSelect(val){
+     this.good_name = val.good_name
+     this.good_id = val.id
+     this.GetCancelStock();
+    },
+    querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+      postSearchGoodList(key,this.storehouse_id).then(response => {
+          if (response.data.state == 1) {
+
+             var list = response.data.data.list
+
+             this.goodList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             var dealer =  response.data.data.dealerList
+             this.dealerList = dealer
+             for(let i=0;i<this.goodList.length;i++){
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                     this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+
+             for(let i=0;i<this.goodList.length;i++){
+               for(let j=0;j<this.dealerList.length;j++){
+                  if(this.goodList[i].dealer == this.dealerList[j].id){
+                    this.goodList[i].dealer = this.dealerList[j].dealer_name
+                  }
+               }
+             }
+
+             cb(this.goodList)
+          } else {
+            cb([])
+          }
+        })
+     },
     PrintAction: function() {
       window.sessionStorage.setItem('start_time_one',this.start_time)
       window.sessionStorage.setItem('end_time_one',this.end_time)
@@ -396,6 +463,7 @@ export default {
         dealer: this.dealer_id,
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
+        good_id:this.good_id,
       };
       const loading = this.$loading({
           lock: true,

src/xt_pages/stock/detail/stockInDetail.vue

@@ -27,7 +27,7 @@
 
     <div class="cell clearfix">
       <label class="title"><span class="name">仓库</span> :</label>
-      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:100px" @change="changeHouseList">
           <el-option
             v-for="(option, index) in houseList"
             :key="index"
@@ -35,6 +35,7 @@
             :value="option.id">
           </el-option>
       </el-select>
+
       <el-input
         size="small"
         style="width: 180px;"
@@ -50,6 +51,11 @@
         @click="search"
         >搜索</el-button
       >
+    
+    
+      
+
+
 
         <label class="title"><span class="name">日期查询</span> : </label>
         <el-date-picker
@@ -88,6 +94,26 @@
         >
     </div>
 
+    <div style="margin-bottom: 10px;">
+      <label class="title"><span class="name">耗材名称</span> : </label>
+      <el-autocomplete
+        class="checkSearch"
+        popper-class="my-autocomplete"
+        v-model="good_name"
+        :fetch-suggestions="querySearchAsync"
+        :trigger-on-focus="true"
+        placeholder="请输入耗材名称"
+        @select="handleSelect"
+        style="width:300px;"
+        :popper-append-to-body="true"
+      >
+        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+      <template slot-scope="{ item }">
+        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+      </template>
+    </el-autocomplete>
+    </div>
+
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
       <div style="width: 100%;">
         <el-table
@@ -201,7 +227,8 @@ import {
   GetAllConfig,
   getStockDetail,
   getPrintStockGood,
-  getGoodDetailPrintList
+  getGoodDetailPrintList,
+  postSearchGoodList
 } from "@/api/stock";
 
 export default {
@@ -254,7 +281,7 @@ export default {
         { value: 2, label: "其他入库单" }
       ],
       newDate: [{ name: "合计", num: "111111" }],
-
+      good_name:"",
       searchKey: "",
       type: 1,
       page: 1,
@@ -287,9 +314,54 @@ export default {
       storehouse_id:0,
       manufacturerList:[],
       dealerList:[],
+      currentIndex:0,
+      good_id:0,
     };
   },
   methods: {
+    handleSelect(val){
+     this.good_name = val.good_name
+     this.good_id = val.id
+     this.GetCancelStock();
+     this.getGoodDetailPrintList()
+    },
+    querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        postSearchGoodList(key,this.storehouse_id).then(response => {
+          if (response.data.state == 1) {
+
+             var list = response.data.data.list
+
+             this.goodList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             var dealer =  response.data.data.dealerList
+             this.dealerList = dealer
+             for(let i=0;i<this.goodList.length;i++){
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                     this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+
+             for(let i=0;i<this.goodList.length;i++){
+               for(let j=0;j<this.dealerList.length;j++){
+                  if(this.goodList[i].dealer == this.dealerList[j].id){
+                    this.goodList[i].dealer = this.dealerList[j].dealer_name
+                  }
+               }
+             }
+
+             cb(this.goodList)
+          } else {
+            cb([])
+          }
+        })
+     },
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
@@ -407,6 +479,7 @@ export default {
         dealer: this.dealer_id,
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
+        good_id:this.good_id,
       };
       this.cancelStockDate = [];
       const loading = this.$loading({
@@ -912,6 +985,7 @@ export default {
           end_time:this.end_time,
           type:1,
           storehouse_id:this.storehouse_id,
+          good_id:this.good_id,
         }
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -97,7 +97,37 @@
 
     </div>
 
-    <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
+    <div style="margin-bottom: 10px;">
+      <label class="title"><span class="name">耗材名称</span> : </label>
+      <el-autocomplete
+        class="checkSearch"
+        popper-class="my-autocomplete"
+        v-model="good_name"
+        :fetch-suggestions="querySearchAsync"
+        :trigger-on-focus="true"
+        placeholder="请输入耗材名称"
+        @select="handleSelect"
+        style="width:300px;"
+        :popper-append-to-body="true"
+      >
+        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+      <template slot-scope="{ item }">
+        <div class="name">{{ item.good_name +"  " +item.specification_name + "  "+item.manufacturer }}</div>
+      </template>
+    </el-autocomplete>
+
+    <label class="title"><span class="name">出库方式</span> : </label>
+    <el-select size="small" v-model="order_way" filterable placeholder="请选择仓库" style="width:200px" @change="changeOrderWayList">
+          <el-option
+            v-for="(option, index) in orderWay"
+            :key="index"
+            :label="option.label"
+            :value="option.value">
+          </el-option>
+      </el-select>
+    </div>
+
+   
       <el-table class="table"
         :data="cancelStockDate"
         :class="signAndWeighBoxPatients"
@@ -223,7 +253,7 @@
 <script>
 import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers, fetchAllDoctorAndNurse } from "@/api/doctor";
-import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood,getGoodInfoList,getGoodDetailPrintList } from "@/api/stock";
+import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood,getGoodInfoList,getGoodDetailPrintList,postSearchGoodList } from "@/api/stock";
 
 export default {
   name: "stockOutDetail",
@@ -276,10 +306,15 @@ export default {
         { value: 1, label: "耗材入库单" },
         { value: 2, label: "其他入库单" }
       ],
+      orderWay:[
+        {value:0,label:"全部"},
+        {value:1,label:"手动出库"},
+        {value:2,label:"自动出库"},
+      ],
       manufacturer_id: "",
       dealer_id: "",
       order_type:"",
-
+      order_way:"",
       searchKey: "",
       type: 2,
       page: 1,
@@ -313,9 +348,58 @@ export default {
       manufacturerList:[],
       dealerList:[],
       patientsList:[],
+      good_id:0,
+      good_name:"",
     };
   },
   methods: {
+    changeOrderWayList(){
+      this.GetCancelStock();
+      this.getGoodDetailPrintList()
+    },
+    handleSelect(val){
+     this.good_name = val.good_name
+     this.good_id = val.id
+     this.GetCancelStock();
+     this.getGoodDetailPrintList()
+    },
+    querySearchAsync(keyword, cb) {
+        let key = '';
+        if (keyword != undefined) {
+          key = keyword
+        }
+        postSearchGoodList(key,this.storehouse_id).then(response => {
+          if (response.data.state == 1) {
+
+             var list = response.data.data.list
+
+             this.goodList = list
+             var manufacturerList = response.data.data.manufacturerList
+             this.manufacturerList = manufacturerList
+             var dealer =  response.data.data.dealerList
+             this.dealerList = dealer
+             for(let i=0;i<this.goodList.length;i++){
+                for(let j=0;j<this.manufacturerList.length;j++){
+                  if(this.goodList[i].manufacturer == this.manufacturerList[j].id){
+                     this.goodList[i].manufacturer = this.manufacturerList[j].manufacturer_name
+                  }
+                }
+             }
+
+             for(let i=0;i<this.goodList.length;i++){
+               for(let j=0;j<this.dealerList.length;j++){
+                  if(this.goodList[i].dealer == this.dealerList[j].id){
+                    this.goodList[i].dealer = this.dealerList[j].dealer_name
+                  }
+               }
+             }
+
+             cb(this.goodList)
+          } else {
+            cb([])
+          }
+        })
+     },
     changeType: function(val) {
       this.order_type = val;
       this.GetCancelStock();
@@ -432,6 +516,8 @@ export default {
         dealer: this.dealer_id,
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
+        good_id:this.good_id,
+        order_way:this.order_way
       };
       this.cancelStockDate = [];
       const loading = this.$loading({
@@ -1100,6 +1186,7 @@ export default {
           start_time:this.start_time,
           end_time:this.end_time,
           type:2,
+          good_id:this.good_id,
         }
       this.tableOut = []
       getGoodDetailPrintList(params).then(response=>{

src/xt_pages/stock/query/purchaseNewStockQuery.vue

@@ -294,7 +294,16 @@ export default {
                   list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
                }else if(this.org_id == 0 || this.org_id == 10644){
                  list[i].stock_in_price = "/"
-                list[i].stockMoney = this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)
+                 console.log("val1",this.getAllStockInPrice(list[i].StWarehousingInfoTwo))
+                 console.log("val2",this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))
+                 console.log("val3",this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) )
+                 console.log("val4",this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow))
+
+                list[i].stockMoney = parseFloat(this.getAllStockInPrice(list[i].StWarehousingInfoTwo))  +parseFloat(this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))  - parseFloat(this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty))  - parseFloat(this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)) 
+                if(list[i].stockMoney>0){
+                  list[i].stockMoney = list[i].stockMoney.toFixed(2)
+                }
+                
                 
                }else{
                 list[i].stock_in_price = "/"
@@ -351,9 +360,9 @@ export default {
                 list[i].overMoney = (list[i].packing_price*list[i].overStock).toFixed(2)
               }else if(this.org_id == 0 || this.org_id ==10644){
                 list[i].overPrice = "/"
-                console.log("stockMoney-00000000000000",list[i].stockMoney)
-                console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)
-                console.log("saleOutMoney-00000000000000",list[i].saleOutMoney)
+                // console.log("stockMoney-00000000000000",list[i].stockMoney)
+                // console.log("saleStockMoney-00000000000000",list[i].saleStockMoney)
+                // console.log("saleOutMoney-00000000000000",list[i].saleOutMoney)
                 list[i].overMoney = (parseFloat(list[i].stockMoney)  + parseFloat(list[i].saleStockMoney) - parseFloat(list[i].saleOutMoney)).toFixed(2)
                 // console.log("hahahha",list[i].overMoney)
               }else{
@@ -1290,7 +1299,7 @@ export default {
        if(total_price>0){
         return total_price.toFixed(2)
        }else{
-        return ""
+        return total_price
        }
       
     },
@@ -1314,7 +1323,7 @@ export default {
        if(total_price>0){
         return total_price.toFixed(2)
        }else{
-        return ""
+        return total_price
        }
        
     },
@@ -1328,16 +1337,17 @@ export default {
       return count
     },
     getAllStockInFlowPrice(val){
+     
       var total_price = 0
       if(val!=null && val.length>0){
         for(let i=0;i<val.length;i++){
-          total_price+= val[i].count * val[i].total_price
+          total_price+= val[i].count * val[i].price
         }
       }
       if(total_price>0){
         return total_price.toFixed(2)
       }else{
-        return ""
+        return total_price
       }
      
     },
@@ -1360,7 +1370,7 @@ export default {
       if(total_price>0){
          return total_price.toFixed(2)
       }else{
-        return ""
+        return total_price
       }
      
     },

src/xt_pages/stock/query/purchaseNewStockQueryPrint.vue

@@ -189,7 +189,10 @@ export default {
                       list[i].stockMoney = (list[i].buy_price * list[i].stockIn).toFixed(2)
                     }else if(this.org_id == 0 || this.org_id == 10644){
                       list[i].stock_in_price = "/"
-                      list[i].stockMoney = (this.getAllStockInPrice(list[i].StWarehousingInfoTwo) + this.getAllStockInFlowPrice(list[i].WareStartInStockFlow) - this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty) - this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow))
+                      list[i].stockMoney = parseFloat(this.getAllStockInPrice(list[i].StWarehousingInfoTwo))  +parseFloat(this.getAllStockInFlowPrice(list[i].WareStartInStockFlow))  - parseFloat(this.getAllOutStockInPrice(list[i].WarehouseOutInfoTenty))  - parseFloat(this.getAllStockOutFlowPrice(list[i].WareStartOutStockFlow)) 
+                      if(list[i].stockMoney>0){
+                        list[i].stockMoney = list[i].stockMoney.toFixed(2)
+                      }
                     } else{
                       list[i].stock_in_price = "/"
                       list[i].stockMoney = "/"
@@ -826,7 +829,7 @@ export default {
        if(total_price>0){
         return total_price.toFixed(2)
        }else{
-        return ""
+        return total_price
        }
       
     },
@@ -843,13 +846,13 @@ export default {
       var total_price = 0
       if(val!=null && val.length>0){
         for(let i=0;i<val.length;i++){
-          total_price+= val[i].count * val[i].total_price
+          total_price+= val[i].count * val[i].price
         }
       }
       if(total_price>0){
         return total_price.toFixed(2)
       }else{
-        return ""
+        return total_price
       }
       
     },
@@ -881,7 +884,7 @@ export default {
        if(total_price>0){
         return total_price.toFixed(2)
       }else{
-        return ""
+        return total_price
       }
      
     },
@@ -895,7 +898,7 @@ export default {
       if(total_price>0){
         return total_price.toFixed(2)
       }else{
-        return ""
+        return total_price
       }
     
     },

src/xt_pages/stock/stockInOrderAdd.vue

@@ -938,7 +938,7 @@
         this.currentIndex = val
       },
       handleSelect(val){
-        console.log("al32323232323223",val)
+        // console.log("al32323232323223",val)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
               this.recordInfo.recordData[i].id = 0

src/xt_pages/user/courseOfDisease_new.vue

@@ -32,7 +32,7 @@
                 </el-table-column>
                 <el-table-column prop="date" label="时间" width="">
                   <template slot-scope="scope">
-                      {{ getTime(scope.row.record_time) }}
+                      {{ getTimeThree(scope.row.record_time) }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="doctor" label="医生">
@@ -66,7 +66,7 @@
                 <el-date-picker v-model="record_date" prefix-icon="el-icon-date" :editable="false"
                               style="width: 250px;"
                               type="datetime" placeholder="选择日期时间" align="right" format="yyyy-MM-dd HH:mm:ss"
-                              value-format="yyyy-MM-dd HH:mm:ss"></el-date-picker>
+                              ></el-date-picker>
               </div>
               <div style="flex: 1;">
                 病程医生:
@@ -84,46 +84,6 @@
               <span style="display: inline-block;border-left: 5px solid #3891f1f5;padding-left: 5px;margin-bottom: 5px;">
                 病程内容
               </span>
-              <div style="display:flex;">
-                <!-- <div>
-                  取值时间:
-                  <el-select v-model="quzhi_date" @change="datachange" placeholder="请选择" style="width: 120px;">
-                    <el-option
-                      v-for="item in quzhi_options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
-                    </el-option>
-                  </el-select>
-                </div>
-                <div style="margin:0 10px">
-                  <el-date-picker
-                  @change="changStartDate"
-                    v-model="start_date"
-                    type="date"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择日期"
-                    style="width: 150px;">
-                  </el-date-picker>
-                  <span>-</span>
-                  <el-date-picker
-                  @change="changEndDate"
-                    v-model="end_date"
-                    type="date"
-                    value-format="yyyy-MM-dd"
-                    placeholder="选择日期"
-                    style="width: 150px;">
-                  </el-date-picker>
-                </div> -->
-                <!-- <div>
-                  <el-button type="primary" size="small" @click="autotext_click">
-                    生成
-                  </el-button>
-                  <el-button type="primary" size="small" @click="auto_dialog=false">
-                    取消
-                  </el-button>
-                </div> -->
-              </div>
               <div style="margin: 10px 0;">
                 <el-button type="primary" size="small" @click="template_click">
                   {{ add_index ==0 ? '设置模板' : '模板库' }}
@@ -162,7 +122,6 @@
         </div>
       </div>
 
-
       <el-dialog
         title="设置模板"
         :visible.sync="template_dialog"
@@ -584,7 +543,7 @@
               医嘱类型:
               <el-select v-model="advice_type" @change="type_chang" placeholder="请选择" style="width: 120px;">
                 <el-option
-                
+
                   v-for="item in type_option"
                   :key="item.value"
                   :label="item.label"
@@ -823,7 +782,7 @@
     getPatientAdviceList,
     getPatientInspectionList,
     getInspectionByProjectId,
-    
+
   } from '@/api/patient'
   import { fetchMoibleAllDoctorAndNurse } from "@/api/doctor";
   import { parseTime } from '@/utils'
@@ -1275,13 +1234,12 @@
         }
       },
       toAdviceContentPint(val){
-       
+
         console.log('blood_context',this.blood_context,this.template_content);
         this.template_content = this.template_content +'<br/>'+ this.blood_context+'<br/>'+this.summary_context +'<br/>' +this.advice_context+'<br/>'+this.option_context
         this.$refs.editor.contents = this.template_content
         const iframe = document.getElementsByClassName('edui-editor-iframeholder')[0].getElementsByTagName('iframe')[0].contentDocument.getElementsByTagName('body')[0]
-        console.log('document.getElementsByClassName',);
-       
+
             this.$nextTick(()=>{
                 const new_list=document.createElement('table')
                 new_list.style.cssText='border:1px solid black;border-collapse:collapse;width:100%';
@@ -1331,7 +1289,7 @@
                     let new_td8 = document.createElement('td');
                     let new_td9 = document.createElement('td');
                     let new_td10 = document.createElement('td');
-                    new_td1.textContent =this.getTimeThree(this.adviceList[i].start_time) 
+                    new_td1.textContent =this.getTimeThree(this.adviceList[i].start_time)
                     new_td2.textContent =this.adviceList[i].advice_name
                     new_td3.textContent =this.adviceList[i].advice_desc
                     new_td4.textContent =this.adviceList[i].single_dose
@@ -1339,12 +1297,12 @@
                     new_td6.textContent =this.adviceList[i].execution_frequency
                     new_td7.textContent =this.adviceList[i].remark
                     if(this.adviceList[i].advice_type == 1){
-                      new_td8.textContent =this.getTimeThree(this.adviceList[i].stop_time) 
+                      new_td8.textContent =this.getTimeThree(this.adviceList[i].stop_time)
                     }else{
-                      new_td8.textContent =this.getTimeThree(this.adviceList[i].execution_time) 
+                      new_td8.textContent =this.getTimeThree(this.adviceList[i].execution_time)
                     }
                     new_td9.textContent =this.adviceList[i].stop_reason
-                    new_td10.textContent =this.getDocName(this.adviceList[i].advice_doctor) 
+                    new_td10.textContent =this.getDocName(this.adviceList[i].advice_doctor)
                     newListItem2.appendChild(new_td1);
                     newListItem2.appendChild(new_td2);
                     newListItem2.appendChild(new_td3);
@@ -1357,7 +1315,7 @@
                     newListItem2.appendChild(new_td10);
                     new_list.appendChild(newListItem2)
                  }
-               } 
+               }
 
                if(this.adviceNewList!=null && this.adviceNewList.length>0 && this.all_select == 1){
                 for(let i in this.adviceNewList){
@@ -1372,7 +1330,7 @@
                     let new_td8 = document.createElement('td');
                     let new_td9 = document.createElement('td');
                     let new_td10 = document.createElement('td');
-                    new_td1.textContent =this.getTimeThree(this.adviceNewList[i].start_time) 
+                    new_td1.textContent =this.getTimeThree(this.adviceNewList[i].start_time)
                     new_td2.textContent =this.adviceNewList[i].advice_name
                     new_td3.textContent =this.adviceNewList[i].advice_desc
                     new_td4.textContent =this.adviceNewList[i].single_dose
@@ -1380,12 +1338,12 @@
                     new_td6.textContent =this.adviceNewList[i].execution_frequency
                     new_td7.textContent =this.adviceNewList[i].remark
                     if(this.adviceNewList[i].advice_type == 1){
-                      new_td8.textContent =this.getTimeThree(this.adviceNewList[i].stop_time) 
+                      new_td8.textContent =this.getTimeThree(this.adviceNewList[i].stop_time)
                     }else{
-                      new_td8.textContent =this.getTimeThree(this.adviceNewList[i].execution_time) 
+                      new_td8.textContent =this.getTimeThree(this.adviceNewList[i].execution_time)
                     }
                     new_td9.textContent =this.adviceNewList[i].stop_reason
-                    new_td10.textContent =this.getDocName(this.adviceNewList[i].advice_doctor) 
+                    new_td10.textContent =this.getDocName(this.adviceNewList[i].advice_doctor)
                     newListItem2.appendChild(new_td1);
                     newListItem2.appendChild(new_td2);
                     newListItem2.appendChild(new_td3);
@@ -1399,19 +1357,18 @@
                     new_list.appendChild(newListItem2)
                  }
                }
-            
+
               const cont = iframe.getElementsByClassName('advice_table')[0]
               cont.appendChild(new_list)
               console.log('iframe.appendChild(new_list)',cont);
               console.log('this.advice_context',this.advice_context);
             })
 
-        
         this.advice_dialog = false
       },
       getCurrentChangeOne(val){
         this.$refs.editor.contents = val.content
-        this.record_date = this.getTime(val.record_time)
+        this.record_date = this.getTimeThree(val.record_time)
         this.admin_user_id = val.recorder
         if(this.admin_user_id == 0){
            this.admin_user_id = ""
@@ -1442,7 +1399,7 @@
      rowclick(){
 
       },
-     
+
       saveTemplate(){
 
         var params = {
@@ -1517,8 +1474,8 @@
       showSave(){
         this.add_index = 0
         this.disabled = true
-        console.log("haaaaaaaaaaaaaaa",this.$refs)
-
+        console.log("haaaaaaaaaaaaaaa",this.record_date)
+        this.getlist()
         if(this.record_date.length == 0) {
           this.$message.error('请选择时间')
           return
@@ -1536,7 +1493,7 @@
         var params = {
           id:this.id,
           patient_id:this.patient_id,
-          record_date:this.record_date,
+          record_date:this.getTimeThree(this.record_date),
           content:this.new_content,
           admin_user_id:this.admin_user_id,
         }
@@ -1551,6 +1508,7 @@
         }).catch(error => {
 
         })
+        
       },
       template_click(){
         console.log('this.add_index',this.add_index);
@@ -1698,7 +1656,6 @@
         console.log("start_time==============",params)
        getAutoPatientContent(params).then(response=>{
           if(response.data.state == 1){
-
             var prescription =  response.data.data.prescription
             this.prescription=[]
             this.prescription = prescription
@@ -2245,9 +2202,6 @@
           kalium = "钾:" + str.replace(/^"(.*)"$/, '$1')+"."+"0"+"mmol/L" + "(" +kaliumStr.split(":")[1]+")"
         }
 
-
-
-
           let sodiumObj = {}
           let sodiumStr =""
 
@@ -2351,8 +2305,6 @@
 
           dialysisIrrigationStr =  JSON.stringify(dialysisIrrigationObj).replace(/^{|}$/g, '')
 
-      
-
         //  医嘱
         if(this.longAdvice!=null && this.longAdvice.length>0){
             for(let i=0;i<this.longAdvice.length;i++){
@@ -2372,12 +2324,11 @@
             }
         }
 
-         
         //抗凝剂
 
         var anticoagulant_str =""
         if(this.groupPrescriptionList!=null && this.groupPrescriptionList.length>0){
-           
+
             for(let i=0;i<this.groupPrescriptionList.length;i++){
                anticoagulant_str += this.getAnticoagulantName(this.groupPrescriptionList[i].anticoagulant) +"," + "剂量:" +this.groupPrescriptionList[i].MinZongLiang +this.getAnticoagulantUnit(this.groupPrescriptionList[i].anticoagulant)+ "~" +this.groupPrescriptionList[i].MaxZongLiang + this.getAnticoagulantUnit(this.groupPrescriptionList[i].anticoagulant)
             }
@@ -2394,9 +2345,9 @@
              cha_weight += this.berforList[i].weight_before - this.berforList[i].WeightAfter
           }
         }
-        
+
         pingjun_weight = (cha_weight/befor_total).toFixed(2)
-       
+
         //透后凝血
         var cruorNewArr = []
         if(this.afterList!=null && this.afterList.length>0){
@@ -2404,7 +2355,7 @@
             cruorNewArr.push(this.afterList[i].cruor)
            }
         }
-      
+
        let dialysisCrruorObj = {}
         let dialysisCrruorStr = ""
         if(cruorNewArr!=null && cruorNewArr.length>0){
@@ -2412,10 +2363,10 @@
             dialysisCrruorObj[item] = (dialysisCrruorObj[item] + 1) || 1
             })
           }
-      
+
 
         dialysisCrruorStr =  JSON.stringify(dialysisCrruorObj).replace(/^{|}$/g, '')
-       
+
         //监测
         var blood_flow_volume_total = 0
         var ultrafiltration_volume_total = 0
@@ -2441,7 +2392,7 @@
           pingjun_ultrafiltration_volume_total = ""
         }
         pingjun_ultrafiltration_rate_total = (ultrafiltration_rate_total/total_length).toFixed(2)
-        if(pingjun_ultrafiltration_rate_total == "NaN"){ 
+        if(pingjun_ultrafiltration_rate_total == "NaN"){
           pingjun_ultrafiltration_rate_total = ""
         }
         var dry_weight_str = ""
@@ -2450,12 +2401,12 @@
            for(let i=0;i<this.dryweightList.length;i++){
             dry_weight_str =  this.getTimeOne(this.dryweightList[i].ctime)+" " +this.dryweightList[i].adjusted_value.slice(4,6)+ this.dryweightList[i].adjusted_value.slice(0,3)+"kg" + "调整到" +" "+ this.dryweightList[i].dry_weight+"kg"+","
            }
-        } 
+        }
 
         //血管通路
         var vascularAccess_str = ""
         var created_time = ""
-      
+
         if(this.patientVascularAccess!=undefined){
           vascularAccess_str  = this.patientVascularAccess.blood_access_part_id + this.patientVascularAccess.blood_access_part_opera_id
           created_time  = this.getTime(this.patientVascularAccess.first_start_time)
@@ -2670,16 +2621,14 @@
                 jiancDoc.appendChild(newList)
             for(let i in this.Inspect){
               let newList1 = document.createElement('p');
-              const child1 = document.createElement('p')
-              const child2 = document.createElement('p')
-              const child3 = document.createElement('p')
+              const child1 = document.createElement('span')
+              const child2 = document.createElement('span')
               newList1.appendChild(child1);
               newList1.appendChild(child2);
-              newList1.appendChild(child3);
               newList1.style.cssText='display: flex;text-align: center;border-bottom: 1px solid black;';
               child1.style.cssText= 'width: 40%;display: inline-block;border-right: 1px solid black;display: flex;'
-              child2.style.cssText= 'width: 40%;display: inline-block;border-right: 1px solid black;display: flex;flex-wrap: wrap;'
-              child3.style.cssText= 'width: 40%;display: inline-block;display: flex;flex-wrap: wrap;'
+              child2.style.cssText= 'width: 80%;display: inline-block;display: flex;flex-wrap: wrap;'
+              // child3.style.cssText= 'width: 40%;display: inline-block;display: flex;flex-wrap: wrap;'
 
               let newListItem1 = document.createElement('span');
               newListItem1.style.cssText= 'flex:1;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
@@ -2691,9 +2640,9 @@
               child1.appendChild(newListItem2);
               for(let j in this.Inspect[i].left){
                 let newListItem3 = document.createElement('span');
-                newListItem3.style.cssText= 'border-bottom: 1px solid black;width:50%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                newListItem3.style.cssText= 'border-bottom: 1px solid black;width:25%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
                 let newListItem4 = document.createElement('span');
-                newListItem4.style.cssText= 'border-bottom: 1px solid black;width:50%;display: inline-block;padding: 5px 0;'
+                newListItem4.style.cssText= 'border-bottom: 1px solid black;width:25%;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
                 newListItem3.textContent = this.Inspect[i].left[j].item_name;
                 newListItem4.textContent = this.Inspect[i].left[j].inspect_value;
                 child2.appendChild(newListItem3);
@@ -2701,13 +2650,14 @@
               }
               for(let x in this.Inspect[i].right){
                 let newListItem5 = document.createElement('span');
-                newListItem5.style.cssText= 'width: 50%;display: inline-block;padding: 5px 0;border-right: 1px solid black;border-bottom: 1px solid black;'
+                newListItem5.style.cssText= 'width: 25%;display: inline-block;padding: 5px 0;border-right: 1px solid black;border-bottom: 1px solid black;'
                 let newListItem6 = document.createElement('span');
-                newListItem6.style.cssText= 'width: 50%;display: inline-block;padding: 5px 0;border-bottom: 1px solid black;'
+                newListItem6.style.cssText= 'width: 25%;display: inline-block;padding: 5px 0;border-bottom: 1px solid black;border-right: 1px solid black;'
                 newListItem5.textContent = this.Inspect[i].right[x].item_name;
                 newListItem6.textContent = this.Inspect[i].right[x].inspect_value;
-                child3.appendChild(newListItem5);
-                child3.appendChild(newListItem6);
+                child2.appendChild(newListItem5);
+                child2.appendChild(newListItem6);
+
               }
               jiancDoc.appendChild(newList1)
             }
@@ -2798,16 +2748,15 @@
                   jiancDoc1.appendChild(newList)
               for(let i in this.Inspect){
                 let newList1 = document.createElement('p');
-                const child1 = document.createElement('p')
-                const child2 = document.createElement('p')
-                const child3 = document.createElement('p')
+                const child1 = document.createElement('span')
+                const child2 = document.createElement('span')
+                // const child3 = document.createElement('span')
                 newList1.appendChild(child1);
                 newList1.appendChild(child2);
-                newList1.appendChild(child3);
+                // newList1.appendChild(child3);
                 newList1.style.cssText='display: flex;text-align: center;border-bottom: 1px solid black;';
                 child1.style.cssText= 'width: 40%;display: inline-block;border-right: 1px solid black;display: flex;'
-                child2.style.cssText= 'width: 40%;display: inline-block;border-right: 1px solid black;display: flex;flex-wrap: wrap;'
-                child3.style.cssText= 'width: 40%;display: inline-block;display: flex;flex-wrap: wrap;'
+                child2.style.cssText= 'width: 80%;display: inline-block;display: flex;flex-wrap: wrap;'
 
                 let newListItem1 = document.createElement('span');
                 newListItem1.style.cssText= 'flex:1;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
@@ -2819,9 +2768,9 @@
                 child1.appendChild(newListItem2);
                 for(let j in this.Inspect[i].left){
                   let newListItem3 = document.createElement('span');
-                  newListItem3.style.cssText= 'border-bottom: 1px solid black;width:50%;box-sizing: border-box;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
+                  newListItem3.style.cssText= 'border-bottom: 1px solid black;width:25%;box-sizing: border-box;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
                   let newListItem4 = document.createElement('span');
-                  newListItem4.style.cssText= 'border-bottom: 1px solid black;width:50%;box-sizing: border-box;display: inline-block;padding: 5px 0;'
+                  newListItem4.style.cssText= 'border-bottom: 1px solid black;width:25%;box-sizing: border-box;display: inline-block;padding: 5px 0;border-right: 1px solid black;'
                   newListItem3.textContent = this.Inspect[i].left[j].item_name;
                   newListItem4.textContent = this.Inspect[i].left[j].inspect_value;
                   child2.appendChild(newListItem3);
@@ -2829,13 +2778,13 @@
                 }
                 for(let x in this.Inspect[i].right){
                   let newListItem5 = document.createElement('span');
-                  newListItem5.style.cssText= 'width: 50%;box-sizing: border-box;display: inline-block;padding: 5px 0;border-right: 1px solid black;border-bottom: 1px solid black;'
+                  newListItem5.style.cssText= 'width: 25%;box-sizing: border-box;display: inline-block;padding: 5px 0;border-right: 1px solid black;border-bottom: 1px solid black;'
                   let newListItem6 = document.createElement('span');
-                  newListItem6.style.cssText= 'width: 50%;box-sizing: border-box;display: inline-block;padding: 5px 0;border-bottom: 1px solid black;'
+                  newListItem6.style.cssText= 'width: 25%;box-sizing: border-box;display: inline-block;padding: 5px 0;border-bottom: 1px solid black;border-right: 1px solid black;'
                   newListItem5.textContent = this.Inspect[i].right[x].item_name;
                   newListItem6.textContent = this.Inspect[i].right[x].inspect_value;
-                  child3.appendChild(newListItem5);
-                  child3.appendChild(newListItem6);
+                  child2.appendChild(newListItem5);
+                  child2.appendChild(newListItem6);
                 }
                 jiancDoc1.appendChild(newList1)
               }
@@ -2884,7 +2833,7 @@
           }
         })
          this.AuToShow = true
-      
+
        }
        })
       },
@@ -3315,10 +3264,10 @@
 
       },
       showEdit() {
-
         this.add_index =1
         this.disabled = false
-
+        console.log('时间',this.record_date);
+        
       }, tableRow({ row, rowIndex }) {
         // 把每一行的索引放进row
         row.index = rowIndex
@@ -3447,7 +3396,7 @@
         console.log('血压',this.bloodRows);
       },
       selectionchange2(val){
-       
+
         this.summaryRows = val
         this.summary_context=""
         if(val!=null){
@@ -3469,13 +3418,13 @@
         console.log('透析小结',this.weightRows);
       },
       selectionchange4(val){
-        
+
         this.optionRows = val
         this.getoption(val)
         console.log('透析小结',this.weightRows);
       },
       selectionchange5(val){
-       
+
         this.adviceRows = val
         this.getNewPatientAdviceList(val)
       },
@@ -3514,7 +3463,7 @@
         this.weight_context = `${arr.join('<br/>')}`
       },
       getoption(val){
-       
+
         var newArr = []
         for(let i=0;i<this.systemPrescritpionList.length;i++){
           for(let j=0;j<val.length;j++){
@@ -3522,10 +3471,10 @@
               newArr.push(this.systemPrescritpionList[i])
             }
           }
-         
+
         }
         const arr= []
-       
+
         if(newArr.length>0){
           for(let i=0;i<newArr.length;i++){
             const text = `<table border="1" style="border-collapse: collapse;width: 100%;">
@@ -3593,7 +3542,7 @@
         })
       },
       option_click(val){
-   
+
         this.option_dialog =true
         // this.start_date1 = this.timeForMat(7)
         // this.end_date1 = this.getTime(new Date())
@@ -3620,7 +3569,7 @@
       hospital_click(){
         const text = `<p style="line-height: 50px;display: flex;"><span style="display: inline-block;flex: 1;">住院日期:</span><span style="display: inline-block;flex: 1;">出院日期:</span></p>
     <p style="line-height: 50px;display: flex;"><span style="display: inline-block;flex: 1;">入院诊断:</span><span style="display: inline-block;flex: 1;">出院诊断:</span></p>`
-       
+
         this.$refs.editor.contents =  this.$refs.editor.contents + text
       },
       Inspect_click(){
@@ -3635,7 +3584,7 @@
 
       },
       childclick(i){
-      
+
           var params = {
             patient_id:i.patient_id,
             project_id:i.project_id,
@@ -3651,11 +3600,11 @@
                 if(inspection[i].inspect_value!=""){
                   inspection_str += inspection[i].item_name+":" + inspection[i].inspect_value+","
                 }
-               
+
               }
             }
             this.inspect_context = inspection_str
-            
+
           }
         })
         // // const inspect_arr = []
@@ -3771,7 +3720,7 @@
            if(response.data.state == 1){
               this.systemPrescritpionList = []
               var systemPrescritpionList =  response.data.data.prescription
-              
+
               if(systemPrescritpionList!=null && systemPrescritpionList.length>0){
                  for(let i=0;i<systemPrescritpionList.length;i++){
                    systemPrescritpionList[i].mode_name = ""
@@ -3797,7 +3746,7 @@
         return name
       },
       getPatientAdviceList(){
-        var ids = this.newIds.join()  
+        var ids = this.newIds.join()
         var params = {
           start_time:this.start_date1,
           end_time:this.end_date1,
@@ -3814,7 +3763,7 @@
         })
       },
       getNewPatientAdviceList(val){
-        
+
          var newArr= []
          for(let i=0;i<val.length;i++){
            for(let j=0;j<this.adviceList.length;j++){
@@ -3823,8 +3772,8 @@
              }
            }
          }
-         
-         
+
+
          this.adviceNewList = []
          this.adviceNewList = newArr
          this.all_select = 1
@@ -3859,11 +3808,11 @@
           }
         getPatientInspectionList(params).then(response=>{
            if(response.data.state == 1){
-             
+
              var groupList = response.data.data.groupList
              var inspection = response.data.data.inspection
              this.inspectionList = inspection
-            
+
              if(groupList.length!=null && groupList.length>0){
                 for(let i=0;i<groupList.length;i++){
                   groupList[i].child = []
@@ -3874,15 +3823,15 @@
                   }
                 }
              }
-        
+
              for(let i=0;i<groupList.length;i++){
                for(let j=0;j<groupList[i].child.length;j++){
-                  groupList[i].child =this.getInspection(groupList[i].child) 
+                  groupList[i].child =this.getInspection(groupList[i].child)
                }
              }
-      
-             this.newInspectionList = groupList 
-          
+
+             this.newInspectionList = groupList
+
            }
         })
       },
@@ -3899,7 +3848,7 @@
           return tempArr;
       },
       changeInspetion(){
-      
+
         for(let i=0;i<this.newInspectionList.length;i++){
            this.newInspectionList[i].childOne =[]
           for(let j=0;j<this.inspectionList.length;j++){
@@ -3908,7 +3857,7 @@
             }
           }
         }
-       
+
          var new_inspection_str =""
         if(this.newInspectionList!=null&& this.newInspectionList.length>0){
            for(let i=0;i<this.newInspectionList.length;i++){
@@ -3918,20 +3867,20 @@
                 if(this.newInspectionList[i].childOne[j].inspect_value!=""){
                   new_inspection_str+= this.newInspectionList[i].childOne[j].item_name+":" + this.newInspectionList[i].childOne[j].inspect_value+","+" "
                 }
-                
+
               }
             }
-              
-           } 
+
+           }
         }
          this.inspect_context = new_inspection_str
       },
       toSystemContentPint(){
-       
+
         this.$refs.editor.contents = this.$refs.editor.contents +this.option_context
         this.option_dialog = false
       },
-    
+
 
     },
     beforeMount(){
@@ -3940,7 +3889,7 @@
     mounted(){
 
     },
-  
+
 
   }
 </script>

src/xt_pages/user/deathSummary.vue

@@ -238,7 +238,7 @@
             {id:2,name:"心血管"},
             {id:3,name:"感染"},
             {id:4,name:"营养不良"},
-            {id:5,name:"全是衰竭"},
+            {id:5,name:"全身衰竭"},
             {id:6,name:"肿瘤"},
             {id:7,name:"出血"},
             {id:8,name:"呼吸衰竭"},

src/xt_pages/user/patient.vue

@@ -98,6 +98,7 @@
         <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
         <el-table-column  label="透析号" min-width="80" property="dialysis_no" align="center"></el-table-column>
         <el-table-column  label="住院号" min-width="80"  property="admission_number" align="center"> </el-table-column>
+        
         <el-table-column property="name" label="姓名" min-width="80" align="center">
           <template slot-scope="scope" >
             <router-link :to="'/patients/edit/'+scope.row.id" style="color:#409eff;width:100%;display:block;" >{{scope.row.name}}</router-link>

src/xt_pages/user/patients.vue

@@ -416,6 +416,13 @@
           align="center"
         >
         </el-table-column>
+        <el-table-column
+          label="年龄"
+          min-width="70"
+          property="age"
+          align="center"
+        >
+        </el-table-column>
         <el-table-column
           property="name"
           label="姓名"
@@ -1651,6 +1658,9 @@
             return false
           } else {
             this.tableData = response.data.data.patients
+            for(let i=0;i<this.tableData.length;i++){
+              this.tableData[i].age = this.getAge(this.tableData[i])
+            }
             console.log("wowowowo",this.tableData)
             console.log('2222222',response.data.data)
             this.pageTotal = this.tableData.length
@@ -1659,6 +1669,27 @@
           }
         })
       },
+      getAge: function(val) {
+          if (val.id_card_no == undefined) {
+            return false
+          }
+          var thisLen = val.id_card_no.length
+          var birth = ''
+          if (thisLen == 15) {
+            birth = '19' + val.id_card_no.substr(6, 6)
+          } else {
+            birth = val.id_card_no.substr(6, 8)
+          }
+          var birthtwo =
+            birth.substr(0, 4) +
+            '-' +
+            birth.substr(4, 2) +
+            '-' +
+            birth.substr(6, 2)
+
+          var age = jsGetAge(birthtwo, '-')
+          return age
+      },
 
       OpenView(name, number, id) {
         this.name = name

src/xt_pages/user/physiqueprinting.vue

@@ -60,8 +60,8 @@
             <div style="flex: 1;">家庭住址：{{ patient.home_address }}</div>
           </div>
           <div style="display: flex; justify-self: start; margin-top: 5px ;width: 100%;">
-            <div style="flex: 1;">肾移植史：{{ item.is_shenyizhi_history == 0?'无':'有' }}</div>
-            <div style="flex: 1;">腹膜透析史：{{ item.is_fumo_dialysis_history == 0? '无':'有' }}</div>
+            <div style="flex: 1;">肾移植史：{{ item.is_shenyizhi_history == 1?'无':'有' }}</div>
+            <div style="flex: 1;">腹膜透析史：{{ item.is_fumo_dialysis_history == 1? '无':'有' }}</div>
             <div style="flex: 1;" v-if="item.is_hypersusceptibility == 0">过敏药物：无</div>
             <div style="flex: 1;" v-if="item.is_hypersusceptibility == 2">过敏药物：有</div>
             <div style="flex: 1;" v-if="item.is_hypersusceptibility == 3">过敏药物：不想</div>
@@ -677,8 +677,9 @@ export default {
         if (response.data.state == 1) {
           this.patient = response.data.data.patient
           this.diagnosis = this.patient.diagnose.split(',')
-          console.log('ttttttt',this.diagnosis);
+          
           this.list = response.data.data.sickhistorys
+          console.log('ttttttt',response.data.data);
         }
       })
     },

src/xt_pages/user/sickHistory_new.vue

@@ -522,8 +522,7 @@ export default {
       if(this.add_index ==0){
         this.template_dialog = true
       }else{
-        const mode=`<p style="font-size: 18px;font-weight: 600;width:100%;margin-bottom: 10px;text-align: center;">血液净化治疗患者首次门诊病历</p>
-        <table border="1" style="border-collapse: collapse;text-align: center;">
+        const mode=`<table border="1" style="border-collapse: collapse;text-align: center;">
       <tbody>
         <tr>
           <td style="width:8%;padding: 5px 0px;font-size: 16px;">

src/xt_pages/workforce/scheduleTablePrintTwo.vue

@@ -295,10 +295,10 @@
             </template>
 
             <!-- 未选择 -->
-            <template v-if="schedule_type == 0 && org_id != 10721 && org_id != 0">
+            <template v-if="schedule_type == 0 && org_id != 10721 ">
               <td style="min-width:50px;" v-if="first_day == 1">
                 <span v-if="item.Mon_M.patient_id">
-                  <span>{{ item.Mon_M.patient }}</span><br />
+                  <span>{{ item.Mon_M.patient }}</span>
                   <span v-if="item.Mon_M.mode_id != 1">{{ item.Mon_M.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Mon_M.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Mon_M.dialysis_machine_name }}
@@ -307,7 +307,7 @@
               </td>
               <td style="min-width:50px;" v-if="first_day == 1">
                 <span v-if="item.Mon_A.patient_id">
-                  <span>{{ item.Mon_A.patient }} </span><br />
+                  <span>{{ item.Mon_A.patient }} </span>
                   <span v-if="item.Mon_A.mode_id != 1">{{ item.Mon_A.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Mon_A.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Mon_A.dialysis_machine_name }}
@@ -317,7 +317,7 @@
               </td>
               <td style="min-width:50px;" v-if="first_day == 1">
                 <span v-if="item.Mon_N.patient_id">
-                  <span>{{ item.Mon_N.patient }} </span><br />
+                  <span>{{ item.Mon_N.patient }} </span>
                   <span v-if="item.Mon_N.mode_id != 1">{{ item.Mon_N.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Mon_N.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Mon_N.dialysis_machine_name }}
@@ -327,7 +327,7 @@
               </td>
               <td style="min-width:50px;" v-if="second_day == 2">
                 <span v-if="item.Tue_M.patient_id">
-                  <span>{{ item.Tue_M.patient }} </span><br />
+                  <span>{{ item.Tue_M.patient }} </span>
                   <span v-if="item.Tue_M.mode_id != 1">{{ item.Tue_M.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Tue_M.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Tue_M.dialysis_machine_name }}
@@ -337,7 +337,7 @@
               </td>
               <td style="min-width:50px;" v-if="second_day == 2">
                 <span v-if="item.Tue_A.patient_id">
-                  <span>{{ item.Tue_A.patient }} </span><br />
+                  <span>{{ item.Tue_A.patient }} </span>
                   <span v-if="item.Tue_A.mode_id != 1">{{ item.Tue_A.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Tue_A.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Tue_A.dialysis_machine_name }}
@@ -348,7 +348,7 @@
               </td>
               <td style="min-width:50px;" v-if="second_day == 2">
                 <span v-if="item.Tue_N.patient_id">
-                  <span>{{ item.Tue_N.patient }} </span><br />
+                  <span>{{ item.Tue_N.patient }} </span>
                   <span v-if="item.Tue_N.mode_id != 1">{{ item.Tue_N.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Tue_N.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Tue_N.dialysis_machine_name }}
@@ -358,7 +358,7 @@
               </td>
               <td style="min-width:50px;" v-if="three_day == 3">
                 <span v-if="item.Wed_M.patient_id">
-                  <span>{{ item.Wed_M.patient }} </span><br />
+                  <span>{{ item.Wed_M.patient }} </span>
                   <span v-if="item.Wed_M.mode_id != 1">{{ item.Wed_M.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Wed_M.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Wed_M.dialysis_machine_name }}
@@ -368,7 +368,7 @@
               </td>
               <td style="min-width:50px;" v-if="three_day == 3">
                 <span v-if="item.Wed_A.patient_id">
-                  <span>{{ item.Wed_A.patient }} </span><br />
+                  <span>{{ item.Wed_A.patient }} </span>
                   <span v-if="item.Wed_A.mode_id != 1">{{ item.Wed_A.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Wed_A.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Wed_A.dialysis_machine_name }}
@@ -378,7 +378,7 @@
               </td>
               <td style="min-width:50px;" v-if="three_day == 3">
                 <span v-if="item.Wed_N.patient_id">
-                  <span>{{ item.Wed_N.patient }} </span><br />
+                  <span>{{ item.Wed_N.patient }} </span>
                   <span v-if="item.Wed_N.mode_id != 1">{{ item.Wed_N.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Wed_N.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Wed_N.dialysis_machine_name }}
@@ -388,7 +388,7 @@
               </td>
               <td style="min-width:50px;" v-if="four_day == 4">
                 <span v-if="item.Thurs_M.patient_id">
-                  <span>{{ item.Thurs_M.patient }} </span><br />
+                  <span>{{ item.Thurs_M.patient }} </span>
                   <span v-if="item.Thurs_M.mode_id != 1">{{ item.Thurs_M.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_M.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Thurs_M.dialysis_machine_name }}
@@ -398,7 +398,7 @@
               </td>
               <td style="min-width:50px;" v-if="four_day == 4">
                 <span v-if="item.Thurs_A.patient_id">
-                  <span>{{ item.Thurs_A.patient }} </span><br />
+                  <span>{{ item.Thurs_A.patient }} </span>
                   <span v-if="item.Thurs_A.mode_id != 1">{{ item.Thurs_A.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_A.anticoagulant) }}</span>
 
@@ -409,7 +409,7 @@
               </td>
               <td style="min-width:50px;" v-if="four_day == 4">
                 <span v-if="item.Thurs_N.patient_id">
-                  <span>{{ item.Thurs_N.patient }} </span><br />
+                  <span>{{ item.Thurs_N.patient }} </span>
                   <span v-if="item.Thurs_N.mode_id != 1">{{ item.Thurs_N.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Thurs_N.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Thurs_N.dialysis_machine_name }}
@@ -419,7 +419,7 @@
               </td>
               <td style="min-width:50px;" v-if="five_day == 5">
                 <span v-if="item.Fri_M.patient_id">
-                  <span>{{ item.Fri_M.patient }} </span><br />
+                  <span>{{ item.Fri_M.patient }} </span>
                   <span v-if="item.Fri_M.mode_id != 1">{{ item.Fri_M.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Fri_M.anticoagulant) }} </span>
                   <span v-show="showflag">{{ item.Fri_M.dialysis_machine_name }}
@@ -429,7 +429,7 @@
               </td>
               <td style="min-width:50px;" v-if="five_day == 5">
                 <span v-if="item.Fri_A.patient_id">
-                  <span>{{ item.Fri_A.patient }} </span><br />
+                  <span>{{ item.Fri_A.patient }} </span>
                   <span v-if="item.Fri_A.mode_id != 1">{{ item.Fri_A.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Fri_A.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Fri_A.dialysis_machine_name }}
@@ -439,7 +439,7 @@
               </td>
               <td style="min-width:50px;" v-if="five_day == 5">
                 <span v-if="item.Fri_N.patient_id">
-                  <span>{{ item.Fri_N.patient }} </span><br />
+                  <span>{{ item.Fri_N.patient }} </span>
                   <span v-if="item.Fri_N.mode_id != 1">{{ item.Fri_N.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Fri_N.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Fri_N.dialysis_machine_name }}
@@ -449,7 +449,7 @@
               </td>
               <td style="min-width:50px;" v-if="six_day == 6">
                 <span v-if="item.Sat_M.patient_id">
-                  <span>{{ item.Sat_M.patient }} </span><br />
+                  <span>{{ item.Sat_M.patient }} </span>
                   <span v-if="item.Sat_M.mode_id != 1">{{ item.Sat_M.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Sat_M.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Sat_M.dialysis_machine_name }}
@@ -459,7 +459,7 @@
               </td>
               <td style="min-width:50px;" v-if="six_day == 6">
                 <span v-if="item.Sat_A.patient_id">
-                  <span>{{ item.Sat_A.patient }} </span><br />
+                  <span>{{ item.Sat_A.patient }} </span>
                   <span v-if="item.Sat_A.mode_id != 1">{{ item.Sat_A.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Sat_A.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Sat_A.dialysis_machine_name }}
@@ -469,7 +469,7 @@
               </td>
               <td style="min-width:50px;" v-if="six_day == 6">
                 <span v-if="item.Sat_N.patient_id">
-                  <span>{{ item.Sat_N.patient }} </span><br />
+                  <span>{{ item.Sat_N.patient }} </span>
                   <span v-if="item.Sat_N.mode_id != 1">{{ item.Sat_N.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Sat_N.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Sat_N.dialysis_machine_name }}
@@ -479,7 +479,7 @@
               </td>
               <td style="min-width:50px;" v-if="seven_day == 7">
                 <span v-if="item.Sun_M.patient_id">
-                  <span>{{ item.Sun_M.patient }} </span><br />
+                  <span>{{ item.Sun_M.patient }} </span>
                   <span v-if="item.Sun_M.mode_id != 1">{{ item.Sun_M.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Sun_M.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Sun_M.dialysis_machine_name }}
@@ -489,7 +489,7 @@
               </td>
               <td style="min-width:50px;" v-if="seven_day == 7">
                 <span v-if="item.Sun_A.patient_id">
-                  <span>{{ item.Sun_A.patient }} </span><br />
+                  <span>{{ item.Sun_A.patient }} </span>
                   <span v-if="item.Sun_A.mode_id != 1">{{ item.Sun_A.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Sun_A.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Sun_A.dialysis_machine_name }}
@@ -500,7 +500,7 @@
               </td>
               <td style="min-width:50px;" v-if="seven_day == 7">
                 <span v-if="item.Sun_N.patient_id">
-                  <span>{{ item.Sun_N.patient }} </span><br />
+                  <span>{{ item.Sun_N.patient }} </span>
                   <span v-if="item.Sun_N.mode_id != 1">{{ item.Sun_N.mode_name }}</span><br />
                   <span v-if="org_id == 0">{{ getAnticoagulant(item.Sun_N.anticoagulant) }}</span>
                   <span v-show="showflag">{{ item.Sun_N.dialysis_machine_name }}
@@ -509,7 +509,7 @@
                 </span>
               </td>
             </template>
-            <template v-if="schedule_type == 0 && org_id == 10721 || org_id == 0">
+            <template v-if="schedule_type == 0 && org_id == 10721 ">
               <td style="min-width:50px;" v-if="first_day == 1">
                 <span v-if="item.Mon_M.patient_id">
                   <span>{{ item.Mon_M.patient }}</span>