修改样式问题

config/prod.env.js

@@ -1,10 +1,9 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  // BASE_API: '"http://api.xt.test.sgjyun.com"'
-
-  BASE_API: '"https://api.xt.kuyicloud.com"'
+  BASE_API: '"http://api.xt.test.sgjyun.com"'
 
+  // BASE_API: '"https://api.xt.kuyicloud.com"'
   // http://api.xt.test.sgjyun.com
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 }

src/api/advice.js

@@ -128,4 +128,11 @@ export function ModifyExecDoctorAdvice(params){
   })
 }
 
+export function GetRemindLongAdvice(params){
+  return request({
+    url:'/m/api/dialysis/advice_remind',
+    method:'Get',
+    params:params,
+  })
+}
 

src/api/dialysis.js

@@ -213,3 +213,15 @@ export function PostModifyEndDialysis (params) {
 }
 
 
+
+
+export function CreateGroupAdvice(id, groupno, advices){
+  return request({
+    url:'/m/api/advice_remind/create?id='+id + '&groupno=' + groupno,
+    method:'post',
+    data:advices,
+  })
+
+}
+
+

src/pages/main/dialog/subMenu/LongAdviceSubMenu.vue

@@ -0,0 +1,213 @@
+<template>
+  <div v-if="visibility" class="Dialog">
+    <div class="DialogTit">
+      <div class="back" @click="cancle()">
+        <span class="iconfont">&#xe720; </span>返回
+      </div>
+      <h1 class="name">长期医嘱推送</h1>
+      <span @click="comfirm" class="success"
+      >确定</span
+      >
+    </div>
+
+    <div class="CheckBox">
+      <ul>
+        <li>
+          <van-checkbox-group v-model="propsForm.result">
+            <van-checkbox
+              style="border-bottom: 1px #e5e5e5 solid;padding: 0 0.38rem"
+              v-for="(advice, index) in propsForm.list"
+              :key="index"
+              :name="advice.id"
+            >
+             <div style="padding-top: 15px;padding-left: 10px">开嘱医生&nbsp;{{ getDoctorName(advice.advice_doctor) }}</div><br/>
+              <div style="padding-left: 10px">开嘱时间&nbsp;{{ getTime(advice.created_time) }}</div><br/>
+              <div style="padding-bottom: 15px;padding-left: 10px"> 医嘱内容&nbsp;{{getContent(advice)}}</div>
+
+            </van-checkbox>
+          </van-checkbox-group>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {parseTime} from '@/utils'
+
+  export default {
+    name: 'LongAdviceSubMenu',
+    created () {
+    },
+    data () {
+      return {
+        result: [],
+        id: 0,
+        selectName: ''
+      }
+    },
+    props: {
+      propsForm: {
+        type: Object
+      },
+      visibility: {
+        type: Boolean,
+        default: false
+      },
+    },
+    methods: {
+      getDoctorName (doctor_id) {
+        for (let i = 0; i < this.propsForm.operators.length; i++) {
+          if (this.propsForm.operators[i].id == doctor_id) {
+            return this.propsForm.operators[i].name
+          }
+        }
+      }, getTime (val) {
+        return parseTime(val, '{y}-{m}-{d} {h}:{i}')
+
+      }, getContent (val) {
+        let prescribing_number = ''
+        let single_dose = ''
+        if (val.prescribing_number > 0) {
+          prescribing_number = val.prescribing_number + val.prescribing_number_unit
+        }
+        if (val.single_dose > 0) {
+          single_dose = ' 单次用量 ' + val.single_dose + val.single_dose_unit
+        }
+        let name = ""
+        if (val.child.length > 0){
+          for (let i = 0 ; i < val.child.length; i++){
+            if(val.child[i].prescribing_number > 0){
+              val.child[i]['presc'] = val.child[i].prescribing_number + val.child[i].prescribing_number_unit
+            }else{
+              val.child[i]['presc'] = ''
+            }
+
+            if(val.child[i].single_dose > 0){
+              val.child[i]['single'] = " "+' 单次用量 '+" "+val.child[i].single_dose + val.child[i].single_dose_unit
+            }else{
+              val.child[i]['single'] = ''
+            }
+            name = name+"▲"+val.child[i].advice_name+""
+              + val.child[i].advice_desc
+              + val.child[i].drug_spec_unit
+              + val.child[i].presc
+              + val.child[i].single
+
+
+          }
+          return  val.advice_name +"  "+ val.advice_desc+" "
+            + val.drug_spec_unit
+            + prescribing_number
+            + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark +name
+
+        }else{
+          return val.advice_name +"  "+ val.advice_desc+" "
+            + val.drug_spec_unit
+            + prescribing_number
+            + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark
+
+        }
+
+
+      },
+
+      cancle: function () {
+        this.$emit('menu-cancle-three')
+      },
+      comfirm: function () {
+        this.$emit('menu-comfirm-three', this.getValue())
+      },
+      getValue: function () {
+        let form = {}
+
+        let results = []
+
+        for (let i = 0; i < this.propsForm.list.length; i++){
+          for (let a = 0; a < this.propsForm.result.length; a++){
+            if( this.propsForm.list[i].id == this.propsForm.result[a]){
+              results.push(this.propsForm.list[i])
+            }
+          }
+        }
+
+        var obj5={}
+        results = results.reduce((cur, next) => {
+          obj5[next.id] ? '' : obj5[next.id] = true && cur.push(next)
+          return cur
+        }, [])
+
+
+
+        return results
+      },
+      itemClick: function (id) {
+        if (id == -2) {
+          this.$emit('menu-empty', this.getValue())
+        }
+        this.propsForm.selectId = id
+        this.$emit('menu-comfirm', this.getValue())
+      }
+    },
+    watch: {
+      visibility (val) {
+        //初始化数据操作
+      }
+    }
+  }
+</script>
+
+<style style="stylesheet/scss" lang="scss" scoped>
+  .optionsBox {
+  background: #fff;
+  max-height: 10rem;
+  min-height: 5rem;
+  @media only screen and (max-width: 812px) {
+  min-height: 8rem !important;
+  }
+  ul {
+  overflow-y: scroll;
+  max-height: 9rem;
+  li {
+  height: 1.1rem;
+  line-height: 1.1rem;
+  border-bottom: 1px #e5e5e5 solid;
+  padding: 0 0.38rem;
+  font-size: 0.36rem;
+  color: $title-color;
+  }
+  .tick {
+  position: relative;
+  &::before {
+  content: "";
+  display: inline-block;
+  border: 2px solid $main-color;
+  border-top-width: 0;
+  border-right-width: 0;
+  width: 0.3rem;
+  height: 0.15rem;
+  -webkit-transform: rotate(-50deg);
+  position: absolute;
+  top: 0.38rem;
+  right: 0.44rem;
+  }
+  }
+  }
+  }
+  .CheckBox {
+  background: #fff;
+  max-height: 6.8rem;
+  min-height: 5rem;
+  overflow-y: scroll;
+  @media only screen and (max-width: 812px) {
+  max-height: 8rem !important;
+  min-height: 8rem !important;
+  }
+
+  ul {
+  li {
+  line-height: 1rem;
+  }
+  }
+  }
+</style>

