Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderThirteen.vue

@@ -211,7 +211,7 @@
           抗凝药物
           <div class="inline_block under_line" style="width:92%;text-align: left;">
             <label-box :isChecked="prescription.anticoagulant == '普通肝素' ? true : false" showValue="普通肝素"></label-box>&nbsp;
-            <label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : prescription.anticoagulant == '低分子肝素钠' ? true : false" showValue="低分子肝素"></label-box>
+            <label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : prescription.anticoagulant == '低分子肝素钠' ? true : prescription.anticoagulant == '低分子肝素' ? true : false" showValue="低分子肝素"></label-box>
             （<label-box :isChecked="prescription.anticoagulant == '低分子肝素钙' ? true : false" showValue="钙"></label-box>
               <label-box :isChecked="prescription.anticoagulant == '低分子肝素钠' ? true : false" showValue="钠"></label-box>）
             <div class="inline_block">

src/xt_pages/user/Sitemap.vue

@@ -985,11 +985,31 @@ export default{
        if(this.V_right!=null && this.V_right.length>0){
 
          for(let i=0;i<this.V_right.length;i++){
-            this.V_right[i].markNum = parseInt(this.V_right[i].markNum)?parseInt(this.V_right[i].markNum):0
+            this.V_right[i].mark_num = parseInt(this.V_right[i].markNum)?parseInt(this.V_right[i].markNum):0
             this.V_right[i].v_num = parseInt(this.V_right[i].v_num)?parseInt(this.V_right[i].v_num):0
          }
        }
 
+
+      if(this.Aarr!=null && this.Aarr.length>0){
+         
+        for(let i=0;i<this.Aarr.length;i++){
+            this.Aarr[i].mark_num = parseInt(this.Aarr[i].markNum)?parseInt(this.Aarr[i].markNum):0
+            this.Aarr[i].is_status = parseInt(this.Aarr[i].status)?parseInt(this.Aarr[i].status):0
+            this.Aarr[i].left = parseInt(this.Aarr[i].left)?parseInt(this.Aarr[i].left):0 
+            this.Aarr[i].top = parseInt(this.Aarr[i].top)?parseInt(this.Aarr[i].top):0 
+        }
+      }
+
+      if(this.Varr!=null && this.Varr.length>0){
+        
+        for(let i=0;i<this.Varr.length;i++){
+            this.Varr[i].mark_num = parseInt(this.Varr[i].markNum)?parseInt(this.Varr[i].markNum):0
+            this.Varr[i].is_status = parseInt(this.Varr[i].status)?parseInt(this.Varr[i].status):0
+            this.Varr[i].left = parseInt(this.Varr[i].left)?parseInt(this.Varr[i].left):0 
+            this.Varr[i].top = parseInt(this.Varr[i].top)?parseInt(this.Varr[i].top):0 
+        }
+      }
    
 
        var params = {
@@ -1031,6 +1051,8 @@ export default{
          patient_id:this.patientID,
          left_a:this.A_left,
          left_v:this.V_left,
+         aarr:this.Aarr,
+         varr:this.Varr,
        }
        console.log("paramswowwo",params)
 
@@ -1095,8 +1117,8 @@ export default{
             this.V_top = sitemap.v_top
             this.xuanzhuan_a = sitemap.xuanzhuan_a
             this.xuanzhuan_v = sitemap.xuanzhuan_v
-            this.A_left = sitemap.a_left
-            this.V_left = sitemap.v_left
+            // this.A_left = sitemap.a_left
+            // this.V_left = sitemap.v_left
             this.A_right = []
             
             for(let i=0;i<sitemap.DeviceValsualALeft.length;i++){
@@ -1144,6 +1166,20 @@ export default{
              for(let i=0;i<sitemap.DeviceValsualTextArr.length;i++){
                this.text_arr.push(sitemap.DeviceValsualTextArr[i])
              }
+
+             this.Aarr = []
+             for(let i=0;i<sitemap.DeviceValusalMapArr.length;i++){
+               sitemap.DeviceValusalMapArr[i].markNum = sitemap.DeviceValusalMapArr[i].mark_num
+               sitemap.DeviceValusalMapArr[i].is_status = sitemap.DeviceValusalMapArr[i].is_status
+               this.Aarr.push(sitemap.DeviceValusalMapArr[i])
+             }
+
+             this.Varr = []
+             for(let i=0;i<sitemap.DeviceValusalMapVrr.length;i++){
+               sitemap.DeviceValusalMapVrr[i].markNum = sitemap.DeviceValusalMapVrr[i].mark_num
+               sitemap.DeviceValusalMapVrr[i].is_status = sitemap.DeviceValusalMapVrr[i].is_status
+               this.Varr.push(sitemap.DeviceValusalMapVrr[i])
+             }
              
             }