长期医嘱提醒

build/cdn.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.0.55"
+  "version": "1.0.58"
 }

src/pages/main/WaitingArea.vue

@@ -129,7 +129,7 @@ export default {
       menuList: [
         { value: "1", label: "全部", count: 0 },
         { value: "3", label: "待开处方", count: 0 },
-        { value: "2", label: "透前称量", count: 0 }
+        { value: "2", label: "待透前称量", count: 0 }
       ],
 
       select_index: 0,

src/pages/main/dialog/PrescriptionDialog.vue

@@ -390,7 +390,7 @@
     },
     data () {
       return {
-        is_pre:0,
+        is_pre: 0,
         loading: false,
         signUrl: '',
         isShowDesc: true,
@@ -510,10 +510,10 @@
     },
 
     methods: {
-      isPermission(){
-        if(this.$store.getters.user.user.user_type == 3 && (this.$store.getters.user.template_info.template_id == 2 || this.$store.getters.user.template_info.template_id == 6)){
+      isPermission () {
+        if (this.$store.getters.user.user.user_type == 3 && (this.$store.getters.user.template_info.template_id == 2 || this.$store.getters.user.template_info.template_id == 6)) {
           return false
-        }else{
+        } else {
           return true
         }
       },
@@ -715,25 +715,27 @@
 
       },
       menuComfirmThree: function (targetAdvices) {
-        let params = {
-          advices: targetAdvices,
-          advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
-          advice_doctor: targetAdvices[0].advice_doctor,
-          advice_type: targetAdvices[0].advice_type,
-          parent_id: this.patient_id,
-          start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
-          remark: '',
-        }
-        CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
-          var resp = rs.data
-          if (resp.state == 1) {
+        if (targetAdvices.length > 0) {
+          let params = {
+            advices: targetAdvices,
+            advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+            advice_doctor: targetAdvices[0].advice_doctor,
+            advice_type: targetAdvices[0].advice_type,
+            parent_id: this.patient_id,
+            start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+            remark: '',
+          }
+          CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
+            var resp = rs.data
+            if (resp.state == 1) {
 
-          } else {
+            } else {
 
-          }
-        })
+            }
+          })
+        }
 
-        if (this.is_pre == 1){
+        if (this.is_pre == 1) {
           Toast.loading({forbidClick: true, duration: 0})
           let ParamsQuery = this.dialysisPrescription
           ParamsQuery['patient'] = this.$route.query.patient_id
@@ -745,14 +747,11 @@
             } else {
               Toast.success('提交成功')
               this.$emit('prescription', response.data.data.prescription)
-              // for (const key in response.data.data.prescription) {
-              //   // this.prescription_prop[key] = response.data.data.prescription[key];
-              // }
               this.finish()
             }
           })
 
-        }else if(this.is_pre == 2){
+        } else if (this.is_pre == 2) {
           Toast.loading({forbidClick: true, duration: 0})
           let ParamsQuery = this.dialysisPrescription
           ParamsQuery['patient'] = this.$route.query.patient_id
@@ -763,18 +762,14 @@
               return false
             } else {
               Toast.success('提交成功')
-
               this.$emit('advice')
               this.$emit('longSolution', response.data.data.solution)
               this.$emit('prescription', response.data.data.prescription)
               this.finish()
-
             }
           })
-
         }
 