src/pages/main/today/TodayTab.vue

@@ -109,8 +109,8 @@
     <van-popup title="透析处方" v-model="menuList[1].showPopup" :overlay="true" :close-on-click-overlay="false">
       <prescription-dialog :patient_prop="patient" :solution_prop="solution" :machines_prop="devices" :config="config"
                            :prescription_prop="prescription" @finish="closePrescriptionDialog" :operators="operators"
-                           :types="goodTypes" :info="goodInfos"
-                           @close="closePrescriptionDialog" @prescription="prescriptionFunc"
+                           :types="goodTypes" :info="goodInfos" :status="status" :targetAdvices="targetAdvices"
+                           @close="closePrescriptionDialog" @prescription="prescriptionFunc"  :admin_users_prop="admin_users" @advice="adviceFunc"
                            @longSolution="longSolutionFunc" ref="prescription_dialog"></prescription-dialog>
     </van-popup>
 
@@ -217,7 +217,9 @@
   import MonitDialog from '../dialog/MonitDialog'
   import ComputerDialog from '../dialog/ComputerDialog'
 
-  import {dialysisGlobalConfig, getDialysisRecord} from '@/api/dialysis'
+  import {dialysisGlobalConfig, getDialysisRecord,CreateGroupAdvice} from '@/api/dialysis'
+  import {GetRemindLongAdvice} from '@/api/advice'
+
   import {parseTime} from '@/utils'
 
   export default {
@@ -300,6 +302,10 @@
         goTopShow: false,
         goodTypes: [],
         goodInfos: [],
+
+        longAdvices: [],
+        targetAdvices:[],
+        status:'',
       }
     },
     computed: {
@@ -373,6 +379,8 @@
       this.patient_id = patient_id
       this.date = date
       this.requestDialysisRecord()
+      this.requestLongAdvice()
+
     },
     mounted () {
       window.addEventListener('scroll', this.handleScroll)
@@ -469,7 +477,7 @@
           monitor.conductivity
         this.monitor_records[monitor_index].displacement_flow_quantity =
           monitor.displacement_flow_quantity
-        this.monitor_records.sort((a, b) =>a.operate_time - b.operate_time )
+        this.monitor_records.sort((a, b) => a.operate_time - b.operate_time)
 
         // if (monitor_index >= 0) {
         //   var record = this.monitor_records[monitor_index]
@@ -918,6 +926,146 @@
           }
         })
       },
