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

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

@@ -15,37 +15,37 @@
       <div class="print_page_main_content">
         <div class="content">
           <h2 style="text-align: center;margin-bottom: 20px;">门诊血液透析治疗病历首页</h2>
-          <div style="display: flex;padding: 10px 5px">
+          <div style="display: flex;padding: 0 5px 10px 5px">
             <div style="flex: 1;">门诊号<span class="unile">{{ patient.admission_number }}</span></div>
             <div style="flex: 1;">透析号 <span class="unile">{{ patient.dialysis_no }}</span></div>
             <div style="flex: 1.5;">首次治疗日期 <span class="unile">{{getTime(patient.first_dialysis_date) }}</span></div>
           </div>
-          <div style="display: flex;padding: 10px 5px">
+          <div style="display: flex;padding: 0 5px 10px 5px">
             <div style="flex: 1;">姓名：<span class="unile">{{ patient.name }}</span></div>
             <div style="flex: 1;">性别：
               <input type="checkbox" v-model="nv" class="nv"/>女
               <input type="checkbox" v-model="nan" class="nan"/>男
             </div>
           </div>
-          <div style="display: flex;padding: 10px 5px">
+          <div style="display: flex;padding: 0 5px 10px 5px">
             <div style="flex: 2;">
               身份证号
-              <span class="unile">{{ patient.id_card_no }}</span>
+              <span class="unile2">{{ patient.id_card_no }}</span>
             </div>
           </div>
-          <div style='padding: 10px 5px'>
+          <div style='padding: 0 5px 10px 5px'>
             <div>
               现住址(详填) <span class="unile2">{{ patient.home_address }}</span>
             </div>
             <!-- <div style="flex: 1;">邮编<span class="unile2"></span></div> -->
           </div>
-          <div style='padding: 10px 5px'>
+          <div style='padding: 0 5px 10px 5px'>
             <div>
               家庭住址<span class="unile2">{{ patient.home_address }}</span>
             </div>
             <!-- <div style="flex: 1;">邮编<span class="unile2"></span></div> -->
           </div>
-          <div style="display: flex;padding: 10px 5px">
+          <div style="display: flex;padding: 0 5px 10px 5px">
             <div style="flex: 1;">
               本人电话<span class="unile">{{ patient.home_telephone }}</span>
             </div>
@@ -56,14 +56,14 @@
               亲属联系方式<span class="unile">{{ patient.relative_phone }}</span>
             </div>
           </div>
-          <div style="padding: 10px 5px">
-            工作单位<span class="unile">{{ patient.work_unit }}</span>
+          <div style="padding: 0 5px 10px 5px">
+            工作单位<span class="unile2">{{ patient.work_unit }}</span>
           </div>
           <!-- <div style="padding: 10px 5px">
             地址<span class="unile2"></span> 省(市)<span class="unile2"></span>路<span class="unile2"></span>号
           </div> -->
-          <div style="padding: 10px 5px">
-            诊断：<span class="unile">{{ patient.diagnose }}</span>
+          <div style="padding: 0 5px 10px 5px">
+            诊断：<span class="unile2">{{ patient.diagnose }}</span>
           </div>
           <!-- <div style="padding: 10px 5px">
             合并症或并发症 <span class="unile"></span>
