长期医嘱提醒

build/cdn.json

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

src/pages/main/dialog/PrescriptionDialog.vue

@@ -366,13 +366,18 @@
       },
       prescription_prop: {
         type: Object,
-      }, status: {
+      }, is_open: {
         type: Number,
       }, targetAdvices: {
         type: Array,
         default: function () {
           return new Array()
         }
+      }, waitUploadAdvices: {
+        type: Array,
+        default: function () {
+          return new Array()
+        }
       },
       machines_prop: {
         type: Array,
@@ -383,6 +388,7 @@
     },
     data () {
       return {
+        is_pre:0,
         loading: false,
         signUrl: '',
         isShowDesc: true,
@@ -706,7 +712,7 @@
           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}') + ' ' + parseTime(targetAdvices[0].start_time, '{y}-{m}-{d}A{h}:{i}').split('A')[1],
+          start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
           remark: '',
         }
         CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
@@ -717,23 +723,49 @@
 
           }
         })
-        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)
-            // for (const key in response.data.data.prescription) {
-            //   // this.prescription_prop[key] = response.data.data.prescription[key];
-            // }
-            this.finish()
-          }
-        })
+
+        if (this.is_pre == 1){
+          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)
+              // 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){
+          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()
+
+            }
+          })
+
+        }
+
+
       },
       menuComfirm: function (val) {
         this.visibility = false
@@ -851,263 +883,238 @@
         return anticoagulan_name
       },
       commitInfo: function () {
+        this.is_pre = 1
 
-        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.$emit('advice')
-            // for (const key in response.data.data.prescription) {
-            //   // this.prescription_prop[key] = response.data.data.prescription[key];
-            // }
-            this.finish()
 
+        if (this.prescription_prop.id == '') {
+          console.log(this.is_open)
+          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 == 2) {
+            this.advice_visibility = false
+            let params = {
+              advices: this.waitUploadAdvices,
+              advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+              advice_doctor: this.waitUploadAdvices[0].advice_doctor,
+              advice_type: this.waitUploadAdvices[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 {
+
+              }
+            })
+
+            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()
+
+              }
+            })
           }
-        })
-        // if (this.targetAdvices.length > 0) {
-        //
-        //   if (this.prescription_prop.id == '') {
-        //     if (this.status == 2) {
-        //       //弹框推送提醒
-        //       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.status == 3) {
-        //       this.advice_visibility = false
-        //       let params = {
-        //         advices: this.targetAdvices,
-        //         advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
-        //         advice_doctor: this.targetAdvices[0].advice_doctor,
-        //         advice_type: this.targetAdvices[0].advice_type,
-        //         parent_id: this.patient_id,
-        //         start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}') + ' ' + parseTime(this.targetAdvices[0].start_time, '{y}-{m}-{d}A{h}:{i}').split('A')[1],
-        //         remark: '',
-        //       }
-        //       CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
-        //         var resp = rs.data
-        //         if (resp.state == 1) {
-        //
-        //         } else {
-        //
-        //         }
-        //       })
-        //
-        //
-        //     }
-        //
-        //   } else {
-        //     if (this.dialysisPrescription.creater == 0) {
-        //       if (this.status == 2) {
-        //         //弹框推送提醒
-        //         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.status == 3) {
-        //         this.advice_visibility = false
-        //         let params = {
-        //           advices: this.targetAdvices,
-        //           advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
-        //           advice_doctor: this.targetAdvices[0].advice_doctor,
-        //           advice_type: this.targetAdvices[0].advice_type,
-        //           parent_id: this.patient_id,
-        //           start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}') + ' ' + parseTime(this.targetAdvices[0].start_time, '{y}-{m}-{d}A{h}:{i}').split('A')[1],
-        //           remark: '',
-        //         }
-        //         CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
-        //           var resp = rs.data
-        //           if (resp.state == 1) {
-        //           } 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.dialysisPrescription.creater == 0) {
+            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 == 2) {
+              this.advice_visibility = false
+              let params = {
+                advices: this.waitUploadAdvices,
+                advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                advice_doctor: this.waitUploadAdvices[0].advice_doctor,
+                advice_type: this.waitUploadAdvices[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 {
+
+                }
+              })
+
+            }
+          }
+
+          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()
+
+            }
+          })
+        }
       }, commitSolutionInfo: function () {
+        this.is_pre = 2
+
+        if (this.prescription_prop.id == '') {
+          if (this.is_open == 1) {
+            //弹框推送提醒
+            this.advicePropForm.list = this.targetAdvices
+            this.advicePropForm.operators = this.admin_users_prop
+            this.advice_visibility = true
+            this.isShowDialog = false
 
-        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('提交成功')
-            // 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('advice')
-            this.$emit('longSolution', response.data.data.solution)
-            this.$emit('prescription', response.data.data.prescription)
-            this.finish()
+            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 == 2) {
+            this.advice_visibility = false
+            let params = {
+              advices: this.waitUploadAdvices,
+              advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+              advice_doctor: this.waitUploadAdvices[0].advice_doctor,
+              advice_type: this.waitUploadAdvices[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 {
+
+              }
+            })
+
+            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()
+
+              }
+            })
 
           }