+      requestLongAdvice () {
+        var dateStr = parseTime(this.date, '{y}-{m}-{d}')
+
+        var params = {
+          id: this.patient_id,
+        }
+        GetRemindLongAdvice(params).then(rs => {
+          var resp = rs.data
+          if (resp.state == 1) {
+
+            var status = parseInt(resp.data.status)
+            this.status = status
+
+            switch (status) {
+              case 2:
+                this.longAdvices = resp.data.advices
+
+                var longAdvicesTwo = resp.data.advices_two
+
+                for (let i = 0; i < this.longAdvices.length; i++) {
+                  this.longAdvices[i]['isCheck'] = 0
+                  switch (this.longAdvices[i].frequency_type) {
+                    case 1: //每日推送
+                      this.longAdvices[i]['isCheck'] = 1
+                      break
+                    case 2: //用今天的日期与推送类型为2的医嘱进行比较如果相差天数等于设定的天数，则设置为选中状态
+                      for (let i = 0;i < this.longAdvices.length;i++){
+                        for (let a = 0; a < longAdvicesTwo.length;a++){
+                          if(this.longAdvices[i].advice_name == longAdvicesTwo[a].advice_name && this.longAdvices[i].advice_desc == longAdvicesTwo[a].advice_desc){
+                            this.longAdvices[i]['isCheck'] = 1
+                          }
+                        }
+                      }
+                      break
+                    case 3://用今天的属于周几与推送类型为3的医嘱进行比较如果包含某个字符串，则设置为选中状态
+                      let day = new Date().getDay()
+                      let name =""
+                      switch (day) {
+                        case 1:
+                          name="周一"
+                          break
+                        case 2:
+                          name="周二"
+
+                          break
+                        case 3:
+                          name="周三"
+
+                          break
+                        case 4:
+                          name="周四"
+                          break
+                        case 5:
+                          name="周五"
+                          break
+                        case 6:
+                          name="周六"
+                          break
+                        case 7:
+                          name="周日"
+                          break
+                      }
+                      if (this.longAdvices[i].week_day.indexOf(name) != -1){
+                        this.longAdvices[i]['isCheck'] = 1
+                      }
+                      break
+                  }
+                }
+
+                this.targetAdvices = this.longAdvices
+
+                break
+              case 3:
+                this.longAdvices = resp.data.advices
+                var advices_two = resp.data.advices_two
+                let dayAdvices = []
+                for (let i = 0; i < this.longAdvices.length; i++) {
+                  switch (this.longAdvices[i].frequency_type) {
+                    case 1: //每日推送，则加入到待上传数组里面
+                      dayAdvices.push(this.longAdvices[i])
+                      break
+                    case 3://用今天的属于周几与推送类型为3的医嘱进行比较如果包含某个字符串，则加入到待上传数组里面
+                      let day = new Date().getDay()
+                      let name =""
+                      switch (day) {
+                        case 1:
+                          name="周一"
+                          break
+                        case 2:
+                          name="周二"
+                          break
+                        case 3:
+                          name="周三"
+                          break
+                        case 4:
+                          name="周四"
+                          break
+                        case 5:
+                          name="周五"
+                          break
+                        case 6:
+                          name="周六"
+                          break
+                        case 7:
+                          name="周日"
+                          break
+                      }
+                      if (this.longAdvices[i].week_day.indexOf(name) != -1){
+                        dayAdvices.push(this.longAdvices[i])
+                      }
+                      break
+                  }
+                }
+                this.targetAdvices = dayAdvices.concat(advices_two)
+                console.log(dayAdvices)
+                console.log(advices_two)
+                console.log( this.targetAdvices)
+
+
+                break
+            }
+          } else {
+
+          }
+        })
+      }, getNowFormatDate () {
+        var date = new Date()
+        var seperator1 = '-'
+        var year = date.getFullYear()
+        var month = date.getMonth() + 1
+        var strDate = date.getDate()
+        if (month >= 1 && month <= 9) {
+          month = '0' + month
+        }
+        if (strDate >= 0 && strDate <= 9) {
+          strDate = '0' + strDate
+        }
+        var currentdate = year + seperator1 + month + seperator1 + strDate
+        return currentdate
+      },
       newAdviceGroupObject: function () {
         return Object.assign(
           {},
@@ -931,69 +1079,88 @@
             // checker: 0,
           }
         )