@@ -381,7 +381,7 @@ export default{
       })
     },
     printThisPage(){
-        const style = '@media print {.content p{font-size: 16px;font-family: 新宋体; padding-left: 20px; margin-bottom: 5px;}.unile{display: inline-block;border-bottom: 1px solid black;width: 60%;}.unile2{display: inline-block;border-bottom: 1px solid black;width: 150px;padding: 15px 0;}.tablepadd{padding: 0 5px; height: 35px;}}'
+        const style = '@media print {.content p{font-size: 16px;font-family: 新宋体; padding-left: 20px; margin-bottom: 5px;}.unile{display: inline-block;border-bottom: 1px solid black;width: 60%;height:25px}.unile2{display: inline-block;border-bottom: 1px solid black;width: 80%;height:25px}.tablepadd{padding: 0 5px; height: 35px;}}'
         printJS({
             printable: 'print_content',
             type: 'html',
@@ -453,14 +453,15 @@ export default{
     display: inline-block;
     border-bottom: 1px solid black;
     width: 60%;
+    height:25px
   }
   .unile2{
     display: inline-block;
     border-bottom: 1px solid black;
-    height: 30px;
+    height: 25px;
     text-align: center;
-    width: 170px;
-    padding: 15px 0;
+    width: 80%;
+    // padding: 15px 0;
   }
   .tablepadd{
     padding: 5px 0;

src/xt_pages/user/evaluationtool/Cathetershedding.vue

@@ -83,10 +83,10 @@
                       </div>
 
                       <div class="bottoms">
-                          <span>评估人:</span>
-                          <el-select v-model="appraiser" placeholder="请选择" >
+                          <span>责任护士:</span>
+                          <el-select v-model="Dutynurse" placeholder="请选择" >
                               <el-option
-                              v-for="item in optionsarr"
+                              v-for="item in Dutynursearr"
                               :key="item.value"
                               :label="item.label"
                               :value="item.value"
@@ -202,6 +202,8 @@ export default {
       input:'',
       value:'',
       date:this.getTime(new Date()),
+      Dutynurse:'',//责任护士
+      Dutynursearr:[],//责任护士数组
       appraiser:'',
       optionsarr:[],
       jiashu_date:this.getTime(new Date()),//家属时间
@@ -259,12 +261,11 @@ export default {
         duct_Totalpoints:this.duct_Totalpoints,
         hulicuoshi:this.hulicuoshi,
         date:this.date,//评估时间
-        appraiser:this.appraiser,
-        optionsarr:this.optionsarr,//评估数组
+        Dutynurse:this.Dutynurse,//责任护士
+        appraiser:this.appraiser,//评估人
         jiashu_date:this.jiashu_date,
         zhuanggui:this.zhuanggui,
         hushi:this.hushi,
-        hushiarr:this.hushiarr,
         hushi_date:this.hushi_date,
         patientID:this.patientID
       }

src/xt_pages/user/evaluationtool/Muscleforce.vue

@@ -272,7 +272,7 @@ export default {
         this.cancel_num=1
 
         var params={
-          shuju:this.shuju,
+          shuju:this.Mus_Totalpoints,
           Mus_Totalpoints:this.Mus_Totalpoints,
           content:this.content,
           date:this.date,

src/xt_pages/user/evaluationtool/OHpressuresore.vue

@@ -422,15 +422,16 @@ export default {
         this.cancel_num=1
         var params={
           patientID:this.patientID,
-          tiwei:this.tiwei,
-          bingli:this.bingli,
-          edema:this.edema,
-          guanjie:this.guanjie,
+          tiwei:this.tiwei_num,
+          bingli:this.bingli_num,
+          edema:this.edema_num,
+          guanjie:this.gaunjie_num,
           oh_huli:this.oh_huli,
           oh_date:this.oh_date,
           oh_appraiser:this.oh_appraiser,
           Totalpoints:this.Totalpoints
         }
+        console.log('params-----',params);
       savePatientHpressuresore(params).then(response=>{
 
       })

src/xt_pages/user/evaluationtool/dailyLife.vue

@@ -456,19 +456,18 @@ export default {
     // 确认
     lifeclick(){
       var params={
-        jinshi:this.jinshi,
-        xizao:this.xizao,
-        xiushi:this.xiushi,
-        chuanyi:this.chuanyi,
-        dabian:this.dabian,
-        xioabian:this.xioabian,
-        ruce:this.ruce,
-        chuangyi:this.chuangyi,
-        pingdi:this.pingdi,
-        louti:this.louti,
+        jinshi:this.jinshi_val,
+        xizao:this.xizao_val,
+        xiushi:this.xiushi_val,
+        chuanyi:this.chuanyi_val,
+        dabian:this.dabian_val,
+        xioabian:this.xiaobian_val,
+        ruce:this.ruce_val,
+        chuangyi:this.chuangyi_val,
+        pingdi:this.paingdi_val,
+        louti:this.louti_val,
         patientID:this.patientID,
         appraiser:this.appraiser,//评估人
-        optionsarr:this.optionsarr,//评估人数组
         date:this.date,
         date_Totalpoints:this.date_Totalpoints
       }

src/xt_pages/user/evaluationtool/mindAssessment.vue

@@ -34,7 +34,7 @@
                             <td>
                                 <div class="jiange">
                                     <el-radio-group v-model="radio1">
-                                        <el-radio v-for="(item,index ) in qingan" :label="item" :key="index" style="color: black;font-size: 15px;">{{ item }}</el-radio>
+                                        <el-radio v-for="(item,index ) in qingan" :label="item.value" :key="index" style="color: black;font-size: 15px;">{{ item.label }}</el-radio>
                                     </el-radio-group>
                                 </div>
                             </td>                           
@@ -44,7 +44,7 @@
                             <td>
                                 <div  class="jiange">
                                     <el-radio-group v-model="radio2">
-                                    <el-radio v-for="(item,index ) in qingan" :label="item" :key="index" style="color: black;font-size: 15px;">{{ item }}</el-radio>
+                                    <el-radio v-for="(item,index ) in qingan" :label="item.value" :key="index" style="color: black;font-size: 15px;">{{ item.label }}</el-radio>
                                     </el-radio-group>
                                 </div>
                             </td>
@@ -54,7 +54,7 @@
                             <td>
                                 <div  class="jiange">
                                     <el-radio-group v-model="radio3">
-                                        <el-radio v-for="(item,index ) in qingan" :label="item" :key="index" style="color: black;font-size: 15px;">{{ item }}</el-radio>
+                                        <el-radio v-for="(item,index ) in qingan" :label="item.value" :key="index" style="color: black;font-size: 15px;">{{ item.label }}</el-radio>
                                     </el-radio-group>
                                 </div>
                             </td>
@@ -116,10 +116,11 @@ export default {
           options:[],
           value:'',
           value1:'',
-          xinli:[{label:'配合治疗',is_check:false,check:0},{label:'担忧',is_check:false,check:0},{label:'烦躁',is_check:false,check:0},
-          {label:'抵触情绪',is_check:false,check:0},{label:'拒绝治疗',is_check:false,check:0},{label:'坐立不安',is_check:false,check:0},
-          {label:'怪异行为',is_check:false,check:0},{label:'其他',is_check:false,check:0},],
-          qingan:['有','无'],
+          xinlishow:[],
+          xinli:[{id:1,label:'配合治疗',is_check:false,check:0},{id:2,label:'担忧',is_check:false,check:0},{id:3,label:'烦躁',is_check:false,check:0},
+          {id:4,label:'抵触情绪',is_check:false,check:0},{id:5,label:'拒绝治疗',is_check:false,check:0},{id:6,label:'坐立不安',is_check:false,check:0},
+          {id:7,label:'怪异行为',is_check:false,check:0},{id:8,label:'其他',is_check:false,check:0},],
+          qingan:[{value:1,label:'有'},{value:0,label:'无'}],
           appraiser:'',
           optionsarr:[],
           date:this.getTime(new Date())
@@ -133,13 +134,25 @@ export default {
     },
     xinliclick(item){
       for(let i in this.xinli){
-        if(item.is_check ==false){
           if(item.label==this.xinli[i].label){
-            this.xinli[i].check=1
+            if(item.check == 0){
+              this.xinli[i].check=1
+              this.xinli[i].is_check = true
+              this.xinlishow.push(item.id)
+            }else{
+              this.xinli[i].check = 0
+              this.xinli[i].is_check = false
+              if(this.xinlishow.length>0){
+                for(let j in this.xinlishow){
+                  if(item.id == this.xinlishow[j]){
+                    let index = this.xinlishow.indexOf(this.xinlishow[j]);
+                    this.xinlishow.splice(index,1)
+                  }
+                }
+              }
+            }
           }
-        }
       }
-      console.log(this.xinli);
     },
     // 确认
     mindclick(){
@@ -149,8 +162,7 @@ export default {
         radio3:this.radio3,
         date:this.date,
         appraiser:this.appraiser,
-        optionsarr:this.optionsarr,
-        xinli:this.xinli,
+        xinli:this.xinlishow,
       }
     },
     // 转换时间

src/xt_pages/user/history/mind_history.vue

@@ -151,7 +151,7 @@
                 <td>
                     <div class="jiange">
                         <el-radio-group v-model="radio1">
-                            <el-radio v-for="(item,index ) in qingan" :label="item" :key="index" style="color: black;font-size: 15px;">{{ item }}</el-radio>
+                            <el-radio v-for="(item,index ) in qingan" :label="item.value" :key="index" style="color: black;font-size: 15px;">{{ item.label }}</el-radio>
                         </el-radio-group>
                     </div>
                 </td>
@@ -161,7 +161,7 @@
                 <td>
                     <div  class="jiange">
                         <el-radio-group v-model="radio2">
-                        <el-radio v-for="(item,index ) in qingan" :label="item" :key="index" style="color: black;font-size: 15px;">{{ item }}</el-radio>
+                        <el-radio v-for="(item,index ) in qingan" :label="item.value" :key="index" style="color: black;font-size: 15px;">{{ item.label }}</el-radio>
                         </el-radio-group>
                     </div>
                 </td>
@@ -171,7 +171,7 @@
                 <td>
                     <div  class="jiange">
                         <el-radio-group v-model="radio3">
-                            <el-radio v-for="(item,index ) in qingan" :label="item" :key="index" style="color: black;font-size: 15px;">{{ item }}</el-radio>
+                            <el-radio v-for="(item,index ) in qingan" :label="item.value" :key="index" style="color: black;font-size: 15px;">{{ item.label }}</el-radio>
                         </el-radio-group>
                     </div>
                 </td>
@@ -247,10 +247,10 @@ export default{
       options:[],
       value:'',
       value1:'',
-      xinli:[{label:'配合治疗',is_check:false,check:0},{label:'担忧',is_check:false,check:0},{label:'烦躁',is_check:false,check:0},
-          {label:'抵触情绪',is_check:false,check:0},{label:'拒绝治疗',is_check:false,check:0},{label:'坐立不安',is_check:false,check:0},
-          {label:'怪异行为',is_check:false,check:0},{label:'其他',is_check:false,check:0},],
-      qingan:['有','无',],
+      xinli:[{id:1,label:'配合治疗',is_check:false,check:0},{id:2,label:'担忧',is_check:false,check:0},{id:3,label:'烦躁',is_check:false,check:0},
+          {id:4,label:'抵触情绪',is_check:false,check:0},{id:5,label:'拒绝治疗',is_check:false,check:0},{id:6,label:'坐立不安',is_check:false,check:0},
+          {id:7,label:'怪异行为',is_check:false,check:0},{id:8,label:'其他',is_check:false,check:0},],
+      qingan:[{value:1,label:'有'},{value:0,label:'无'}],
       appraiser:'',
       optionsarr:[],
       date:this.getTime(new Date())
@@ -295,16 +295,28 @@ export default{
       }
       this.delete_centerDialogVisible=false
     },
-    // 确认
+    // 心理
     xinliclick(item){
       for(let i in this.xinli){
-        if(item.is_check ==false){
           if(item.label==this.xinli[i].label){
-            this.xinli[i].check=1
+            if(item.check == 0){
+              this.xinli[i].check=1
+              this.xinli[i].is_check = true
+              this.xinlishow.push(item.id)
+            }else{
+              this.xinli[i].check = 0
+              this.xinli[i].is_check = false
+              if(this.xinlishow.length>0){
+                for(let j in this.xinlishow){
+                  if(item.id == this.xinlishow[j]){
+                    let index = this.xinlishow.indexOf(this.xinlishow[j]);
+                    this.xinlishow.splice(index,1)
+                  }
+                }
+              }
+            }
           }
-        }
       }
-      console.log(this.xinli);
     },
     // 确认
     mindclick(){