-
       },
       menuComfirm: function (val) {
         this.visibility = false
@@ -892,12 +887,10 @@
         return anticoagulan_name
       },
       commitInfo: function () {
-
-
         this.is_pre = 1
         if (this.prescription_prop.id == '') {
-          console.log(this.is_open)
-          if (this.is_open == 0){
+
+          if (this.is_open == 0) {
             Toast.loading({forbidClick: true, duration: 0})
             let ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.$route.query.patient_id
@@ -908,29 +901,40 @@
                 return false
               } else {
                 Toast.success('提交成功')
-
                 this.$emit('prescription', response.data.data.prescription)
                 this.finish()
-
               }
             })
-
-          }else if (this.is_open == 1) {
-            //弹框推送提醒
-            this.advicePropForm.list = this.targetAdvices
-            this.advicePropForm.operators = this.admin_users_prop
-            this.advice_visibility = true
-            this.isShowDialog = false
-
-            for (let i = 0; i < this.advicePropForm.list.length; i++) {
-              if (this.advicePropForm.list[i].parent_id == 0 && this.advicePropForm.list[i].isCheck == 1) {
-                this.advicePropForm.result.push(this.advicePropForm.list[i].id)
+          } else if (this.is_open == 1) {
+            if (this.targetAdvices.length > 0) {
+              //弹框推送提醒
+              this.advicePropForm.list = this.targetAdvices
+              this.advicePropForm.operators = this.admin_users_prop
+              this.advice_visibility = true
+              this.isShowDialog = false
+              for (let i = 0; i < this.advicePropForm.list.length; i++) {
+                if (this.advicePropForm.list[i].parent_id == 0 && this.advicePropForm.list[i].isCheck == 1) {
+                  this.advicePropForm.result.push(this.advicePropForm.list[i].id)
+                }
               }
+            } else {
+              Toast.loading({forbidClick: true, duration: 0})
+              let ParamsQuery = this.dialysisPrescription
+              ParamsQuery['patient'] = this.$route.query.patient_id
+              ParamsQuery['record_date'] = this.record_date
+              commitDialysisPrescription(ParamsQuery).then(response => {
+                if (response.data.state == 0) {
+                  Toast.fail(response.data.msg)
+                  return false
+                } else {
+                  Toast.success('提交成功')
+                  this.$emit('prescription', response.data.data.prescription)
+                  this.finish()
+                }
+              })
             }
-
           } else if (this.is_open == 2) {
-
-            if(this.waitUploadAdvices.length > 0) {
+            if (this.waitUploadAdvices.length > 0) {
               this.advice_visibility = false
               let params = {
                 advices: this.waitUploadAdvices,
@@ -949,29 +953,42 @@
 
                 }
               })
+              Toast.loading({forbidClick: true, duration: 0})
+              let ParamsQuery = this.dialysisPrescription
+              ParamsQuery['patient'] = this.$route.query.patient_id
+              ParamsQuery['record_date'] = this.record_date
+              commitDialysisPrescription(ParamsQuery).then(response => {
+                if (response.data.state == 0) {
+                  Toast.fail(response.data.msg)
+                  return false
+                } else {
+                  Toast.success('提交成功')
+                  this.$emit('prescription', response.data.data.prescription)
+                  this.finish()
+                }
+              })
+            } else {
+              Toast.loading({forbidClick: true, duration: 0})
+              let ParamsQuery = this.dialysisPrescription
+              ParamsQuery['patient'] = this.$route.query.patient_id
+              ParamsQuery['record_date'] = this.record_date
+              commitDialysisPrescription(ParamsQuery).then(response => {
+                if (response.data.state == 0) {
+                  Toast.fail(response.data.msg)
+                  return false
+                } else {
+                  Toast.success('提交成功')
+                  this.$emit('prescription', response.data.data.prescription)
+                  this.finish()
+                }
+              })
             }
 
-            Toast.loading({forbidClick: true, duration: 0})
-            let ParamsQuery = this.dialysisPrescription
-            ParamsQuery['patient'] = this.$route.query.patient_id
-            ParamsQuery['record_date'] = this.record_date
-            commitDialysisPrescription(ParamsQuery).then(response => {
-              if (response.data.state == 0) {
-                Toast.fail(response.data.msg)
-                return false
-              } else {
-                Toast.success('提交成功')
-
-                this.$emit('prescription', response.data.data.prescription)
-                this.finish()
-
-              }
-            })
           }
 
         } else {
           if (this.dialysisPrescription.creater == 0) {
-            if (this.is_open == 0){
+            if (this.is_open == 0) {
               Toast.loading({forbidClick: true, duration: 0})
               let ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.$route.query.patient_id
@@ -989,21 +1006,42 @@
                 }
               })
 
-            }else  if (this.is_open == 1) {
-              //弹框推送提醒
-              this.advicePropForm.list = this.targetAdvices
-              this.advicePropForm.operators = this.admin_users_prop
-              this.advice_visibility = true
-              this.isShowDialog = false
+            } else if (this.is_open == 1) {
+              if (this.targetAdvices.length > 0) {
 
-              for (let i = 0; i < this.advicePropForm.list.length; i++) {
-                if (this.advicePropForm.list[i].parent_id == 0 && this.advicePropForm.list[i].isCheck == 1) {
-                  this.advicePropForm.result.push(this.advicePropForm.list[i].id)
+                //弹框推送提醒
+                this.advicePropForm.list = this.targetAdvices
+                this.advicePropForm.operators = this.admin_users_prop
+                this.advice_visibility = true
+                this.isShowDialog = false
+
+                for (let i = 0; i < this.advicePropForm.list.length; i++) {
+                  if (this.advicePropForm.list[i].parent_id == 0 && this.advicePropForm.list[i].isCheck == 1) {
+                    this.advicePropForm.result.push(this.advicePropForm.list[i].id)
+                  }
                 }
+              } else {
+                Toast.loading({forbidClick: true, duration: 0})
+                let ParamsQuery = this.dialysisPrescription
+                ParamsQuery['patient'] = this.$route.query.patient_id
+                ParamsQuery['record_date'] = this.record_date
+                commitDialysisPrescription(ParamsQuery).then(response => {
+                  if (response.data.state == 0) {
+                    Toast.fail(response.data.msg)
+                    return false
+                  } else {
+                    Toast.success('提交成功')
+
+                    this.$emit('prescription', response.data.data.prescription)
+                    this.finish()
+
+                  }
+                })
+
               }
 
             } else if (this.is_open == 2) {
-              if(this.waitUploadAdvices.length > 0) {
+              if (this.waitUploadAdvices.length > 0) {
 
                 this.advice_visibility = false
                 let params = {
@@ -1023,11 +1061,43 @@
 
                   }
                 })
-              }
+                Toast.loading({forbidClick: true, duration: 0})
+                let ParamsQuery = this.dialysisPrescription
+                ParamsQuery['patient'] = this.$route.query.patient_id
+                ParamsQuery['record_date'] = this.record_date
+                commitDialysisPrescription(ParamsQuery).then(response => {
+                  if (response.data.state == 0) {
+                    Toast.fail(response.data.msg)
+                    return false
+                  } else {
+                    Toast.success('提交成功')
+
+                    this.$emit('prescription', response.data.data.prescription)
+                    this.finish()
 
+                  }
+                })
+              } else {
+                Toast.loading({forbidClick: true, duration: 0})
+                let ParamsQuery = this.dialysisPrescription
+                ParamsQuery['patient'] = this.$route.query.patient_id
+                ParamsQuery['record_date'] = this.record_date
+                commitDialysisPrescription(ParamsQuery).then(response => {
+                  if (response.data.state == 0) {
+                    Toast.fail(response.data.msg)
+                    return false
+                  } else {
+                    Toast.success('提交成功')
+
+                    this.$emit('prescription', response.data.data.prescription)
+                    this.finish()
+
+                  }
+                })
+
+              }
             }
           }
