新分支

src/api/patient.js

@@ -767,4 +767,31 @@ export function getPatientAllagic(id,params){
     method:"get",
     params:params
   })
+}
+
+export function saveSitemap(data){
+  
+  return request({
+    url:"/api/patient/savesitemap",
+    method:"Post",
+    data:data,
+  })
+}
+
+export function getPatientSitemap(patient_id,params){
+  
+  return request({
+    url:"/api/patient/getpatientsitemap?patient_id="+patient_id,
+    method:"Get",
+    params:params
+  })
+}
+
+export function updateSiteMap(data){
+   
+  return request({
+    url:"/api/patient/updatesitemap",
+    method:"Post",
+    data:data,
+  })
 }

src/lang/zh.js

@@ -297,6 +297,7 @@ export default {
     zeroSummary: '零用明细汇总',
     hospitalhistory: '住院历史',
     dialysis_index:'信息归档',
+    log_index:"日志查询",
     objectRegistration:"医疗器械登记",
     Dialysisanalysis: '专业质控'
   },

src/xt_pages/dialysis/batch_print/batch_print_order_twentySeven.vue

@@ -97,14 +97,7 @@
                       </td>
                       <td width="120">
                         <div class="under-line">&nbsp;
-                          <span style="width:30px;text-align:left;">
-                          {{ record.assessment_after_dislysis.actual_treatment_hour ? 
-                          record.assessment_after_dislysis.actual_treatment_hour : '' }}
-                        </span>h
-                        <span style="width:30px;text-align:left;" v-if="record.assessment_after_dislysis.actual_treatment_minute>0">
-                          {{ record.assessment_after_dislysis.actual_treatment_minute ? 
-                          record.assessment_after_dislysis.actual_treatment_minute : '0' }}
-                        </span>min
+                          {{ getTime(record.schedule_date, "{y}-{m}-{d}") }}
                       </div>
                       </td>
                       <td width="10"></td>
@@ -113,9 +106,9 @@
                       <td width="120">
                         <div class="under-line">&nbsp;
                           {{
-                            record.patient.total_dialysis +
+                            record.Count +
                             record.patient.user_sys_before_count
-                              ? record.patient.total_dialysis +
+                              ? record.Count +
                                 record.patient.user_sys_before_count
                               : "/"
                           }}
@@ -1558,12 +1551,11 @@
                               <td width="70">抗凝方式:</td>
                               <td width="120">
                                 <label-box
-                                  :isChecked="
-                                    record.prescription.anticoagulant == 6
+                                  :isChecked="(record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7 || record.prescription.anticoagulant == 3)
                                       ? true
                                       : false
                                   "
-                                  showValue="低分子肝素钙"
+                                  showValue="低分子肝素"
                                 ></label-box>
                               </td>
 
@@ -1572,7 +1564,7 @@
                                   &nbsp;
                                   <span
                                     v-if="
