4月20

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

@@ -63,7 +63,7 @@
             地址<span class="unile2"></span> 省(市)<span class="unile2"></span>路<span class="unile2"></span>号
           </div> -->
           <div style="padding: 0 5px 10px 5px">
-            诊断：<span class="unile2">{{ patient.diagnose }}</span>
+            诊断：<span style="border-bottom: 1px solid black;">{{ patient.diagnose }}</span>
           </div>
           <!-- <div style="padding: 10px 5px">
             合并症或并发症 <span class="unile"></span>

src/xt_pages/user/components/PatientSidebar.vue

@@ -204,68 +204,68 @@ export default {
             },
           ]
         },
-        // {
-        //   name: '5',
-        //   label: '评估工具',
-        //   children: [
-        //     {
-        //       name: '5-1',
-        //       label: '跌倒评估'
-        //     },
-        //     {
-        //       name: '5-2',
-        //       label: '小儿跌倒风险评估'
-        //     },
-        //     {
-        //       name: '5-3',
-        //       label: '压疮风险评估'
-        //     },
-        //     {
-        //       name: '5-4',
-        //       label: 'OH压疮评估'
-        //     },
-        //     {
-        //       name: '5-5',
-        //       label: '日常生活能力评估'
-        //     },
-        //     {
-        //       name: '5-6',
-        //       label: '导管脱落风险评估'
-        //     },
-        //     {
-        //       name: '5-7',
-        //       label: 'RASS及疼痛评估'
-        //     },
-        //     {
-        //       name: '5-8',
-        //       label: '营养状况评估'
-        //     },
-        //     {
-        //       name: '5-9',
-        //       label: '约束告知单'
-        //     },
-        //     {
-        //       name: '5-10',
-        //       label: '心理评估'
-        //     },
-        //     {
-        //       name: '5-11',
-        //       label: '瘙痒评估'
-        //     },
-        //     {
-        //       name: '5-12',
-        //       label: '血液透析患者评估'
-        //     },
-        //     {
-        //       name: '5-13',
-        //       label: 'Glasgow昏迷评分量表'
-        //     },
-        //     {
-        //       name: '5-14',
-        //       label: '肌力评估表'
-        //     },
-        //    ]
-        //  },
+         {
+          name: '5',
+          label: '评估工具',
+          children: [
+            {
+              name: '5-1',
+              label: '跌倒评估'
+            },
+            {
+              name: '5-2',
+              label: '小儿跌倒风险评估'
+            },
+            {
+              name: '5-3',
+              label: '压疮风险评估'
+            },
+            {
+              name: '5-4',
+              label: 'OH压疮评估'
+            },
+            {
+              name: '5-5',
+              label: '日常生活能力评估'
+            },
+            {
+              name: '5-6',
+              label: '导管脱落风险评估'
+            },
+            {
+              name: '5-7',
+              label: 'RASS及疼痛评估'
+            },
+            {
+              name: '5-8',
+              label: '营养状况评估'
+            },
+            // {
+            //   name: '5-9',
+            //   label: '约束告知单'
+            // },
+            {
+              name: '5-10',
+              label: '心理评估'
+            },
+            {
+              name: '5-11',
+              label: '瘙痒评估'
+            },
+            {
+              name: '5-12',
+              label: '血液透析患者评估'
+            },
+            {
+              name: '5-13',
+              label: 'Glasgow昏迷评分量表'
+            },
+            {
+              name: '5-14',
+              label: '肌力评估表'
+            },
+           ]
+         },
         {
           name: '6',
           label: '文书管理',
@@ -407,7 +407,7 @@ export default {
         if (response.data.state == 1) {
           if(this.org_id ==10191 || this.org_id == 0){
              var patients = response.data.data.patients
-             console.log("patients",patients)
+            //  console.log("patients",patients)
              for(let i=0;i<patients.length;i++){
                if(patients[i].lapseto ==1){
                 this.patientsList.push(patients[i])

src/xt_pages/user/evaluationtool/Cathetershedding.vue

@@ -87,9 +87,9 @@
                           <el-select v-model="Dutynurse" placeholder="请选择" style="width:150px;">
                               <el-option
                               v-for="item in Dutynursearr"
-                              :key="item.id"
-                              :label="item.label"
-                              :value="item.id"
+                              :key="item.admin_user_id"
+                              :label="item.user_name"
+                              :value="item.admin_user_id"
                               >
                               </el-option>
                           </el-select>
@@ -126,10 +126,11 @@
                             评估人签字:
                             <el-select v-model="appraiser" placeholder="请选择" style="width: 120px;">
                                 <el-option
-                                v-for="item in optionsarr"
-                                :key="item.id"
-                                :label="item.label"
-                                :value="item.id">
+                                v-for="item in Dutynursearr"
+                                :key="item.admin_user_id"
+                                :label="item.user_name"
+                                :value="item.admin_user_id"
+                                >
                                 </el-option>
                             </el-select>
                         </p>
@@ -149,10 +150,10 @@
                             护士长签字:
                             <el-select v-model="hushi" placeholder="请选择" style="width: 120px;">
                                 <el-option
-                                v-for="item in hushiarr"
-                                :key="item.id"
-                                :label="item.label"
-                                :value="item.id">
+                                v-for="item in Dutynursearr"
+                                :key="item.admin_user_id"
+                                :label="item.user_name"
+                                :value="item.admin_user_id">
                                 </el-option>
                             </el-select>
                         </p>
@@ -183,7 +184,7 @@
 <script>
 import { uParseTime } from '@/utils/tools'
 import PatientSidebar from '../components/PatientSidebar.vue'
-import {savePatientHpressuresore} from '@/api/fallassement'
+import {getAllNurseList,savePatientHpressuresore} from '@/api/fallassement'
 export default {
   components:{
     PatientSidebar
@@ -205,14 +206,12 @@ export default {
       date:this.getTime(new Date()),
       Dutynurse:'',//责任护士
       // Dutynursearr:[],//责任护士数组
-      Dutynursearr:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+      Dutynursearr:[],
       appraiser:'',
       // optionsarr:[],
-      optionsarr:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
       jiashu_date:this.getTime(new Date()),//家属时间
       zhuanggui:'',//转归
       hushi:'',//护理
-      hushiarr:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],//护理
       hushi_date:this.getTime(new Date()),//护理时间
       cuoshi_show:[],//护理措施选中数组
       Patient_info:{name:'',dialysis_no:''},
@@ -243,6 +242,7 @@ export default {
   created(){
     const id = this.$route.params && this.$route.params.id
     this.patientID = parseInt(id)
+    this.getAllNurseList()
   },
   methods:{
     // 选中
@@ -291,8 +291,9 @@ export default {
       }
       savePatientHpressuresore(params).then(response =>{
         if(response.data.state == 1){
-          console.log('111111111',response.data.data);
+          
           const cath = response.data.data.pedFallssessment
+          console.log('111111111',JSON.parse(cath.text));
           this.$message({message:'保存成功',type:'success'})
           // if(cath.text !=''){
           //   const text = JSON.parse(cath.text)
@@ -345,6 +346,16 @@ export default {
         dialysis_no:event.dialysis_no
       }
     },
+    // 评估人数据源
+    getAllNurseList(){
+      getAllNurseList().then(response=>{
+        if(response.data.state ==1){
+          var nurseList  = response.data.data.nurseList
+
+          this.Dutynursearr =nurseList
+        }
+      })
+    },
   },
   computed:{
     duct_Totalpoints(){

src/xt_pages/user/evaluationtool/Glasgow.vue

@@ -15,7 +15,7 @@
               </div>
               <div style="flex:1" v-if="Glas_baoxiao">
                 <el-button type="primary" @click="Glas_save" v-if="qufen == false">保存</el-button>
-                <el-button type="primary" @click="Glas_save2" v-if="qufen == true && dele_id != ''">保存1</el-button>
+                <el-button type="primary" @click="Glas_save2" v-if="qufen == true && dele_id != ''">保存</el-button>
                 <el-button  @click="Glas_quxiao" >取消</el-button>
               </div>
 
@@ -97,14 +97,15 @@
                 <el-select v-model="Glas_pinggu" placeholder="请选择" style="width:120px;">
                     <el-option
                     v-for="item in pinggr"
-                    :key="item.id"
-                    :label="item.label"
-                    :value="item.id"
+                    :key="item.admin_user_id"
+                    :label="item.user_name"
+                    :value="item.admin_user_id"
                     >
                     </el-option>
                 </el-select>
               </div>
             </div>
+            <div id="ctrl-xgtlpic-mask2" class="readonly" data-text="图片操作的遮罩层" v-show="append2 == false"></div>
             <div id="ctrl-xgtlpic-mask" class="readonly" data-text="图片操作的遮罩层" v-show="append == false"></div>
             <hr style=" background-color: #DCDFE6;margin-top: 20px; height: 1px;border: none;"/>
             <div class="shuoming">
@@ -270,10 +271,12 @@ export default {
       yundong:[{value:6,label:'能按指令运动肢体(6分)',is_check:false,check:0},{value:5,label:'对刺痛能定位(5分)',is_check:false,check:0},{value:4,label:'对刺痛能躲避(4分)',is_check:false,check:0},
       {value:3,label:'刺痛肢体屈曲(3分)',is_check:false,check:0},{value:2,label:'刺痛肢体过伸(2分)',is_check:false,check:0},{value:1,label:'无反应(1分)',is_check:false,check:0}],
 
-      pinggr:[{id:1,label:'小米'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+      pinggr:[],
       history_Glasgow:[],
 
       append:false,//显示遮罩层
+      append2:false,
+      add_open:1,//新增按钮控制条件
       Glasadd_show:true,//显示新增
       Glas_gzdayin:false,//显示编辑删除
       Glas_baoxiao:false,//显示保存
@@ -282,6 +285,7 @@ export default {
       Glas_pinggu:null,
       open_print:false,
       dele_id:'',
+      dele_id2:'',
       dele_dialogVisible:false,
       dayintime:this.getTime2(new Date()),
       glasgow_zong:0,
@@ -292,6 +296,7 @@ export default {
     const id = this.$route.params && this.$route.params.id
     this.patientID = parseInt(id)
     this.getlist()
+    this.getAllNurseList()
   },
   methods:{
     //睁眼
@@ -354,12 +359,19 @@ export default {
     },
     // 新增
     Glas_add(){
-      this.cancel_num=0
-      this.append=true
-      this.Glas_baoxiao=true
-      this.Glasadd_show =false
-      this.Glas_gzdayin = false
-      this.qufen = false
+      if(this.add_open ==1){
+        this.cancel_num=0
+        this.append=true
+        this.append2=true
+        this.Glas_baoxiao=true
+        this.Glasadd_show =false
+        this.Glas_gzdayin = false
+        this.qufen = false
+      }else{
+        this.append = false
+        this.append2 = false
+      }
+      
     },
     // 新增保存
     Glas_save(){
@@ -391,41 +403,22 @@ export default {
             if(response.data.state == 1){
               const Glasgow = response.data.data.pedFallssessment
               console.log('response.data.state',response.data.data.pedFallssessment);
-              if(Glasgow.text !=''){
-                var text = JSON.parse(Glasgow.text)
-                const arr ={
-                  id:Glasgow.id,
-                  date:text.date,
-                  mark:text.total,
-                  evaluate:this.getpinggr(text.Glas_pinggu),
-                  list:text
-                }
-                this.history_Glasgow.push(arr)
-              }
+              this.getlist()
+              // if(Glasgow.text !=''){
+              //   var text = JSON.parse(Glasgow.text)
+              //   this.dele_id2 = Glasgow.id
+              //   const arr ={
+              //     id:Glasgow.id,
+              //     date:text.date,
+              //     mark:text.total,
+              //     evaluate:this.getpinggr(text.Glas_pinggu),
+              //     list:text
+              //   }
+              //   this.history_Glasgow.push(arr)
+              // }
             }
         })
-        // console.log('1111111',params);
-        // const arr={
-        //   date:this.date,
-        //   mark:this.Glasgow_Totalpoints,
-        //   evaluate:this.Glas_pinggu
-        // }
-        // console.log('2121212',arr,params);
-        // this.history_Glasgow.push(arr)
-        // const Glalen=this.pinggr
-        // const historylen = this.history_Glasgow
-        // var pingguname =''
-        // for(let x=0;x<historylen.length;x++){
-        //   historylen[x].mark = this.Glasgow_Totalpoints
-        //   for(let i=0;i<Glalen.length;i++){
-        //     if(this.Glas_pinggu==Glalen[i].id){
-        //       pingguname = Glalen[i].label
 
-        //     }
-        //   }
-        //   historylen[x].evaluate = pingguname
-        //       // return historylen[x].evaluate
-        // }
         return this.history_Glasgow
       }
     },
@@ -482,10 +475,16 @@ export default {
       this.Glasadd_show=false
       this.cancel_num =1
       this.qufen = true
+      this.append2 = true
     },
     // 选中数据
     glasgow_click(row,column, event){
-      this.dele_id=row.id
+      if(row.id == 0){
+        this.dele_id =this.dele_id2
+      }else{
+        this.dele_id=row.id
+      }
+      
       // if(this.cancel_num == 1){
       //   this.Glasadd_show = true
       //   this.Glas_gzdayin = true
@@ -497,12 +496,13 @@ export default {
         this.Glas_gzdayin = true
         this.Glas_baoxiao = false
         this.qufen = false
-        // this.append2 = false
+        this.append2 = false
       }
       getPedPatientFallAssessmentById(this.dele_id).then(response =>{
         if(response.data.state ==1){
           const glasgow = response.data.data.fallassessment
-          // console.log('response.data.',response.data.data.fallassessment);
+        
+          console.log('response.data.',response.data.data.fallassessment);
           if(glasgow.text !=''){
             const text =JSON.parse(glasgow.text)
             for(let i in this.zhengyan){
@@ -566,6 +566,23 @@ export default {
               this.history_Glasgow.splice(i,1)
             }
           }
+          for(let i=0;i<this.zhengyan.length;i++){
+        
+            this.zhengyan[i].check =0
+            this.zhengyan[i].is_check = false
+            this.zhengyan_num = 0
+          }
+          for(let i=0;i<this.yanyu.length;i++){
+            this.yanyu[i].check =0
+            this.yanyu[i].is_check = false
+            this.yuyan_num = 0
+          }
+          for(let i=0;i<this.yundong.length;i++){
+            this.yundong[i].check =0
+            this.yundong[i].is_check = false
+            this.yundong_num = 0
+          }
+          this.Glas_pinggu = ''
         }
       })
       this.dele_dialogVisible=false
@@ -586,13 +603,14 @@ export default {
         this.Glasadd_show=true
         this.Glas_gzdayin=false
         this.Glas_baoxiao=false
-        
+        this.append2=false
       //  return this.append
       }else{
         this.Glasadd_show=true
         this.Glas_gzdayin=true
         this.Glas_baoxiao=false
         this.append=true
+        this.append2=false
       }
       for(let i in this.zhengyan){
         this.zhengyan[i].is_check = false
@@ -647,8 +665,8 @@ export default {
     // 评估护士
     getpinggr(id){
       for(let i in this.pinggr){
-        if(id == this.pinggr[i].id){
-          return this.pinggr[i].label
+        if(id == this.pinggr[i].admin_user_id){
+          return this.pinggr[i].user_name
         }
       }
     },
@@ -662,6 +680,9 @@ export default {
         }
       getPatientBedlist(params).then(response=>{
         if(response.data.state ==1){
+          if(this.history_Glasgow.length >0){
+            this.history_Glasgow.length =0
+          }
           var list = response.data.data.list
           list.forEach((item) => {
             if(item.text !=''){
@@ -681,7 +702,7 @@ export default {
           console.log('list',list);
         }
       })
-      return this.history_OH
+      return this.history_Glasgow
     },
     // 患者信息
     tranpatient(event){
@@ -691,6 +712,16 @@ export default {
         dialysis_no:event.dialysis_no
       }
     },
+     // 评估人数据源
+    getAllNurseList(){
+        getAllNurseList().then(response=>{
+          if(response.data.state ==1){
+            var nurseList  = response.data.data.nurseList
+
+            this.pinggr =nurseList
+          }
+        })
+    },
   },
   computed:{
     Glasgow_Totalpoints:{
@@ -764,6 +795,9 @@ export default {
 #ctrl-xgtlpic-mask.readonly {
   z-index: 2000;
 }
+#ctrl-xgtlpic-mask2.readonly {
+  z-index: 2000;
+}
 #ctrl-xgtlpic-mask {
     width: 85%;
     height: 100%;
@@ -773,6 +807,15 @@ export default {
     opacity: 0;
     z-index: -1;
 }
+#ctrl-xgtlpic-mask2 {
+    width: 50%;
+    height: 100%;
+    position: absolute;
+    left: 196px;
+    top: 131px;
+    opacity: 0;
+    z-index: -1;
+}
 .tables {
 
   thead th{

src/xt_pages/user/evaluationtool/Muscleforce.vue

@@ -73,14 +73,15 @@
                   <el-select v-model="muscle_pinggu" placeholder="请选择" style="width:120px;">
                       <el-option
                       v-for="item in pinggr"
-                      :key="item.id"
-                      :label="item.label"
-                      :value="item.id"
+                      :key="item.admin_user_id"
+                      :label="item.user_name"
+                      :value="item.admin_user_id"
                       >
                       </el-option>
                   </el-select>
               </div>
             </div>
+            <div id="ctrl-xgtlpic-mask2" class="readonly" data-text="图片操作的遮罩层" v-show="append2 == false"></div>
             <div id="ctrl-xgtlpic-mask" class="readonly" data-text="图片操作的遮罩层" v-show="append == false"></div>
           </div>
           <!-- 虚线 -->
@@ -218,8 +219,9 @@ export default {
         {title:'5级',label:' 正常肌力',value:5,is_check:false,check:0},
       ],
       history_muscle:[],
-      pinggr:[{id:1,label:'小米'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
-      append:false,
+      pinggr:[],
+      append:false,//遮罩层
+      append2:false,
       add_open:1,
       muscle_show:true,
       baocun_quxiao:false,
@@ -227,6 +229,7 @@ export default {
       cancel_num:0,//是否点击右侧
       open_print:false,
       dele_id:'',
+      dele_id2:'',
       dele_dialogVisible:false,
       content:"",
       text:"",
@@ -242,6 +245,7 @@ export default {
     const id = this.$route.params && this.$route.params.id
     this.patientID = parseInt(id)
     this.getlist()
+    this.getAllNurseList()
   },
   methods:{
     // 选择
@@ -269,9 +273,12 @@ export default {
         this.append=true
         this.baocun_quxiao=true
         this.muscle_show =false
+        this.muscle_gsdayin = false
         this.qufen =false
+        this.append2 = true
       }else{
         this.append = false
+        this.append2 = false
       }
     },
     // 保存
@@ -302,16 +309,18 @@ export default {
           if(response.data.state == 1){
             console.log('response',response.data.data);
             const muscle = response.data.data.pedFallssessment
-            if(muscle.text !=''){
-              const text = JSON.parse(muscle.text)
-              const arr={
-                id:muscle.id,
-                date:text.date,
-                mark:text.total,
-                evaluate:this.getpinggr(text.muscle_pinggu)
-              }
-              this.history_muscle.push(arr)
-            }
+            // if(muscle.text !=''){
+            //   const text = JSON.parse(muscle.text)
+            //   this.dele_id2 = muscle.id
+            //   const arr={
+            //     id:muscle.id,
+            //     date:text.date,
+            //     mark:text.total,
+            //     evaluate:this.getpinggr(text.muscle_pinggu)
+            //   }
+            //   this.history_muscle.push(arr)
+            // }
+            this.getlist()
             this.$message({message:'保存成功',type:'success'})
           }
         })
@@ -361,12 +370,18 @@ export default {
     },
     // 选中右侧数据
     Muscle_click(row,column, event){
-      this.dele_id=row.id
+      if(row.id ==0){
+        this.dele_id=this.dele_id2 
+      }else{
+        this.dele_id=row.id
+      }
+      console.log('row.id',this.dele_id);
       this.muscle_show=true
       this.baocun_quxiao=false
       this.muscle_gsdayin=true
       this.qufen = true
-      getPedPatientFallAssessmentById(row.id).then(response =>{
+      this.append2 = false
+      getPedPatientFallAssessmentById(this.dele_id).then(response =>{
         if(response.data.state == 1){
           console.log('111111111',response.data.data.fallassessment); 
           const muscle = response.data.data.fallassessment
@@ -440,11 +455,13 @@ export default {
         this.muscle_show=true
         this.muscle_gsdayin=false
         this.append=false
+        this.append2=false
       }else{
         this.muscle_gsdayin=true
         this.muscle_show=true
         this.baocun_quxiao=false
         this.append=true
+        this.append2=false
       }
 
     },
@@ -455,6 +472,7 @@ export default {
       this.muscle_show=false
       this.qufen = true
       this.cancel_num=1
+      this.append2 = true
     },
     // 打印
     print_pingfen(){
@@ -491,8 +509,8 @@ export default {
     // 评估护士
     getpinggr(id){
       for(let i in this.pinggr){
-        if(id == this.pinggr[i].id){
-          return this.pinggr[i].label
+        if(id == this.pinggr[i].admin_user_id){
+          return this.pinggr[i].user_name
         }
       }
     },
@@ -515,6 +533,9 @@ export default {
       }
       getPatientBedlist(params).then(response =>{
         if(response.data.state ==1){
+          if(this.history_muscle.length >0){
+            this.history_muscle.length=0
+          }
           const list = response.data.data.list
           console.log('response.data.data.list12',list);
           list.forEach(item => {
@@ -534,7 +555,17 @@ export default {
           });
         }
       })
-    }
+    },
+     // 评估人数据源
+    getAllNurseList(){
+        getAllNurseList().then(response=>{
+          if(response.data.state ==1){
+            var nurseList  = response.data.data.nurseList
+
+            this.pinggr =nurseList
+          }
+        })
+    },
   }
 }
 </script>
@@ -586,6 +617,9 @@ export default {
 #ctrl-xgtlpic-mask.readonly {
   z-index: 2000;
 }
+#ctrl-xgtlpic-mask2.readonly {
+  z-index: 2000;
+}
 #ctrl-xgtlpic-mask {
     width: 85%;
     height: 100%;
@@ -595,6 +629,15 @@ export default {
     opacity: 0;
     z-index: -1;
 }
+#ctrl-xgtlpic-mask2 {
+    width: 50%;
+    height: 100%;
+    position: absolute;
+    left: 196px;
+    top: 131px;
+    opacity: 0;
+    z-index: -1;
+}
 .tables {
 
   thead th{

src/xt_pages/user/evaluationtool/OHpressuresore.vue

@@ -17,7 +17,7 @@
 
               <div style="flex:1" v-if="baocun_open==1">
                 <el-button type="primary" @click="save_OH" v-if="this.qufen ==false">保存</el-button>
-                <el-button type="primary" @click="updateBedPatientList" v-if="this.qufen == true && this.dele_id !=''">保存1</el-button>
+                <el-button type="primary" @click="updateBedPatientList" v-if="this.qufen == true && this.dele_id !=''">保存</el-button>
                 <el-button  @click="cancel_OH" >取消</el-button>
               </div>
 
@@ -107,9 +107,9 @@
                   <el-select v-model="oh_appraiser" placeholder="请选择"  style="width:120px;">
                       <el-option
                       v-for="item in oh_pinggr"
-                      :key="item.id"
-                      :label="item.label"
-                      :value="item.id"
+                      :key="item.admin_user_id"
+                      :label="item.user_name"
+                      :value="item.admin_user_id"
                      >
                       </el-option>
                   </el-select>
@@ -303,7 +303,7 @@ export default {
       bingli:[{value:0,label:'无(0分)',check:0,is_check:false},{value:1.5,label:'轻度/中度(1.5分)',check:0,is_check:false},{value:3,label:'高度(3分)',check:0,is_check:false}],
       edema:[{value:0,label:'无(0分)',check:0,is_check:false},{value:3,label:'有(3分)',check:0,is_check:false}],
       guanjie:[{value:0,label:'无(0分)',check:0,is_check:false},{value:1,label:'有(1分)',check:0,is_check:false}],
-      oh_pinggr:[{id:1,label:'小米'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+      oh_pinggr:[],
       checkList:[],
       checkList1:[],
       checkList2:[],
@@ -319,6 +319,7 @@ export default {
       cancel_num:0,//取消的条件
       open_print:false,
       dele_id:'',//删除的索引
+      dele_id2:'',
       dele_dialogVisible:false,
       oh_huli:'',//护理措施
       oh_date:this.getTime(new Date()),
@@ -432,6 +433,7 @@ export default {
         this.append = false
         this.append2 = false
       }
+
       // for(let i in this.tiwei){
       //   this.tiwei[i].is_check = false,
       //   this.tiwei[i].check = 0
@@ -461,6 +463,7 @@ export default {
         this.add_show=true
         this.zsgy_open=1
         this.cancel_num=1
+        this.append2 =false
         const data = {}
         var list =[]
         data['patient_id'] =  this.patientID
@@ -485,19 +488,21 @@ export default {
           if(response.data.state ==1){
             console.log('response.data.state',response.data);
             const item = response.data.data.pedFallssessment
-            var oh_text = JSON.parse(item.text)
-            // console.log('oh_data.text',JSON.parse(item.text));
-              const arr ={
-                id:item.id,
-                date:this.getTime(item.record_date),
-                mark:oh_text.total,
-                evaluate:this.getpinggr(oh_text.oh_appraiser),
-                list:oh_text
-              }
-              this.history_OH.push(arr)
+            this.getlist()
+            // var oh_text = JSON.parse(item.text)
+            // // console.log('oh_data.text',JSON.parse(item.text));
+            //   this.dele_id2 = item.id
+            //   const arr ={
+            //     id:item.id,
+            //     date:this.getTime(item.record_date),
+            //     mark:oh_text.total,
+            //     evaluate:this.getpinggr(oh_text.oh_appraiser),
+            //     list:oh_text
+            //   }
+            //   this.history_OH.push(arr)
           }
         })
-        return this.history_OH
+        // return this.history_OH
       }
     },
     //编辑
@@ -510,9 +515,8 @@ export default {
       this.qufen =true
     },
     // 选中数据
-    dele_click(row, column, event){
-
-      this.dele_id=row.id
+    dele_click(row, column, event){    
+        this.dele_id = row.id
       console.log('row',this.dele_id);
       if(this.baocun_open == 1){
         this.add_show = true
@@ -523,96 +527,63 @@ export default {
       getPedPatientFallAssessmentById(this.dele_id).then(response=>{
         if(response.data.state ==1){
           const oheditor = response.data.data.fallassessment
-          var editor  =JSON.parse(oheditor.text)
-          if(oheditor.id == row.id){
-            for(let i in this.tiwei){
-              if(editor.tiwei == this.tiwei[i].value){
-                this.tiwei[i].is_check = true
-                this.tiwei[i].check = 1
-                this.tiwei_num = editor.tiwei
-              }else{
-                this.tiwei[i].is_check = false
-                this.tiwei[i].check = 0
-                // this.tiwei_num = 0
-              }
-            }
-            for(let i in this.bingli){
-              if(editor.bingli == this.bingli[i].value){
-                this.bingli[i].is_check = true
-                this.bingli[i].check = 1
-                this.bingli_num = editor.bingli
-              }else{
-                this.bingli[i].is_check = false
-                this.bingli[i].check = 0
-                // this.bingli_num = 0
+          if(oheditor.text !=''){
+            var editor  =JSON.parse(oheditor.text)
+            if(oheditor.id == row.id){
+              for(let i in this.tiwei){
+                if(editor.tiwei == this.tiwei[i].value){
+                  this.tiwei[i].is_check = true
+                  this.tiwei[i].check = 1
+                  this.tiwei_num = editor.tiwei
+                }else{
+                  this.tiwei[i].is_check = false
+                  this.tiwei[i].check = 0
+                  // this.tiwei_num = 0
+                }
               }
+              for(let i in this.bingli){
+                if(editor.bingli == this.bingli[i].value){
+                  this.bingli[i].is_check = true
+                  this.bingli[i].check = 1
+                  this.bingli_num = editor.bingli
+                }else{
+                  this.bingli[i].is_check = false
+                  this.bingli[i].check = 0
+                  // this.bingli_num = 0
+                }
 
-            }
-            for(let i in this.edema){
-              if(editor.edema == this.edema[i].value){
-                this.edema[i].is_check = true
-                this.edema[i].check = 1
-                this.edema_num = editor.edema
-              }else{
-                this.edema[i].is_check = false
-                this.edema[i].check = 0
-                // this.edema_num = 0
               }
-            }
-            for(let i in this.guanjie){
-              if(editor.guanjie == this.guanjie[i].value){
-                this.guanjie[i].is_check = true
-                this.guanjie[i].check = 1
-                this.gaunjie_num = editor.guanjie
-              }else{
-                this.guanjie[i].is_check = false
-                this.guanjie[i].check = 0
-                // this.gaunjie_num = 0
+              for(let i in this.edema){
+                if(editor.edema == this.edema[i].value){
+                  this.edema[i].is_check = true
+                  this.edema[i].check = 1
+                  this.edema_num = editor.edema
+                }else{
+                  this.edema[i].is_check = false
+                  this.edema[i].check = 0
+                  // this.edema_num = 0
+                }
+              }
+              for(let i in this.guanjie){
+                if(editor.guanjie == this.guanjie[i].value){
+                  this.guanjie[i].is_check = true
+                  this.guanjie[i].check = 1
+                  this.gaunjie_num = editor.guanjie
+                }else{
+                  this.guanjie[i].is_check = false
+                  this.guanjie[i].check = 0
+                  // this.gaunjie_num = 0
+                }
               }
+              this.oh_appraiser = editor.oh_appraiser
+              this.oh_huli = editor.oh_huli
+              this.oh_date = editor.record_date
+              this.Totalpoints = editor.total
             }
-            this.oh_appraiser = editor.oh_appraiser
-            this.oh_huli = editor.oh_huli
-            this.oh_date = editor.record_date
-            this.Totalpoints = editor.total
+            console.log('data',this.Totalpoints,oheditor);
           }
-          console.log('data',this.Totalpoints,oheditor);
         }
       })
-
-
-      // for(let i in this.tiwei){
-      //   if(row.list.tiwei == this.tiwei[i].value){
-      //     this.tiwei[i].is_check = true
-      //     this.tiwei[i].check = 1
-      //   }
-      // }
-      // for(let i in this.bingli){
-      //   if(row.list.bingli == this.bingli[i].value){
-      //     this.bingli[i].is_check = true
-      //     this.bingli[i].check = 1
-      //   }
-      // }
-      // for(let i in this.edema){
-      //   if(row.list.edema == this.edema[i].value){
-      //     this.edema[i].is_check = true
-      //     this.edema[i].check = 1
-      //   }
-      // }
-      // for(let i in this.guanjie){
-      //   if(row.list.guanjie == this.guanjie[i].value){
-      //     this.guanjie[i].is_check = true
-      //     this.guanjie[i].check = 1
-      //   }
-      // }
-      // this.oh_appraiser = row.list.oh_appraiser
-      // this.oh_huli = row.list.oh_huli
-      // this.oh_date = row.list.record_date
-      // this.Totalpoints = row.mark
-      // console.log('Totalpoints',this.Totalpoints);
-      //row.id 为 选中当前行的id
-      // deletePedPatientFallassment(row.id).then(response=>{
-
-      // })
     },
     //删除
     dele_OH(){
@@ -639,13 +610,31 @@ export default {
               this.history_OH.splice(i,1)
             }
           }
+          this.oh_appraiser = ''
+          this.oh_huli = ''
+            for(let i in this.tiwei){
+                this.tiwei[i].is_check = false
+                this.tiwei[i].check = 0
+                this.tiwei_num =0
+            }
+            for(let i in this.bingli){
+                this.bingli[i].is_check = false
+                this.bingli[i].check = 0
+                this.bingli_num =0
+            }
+            for(let i in this.edema){
+             
+                this.edema[i].is_check = false
+                this.edema[i].check = 0
+                this.edema_num = 0
+            }
+            for(let i in this.guanjie){
+                this.guanjie[i].is_check = false
+                this.guanjie[i].check = 0
+                this.gaunjie_num =0
+            }
         }
       })
-      // for(let i=0;i<this.history_OH.length;i++){
-      //   if(this.dele_id==this.history_OH[i].id){
-      //     this.history_OH.splice(i,1)
-      //   }
-      // }
       this.dele_dialogVisible=false
       return this.history_OH
     },
@@ -667,10 +656,12 @@ export default {
       if(this.cancel_num==1){
         this.zsgy_open=1
         this.add_show=true
+        this.append2=false
       }else{
         this.zsgy_open=0
         this.add_show=true
         this.append=false
+        this.append2=false
         this.tiwei_num=''
         this.bingli_num=null
         this.edema_num=null
@@ -705,17 +696,18 @@ export default {
     // 评估护士
     getpinggr(id){
       for(let i in this.oh_pinggr){
-        if(id == this.oh_pinggr[i].id){
-          return this.oh_pinggr[i].label
+        if(id == this.oh_pinggr[i].admin_user_id){
+          return this.oh_pinggr[i].user_name
         }
       }
     },
+    // 评估数据
     getAllNurseList(){
      getAllNurseList().then(response=>{
         if(response.data.state ==1){
           var nurseList  = response.data.data.nurseList
 
-          this.nurseList =nurseList
+          this.oh_pinggr =nurseList
         }
       })
     },
@@ -729,6 +721,9 @@ export default {
         }
       getPatientBedlist(params).then(response=>{
         if(response.data.state ==1){
+          if(this.history_OH.length >0){
+            this.history_OH.length=0
+          }
           var list = response.data.data.list
           list.forEach((item) => {
 
@@ -811,6 +806,7 @@ export default {
   this.patientID = parseInt(id)
   console.log('this.$route.query.patient_id',this.patientID);
   this.getlist()
+  this.getAllNurseList()
  }
 }
 </script>

src/xt_pages/user/evaluationtool/RassAssessment.vue

@@ -454,7 +454,7 @@
 import PatientSidebar from '../components/PatientSidebar.vue'
 import behavior from './behavior.vue'
 import { uParseTime } from '@/utils/tools'
-import {savePatientHpressuresore} from '@/api/fallassement'
+import {getAllNurseList,savePatientHpressuresore} from '@/api/fallassement'
 export default {
     components:{
       PatientSidebar,
@@ -480,7 +480,7 @@ export default {
             RAssdate:this.getTime(new Date()),
             rass_appraiser:'',
             Rass_num:0,//控制是rass还是LOS
-            rassoptions:[{admin_user_id:1,user_name:'寒千落'},{admin_user_id:2,user_name:'千仞雪'},{admin_user_id:3,user_name:'千亦雪'}],
+            rassoptions:[],
 
             qita_val:'',
             qita_textarea:'',
@@ -565,6 +565,7 @@ export default {
     created(){
       const id = this.$route.params && this.$route.params.id
       this.patientID = parseInt(id)
+      this.getAllNurseList()
     },
     methods:{
       // RASS评估表
@@ -934,6 +935,16 @@ export default {
           dialysis_no:event.dialysis_no
         }
       },
+      // 评估人数据源
+      getAllNurseList(){
+        getAllNurseList().then(response=>{
+          if(response.data.state ==1){
+            var nurseList  = response.data.data.nurseList
+
+            this.rassoptions =nurseList
+          }
+        })
+      },
     },
     computed:{
       // Pain_score(){

src/xt_pages/user/evaluationtool/dailyLife.vue

@@ -177,9 +177,9 @@
                           <el-select v-model="appraiser" placeholder="请选择"  style="width:150px;">
                               <el-option
                               v-for="item in optionsarr"
-                              :key="item.id"
-                              :label="item.label"
-                              :value="item.id"
+                              :key="item.admin_user_id"
+                              :label="item.user_name"
+                              :value="item.admin_user_id"
                              >
                               </el-option>
                           </el-select>
@@ -205,7 +205,7 @@
 <script>
 import PatientSidebar from '../components/PatientSidebar.vue'
 import { uParseTime } from '@/utils/tools'
-import {savePatientHpressuresore} from '@/api/fallassement'
+import {getAllNurseList,savePatientHpressuresore} from '@/api/fallassement'
 export default {
   components:{
     PatientSidebar
@@ -229,7 +229,7 @@ export default {
       louti_val:null,
       appraiser:'',
       // optionsarr:[],
-      optionsarr:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+      optionsarr:[],
       date:this.getTime(new Date()),
       Patient_info:{name:'',dialysis_no:''},
       jinshi:[{value:10,label:'可独立进食(10分)',is_check:false,check:0},
@@ -278,7 +278,7 @@ export default {
   created(){
     const id = this.$route.params && this.$route.params.id
     this.patientID = parseInt(id)
-    // this.patient_id = parseInt(id)
+    this.getAllNurseList()
   },
   methods:{
     jinshiclick(e,item){
@@ -517,6 +517,7 @@ export default {
               Patient_info:this.Patient_info}
         })
     },
+    // 患者信息
     tranpatient(event){
       console.log('event',event);
       this.Patient_info={
@@ -524,6 +525,16 @@ export default {
         dialysis_no:event.dialysis_no
       }
     },
+    // 评估人数据源
+    getAllNurseList(){
+      getAllNurseList().then(response=>{
+        if(response.data.state ==1){
+          var nurseList  = response.data.data.nurseList
+
+          this.optionsarr =nurseList
+        }
+      })
+    },
   },
   computed:{
     date_Totalpoints(){

src/xt_pages/user/evaluationtool/mindAssessment.vue

@@ -82,9 +82,9 @@
                             <el-select v-model="appraiser" placeholder="请选择" style="width:150px;">
                                 <el-option
                                 v-for="item in optionsarr"
-                                :key="item.id"
-                                :label="item.label"
-                                :value="item.id"
+                                :key="item.admin_user_id"
+                                :label="item.user_name"
+                                :value="item.admin_user_id"
                                 >
                                 </el-option>
                             </el-select>
@@ -102,7 +102,7 @@
 <script>
 import { uParseTime } from '@/utils/tools'
 import PatientSidebar from '../components/PatientSidebar.vue'
-import {savePatientHpressuresore} from '@/api/fallassement'
+import {getAllNurseList,savePatientHpressuresore} from '@/api/fallassement'
 export default {
   components:{
     PatientSidebar
@@ -124,7 +124,7 @@ export default {
           qingan:[{value:1,label:'有'},{value:0,label:'无'}],
           appraiser:'',
           // optionsarr:[],
-          optionsarr:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+          optionsarr:[],
           date:this.getTime(new Date()),
           Patient_info:{name:'',dialysis_no:''},
       }
@@ -133,7 +133,7 @@ export default {
   created(){
     const id = this.$route.params && this.$route.params.id
     this.patientID = parseInt(id)
-    // this.patient_id = parseInt(id)
+    this.getAllNurseList()
   },
   methods:{
     // 历史评分
@@ -211,7 +211,16 @@ export default {
         dialysis_no:event.dialysis_no
       }
     },
+    // 评估人数据源
+    getAllNurseList(){
+        getAllNurseList().then(response=>{
+          if(response.data.state ==1){
+            var nurseList  = response.data.data.nurseList
 
+            this.optionsarr =nurseList
+          }
+        })
+    },
   }
 }
 </script>

src/xt_pages/user/evaluationtool/nourishmentAssessment.vue

@@ -202,7 +202,7 @@
 <script>
 import PatientSidebar from '../components/PatientSidebar.vue'
 import { uParseTime } from '@/utils/tools'
-import {savePatientHpressuresore} from '@/api/fallassement'
+import {getAllNurseList,savePatientHpressuresore} from '@/api/fallassement'
 export default {
   components:{
     PatientSidebar
@@ -233,7 +233,7 @@ export default {
       yy_date:this.getTime(new Date()),
       Patient_info:{name:'',dialysis_no:''},
       yy_appraiser:'',
-      yy_options:[{admin_user_id:1,user_name:'寒千落'},{admin_user_id:2,user_name:'千仞雪'},{admin_user_id:3,user_name:'千亦雪'}],
+      yy_options:[],
       jibq_show:[],
       jibz_show:[],
       jibzz_show:[],
@@ -256,6 +256,7 @@ export default {
   created(){
     const id = this.$route.params && this.$route.params.id
     this.patientID = parseInt(id)
+    this.getAllNurseList()
   },
   methods:{
     // 选中分值
@@ -704,6 +705,16 @@ export default {
         dialysis_no:event.dialysis_no
       }
     },
+     // 评估人数据源
+    getAllNurseList(){
+        getAllNurseList().then(response=>{
+          if(response.data.state ==1){
+            var nurseList  = response.data.data.nurseList
+
+            this.yy_options =nurseList
+          }
+        })
+    },
   },
   computed:{
     nour_Totalpoints(){

src/xt_pages/user/evaluationtool/pediatricFallAssessment.vue

@@ -198,8 +198,8 @@ export default {
       dialogVisible:false,
       text:'',
       num:1,
-      tumble_options:[{admin_user_id:1,user_name:'小米'},{admin_user_id:2,user_name:'小明'},{admin_user_id:3,user_name:'小红'}],
-      // tumble_options:[],
+      // tumble_options:[{admin_user_id:1,user_name:'小米'},{admin_user_id:2,user_name:'小明'},{admin_user_id:3,user_name:'小红'}],
+      tumble_options:[],
       tumble:'',
       date:this.getTime(new Date()),
       patient:'',
@@ -367,13 +367,14 @@ export default {
         })
       }
     },
+    // 评估人数据源
     getAllNurseList(){
         getAllNurseList().then(response=>{
            if(response.data.state ==1){
             console.log('response.data.data',response.data.data);
              var nurseList  = response.data.data.nurseList
 
-            //  this.tumble_options =nurseList
+             this.tumble_options =nurseList
            }
         })
     },

src/xt_pages/user/evaluationtool/pressuresore.vue

@@ -229,9 +229,9 @@
                     <el-select v-model="duty" placeholder="请选择" style="width:120px;">
                         <el-option
                           v-for="item in dutyoptions"
-                          :key="item.id"
-                          :label="item.label"
-                          :value="item.id"
+                          :key="item.admin_user_id"
+                          :label="item.user_name"
+                          :value="item.admin_user_id"
                           >
                         </el-option>
                     </el-select>
@@ -291,10 +291,10 @@
                     护士长签字:
                     <el-select v-model="nurse" placeholder="请选择" style="width: 120px;">
                         <el-option
-                        v-for="item in nurse_options"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="item in dutyoptions"
+                        :key="item.admin_user_id"
+                        :label="item.user_name"
+                        :value="item.admin_user_id">
                         </el-option>
                     </el-select>
                 </p>
@@ -371,13 +371,12 @@ export default {
       date:this.getTime(new Date()),
       huli_value:'',
       family_date:this.getTime(new Date()),
-      dutyoptions:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+      dutyoptions:[],
       duty:'',
       family_member:'',
       appraiser:'',
       appraiser_date:this.getTime(new Date()),
       nurse:'',
-      nurse_options:[],
       nurse_date:this.getTime(new Date()),
       hulicheckarr:[],//护理措施选中
       hulicuoshi:[{id:1,label:'挂床头警示标识',hulicheck:0,is_check:false},{id:2,label:'保护受压皮肤，使用减压用具(气垫床/压疮床)',hulicheck:0,is_check:false},
@@ -456,13 +455,13 @@ export default {
         return uParseTime(val, '{y}-{m}-{d}')
         }
     },
-    // 评估
+    // 评估人数据源
     getAllNurseList(){
         getAllNurseList().then(response=>{
            if(response.data.state ==1){
              var nurseList  = response.data.data.nurseList
 
-             this.nurseList =nurseList
+             this.dutyoptions =nurseList
            }
         })
     },

src/xt_pages/user/evaluationtool/pruritusAssessment.vue

@@ -105,9 +105,9 @@
               <el-select v-model="pruritus_appraiser" placeholder="请选择" style="width:150px;">
                   <el-option
                   v-for="item in pruritus_options"
-                  :key="item.id"
-                  :label="item.label"
-                  :value="item.id"
+                  :key="item.admin_user_id"
+                  :label="item.user_name"
+                  :value="item.admin_user_id"
                   >
                   </el-option>
               </el-select>
@@ -125,7 +125,7 @@
 <script>
 import PatientSidebar from '../components/PatientSidebar.vue'
 import { uParseTime } from '@/utils/tools'
-import {savePatientHpressuresore} from '@/api/fallassement'
+import {getAllNurseList,savePatientHpressuresore} from '@/api/fallassement'
 export default {
   components:{
     PatientSidebar
@@ -144,7 +144,7 @@ export default {
       radio3_points:0,
       checked_points:0,
       // pruritus_options:[],
-      pruritus_options:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+      pruritus_options:[],
       pruritus_appraiser:'',
       pruritus_date:this.getTime(new Date()),
       buwei:[{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},],
@@ -167,6 +167,7 @@ export default {
   created(){
     const id = this.$route.params && this.$route.params.id
     this.patientID = parseInt(id)
+    this.getAllNurseList()
   },
   methods:{
     // 痒的部位选项
@@ -380,6 +381,16 @@ export default {
         dialysis_no:event.dialysis_no
       }
     },
+    // 评估人数据源
+    getAllNurseList(){
+        getAllNurseList().then(response=>{
+          if(response.data.state ==1){
+            var nurseList  = response.data.data.nurseList
+
+            this.pruritus_options =nurseList
+          }
+        })
+    },
   },
   computed:{
     pruritus_Totalpoints(){

src/xt_pages/user/history/Children_history.vue

@@ -353,7 +353,7 @@
 <script>
 import print from 'print-js'
 import { uParseTime } from '@/utils/tools'
-import {  getPedDiatricFallAssessmentList,getPedPatientFallAssessmentById,deletePedPatientFallassment,updatepatientfallassessmentById } from '@/api/fallassement'
+import { getAllNurseList, getPedDiatricFallAssessmentList,getPedPatientFallAssessmentById,deletePedPatientFallassment,updatepatientfallassessmentById } from '@/api/fallassement'
 export default{
   data(){
     return{
@@ -394,8 +394,8 @@ export default{
       checked:'',
       checkList:[],
       text:'',
-      tumble_options:[{admin_user_id:1,user_name:'小米'},{admin_user_id:2,user_name:'小明'},{admin_user_id:3,user_name:'小红'}],
-      // tumble_options:[],
+      // tumble_options:[{admin_user_id:1,user_name:'小米'},{admin_user_id:2,user_name:'小明'},{admin_user_id:3,user_name:'小红'}],
+      tumble_options:[],
       tumble:0,//评估人
       date:this.getTime(new Date()),//评估日期
       patient_id:0,
@@ -663,6 +663,7 @@ export default{
               this.tableData[i].mark = updatenum.total,
               this.tableData[i].time = this.getTime(updatenum.record_date),
               this.tableData[i].evaluate = this.getoptions(updatenum.admin_user_id)
+              this.tableData[i].list = updatenum
             }
            }
          }
@@ -743,7 +744,18 @@ export default{
           return options[i].user_name
         }
       }
-    }
+    },
+    // 评估人数据源
+    getAllNurseList(){
+        getAllNurseList().then(response=>{
+           if(response.data.state ==1){
+            console.log('response.data.data',response.data.data);
+             var nurseList  = response.data.data.nurseList
+
+             this.tumble_options =nurseList
+           }
+        })
+    },
   },
   computed:{
     pedia_Totalpoints:{
@@ -765,6 +777,7 @@ export default{
     this.Patient_info = this.$route.query.Patient_info
     // this.tumble_options = this.$route.query.tumble_options
     this.getPedDiatricFallAssessmentList()
+    this.getAllNurseList()
   }
 }
 </script>

src/xt_pages/user/history/Pressure_history.vue

@@ -347,7 +347,7 @@
                 <div class="zhuangui">
                   <p style="display: inline-block; margin-right: 30px;">
                       护士长签字:
-                      <span style="display: inline-block; border-bottom: 1px solid black;width: 100px;">{{items.nurse}}</span>
+                      <span style="display: inline-block; border-bottom: 1px solid black;width: 100px;">{{getoptions(items.nurse)}}</span>
                   </p>
                   <p style="display: inline-block;">
                       日期：
@@ -588,9 +588,9 @@
                     <el-select v-model="duty" placeholder="请选择" style="width:120px;">
                         <el-option
                           v-for="item in dutyoptions"
-                          :key="item.id"
-                          :label="item.label"
-                          :value="item.id"
+                          :key="item.admin_user_id"
+                          :label="item.user_name"
+                          :value="item.admin_user_id"
                           >
                         </el-option>
                     </el-select>
@@ -647,10 +647,10 @@
                   护士长签字:
                   <el-select v-model="nurse" placeholder="请选择" style="width: 120px;">
                       <el-option
-                      v-for="item in nurse_options"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
+                      v-for="item in dutyoptions"
+                        :key="item.admin_user_id"
+                        :label="item.user_name"
+                        :value="item.admin_user_id">
                       </el-option>
                   </el-select>
               </p>
@@ -733,13 +733,13 @@ export default{
       date:this.getTime(new Date()),
       huli_value:'',
       family_date:this.getTime(new Date()),
-      dutyoptions:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+      dutyoptions:[],
       duty:'',
       family_member:'',
       appraiser:'',
       appraiser_date:this.getTime(new Date()),
       nurse:'',
-      nurse_options:[],
+      nurse_options:[{admin_user_id:1,user_name:'寒千落'},{admin_user_id:2,user_name:'千仞雪'},{admin_user_id:3,user_name:'千亦雪'}],
       nurse_date:this.getTime(new Date()),
       hulicheckarr:[],
       patientID:0,
@@ -760,6 +760,7 @@ export default{
     this.patient_id = this.$route.query.patient_id
     this.Patient_info = this.$route.query.Patient_info
     this.getlist()
+    this.getAllNurseList()
   },
   methods:{
     // 返回
@@ -981,7 +982,7 @@ export default{
                 this.tableData[i].jiashu_date = text.jiashu_date,
                 this.tableData[i].appraiser = text.appraiser,
                 this.tableData[i].pingg_date = text.pingg_date,
-                this.tableData[i].nurse = text.nurse,
+                this.tableData[i].nurse = this.getnurse(text.nurse),
                 this.tableData[i].nurse_date = text.nurse_date,
                 this.tableData[i].zhuang_show = text.zhuang_show,
                 this.tableData[i].hulicuoshi = text.hulicuoshi
@@ -1062,8 +1063,17 @@ export default{
     getoptions(ids){
      const options= this.dutyoptions
       for(let i in options){
-        if(options[i].id == ids){
-          return options[i].label
+        if(options[i].admin_user_id == ids){
+          return options[i].user_name
+        }
+      }
+    },
+     // 护士长
+    getnurse(ids){
+     const options= this.nurse_options
+      for(let i in options){
+        if(options[i].admin_user_id == ids){
+          return options[i].user_name
         }
       }
     },
@@ -1081,7 +1091,17 @@ export default{
           console.log('arr2',arr2);
       }
       return arr2
-    }
+    },
+    // 评估人数据源
+    getAllNurseList(){
+      getAllNurseList().then(response=>{
+          if(response.data.state ==1){
+            var nurseList  = response.data.data.nurseList
+
+            this.dutyoptions =nurseList
+          }
+      })
+    },
   },
   computed:{
     mark:{

src/xt_pages/user/history/RASS_history.vue

@@ -323,7 +323,7 @@ export default{
       RAssradio:'',
       dayin:this.getTime2(new Date()),
       num:1,
-      rassoptions:[{admin_user_id:1,user_name:'寒千落'},{admin_user_id:2,user_name:'千仞雪'},{admin_user_id:3,user_name:'千亦雪'}],
+      rassoptions:[],
       tengtable:[],
       LOS:[{title:'0分', label:'清醒',value:0},{title:'1分', label:'有些昏昏欲睡，但容易唤醒',value:1},
             {title:'2分', label:'频繁发生昏昏欲睡，容易唤醒，但不能持续处于觉醒状态',value:2},
@@ -350,6 +350,7 @@ export default{
     this.Patient_info = this.$route.query.Patient_info
     this.getRass_list()
     this.getteng_list()
+    this.getAllNurseList()
   },
   methods:{
     // 返回
@@ -574,9 +575,16 @@ export default{
         }
       }
     },
-    // getqita(ids,){
-    //   if()
-    // }
+    // 评估人数据源
+    getAllNurseList(){
+      getAllNurseList().then(response=>{
+        if(response.data.state ==1){
+          var nurseList  = response.data.data.nurseList
+
+          this.rassoptions =nurseList
+        }
+      })
+    },
 
   }
 }

src/xt_pages/user/history/daoguan_history.vue

@@ -177,7 +177,7 @@
                     <td rowspan="3">
                       <div style="vertical-align: top; color: black; padding: 5px;">
                         <span >
-                          <template v-for="item in items.huli_show">  
+                          <template v-for="item in items.cuoshi1">  
                             <span >                  
                               <label><input type="checkbox" v-model="item.is_check" @click="cuoshi(item)"/>&nbsp;<span>{{ item.id }}.</span>{{item.label}}</label> <br/>
                             </span> 
@@ -340,9 +340,9 @@
                 <el-select v-model="Dutynurse" placeholder="请选择" style="width:150px;">
                     <el-option
                     v-for="item in Dutynursearr"
-                    :key="item.id"
-                    :label="item.label"
-                    :value="item.id"
+                    :key="item.admin_user_id"
+                    :label="item.user_name"
+                    :value="item.admin_user_id"
                     >
                     </el-option>
                 </el-select>
@@ -379,10 +379,10 @@
                 评估人签字:
                 <el-select v-model="appraiser" placeholder="请选择" style="width: 120px;">
                     <el-option
-                    v-for="item in optionsarr"
-                    :key="item.id"
-                    :label="item.label"
-                    :value="item.id">
+                    v-for="item in Dutynursearr"
+                    :key="item.admin_user_id"
+                    :label="item.user_name"
+                    :value="item.admin_user_id">
                     </el-option>
                 </el-select>
             </p>
@@ -402,10 +402,10 @@
                 护士长签字:
                 <el-select v-model="hushi" placeholder="请选择" style="width: 120px;">
                     <el-option
-                    v-for="item in hushiarr"
-                    :key="item.id"
-                    :label="item.label"
-                    :value="item.id">
+                    v-for="item in Dutynursearr"
+                    :key="item.admin_user_id"
+                    :label="item.user_name"
+                    :value="item.admin_user_id">
                     </el-option>
                 </el-select>
             </p>
@@ -472,14 +472,14 @@ export default{
       tableData:[],
       date:this.getTime(new Date()),
       appraiser:'',
-      optionsarr:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+      // optionsarr:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
       Dutynurse:'',//责任护士
       // Dutynursearr:[],//责任护士数组
-      Dutynursearr:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+      Dutynursearr:[],
       jiashu_date:this.getTime(new Date()),//家属时间
       zhuanggui:'',//转归
       hushi:'',//护理
-      hushiarr:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],//护理
+      // hushiarr:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],//护理
       hushi_date:this.getTime(new Date()),//护理时间
       limit:10,
       page:1,
@@ -516,6 +516,7 @@ export default{
     this.patient_id = this.$route.query.patient_id
     this.Patient_info = this.$route.query.Patient_info
     this.getlist()
+    this.getAllNurseList()
   },
   methods:{
     fanhui(){
@@ -744,10 +745,11 @@ export default{
       getPatientBedlist(params).then(response =>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          console.log('list-----',list);
+          
           list.forEach(item => {
             if(item.text !=''){
               const text = JSON.parse(item.text)
+              console.log('list-----',text);
               const arr = {
                 id:item.id,
                 radio:text.radio,
@@ -761,7 +763,7 @@ export default{
                 zhuanggui:text.zhuanggui,
                 hushi:text.hushi,
                 hushi_date:text.hushi_date,
-                huli_show:text.cuoshi1,
+                cuoshi1:text.cuoshi1,
                 appraiser:text.appraiser
               }
               this.tableData.push(arr)
@@ -775,10 +777,10 @@ export default{
     
      // 评估护士
      getoptions(ids){
-     const options= this.optionsarr
+      const options= this.Dutynursearr
       for(let i in options){
-        if(options[i].id == ids){
-          return options[i].label
+        if(options[i].admin_user_id == ids){
+          return options[i].user_name
         }
       }
     },
@@ -794,7 +796,17 @@ export default{
         var arr2 = arr.join()
       }
       return arr2
-    }
+    },
+    // 评估人数据源
+    getAllNurseList(){
+      getAllNurseList().then(response=>{
+        if(response.data.state ==1){
+          var nurseList  = response.data.data.nurseList
+
+          this.Dutynursearr =nurseList
+        }
+      })
+    },
   },
   computed:{
     duct_Totalpoints:{

src/xt_pages/user/history/date_history.vue

@@ -525,9 +525,9 @@
                           <el-select v-model="appraiser" placeholder="请选择" style="width:150px;">
                               <el-option
                               v-for="item in optionsarr"
-                              :key="item.id"
-                              :label="item.label"
-                              :value="item.id"
+                              :key="item.admin_user_id"
+                              :label="item.user_name"
+                              :value="item.admin_user_id"
                               >
                               </el-option>
                           </el-select>
@@ -589,8 +589,7 @@ export default{
       row:'',
       tableData:[],
       appraiser:0,
-      // optionsarr:[],
-      optionsarr:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+      optionsarr:[],
       date:this.getTime(new Date()),
       patient_id:0,
       Patient_info:{},
@@ -1138,14 +1137,24 @@ export default{
         }
     },
      // 评估护士
-     getoptions(ids){
+    getoptions(ids){
      const options= this.optionsarr
       for(let i in options){
-        if(options[i].id == ids){
-          return options[i].label
+        if(options[i].admin_user_id == ids){
+          return options[i].user_name
         }
       }
-    }
+    },
+    // 评估人数据源
+    getAllNurseList(){
+      getAllNurseList().then(response=>{
+        if(response.data.state ==1){
+          var nurseList  = response.data.data.nurseList
+
+          this.optionsarr =nurseList
+        }
+      })
+    },
   },
   computed:{
     date_Totalpoints:{
@@ -1165,6 +1174,7 @@ export default{
     this.Patient_info = this.$route.query.Patient_info
     // this.tumble_options = this.$route.query.tumble_options
     this.getlist()
+    this.getAllNurseList()
   }
 }
 </script>

src/xt_pages/user/history/mind_history.vue

@@ -199,9 +199,9 @@
               <el-select v-model="appraiser" placeholder="请选择" style="width:150px;">
                   <el-option
                   v-for="item in optionsarr"
-                  :key="item.id"
-                  :label="item.label"
-                  :value="item.id"
+                  :key="item.admin_user_id"
+                  :label="item.user_name"
+                  :value="item.admin_user_id"
                   >
                   </el-option>
               </el-select>
@@ -255,7 +255,7 @@ export default{
       qingan:[{value:1,label:'有'},{value:0,label:'无'}],
       appraiser:'',
       // optionsarr:[],
-      optionsarr:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+      optionsarr:[],
       date:this.getTime(new Date()),
       limit:10,
       page:1,
@@ -269,6 +269,7 @@ export default{
     this.patient_id = this.$route.query.patient_id
     this.Patient_info = this.$route.query.Patient_info
     this.getlist()
+    this.getAllNurseList()
   },
   methods:{
     fanhui(){
@@ -490,11 +491,21 @@ export default{
     getoptions(ids){
      const options= this.optionsarr
       for(let i in options){
-        if(options[i].id == ids){
-          return options[i].label
+        if(options[i].admin_user_id == ids){
+          return options[i].user_name
         }
       }
-    }
+    },
+    // 评估人数据源
+    getAllNurseList(){
+        getAllNurseList().then(response=>{
+          if(response.data.state ==1){
+            var nurseList  = response.data.data.nurseList
+
+            this.optionsarr =nurseList
+          }
+        })
+    },
   }
 }
 </script>

src/xt_pages/user/history/nourishment_history.vue

@@ -540,7 +540,7 @@ export default{
       check3:0,
       yy_date:this.getTime(new Date()),
       yy_appraiser:'',
-      yy_options:[{admin_user_id:1,user_name:'寒千落'},{admin_user_id:2,user_name:'千仞雪'},{admin_user_id:3,user_name:'千亦雪'}],
+      yy_options:[],
       jibq_show:[],
       jibz_show:[],
       jibzz_show:[],
@@ -574,6 +574,7 @@ export default{
     this.patient_id = this.$route.query.patient_id
     this.Patient_info = this.$route.query.Patient_info
     this.getlist()
+    this.getAllNurseList()
   },
   methods:{
     fanhui(){
@@ -1279,6 +1280,15 @@ export default{
         }
       }
     },
+    // 评估人数据源
+    getAllNurseList(){
+        getAllNurseList().then(response=>{
+          if(response.data.state ==1){
+            var nurseList  = response.data.data.nurseList
+            this.yy_options =nurseList
+          }
+        })
+    },
   },
   computed:{
     nour_Totalpoints:{

src/xt_pages/user/history/pruritus_history.vue

@@ -170,7 +170,9 @@
                               <label><input type="checkbox" class="check" :value="item.id" v-model="item.is_check"  @click="handleCheckedCitiesChange($event,item)"/>&nbsp;{{ item.label }}</label>
                           </span>
                           <label ><input type="checkbox" class="check" value="其他"  v-model="items.is_check1" @click="qita_click"/>
-                              &nbsp;其他 <el-input v-model="buwei_input" style="width: 100px;"></el-input>
+                              &nbsp;其他 
+                              <span style="border-bottom: 1px solid black;display: inline-block;width: 100px;">{{ items.buwei_input }}</span>
+                              <!-- <el-input v-model="buwei_input" style="width: 100px;"></el-input> -->
                           </label>
                           <label >
                             <input type="checkbox" class="checkbox" value="全身" v-model="items.is_check2" @click="quan_change"/>&nbsp;全身
@@ -326,13 +328,13 @@
 
             <div class="bottoms">
               <span>评估人:</span>
-              <el-select v-model="pruritus_appraiser" placeholder="请选择" >
+              <el-select v-model="pruritus_appraiser" placeholder="请选择" style="width:150px;">
                   <el-option
                   v-for="item in pruritus_options"
-                  :key="item.id"
-                  :label="item.label"
-                  :value="item.id"
-                  style="width:150px;">
+                  :key="item.admin_user_id"
+                  :label="item.user_name"
+                  :value="item.admin_user_id"
+                  >
                   </el-option>
               </el-select>
             </div>
@@ -389,7 +391,7 @@ export default{
       check1:0,
       is_check2:false,
       check2:0,
-      pruritus_options:[{id:1,label:'寒千落'},{id:2,label:'千仞雪'},{id:3,label:'千亦雪'},],
+      pruritus_options:[],
       pruritus_appraiser:'',
       buwei_input:'',
       pruritus_date:this.getTime(new Date()),
@@ -414,6 +416,7 @@ export default{
     this.patient_id = this.$route.query.patient_id
     this.Patient_info = this.$route.query.Patient_info
     this.getlist()
+    this.getAllNurseList()
   },
   methods:{
     // 返回
@@ -822,8 +825,8 @@ export default{
     getoptions(ids){
      const options= this.pruritus_options
       for(let i in options){
-        if(options[i].id == ids){
-          return options[i].label
+        if(options[i].admin_user_id == ids){
+          return options[i].user_name
         }
       }
     },
@@ -863,7 +866,7 @@ export default{
     //     const val = '全身'
     //     return val
     //   }
-    // },
+    // }, pruritus_options
     getchegdu(val){
       const text = this.chengdu
       for(let i in text){
@@ -892,6 +895,16 @@ export default{
         }
       }
     },
+    // 评估人数据源
+    getAllNurseList(){
+        getAllNurseList().then(response=>{
+          if(response.data.state ==1){
+            var nurseList  = response.data.data.nurseList
+
+            this.pruritus_options =nurseList
+          }
+        })
+    },
   },
   computed:{
     pruritus_Totalpoints:{