-        })
 
-        // if (this.targetAdvices.length > 0) {
-        //
-        //   if (this.prescription_prop.id == '') {
-        //     if (this.status == 2) {
-        //       //弹框推送提醒
-        //       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.result.push(this.advicePropForm.list[i].id)
-        //         }
-        //       }
-        //
-        //     } else if (this.status == 3) {
-        //       let params = {
-        //         advices: this.targetAdvices,
-        //         advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
-        //         advice_doctor: this.targetAdvices[0].advice_doctor,
-        //         advice_type: this.targetAdvices[0].advice_type,
-        //         parent_id: this.patient_id,
-        //         start_time: parseTime(this.$route.query.date, '{y}-{m}-{d}') + ' ' + parseTime(this.targetAdvices[0].start_time, '{y}-{m}-{d}A{h}:{i}').split('A')[1],
-        //         remark: '',
-        //       }
-        //       CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
-        //         var resp = rs.data
-        //         if (resp.state == 1) {
-        //
-        //         } 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('提交成功')
-        //           // 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('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('提交成功')
-        //           // 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()
-        //
-        //         }
-        //       })
-        //     }
-        //   } 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('提交成功')
-        //         // 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('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 == 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 == 2) {
+              this.advice_visibility = false
+              let params = {
+                advices: this.waitUploadAdvices,
+                advice_date: parseTime(this.$route.query.date, '{y}-{m}-{d}'),
+                advice_doctor: this.waitUploadAdvices[0].advice_doctor,
+                advice_type: this.waitUploadAdvices[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 {
+
+                }
+              })
+
+            }
+          }
+
+          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('提交成功')
+              // 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()
+
+            }
+          })
+        }
 
       }, finish: function () {
         this.$emit('finish')
@@ -1350,7 +1357,8 @@
       MultipleSubMenu,
       // MultipleSubMenu,
       CheckBoxSubMenu
-    }, watch: {
+    },
+    watch: {
       isShowDialog (val) {
         if (val) {
           this.advice_visibility = false

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

@@ -68,12 +68,19 @@
       }, getContent (val) {
         let prescribing_number = ''
         let single_dose = ''
+        let advice_name = ''
+
         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
         }
+
+        if (val.advice_name > 0) {
+          advice_name = val.advice_name + val.drug_spec_unit
+        }
+
         let name = ""
         if (val.child.length > 0){
           for (let i = 0 ; i < val.child.length; i++){
@@ -89,7 +96,7 @@
               val.child[i]['single'] = ''
             }
             name = name+"▲"+val.child[i].advice_name+""
-              + val.child[i].drug_spec
+              + val.child[i].advice_desc
               + val.child[i].drug_spec_unit
               + val.child[i].presc
               + val.child[i].single
@@ -100,8 +107,7 @@
             + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark +name
 
         } else {
-          return val.advice_name +"  "+ val.drug_spec+" "
-            + val.drug_spec_unit
+          return advice_name +"  "
             + prescribing_number
             + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark
         }

src/pages/main/today/TodayTab.vue

@@ -109,8 +109,10 @@
     <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" :status="status" :targetAdvices="targetAdvices"
-                           @close="closePrescriptionDialog" @prescription="prescriptionFunc"  :admin_users_prop="admin_users" @advice="adviceFunc"
+                           :types="goodTypes" :info="goodInfos" :status="status" :targetAdvices="longAdvices"
+                           :waitUploadAdvices="waitUploadAdvices" :is_open="is_open"
+                           @close="closePrescriptionDialog" @prescription="prescriptionFunc"
+                           :admin_users_prop="admin_users" @advice="adviceFunc"
                            @longSolution="longSolutionFunc" ref="prescription_dialog"></prescription-dialog>
     </van-popup>
 
@@ -217,7 +219,7 @@
   import MonitDialog from '../dialog/MonitDialog'
   import ComputerDialog from '../dialog/ComputerDialog'
 
-  import {dialysisGlobalConfig, getDialysisRecord,CreateGroupAdvice} from '@/api/dialysis'
+  import {CreateGroupAdvice, dialysisGlobalConfig, getDialysisRecord} from '@/api/dialysis'
   import {GetRemindLongAdvice} from '@/api/advice'
 
   import {parseTime} from '@/utils'
@@ -304,8 +306,10 @@
         goodInfos: [],
 
         longAdvices: [],
-        targetAdvices:[],
-        status:'',
+        waitUploadAdvices: [],
+        is_open: 0,
+        targetAdvices: [],
+        status: '',
       }
     },
     computed: {
@@ -379,7 +383,7 @@
       this.patient_id = patient_id
       this.date = date
       this.requestDialysisRecord()
-      // this.requestLongAdvice()
+      this.requestLongAdvice()
 
     },
     mounted () {
@@ -941,118 +945,44 @@
 
             switch (status) {
               case 2:
-                this.longAdvices = resp.data.advices
-
+                var totalAdvice = resp.data.advices
                 var longAdvicesTwo = resp.data.advices_two
+                var waitUploadAdvices = []
+                for (let i = 0; i < totalAdvice.length; i++) {
+                  totalAdvice[i]['isCheck'] = 1
 
-                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()
-                      console.log(day)
-                      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 0:
-                          name="周日"
-                          break
-                      }
-
+                }
 
-                      if (this.longAdvices[i].week_day.indexOf(name) != -1){
-                        console.log("11111")
-                        this.longAdvices[i]['isCheck'] = 1
-                      }
-                      break
+                for (let i = 0; i < totalAdvice.length; i++) {
+                  for (let a = 0; a < longAdvicesTwo.length; a++) {
+                    if (totalAdvice[i].template_id == longAdvicesTwo[a].template_id) {
+                      totalAdvice[i]['isCheck'] = 0
+                    }
                   }
                 }
 
-                console.log( this.longAdvices)
-                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 0:
-                          name="周日"
-                          break
-                      }
-                      if (this.longAdvices[i].week_day.indexOf(name) != -1){
-                        dayAdvices.push(this.longAdvices[i])
-                      }
-                      break
-                  }
+                for (let i = 0; i < totalAdvice.length; i++) {
+                    if( totalAdvice[i].isCheck == 1){
+                      waitUploadAdvices.push(totalAdvice[i])
+                    }
                 }
