hah阿凡达

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -388,13 +388,13 @@
           <span class="unit">{{ ultrafiltration != "0" ? "L" : "" }}</span>
         </li>
 
-        <li v-if="isShow('电导度')">
+        <!-- <li v-if="isShow('电导度')">
           <label>电导度 : </label>
           <span class="content">{{
             conductivity != "0" ? conductivity : ""
           }}</span>
           <span class="unit">{{ conductivity != "0" ? "mS/m" : "" }}</span>
-        </li>
+        </li> -->
 
         <li v-if="isShow('置换液') && dialysis_mode == 'HDF'">
           <label
@@ -419,6 +419,12 @@
           <span class="unit"></span>
         </li>
 
+        <li v-if="isShow('电导度')">
+          <label>电导度: </label>
+          <span class="content">{{ this.prescription.conduct }}</span>
+          <span class="unit"></span>
+        </li>
+
         <li v-if="isShow('血管通路')">
           <label>血管通路: </label>
           <span class="content">{{ blood_access }}</span>

src/xt_pages/user/components/PatientSidebar.vue

@@ -179,10 +179,10 @@ export default {
             //   name: '3-3',
             //   label: '体格检查新'
             // },
-            // {
-            //   name: '3-5',
-            //   label: '病程记录新'
-            // },
+            {
+              name: '3-5',
+              label: '病程记录新'
+            },
             {
               name: '1-11',
               label: '首次病程记录'

src/xt_pages/user/courseOfDisease_new.vue

@@ -180,6 +180,7 @@
             </div>
             <div style="margin:0 10px">
               <el-date-picker
+               @change="changStartDate"
                 v-model="start_date"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -188,6 +189,7 @@
               </el-date-picker>
               <span>-</span>
               <el-date-picker
+               @change="changEndDate"
                 v-model="end_date"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -332,6 +334,12 @@
       this.getlist()
     },
     methods: {
+      changStartDate(val){
+        this.start_date = val
+      },
+      changEndDate(val){
+        this.end_date = val
+      },
       datachange(val){
         if(val ==1){
           this.start_date = this.getFirstDayOfWeek(new Date())

src/xt_pages/user/text_content.vue

@@ -220,20 +220,7 @@ export default{
    
   },
   mounted(){
-    console.log("mounted---------------------",this.patient)
-
-    this.name = this.patient.name
-    this.gander = ""
-    this.age = 0
-    this.dialysis_no = ""
-    if(this.patient.gender == 1){
-      this.gander = "男"
-    }
-    if(this.patient.gender == 2){
-      this.gander = "女"
-    }
-    this.age = this.patient.age
-    this.dialysis_no = this.patient.dialysis_no
+   
 
     console.log("name:",this.name)
     console.log("gander:",this.gander)
@@ -935,28 +922,12 @@ export default{
             dialysisIrrigationStr =  JSON.stringify(dialysisIrrigationObj).replace(/^{|}$/g, '')
             
            
+           var longAdvice = response.data.data.longAdvice
 
 
 
 
-
-            // if(doctorList!=null && doctorList.length > 0){
-            //       let dataInfo = {}
-            //       doctorList.forEach((item, index) => {
-            //       let { advice_name } = item
-            //       if (!dataInfo[advice_name]) {
-            //         dataInfo[advice_name] = {
-            //           advice_name:item.advice_name,
-            //           child: [],
-            //           count:0,
-            //           drug_id:item.drug_id,
-            //           specification_name:item.advice_desc +item.drug_spec_unit,
-            //           patient_id:item.patient_id,
-            //           delivery_way:"",
-            //         }
-            //       }
-            //     })
-            //     let arr = Object.values(dataInfo)
+          
 
 
             const contents = `<table border="1" class="table" style="border-collapse: collapse;width: 100%;">
@@ -1041,6 +1012,16 @@ export default{
                     <span style="width: 30%;display: inline-block;padding: 5px 0;border-right: 1px solid black;">药物名称</span><span style="width:20% ;display: inline-block;padding: 5px 0;border-right: 1px solid black;">医嘱类型</span><span style="width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;">开始时间</span><span style="width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;">单次用量</span><span style="width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;">执行频率</span><span style="width: 10%;padding: 5px 0;display: inline-block;">状态</span></p>
                 </td>
               </tr>
+
+               <tr>
+                <td style="align-items: center;padding: 5px;">医嘱用药</td>
+                <td  class='' style="padding: 0;">
+                  <p style="display: flex;text-align: center;border-bottom: 1px solid black;">
+                    <span style="width: 30%;display: inline-block;padding: 5px 0;border-right: 1px solid black;">药物名称</span><span style="width:20% ;display: inline-block;padding: 5px 0;border-right: 1px solid black;">医嘱类型</span><span style="width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;">开始时间</span><span style="width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;">单次用量</span><span style="width: 20%;display: inline-block;padding: 5px 0;border-right: 1px solid black;">执行频率</span><span style="width: 10%;padding: 5px 0;display: inline-block;">状态</span></p>
+                </td>
+              </tr>
+              
+              
               <tr>
                 <td style="align-items: center;padding: 5px;">透析总评价和建议</td>
                 <td style='padding: 5px;'>