+      }
+      ,adviceFunc:function(){
+        console.log("111111")
+        this.requestDialysisRecord()
+
       },
       prescriptionFunc: function (val) {
         this.prescription = val
 
-      },
+      }
+      ,
       longSolutionFunc: function (val) {
         this.solution = val
 
-      },
+      }
+      ,
       closePrescriptionDialog: function () {
         this.closeDialog(1)
         this.scrollToView('prescription')
-      },
+      }
+      ,
       closeAcceptsAssessment: function () {
         this.closeDialog(2)
         this.scrollToView('accepts_assessment')
-      },
+      }
+      ,
       closeAssessmentBefore: function () {
         this.closeDialog(3)
         this.scrollToView('assessment_before')
-      },
+      }
+      ,
       update_evaluation: function (evaluation) {
         this.predialysis_evaluation = evaluation
         this.closeAssessmentBefore()
-      },
+      }
+      ,
       closeStatOrder: function () {
         this.closeDialog(4)
         this.doctor_advices.push([])
         this.scrollToView('stat_order')
-      },
+      }
+      ,
       closeDialysisComputer: function (dialysis_order) {
         this.closeDialog(0)
         this.scrollToView('dialysis_computer')
-      },
+      }
+      ,
       closeDoubleCheck: function () {
         this.closeDialog(5)
         this.scrollToView('double_check')
-      },
+      }
+      ,
       closeMonitoring: function () {
         this.closeDialog(6)
         this.scrollToView('monitoring')
-      },
+      }
+      ,
       closeDialysisOff: function () {
         this.closeDialog(7)
         this.scrollToView('dialysis_off')
-      },
+      }
+      ,
       closeAssessmentAfter: function (assessment_after_dislysis) {
         this.closeDialog(8)
         this.scrollToView('assessment_after')
         if (assessment_after_dislysis != undefined) {
           this.assessment_after_dislysis = assessment_after_dislysis
         }
-      },
+      }
+      ,
       closeTreatmentOf: function () {
         this.closeDialog(9)
         this.scrollToView('treatment_of')
-      },
+      }
+      ,
       scrollToView: function (id) {
         document.body.scrollTop =
           document.querySelector('#' + id).offsetTop - 100
         document.documentElement.scrollTop =
           document.querySelector('#' + id).offsetTop - 100
-      },
+      }
+      ,
       handleScroll () {
         this.scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop
         if (this.scrollTop > 50) {
@@ -1001,7 +1168,8 @@
         } else {
           this.goTopShow = false
         }
-      },
+      }
+      ,
       goTop () {
         let timer = null,
           _that = this
@@ -1017,10 +1185,13 @@
             _that.goTopShow = false
           }
         })
-      },
+      }
+      ,
       destroyed () {
         window.removeEventListener('scroll', this.handleScroll)
-      }, getUnReadNum () {
+      }
+      ,
+      getUnReadNum () {
         let doctorAdvice = []
         for (let y = 0; y < this.doctor_advices.length; y++) {
           if (this.doctor_advices[y].execution_state == 2) {
@@ -1033,7 +1204,9 @@
 
         return sorted.length
 
-      }, groupBy (array, f) {
+      }
+      ,
+      groupBy (array, f) {
         const groups = {}
         array.forEach(function (o) {
           const group = JSON.stringify(f(o))
@@ -1043,19 +1216,26 @@
         return Object.keys(groups).map(function (group) {
           return groups[group]
         })
-      }, getDeviceNumber () {
+      }
+      ,
+      getDeviceNumber () {
         if (this.dialysis_order.id && this.dialysis_order.DeviceNumber && this.dialysis_order.DeviceNumber.number.length > 0) {
           return this.dialysis_order.DeviceNumber.number
-
         } else {
           if (this.schedual.device_number == null) {
             return ''
           } else {
             return this.schedual.device_number.number
           }
-
         }
-
+      }
+      ,
+      dateDiff (firstDate, secondDate) {
+        var firstDate = new Date(firstDate)
+        var secondDate = new Date(secondDate)
+        var diff = Math.abs(firstDate.getTime() - secondDate.getTime())
+        var result = parseInt(diff / (1000 * 60 * 60 * 24))
+        return result
       }
     }
   }