龙岗二院

src/pages/main/dialog/PrescriptionDialog.vue

@@ -851,235 +851,263 @@
         return anticoagulan_name
       },
       commitInfo: function () {
-        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 {
-
-                }
-              })
-
-              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()
-
-                }
-              })
-            }
 
+        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 {
-            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()
+            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.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()
+        //
+        //       }
+        //     })
+        //   }
+        // }
       }, commitSolutionInfo: function () {
 
-        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()
-
-                }
-              })
-            }
+        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)
 
-            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()
-
-              }
-            })
+            // 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()
+        //
+        //       }
+        //     })
+        //
+        //   }
+        //
+        // }
 
       }, finish: function () {
         this.$emit('finish')

src/pages/main/today/TodayTab.vue

@@ -379,7 +379,7 @@
       this.patient_id = patient_id
       this.date = date
       this.requestDialysisRecord()
-      this.requestLongAdvice()
+      // this.requestLongAdvice()
 
     },
     mounted () {