-
           Toast.loading({forbidClick: true, duration: 0})
           let ParamsQuery = this.dialysisPrescription
           ParamsQuery['patient'] = this.$route.query.patient_id
@@ -1044,23 +1114,26 @@
 
             }
           })
+
         }
       }, commitSolutionInfo: function () {
         this.is_pre = 2
 
         if (this.prescription_prop.id == '') {
-          if (this.is_open == 0){
+          if (this.is_open == 0) {
             Toast.loading({forbidClick: true, duration: 0})
             let ParamsQuery = this.dialysisPrescription
             ParamsQuery['patient'] = this.$route.query.patient_id
             ParamsQuery['record_date'] = this.record_date
-            commitDialysisPrescription(ParamsQuery).then(response => {
+            postSolution(ParamsQuery).then(response => {
               if (response.data.state == 0) {
                 Toast.fail(response.data.msg)
                 return false
               } else {
                 Toast.success('提交成功')
 
+                this.$emit('advice')
+                this.$emit('longSolution', response.data.data.solution)
                 this.$emit('prescription', response.data.data.prescription)
                 this.finish()
 
@@ -1068,20 +1141,43 @@
             })
 
           } else if (this.is_open == 1) {
-            //弹框推送提醒
-            this.advicePropForm.list = this.targetAdvices
-            this.advicePropForm.operators = this.admin_users_prop
-            this.advice_visibility = true
-            this.isShowDialog = false
+            if (this.targetAdvices.length > 0) {
+              //弹框推送提醒
+              this.advicePropForm.list = this.targetAdvices
+              this.advicePropForm.operators = this.admin_users_prop
+              this.advice_visibility = true
+              this.isShowDialog = false
 
-            for (let i = 0; i < this.advicePropForm.list.length; i++) {
-              if (this.advicePropForm.list[i].parent_id == 0 && this.advicePropForm.list[i].isCheck == 1) {
-                this.advicePropForm.result.push(this.advicePropForm.list[i].id)
+              for (let i = 0; i < this.advicePropForm.list.length; i++) {
+                if (this.advicePropForm.list[i].parent_id == 0 && this.advicePropForm.list[i].isCheck == 1) {
+                  this.advicePropForm.result.push(this.advicePropForm.list[i].id)
+                }
               }
+            } else {
+
+              Toast.loading({forbidClick: true, duration: 0})
+              let ParamsQuery = this.dialysisPrescription
+              ParamsQuery['patient'] = this.$route.query.patient_id
+              ParamsQuery['record_date'] = this.record_date
+              postSolution(ParamsQuery).then(response => {
+                if (response.data.state == 0) {
+                  Toast.fail(response.data.msg)
+                  return false
+                } else {
+                  Toast.success('提交成功')
+
+                  this.$emit('advice')
+                  this.$emit('longSolution', response.data.data.solution)
+                  this.$emit('prescription', response.data.data.prescription)
+                  this.finish()
+
+                }
+              })
+
             }
 
           } else if (this.is_open == 2) {
-            if(this.waitUploadAdvices.length > 0) {
+            if (this.waitUploadAdvices.length > 0) {
               this.advice_visibility = false
               let params = {
                 advices: this.waitUploadAdvices,
@@ -1100,64 +1196,108 @@
 
                 }
               })
-            }
+              Toast.loading({forbidClick: true, duration: 0})
+              let ParamsQuery = this.dialysisPrescription
+              ParamsQuery['patient'] = this.$route.query.patient_id
+              ParamsQuery['record_date'] = this.record_date
+              postSolution(ParamsQuery).then(response => {
+                if (response.data.state == 0) {
+                  Toast.fail(response.data.msg)
+                  return false
+                } else {
+                  Toast.success('提交成功')
 
-            Toast.loading({forbidClick: true, duration: 0})
-            let ParamsQuery = this.dialysisPrescription
-            ParamsQuery['patient'] = this.$route.query.patient_id
-            ParamsQuery['record_date'] = this.record_date
-            postSolution(ParamsQuery).then(response => {
-              if (response.data.state == 0) {
-                Toast.fail(response.data.msg)
-                return false
-              } else {
-                Toast.success('提交成功')
+                  this.$emit('advice')
+                  this.$emit('longSolution', response.data.data.solution)
+                  this.$emit('prescription', response.data.data.prescription)
+                  this.finish()
 
-                this.$emit('advice')
-                this.$emit('longSolution', response.data.data.solution)
-                this.$emit('prescription', response.data.data.prescription)
-                this.finish()
+                }
+              })
+            } else {
+              Toast.loading({forbidClick: true, duration: 0})
+              let ParamsQuery = this.dialysisPrescription
+              ParamsQuery['patient'] = this.$route.query.patient_id
+              ParamsQuery['record_date'] = this.record_date
+              postSolution(ParamsQuery).then(response => {
+                if (response.data.state == 0) {
+                  Toast.fail(response.data.msg)
+                  return false
+                } else {
+                  Toast.success('提交成功')
 
-              }
-            })
+                  this.$emit('advice')
+                  this.$emit('longSolution', response.data.data.solution)
+                  this.$emit('prescription', response.data.data.prescription)
+                  this.finish()
+
+                }
+              })
+            }
 
           }
 
         } else {
           if (this.dialysisPrescription.creater == 0) {
-            if (this.is_open == 0){
+            if (this.is_open == 0) {
               Toast.loading({forbidClick: true, duration: 0})
               let ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.$route.query.patient_id
               ParamsQuery['record_date'] = this.record_date
-              commitDialysisPrescription(ParamsQuery).then(response => {
+              postSolution(ParamsQuery).then(response => {
                 if (response.data.state == 0) {
                   Toast.fail(response.data.msg)
                   return false
                 } else {
                   Toast.success('提交成功')
 
+                  this.$emit('advice')
+                  this.$emit('longSolution', response.data.data.solution)
                   this.$emit('prescription', response.data.data.prescription)
                   this.finish()
 
                 }
               })
 
-            }else  if (this.is_open == 1) {
-              //弹框推送提醒
-              this.advicePropForm.list = this.targetAdvices
-              this.advicePropForm.operators = this.admin_users_prop
-              this.advice_visibility = true
-              this.isShowDialog = false
+            } else if (this.is_open == 1) {
+              if (this.targetAdvices.length > 0) {
 
-              for (let i = 0; i < this.advicePropForm.list.length; i++) {
-                if (this.advicePropForm.list[i].parent_id == 0 && this.advicePropForm.list[i].isCheck == 1) {
-                  this.advicePropForm.result.push(this.advicePropForm.list[i].id)
+                //弹框推送提醒
+                this.advicePropForm.list = this.targetAdvices
+                this.advicePropForm.operators = this.admin_users_prop
+                this.advice_visibility = true
+                this.isShowDialog = false
+
+                for (let i = 0; i < this.advicePropForm.list.length; i++) {
+                  if (this.advicePropForm.list[i].parent_id == 0 && this.advicePropForm.list[i].isCheck == 1) {
+                    this.advicePropForm.result.push(this.advicePropForm.list[i].id)
+                  }
                 }
+              } else {
+
+                Toast.loading({forbidClick: true, duration: 0})
+                let ParamsQuery = this.dialysisPrescription
+                ParamsQuery['patient'] = this.$route.query.patient_id
+                ParamsQuery['record_date'] = this.record_date
+                postSolution(ParamsQuery).then(response => {
+                  if (response.data.state == 0) {
+                    Toast.fail(response.data.msg)
+                    return false
+                  } else {
+                    Toast.success('提交成功')
+
+                    this.$emit('advice')
+                    this.$emit('longSolution', response.data.data.solution)
+                    this.$emit('prescription', response.data.data.prescription)
+                    this.finish()
+
+                  }
+                })
+
               }
 
             } else if (this.is_open == 2) {
-              if(this.waitUploadAdvices.length > 0) {
+              if (this.waitUploadAdvices.length > 0) {
                 this.advice_visibility = false
                 let params = {
                   advices: this.waitUploadAdvices,
@@ -1176,11 +1316,44 @@
 
                   }
                 })
-              }
+                Toast.loading({forbidClick: true, duration: 0})
+                let ParamsQuery = this.dialysisPrescription
+                ParamsQuery['patient'] = this.$route.query.patient_id
+                ParamsQuery['record_date'] = this.record_date
+                postSolution(ParamsQuery).then(response => {
+                  if (response.data.state == 0) {
+                    Toast.fail(response.data.msg)
+                    return false
+                  } else {
+                    Toast.success('提交成功')
 
+                    this.$emit('advice')
+                    this.$emit('longSolution', response.data.data.solution)
+                    this.$emit('prescription', response.data.data.prescription)
+                    this.finish()
+
+                  }
+                })
+              } else {
+                Toast.loading({forbidClick: true, duration: 0})
+                let ParamsQuery = this.dialysisPrescription
+                ParamsQuery['patient'] = this.$route.query.patient_id
+                ParamsQuery['record_date'] = this.record_date
+                postSolution(ParamsQuery).then(response => {
+                  if (response.data.state == 0) {
+                    Toast.fail(response.data.msg)
+                    return false
+                  } else {
+                    Toast.success('提交成功')
+                    this.$emit('advice')
+                    this.$emit('longSolution', response.data.data.solution)
+                    this.$emit('prescription', response.data.data.prescription)
+                    this.finish()
+                  }
+                })
+              }
             }
           }
-
           Toast.loading({forbidClick: true, duration: 0})
           let ParamsQuery = this.dialysisPrescription
           ParamsQuery['patient'] = this.$route.query.patient_id
@@ -1191,14 +1364,6 @@
               return false
             } else {
               Toast.success('提交成功')
-              // for (const key in response.data.data.solution) {
-              //   this.solution_prop[key] = response.data.data.solution[key];
-              // }
-              // for (const key in response.data.data.prescription) {
-              //   this.prescription_prop[key] = response.data.data.prescription[key];
-              // }
-              // console.log(response.data.data.prescription)
-
               this.$emit('longSolution', response.data.data.solution)
               this.$emit('prescription', response.data.data.prescription)
               this.finish()

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

@@ -23,6 +23,9 @@
              <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>
+              <div style="padding-bottom: 15px;padding-left: 10px" v-if="advice.frequency_type == 1"> 推送频率 每日必推</div>
+              <div style="padding-bottom: 15px;padding-left: 10px" v-if="advice.frequency_type == 2"> 推送频率&nbsp;{{advice.day_count}}天/次</div>
+              <div style="padding-bottom: 15px;padding-left: 10px" v-if="advice.frequency_type == 3"> 推送频率&nbsp;每周{{advice.week_day}}</div>
 
             </van-checkbox>
           </van-checkbox-group>
@@ -123,9 +126,7 @@
       },
       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]){
@@ -133,15 +134,11 @@
             }
           }
         }
-
         var obj5={}
         results = results.reduce((cur, next) => {
           obj5[next.id] ? '' : obj5[next.id] = true && cur.push(next)
           return cur
         }, [])
-
-        results
-
         return results
       },
 

src/pages/main/today/TodayTab.vue

@@ -156,7 +156,7 @@
 
     <van-popup title="透析下机" v-model="menuList[7].showPopup" :overlay="true" :close-on-click-overlay="false">
       <plane-dialog :patient_prop="patient" :record="dialysis_order" :last_monitor_record="last_monitor_record" :admins="admin_users" :admin_map="admin_user_map"
-                    :special_premission="special_premission" 
+                    :special_premission="special_premission"
                     @did_off="closeDialysisOff" @close="closeDialysisOff" ref="plane_dialog"></plane-dialog>
     </van-popup>
 
@@ -343,7 +343,7 @@
         ) {
           steps[2].value = 1
         }
-        if (this.doctor_advices.length > 0) {
+        if (this.advice_groups.length > 0) {
           steps[3].value = 1
         }
 
@@ -749,6 +749,8 @@
           patient_id: this.patient_id,
           date: dateStr
         }
+        this.advice_groups = []
+
         getDialysisRecord(params).then(rs => {
           var resp = rs.data
           console.log(resp)
@@ -1068,8 +1070,8 @@
       }
       ,
       closeStatOrder: function () {
+
         this.closeDialog(4)
-        this.doctor_advices.push([])
         this.scrollToView('stat_order')
       }
       ,