-                                      record.prescription.anticoagulant == 6
+                                      record.prescription.anticoagulant == 6 || record.prescription.anticoagulant == 7 || record.prescription.anticoagulant == 3
                                     "
                                     >{{
                                       record.prescription
@@ -1880,7 +1872,11 @@
                                 </div>
                               </td>
                               <td width="10">ml</td>
-                              <td></td>
+                              <td style="padding-left:5px;width:20%;">
+                                 置换液总量:
+                               <span style="width:50px;display: inline-block;">&nbsp;{{ record.prescription.displace_liqui_value ? record.prescription.displace_liqui_value : '' }}</span>L
+                             </td>
+                              
                             </tr>
                           </tbody>
                         </table>
@@ -2911,17 +2907,17 @@
                           v-if="
                             setAdminUserES(
                               advice[0],
-                              'execution_staff'
+                              'advice_doctor'
                             ) == ''
                           "
                           >{{
-                            getAdminUser(advice[0], "execution_staff")
+                            getAdminUser(advice[0], "advice_doctor")
                           }}</span
                         >
                         <img
                           class="es-img"
                           :src="
-                            setAdminUserES(advice[0], 'execution_staff')
+                            setAdminUserES(advice[0], 'advice_doctor')
                           "
                           alt=""
                           srcset=""

src/xt_pages/dialysis/template/DialysisPrintOrderTwentySeven.vue

@@ -63,7 +63,15 @@
               <td width="10"></td>
               <td width="80">透析次数:</td>
               <td width="120">
-                <div class="under-line">&nbsp;{{ patientInfo.total_dialysis + patientInfo.user_sys_before_count }}</div>
+                <div class="under-line">&nbsp;
+                  {{
+                          patientInfo.total_dialysis +
+                          patientInfo.user_sys_before_count
+                            ? patientInfo.total_dialysis +
+                              patientInfo.user_sys_before_count
+                            : "/"
+                        }}
+                </div>
               </td>
               <td></td>
             </tr>
@@ -593,7 +601,7 @@
                           &nbsp;{{ afterdialysis.actual_treatment_minute ? afterdialysis.actual_treatment_minute : 0 }}
                         </div>
                       </td>
-                      <td width="35">min</td>
+                      <td width="35" v-if="afterdialysis.actual_treatment_minute>0">min</td>
                       <td></td>
                     </tr>
                   </tbody>

src/xt_pages/role/admin.vue

@@ -122,7 +122,7 @@
           @click="toTestTwo">创建个人印章</el-button> -->
 
 
-          <el-button
+          <!-- <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
@@ -175,7 +175,7 @@
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toEnd">结束签署</el-button>
+          @click="toEnd">结束签署</el-button> -->
            
          
           

src/xt_pages/user/Sitemap.vue

@@ -18,8 +18,8 @@
         </div>
       </div>
       <div style="margin-top:6px;display:flex;flex-wrap: wrap;position:relative;min-height:480px;">
-        <div style="width:530px;border:1px solid #ddd;padding: 5px;" id="print_mark_img" ref="imageWrapper">
-          <div id="point_mark_img_wrap1" class="print_main_content" style="width: 520px;padding: 0;border: 0;" >
+        <div style="width:47%;border:1px solid #ddd;padding: 5px;" id="print_mark_img" ref="imageWrapper">
+          <div id="point_mark_img_wrap1" class="print_main_content" style="width: 100%;padding: 0;border: 0;" >
             <!-- <template>
               <div>
                 <quill-editor v-model="content" ref="myQuillEditor" :options="editorOption">
@@ -98,8 +98,8 @@
             </div> 
           </div>
         </div>
-        <div style="width:50px;"></div>
-        <div style="width:570px;">
+        <div style="width:20px;"></div>
+        <div style="width:48%;">
           <div>
             <p class="point-mark-title">A端：</p>
             <div :class="append == false ? 'point-mark-items' : 'mark-a-items'"> <!-- v-for="(item,index) in 12" :key="index" -->
@@ -240,6 +240,7 @@
 <script>
 import print from "print-js";
 import { getFileExtension} from '@/utils/tools'
+import { saveSitemap,getPatientSitemap,updateSiteMap } from "@/api/patient";
 import { getToken } from '@/api/qiniu'
 // import html2canvas from "html2canvas"
 // import Quill from 'quill';
@@ -303,7 +304,8 @@ export default{
       value:'',//获取文本框文字
       // endx:null,//移动停止x点
       // endy:null,//移动停止y点
-
+      patientID:0,
+      id:0
     }
   },
   methods:{
@@ -616,6 +618,260 @@ export default{
       // console.log('3333');
       // const editedHTML=this.editor.getContents();
       // console.log('6666',editedHTML);
+       
+       var is_append = 2
+        
+      
+       if(this.append == true){
+           is_append = 1
+       }
+       if(this.append == false){
+          is_append = 2
+       }
+
+       var is_img_v = 2
+
+      
+       if(this.img_v ==true){
+          is_img_v = 1
+         
+       }
+       if(this.img_v == false){
+          is_img_v = 2
+       }
+
+       var is_img_a = 2
+       if(this.img_a == true){
+          is_img_a = 1
+       }
+       if(this.img_a == false){
+          is_img_a = 2
+       }
+
+       var a_arr_str = ""
+       if(this.A_arr!=null && this.A_arr.length>0){
+         a_arr_str = this.A_arr.join(",")
+       }
+       var v_arr_str = ""
+       if(this.V_arr!=null){
+        v_arr_str = this.V_arr.join(",")
+       }
+
+       var text_arr_str = ""
+       if(this.text_arr!=null){
+          text_arr_str = this.text_arr.join(",")
+       }
+
+       console.log("fangxiang_A_top",this.fangxiangA_top)
+
+       var params = {
+         is_append:is_append,
+         is_img_v:is_img_v,
+         is_img_a:is_img_a,
+         a_num:this.a_num?this.a_num:0,
+         v_num:this.v_num?this.v_num:0,
+         text_num:this.text_num?this.text_num:0,
+         fangxianga_num:this.fangxiangA_num?this.fangxiangA_num:0,
+         fangxiangv_num:this.fangxiangV_num?this.fangxiangV_num:0,
+         fangxianga_left:this.fangxiangA_left?this.fangxiangA_left:0,
+         fangxianga_top:this.fangxiangA_top?this.fangxiangA_top:0,
+         fangxiangv_left:this.fangxiangV_left?this.fangxiangV_left:0,
+         fangxiangv_top:this.fangxiangV_top?this.fangxiangV_top:0,
+         fuzhua_num:this.fuzhua_num?this.fuzhua_num:0,
+         fuzhuv_num:this.fuzhuv_num?fuzhuv_num:0,
+         xuanzhuan_a:this.xuanzhuan_a?this.xuanzhuan_a:0,
+         xuanzhuan_v:this.xuanzhuan_v?this.xuanzhuan_v:0,
+         fuzhua_top:this.fuzhuA_top?this.fuzhuA_top:0,
+         fuzhua_left:this.fuzhuA_left?this.fuzhuA_left:0,
+         fuzhuv_top:this.fuzhuV_top?fuzhuV_top:0,
+         fuzhuv_left:this.fuzhuV_left?this.fuzhuV_left:0,
+         a_arr_str:a_arr_str,
+         v_arr_str:v_arr_str,
+         a_left:this.A_left?this.A_left:0,
+         a_top:this.A_top?this.A_top:0,
+         v_left:this.V_left?this.V_left:0,
+         v_top:this.V_top?this.V_top:0,
+         text_arr_str:text_arr_str,
+         text_left:this.text_left,
+         text_top:this.text_top?this.text_top:0,
+         scalev_num:this.scalev_num?this.scalev_num:0,
+         scalea_num:this.scalea_num?this.scalea_num:0,
+         value:this.value,
+         patient_id:this.patientID,
+       }
+       console.log("paramswowwo",params)
+       saveSitemap(params).then(response=>{
+          if(response.data.state == 1){
+            var deviceValsualMap =  response.data.data.deviceValsualMap
+            this.$message.success("保存成功!")
+          }
+       })
+    },
+    getPatientSitemap(patient_id){
+      getPatientSitemap(patient_id).then(response=>{
+         if(response.data.state == 1){
+            var sitemap = response.data.data.sitemap
+            if(sitemap.is_append == 1){
+              this.is_append =true
+            }else{
+              this.is_append = false
+            }
+
+            if(sitemap.is_img_v == 1){
+               this.is_img_v= true
+            }else{
+              this.is_img_v = false
+            }
+
+            if(sitemap.is_img_a == 1){
+               this.is_img_a = true
+            }else{
+              this.is_img_a = false
+            }
+
+            this.a_num =  sitemap.a_num
+
+            this.v_num =  sitemap.v_num
+
+            this.text_num = sitemap.text_num
+
+            this.fangxiangA_num = sitemap.fangxianga_num
+           
+            this.fangxiangA_left = sitemap.fangxianga_left
+
+            this.fangxiangV_top = sitemap.fangxianga_top,
+
+            this.fangxiangV_left = sitemap.fangxiangV_left
+
+            this.fuzhuA_num = sitemap.fuzhua_num
+
+            this.fuzhuV_num = sitemap.fuzhuv_num
+
+            this.xuanzhuan_a =  sitemap.xuanzhuan_a
+
+            this.xuanzhuan_v = sitemap.xuanzhuan_a
+           
+            this.fuzhuA_top = sitemap.fuzhua_top
+
+            this.fuzhuV_top  = sitemap.fuzhuv_top
+
+            this.A_arr  = sitemap.a_arr_str.split(",")
+           
+            this.V_arr  = sitemap.v_arr_str.split(",")
+           
+            this.A_left = sitemap.a_left
+
+            this.A_top = sitemap.a_top
+
+            this.V_left = sitemap.v_left
+    
+            this.V_top = sitemap.v_top
+        
+            this.text_arr = sitemap.text_arr.split(",")
+
+            this.text_left = sitemap.text_left
+
+            this.text_top = sitemap.text_top
+
+            this.scalev_num = sitemap.scalev_num
+
+            this.scalea_num =  sitemap.scalea_num 
+
+            this.value = sitemap.value
+
+            this.id = sitemap.id
+            
+         }
+      })
+    },
+    updateSiteMap(){
+      var is_append = 2
+        
+      
+        if(this.append == true){
+            is_append = 1
+        }
+        if(this.append == false){
+           is_append = 2
+        }
+ 
+        var is_img_v = 2
+ 
+       
+        if(this.img_v ==true){
+           is_img_v = 1
+          
+        }
+        if(this.img_v == false){
+           is_img_v = 2
+        }
+ 
+        var is_img_a = 2
+        if(this.img_a == true){
+           is_img_a = 1
+        }
+        if(this.img_a == false){
+           is_img_a = 2
+        }
+ 
+        var a_arr_str = ""
+        if(this.A_arr!=null && this.A_arr.length>0){
+          a_arr_str = this.A_arr.join(",")
+        }
+        var v_arr_str = ""
+        if(this.V_arr!=null){
+         v_arr_str = this.V_arr.join(",")
+        }
+ 
+        var text_arr_str = ""
+        if(this.text_arr!=null){
+           text_arr_str = this.text_arr.join(",")
+        }
+ 
+        var params = {
+         id:this.id,
+         is_append:is_append,
+         is_img_v:is_img_v,
+         is_img_a:is_img_a,
+         a_num:this.a_num?this.a_num:0,
+         v_num:this.v_num?this.v_num:0,
+         text_num:this.text_num?this.text_num:0,
+         fangxianga_num:this.fangxiangA_num?this.fangxiangA_num:0,
+         fangxiangv_num:this.fangxiangV_num?this.fangxiangV_num:0,
+         fangxianga_left:this.fangxiangA_left?this.fangxiangA_left:0,
+         fangxianga_top:this.fangxiangA_top?this.fangxiangA_top:0,
+         fangxiangv_left:this.fangxiangV_left?this.fangxiangV_left:0,
+         fangxiangv_top:this.fangxiangV_top?this.fangxiangV_top:0,
+         fuzhua_num:this.fuzhua_num?this.fuzhua_num:0,
+         fuzhuv_num:this.fuzhuv_num?fuzhuv_num:0,
+         xuanzhuan_a:this.xuanzhuan_a?this.xuanzhuan_a:0,
+         xuanzhuan_v:this.xuanzhuan_v?this.xuanzhuan_v:0,
+         fuzhua_top:this.fuzhuA_top?this.fuzhuA_top:0,
+         fuzhua_left:this.fuzhuA_left?this.fuzhuA_left:0,
+         fuzhuv_top:this.fuzhuV_top?fuzhuV_top:0,
+         fuzhuv_left:this.fuzhuV_left?this.fuzhuV_left:0,
+         a_arr_str:a_arr_str,
+         v_arr_str:v_arr_str,
+         a_left:this.A_left?this.A_left:0,
+         a_top:this.A_top?this.A_top:0,
+         v_left:this.V_left?this.V_left:0,
+         v_top:this.V_top?this.V_top:0,
+         text_arr_str:text_arr_str,
+         text_left:this.text_left,
+         text_top:this.text_top?this.text_top:0,
+         scalev_num:this.scalev_num?this.scalev_num:0,
+         scalea_num:this.scalea_num?this.scalea_num:0,
+         value:this.value,
+         patient_id:this.patientID,
+        }
+        console.log("paramswowwo",params)
+      updateSiteMap(params).then(response=>{
+         if(response.data.state == 1){
+           var deviceValsualMap =  response.data.data.deviceValsualMap
+
+           this.$message.success("修改成功!")
+         }
+      })
     },
     chakan(){
       console.log('22222',);
@@ -634,6 +890,10 @@ export default{
     }
   },
   created(){
+    const id = this.$route.params && this.$route.params.id;
+    this.patientID = parseInt(id);
+
+    this.getPatientSitemap(this.patientID)
     // if(this.fuzhuV_num ==1 || this.append ==false){
     //   return this.xuanzhuan =0
     // }

src/xt_pages/user/dialysisRecord.vue

@@ -153,6 +153,15 @@
               <span>{{getTime(scope.row.assessment_after_dislysis)}}</span>
             </template>
           </el-table-column>
+
+          <el-table-column  width="96" align="center" label="透析器/灌流器">
+             <template slot-scope="scope">
+                 {{ scope.row.prescription.dialyzer_perfusion_apparatus }}
+                 {{ scope.row.prescription.dialysis_dialyszers }}
+              <span v-if="scope.row.prescription.dialysis_irrigation!=''">/{{ scope.row.prescription.dialysis_irrigation }}</span>    
+             </template>
+          </el-table-column>
+
           <el-table-column
             prop="predialysis_evaluation.dry_weight"
             width="96"
@@ -337,6 +346,7 @@
               <th>分区机号</th>
               <th>透析模式</th>
               <th>透析时长（h）</th>
+              <th>透析器/灌流器</th>
               <th>干体重（kg）</th>
               <th>透前称重（kg）</th>
               <th>透后称重（kg）</th>
@@ -356,6 +366,11 @@
                 <td>{{ item.partition_name }}-{{ item.device.number }}</td>
                 <td>{{ modeName(item.prescription.mode_id) }}</td>
                 <td>{{getTime(item.assessment_after_dislysis)}}</td>
+                <td>
+                   <span v-if="item.prescription.dialyzer_perfusion_apparatus"></span>
+                   <span v-if="item.prescription.dialysis_dialyszers!=''">{{ item.prescription.dialysis_dialyszers }} </span>
+                   <span v-if="item.prescription.dialysis_irrigation!=''">/{{ item.prescription.dialysis_irrigation }} </span> 
+                </td>
                 <td>{{ item.predialysis_evaluation.dry_weight }}</td>
                 <td>{{ item.predialysis_evaluation.weight_before }}</td>
                 <td>{{ item.assessment_after_dislysis.weight_after }}</td>