hah阿凡达

src/api/advice.js

@@ -377,6 +377,12 @@ export function CreateNewDoctorAdvice(id, advice, mode) {
 
 export function CreateNewGroupAdvice(id, groupno, advices, mode) {
   console.log("advices2332332233w",advices)
+  if(advices.advice_type == "长期"){
+    advices.advice_type =1
+  }
+  if(advices.advice_type == "临时"){
+    advices.advice_type =2
+  }
   if (advices.remind > 0) {
     return request({
       url:
@@ -388,9 +394,9 @@ export function CreateNewGroupAdvice(id, groupno, advices, mode) {
         mode,
       method: 'post',
       data: advices,
-      headers: {
-        Permission: 3
-      }
+      // headers: {
+      //   Permission: 3
+      // }
     })
   } else {
     return request({
@@ -403,9 +409,9 @@ export function CreateNewGroupAdvice(id, groupno, advices, mode) {
         mode,
       method: 'post',
       data: advices,
-      headers: {
-        Permission: 3
-      }
+      // headers: {
+      //   Permission: 3
+      // }
     })
   }
 }

src/xt_pages/dialysis/bloodPresssWatch.vue

@@ -1728,7 +1728,7 @@
         align="right"
         @size-change="handleSizeChange"
         @current-change="handleCurrentChange"
-        :page-sizes="[20, 40, 60, 80,100,300,500]"
+        :page-sizes="[20, 40, 60, 80,100,300,500,600]"
         :page-size="10"
         background
         style="margin-top:20px;"

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -221,7 +221,8 @@
 
         <li v-if="isShow('体重减少')">
           <label>体重减少 : </label>
-          <span class="content" v-if="weight_loss != '0'">{{
+          <span class="content" v-if="weight_loss != '0'">
+           {{
             weight_loss
           }}</span>
           <span class="unit" v-if="weight_loss != '0'">kg</span>

src/xt_pages/dialysis/details/dialog/AssessmentAfterDislysis.vue

@@ -1311,7 +1311,6 @@ export default {
             data["last_after_weight"] = ""
           }
           if(ParamsQuery.weight_loss == 0){
-
              ParamsQuery.weight_loss = (this.predialysis_evaluation.weight_before - this.form.weight_after).toFixed(1)
           }
 

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -392,14 +392,14 @@
             "
           >
             <template slot-scope="scope">
-             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206 || org_id ==10612 || org_id ==10617 || org_id ==10702 || org_id == 10644">
+             <span v-if="org_id == 10440 || org_id == 9671 || org_id ==10206 || org_id ==10612 || org_id ==10617 || org_id ==10702 || org_id == 10644 || org_id == 10744">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume
                   : "0"
               }}
               </span>
-               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206 && org_id!=10612 && org_id!=10617 && org_id!=10702 && org_id!=10644">
+               <span v-if="org_id != 10440 && org_id!=9671 && org_id!=10206 && org_id!=10612 && org_id!=10617 && org_id!=10702 && org_id!=10644&& org_id!=10744">
               {{
                 scope.row.ultrafiltration_volume
                   ? scope.row.ultrafiltration_volume

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -94,8 +94,8 @@
           <td v-if="isShow('跨膜压')"> {{ monitor.transmembrane_pressure ? monitor.transmembrane_pressure : "" }} </td>
           <td v-if="isShow('跨膜压1')"> {{ monitor.transmembrane_pressure_one ? monitor.transmembrane_pressure_one : "/" }} </td>
           <td v-if="isShow('超滤量')"> 
-            <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10702 && org_id!=10644">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </span> 
-            <span v-if="org_id ==9671 || org_id==10440 || org_id == 10702 || org_id == 10644">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}  </span> 
+            <span v-if="org_id!=9671 && org_id!=10440 && org_id!=10702 && org_id!=10644 && org_id!=10744">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "" }}  </span> 
+            <span v-if="org_id ==9671 || org_id==10440 || org_id == 10702 || org_id == 10644 || org_id == 10744">{{ monitor.ultrafiltration_volume ? monitor.ultrafiltration_volume : "0" }}  </span> 
           </td>
           <td v-if="isShow('超滤量1')"> 
             {{ monitor.ultrafiltration_volume_one ? monitor.ultrafiltration_volume_one : "/" }}

src/xt_pages/dialysis/details/index.vue

@@ -3231,7 +3231,7 @@ export default {
            if(list!=null && list.length>0){
              for(let i=0;i<list.length;i++){
                list[i].order_date =""
-               if(this.org_id ==9538 || this.org_id ==10101||this.org_id ==10353 ){
+               if(this.org_id ==9538 || this.org_id ==10101 || this.org_id ==10353 ){
                   list[i].order_date = this.getOrderTime(list[i].dialysis_date)
                   list[i].schedual_type_name= list[i].schedual_type
                }else{
@@ -3269,10 +3269,15 @@ export default {
       }
     },
     viewDayWork(val){
+
+      console.log("val00000000000000000",val)
       const starttime = moment(this.time_value).format('YYYY-MM-DD')
       console.log('eeeeeeee',starttime);
       const len = (val.target.innerText).split(' ')
       console.log("val33333333333333444",len)
+
+    
+
       if(val.target.innerText == '下个月'){
         this.start_time = moment(this.time_value).startOf('month').format('YYYY-MM-DD')
         this.end_time = moment(this.time_value).endOf('month').format('YYYY-MM-DD')

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -72,9 +72,9 @@
                 <span v-if="receiverTreatmentAccess.condition != 1">{{
                   patientInfo.DialysisSchedule.device_zone.name
                     ? patientInfo.DialysisSchedule.device_zone.name
-                    : ""
+                    : "/"
                 }}</span>
-                <span>{{ "/" }}</span>
+                <span></span>
               </div>
             </div>
             <div class="inline_block" v-if="org_id != 10460 && org_id != 10624">
@@ -100,7 +100,7 @@
                     }}
                   </span>
                 </span>
-                <span>{{ "/" }}</span>
+                <span></span>
               </div>
             </div>
             <div class="inline_block" v-if="org_id != 10683">

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -1003,6 +1003,12 @@ export default {
               }
             }
             console.log("编辑",submitForm)
+            if(_this.groupForm.advice_type=="临时"){
+                 _this.groupForm.advice_type = 2
+              }
+            if(_this.groupForm.advice_type=="长期"){
+                 _this.groupForm.advice_type = 1
+            }
             EditNewDoctorAdvice(
               this.patientID,
               this.groupSelectRow.id,
@@ -1151,6 +1157,13 @@ export default {
                 remark:_this.groupForm.push_start_time,
               };
 
+              if(_this.groupForm.advice_type=="临时"){
+                 _this.groupForm.advice_type = 2
+              }
+              if(_this.groupForm.advice_type=="长期"){
+                 _this.groupForm.advice_type = 1
+              }
+
               let mode = "";
               if (_this.groupForm.advice_type == 1) {
                 mode = "1-2";
@@ -1158,12 +1171,15 @@ export default {
                 mode = "1-1";
               }
               console.log("submitFort",submitForm)
+
+
               CreateNewDoctorAdvice(this.patientID, submitForm, mode).then(
                 response => {
                   if (response.data.state == 0) {
                     this.$message.error(response.data.msg);
                     return false;
                   } else {
+                    this.nameFormVisible = false
                     this.$notify({
                       title: "成功",
                       message: "新增医嘱成功",
@@ -1281,6 +1297,12 @@ export default {
                 mode = "1-1";
               }
               console.log("触发了吗",_this.patientID,_this.submitGroupForm)
+              if(_this.submitNameForm.advice_type == "临时"){
+                 _this.submitNameForm.advice_type =2
+              }
+              if(_this.submitNameForm.advice_type == "长期"){
+                 _this.submitNameForm.advice_type =1
+              }
               CreateNewGroupAdvice(_this.patientID, _this.groupForm.groupno,_this.submitGroupForm, mode).then(response => {
 
                 if (response.data.state == 0) {
@@ -1910,6 +1932,15 @@ export default {
         mode = "1-1";
       }
 
+      if(this.groupForm.advice_type == "临时"){
+          this.groupForm.advice_type =2
+        }
+      if(this.groupForm.advice_type == "长期"){
+        this.groupForm.advice_type =1
+      }
+
+      
+
       CreateNewGroupAdvice(
         this.patientID,
         this.groupForm.groupno,
@@ -2123,6 +2154,13 @@ export default {
               mode = "1-1";
             }
 
+            if(this.groupForm.advice_type == "临时"){
+              this.groupForm.advice_type =2
+            }
+            if(this.groupForm.advice_type == "长期"){
+              this.groupForm.advice_type =1
+            }
+
             CreateNewGroupAdvice(
               _this.patientID,
               _this.groupForm.groupno,
@@ -2516,6 +2554,16 @@ export default {
       },
       handleSelect(val){
          console.log("val233333333333",val)
+         console.log("advice_type ====",this.groupForm.advice_type)
+       if(this.groupForm.advice_type == "临时"){
+         this.nameForm.advice_type = 2
+       } 
+       if(this.groupForm.advice_type == "长期"){
+         this.nameForm.advice_type = 1
+       } 
+       if(this.groupForm.advice_type == "普通"){
+         this.nameForm.advice_type = 4
+       } 
        this.drug_id = val.drug_id
         this.nameForm.drug_id = val.drug_id
         this.nameForm.way = 1
@@ -2527,10 +2575,13 @@ export default {
         this.nameForm.prescribing_number = tmp.prescribing_number//开药数量
         this.nameForm.prescribing_number_unit = tmp.prescribing_number_unit
         this.nameForm.single_dose = tmp.single_dose//单次用量
-        this.nameForm.single_dose_unit = tmp.drug_dose_unit
+        this.nameForm.single_dose_unit = tmp.min_unit
         this.nameForm.delivery_way = tmp.delivery_way//给药途径
         this.nameForm.execution_frequency = tmp.execution_frequency//执行频率
         this.nameForm.drug_id = tmp.id
+        this.nameForm.drug_name_id = tmp.id
+       
+
       },
 
        querySearch(queryString, cb) {

src/xt_pages/user/dialysisRecordPrint.vue

@@ -140,6 +140,27 @@
           }
           return symptom
         },
+        getMonitorSymptomOne(val){
+           
+           var symptom = ""
+           var is_total = 9
+           if(val!=null && val.length>0){
+              
+             for(let i=0;i<val.length;i++){
+                if(val[i].symptom!=""){
+                  symptom +=val[i].symptom +","
+                  is_total = 8
+                }
+                
+             }
+           }
+           if(symptom!=""){
+             return 1
+           }else{
+             return 0
+           }
+           
+         },
         getMonitorSymptomResult(val){
             var result = ""
           if(val!=null && val.length>0){
@@ -177,7 +198,23 @@
            getSchedualPatient(params).then(response=>{
              if(response.data.state == 1){
                 var schedule =  response.data.data.schedule
-                this.tableDataList = schedule
+                 var newArr = []
+                 if(schedule!=null && schedule.length >0){
+                    for(let i=0;i<schedule.length;i++){
+                      schedule[i].symp_str = 0
+                      var str = this.getMonitorSymptomOne(schedule[i].monitoring_record)
+                      schedule[i].symp_str = str
+                    }
+                 }
+                 console.log("schedule_=====",schedule)
+                 for(let i=0;i<schedule.length;i++){
+                  console.log("schedule[i].symp_str",schedule[i].symp_str)
+                   if(schedule[i].symp_str==1){
+                     newArr.push(schedule[i])
+                   }
+                 }
+                console.log("newArr======",newArr)
+                this.tableDataList = newArr
              }
            })
         },

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
  // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))