-                this.targetAdvices = dayAdvices.concat(advices_two)
+
+
+                this.is_open = resp.data.is_open_remind
+                this.longAdvices = totalAdvice
+                this.waitUploadAdvices = waitUploadAdvices
+                console.log(this.longAdvices)
+                console.log(this.waitUploadAdvices)
+
                 break
+
             }
           } else {
 
           }
         })
+
       }, getNowFormatDate () {
         var date = new Date()
         var seperator1 = '-'
@@ -1082,18 +1012,17 @@
           }
         )
       }
-      ,adviceFunc:function(){
-
+      , adviceFunc: function () {
 
       },
       prescriptionFunc: function (val) {
-        if (this.status == 2){
-          if(val.creater > 0 && val.modifier == 0){
+        if (this.status == 2) {
+          if (val.creater > 0 && val.modifier == 0) {
             this.requestDialysisRecord()
           }
 
-        }else if(this.status == 3){
-          if(val.creater > 0 && val.modifier == 0){
+        } else if (this.status == 3) {
+          if (val.creater > 0 && val.modifier == 0) {
             this.requestDialysisRecord()
           }
         }
@@ -1104,13 +1033,13 @@
       ,
       longSolutionFunc: function (val) {
         this.solution = val
-        if (this.status == 2){
-          if(val.creater > 0 && val.modifier == 0){
+        if (this.status == 2) {
+          if (val.creater > 0 && val.modifier == 0) {
             this.requestDialysisRecord()
           }
 
-        }else if(this.status == 3){
-          if(val.creater > 0 && val.modifier == 0){
+        } else if (this.status == 3) {
+          if (val.creater > 0 && val.modifier == 0) {
             this.requestDialysisRecord()
           }
         }