医嘱

build/cdn.json

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

config/prod.env.js

@@ -3,7 +3,7 @@ module.exports = {
   NODE_ENV: '"production"',
   BASE_API: '"https://api.xt.kuyicloud.com"'
 
-  // BASE_API: '"https://api.xt.kuyicloud.com"'
+  // BASE_API: '"http://api.xt.test.sgjyun.com"'
   // http://api.xt.test.sgjyun.com
   // '"http://api.xt.kuyicloud.com"', //'"http://api.xt.kuyicloud.com"','"http://api.xt.test.sgjyun.com"'
 }

src/pages/main/dialog/PrescriptionDialog.vue

@@ -746,26 +746,9 @@ import MsgTip from './subMenu/MsgTip'
     },
 
     menuComfirmThree: function (targetAdvices) {
-        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) {
-              this.doctorAdvices = resp.data.advices
-
-            } else {
 
-            }
-          })
 
+        if (targetAdvices.length > 0) {
           if (this.is_pre == 1) {
             Toast.loading({forbidClick: true, duration: 0})
             let ParamsQuery = this.dialysisPrescription
@@ -776,10 +759,29 @@ import MsgTip from './subMenu/MsgTip'
                 Toast.fail(response.data.msg)
                 return false
               } else {
-                Toast.success('提交成功')
+                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) {
+                    this.doctorAdvices = resp.data.advices
+                    Toast.success('提交成功')
+
+                    this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
+                    this.finish()
+
+                  } else {
+
+                  }
+                })
 
-                this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
-                this.finish()
               }
             })
 
@@ -976,8 +978,8 @@ import MsgTip from './subMenu/MsgTip'
       },
       commitInfo: function () {
         this.is_pre = 1
-        if (this.prescription_prop.id == '') {
 
+        if (this.prescription_prop.id == '') {
           if (this.is_open == 0) {
             Toast.loading({forbidClick: true, duration: 0})
             let ParamsQuery = this.dialysisPrescription
@@ -1007,8 +1009,7 @@ import MsgTip from './subMenu/MsgTip'
                   this.advicePropForm.result.push(this.advicePropForm.list[i].id)
                 }
               }
-            }
-            else {
+            } else {
               Toast.loading({forbidClick: true, duration: 0})
               let ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.$route.query.patient_id
@@ -1029,25 +1030,7 @@ import MsgTip from './subMenu/MsgTip'
 
           } else if (this.is_open == 2) {
             if (this.waitUploadAdvices.length > 0) {
-              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) {
-                  this.doctorAdvices = resp.data.advices
 
-                } else {
-
-                }
-              })
               Toast.loading({forbidClick: true, duration: 0})
               let ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.$route.query.patient_id
@@ -1073,10 +1056,29 @@ import MsgTip from './subMenu/MsgTip'
                   Toast.fail(response.data.msg)
                   return false
                 } else {
-                  Toast.success('提交成功')
+                  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) {
+                      this.doctorAdvices = resp.data.advices
+                      Toast.success('提交成功')
+                      this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
+                      this.finish()
+                    } else {
+
+                    }
+                  })
+
 
-                  this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
-                  this.finish()
                 }
               })
             }
@@ -1141,25 +1143,7 @@ import MsgTip from './subMenu/MsgTip'
             } else if (this.is_open == 2) {
               if (this.waitUploadAdvices.length > 0) {
 
-                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) {
-                    this.doctorAdvices = resp.data.advices
-
-                  } else {
 
-                  }
-                })
                 Toast.loading({forbidClick: true, duration: 0})
                 let ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.$route.query.patient_id
@@ -1186,9 +1170,28 @@ import MsgTip from './subMenu/MsgTip'
                     Toast.fail(response.data.msg)
                     return false
                   } else {
-                    Toast.success('提交成功')
-                    this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
-                    this.finish()
+                    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) {
+                        this.doctorAdvices = resp.data.advices
+                        Toast.success('提交成功')
+                        this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
+                        this.finish()
+
+                      } else {
+
+                      }
+                    })
 
                   }
                 })
@@ -1279,26 +1282,7 @@ import MsgTip from './subMenu/MsgTip'
 
           } else if (this.is_open == 2) {
             if (this.waitUploadAdvices.length > 0) {
-              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) {
-                  this.doctorAdvices = resp.data.advices
-
 
-                } else {
-
-                }
-              })
               Toast.loading({forbidClick: true, duration: 0})
               let ParamsQuery = this.dialysisPrescription
               ParamsQuery['patient'] = this.$route.query.patient_id
@@ -1327,6 +1311,26 @@ import MsgTip from './subMenu/MsgTip'
                   Toast.fail(response.data.msg)
                   return false
                 } else {
+                  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) {
+                      this.doctorAdvices = resp.data.advices
+
+
+                    } else {
+
+                    }
+                  })
                   Toast.success('提交成功')
 
                   this.$emit('advice')
@@ -1401,26 +1405,7 @@ import MsgTip from './subMenu/MsgTip'
 
             } else if (this.is_open == 2) {
               if (this.waitUploadAdvices.length > 0) {
-                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) {
-                    this.doctorAdvices = resp.data.advices
-
-
-                  } else {
 
-                  }
-                })
                 Toast.loading({forbidClick: true, duration: 0})
                 let ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.$route.query.patient_id
@@ -1430,12 +1415,30 @@ import MsgTip from './subMenu/MsgTip'
                     Toast.fail(response.data.msg)
                     return false
                   } else {
-                    Toast.success('提交成功')
+                    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) {
+                        this.doctorAdvices = resp.data.advices
+                        Toast.success('提交成功')
+                        this.$emit('advice')
+                        this.$emit('longSolution', response.data.data.solution)
+                        this.$emit('prescription', response.data.data.prescription)
+                        this.finish()
+                      } else {
+
+                      }
+                    })
 
-                    this.$emit('advice')
-                    this.$emit('longSolution', response.data.data.solution)
-                    this.$emit('prescription', response.data.data.prescription)
-                    this.finish()
 
                   }
                 })

src/pages/main/index.vue

@@ -62,6 +62,7 @@
               return [item.groupno]
             })
 
+
             this.unReadWaitNum = sorted.length
 
           } else {

src/pages/main/today/TodayTab.vue

@@ -1029,135 +1029,138 @@
       },
       prescriptionFunc: function (val,advices) {
         this.prescription = val
-        if (advices.length > 0){
-
-          if (advices.length > 0) {
-            var group = this.newAdviceGroupObject()
-            var initGroupBlock = function (group, advice) {
-              group.group_no = advice.groupno
-              // group.start_time = advice.start_time
-              // group.advice_doctor = advice.advice_doctor
-              // group.exec_staff = advice.execution_staff
-              // group.exec_time = advice.execution_time
-              // group.checker = advice.checker
-            }
-            for (let index = 0; index < advices.length; index++) {
-              const advice = advices[index]
-              if (advice.groupno == 0) {
-                // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
-                if (advice.parent_id > 0) {
-                  if (this.advice_groups.length > 0) {
-                    var parent_group = this.advice_groups[
-                    this.advice_groups.length - 1
-                      ]
-                    if (parent_group.advices.length > 0) {
-                      if (parent_group.advices[0].id == advice.parent_id) {
-                        parent_group.advices.push(advice)
-                      }
-                    }
-                  }
-                  continue
-                } else {
-                  if (group.group_no > 0) {
-                    this.advice_groups.push(group)
-                    group = this.newAdviceGroupObject()
-                  }
-
-                  initGroupBlock(group, advice)
-                  group.advices.push(advice)
-                  this.advice_groups.push(group)
-                  group = this.newAdviceGroupObject()
-                  continue
-                }
-              }
-
-              if (group.group_no > 0 && group.group_no != advice.groupno) {
-                this.advice_groups.push(group)
-                group = this.newAdviceGroupObject()
-              }
-              if (group.group_no == 0) {
-                initGroupBlock(group, advice)
-              }
-              if (group.group_no == advice.groupno) {
-                group.advices.push(advice)
-              }
-            }
-            if (group.group_no > 0) {
-              // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-              this.advice_groups.push(group)
-            }
-
-          }
-
-
-        }
+        this.requestDialysisRecord()
+        // if (advices.length > 0){
+        //
+        //   // if (advices.length > 0) {
+        //   //   var group = this.newAdviceGroupObject()
+        //   //   var initGroupBlock = function (group, advice) {
+        //   //     group.group_no = advice.groupno
+        //   //     // group.start_time = advice.start_time
+        //   //     // group.advice_doctor = advice.advice_doctor
+        //   //     // group.exec_staff = advice.execution_staff
+        //   //     // group.exec_time = advice.execution_time
+        //   //     // group.checker = advice.checker
+        //   //   }
+        //   //   for (let index = 0; index < advices.length; index++) {
+        //   //     const advice = advices[index]
+        //   //     if (advice.groupno == 0) {
+        //   //       // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
+        //   //       if (advice.parent_id > 0) {
+        //   //         if (this.advice_groups.length > 0) {
+        //   //           var parent_group = this.advice_groups[
+        //   //           this.advice_groups.length - 1
+        //   //             ]
+        //   //           if (parent_group.advices.length > 0) {
+        //   //             if (parent_group.advices[0].id == advice.parent_id) {
+        //   //               parent_group.advices.push(advice)
+        //   //             }
+        //   //           }
+        //   //         }
+        //   //         continue
+        //   //       } else {
+        //   //         if (group.group_no > 0) {
+        //   //           this.advice_groups.push(group)
+        //   //           group = this.newAdviceGroupObject()
+        //   //         }
+        //   //
+        //   //         initGroupBlock(group, advice)
+        //   //         group.advices.push(advice)
+        //   //         this.advice_groups.push(group)
+        //   //         group = this.newAdviceGroupObject()
+        //   //         continue
+        //   //       }
+        //   //     }
+        //   //
+        //   //     if (group.group_no > 0 && group.group_no != advice.groupno) {
+        //   //       this.advice_groups.push(group)
+        //   //       group = this.newAdviceGroupObject()
+        //   //     }
+        //   //     if (group.group_no == 0) {
+        //   //       initGroupBlock(group, advice)
+        //   //     }
+        //   //     if (group.group_no == advice.groupno) {
+        //   //       group.advices.push(advice)
+        //   //     }
+        //   //   }
+        //   //   if (group.group_no > 0) {
+        //   //     // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
+        //   //     this.advice_groups.push(group)
+        //   //   }
+        //   //
+        //   // }
+        //
+        //
+        // }
 
       }
       ,
       longSolutionFunc: function (val) {
         this.solution = val
-        if (advices.length > 0){
-
-          if (advices.length > 0) {
-            var group = this.newAdviceGroupObject()
-            var initGroupBlock = function (group, advice) {
-              group.group_no = advice.groupno
-              // group.start_time = advice.start_time
-              // group.advice_doctor = advice.advice_doctor
-              // group.exec_staff = advice.execution_staff
-              // group.exec_time = advice.execution_time
-              // group.checker = advice.checker
-            }
-            for (let index = 0; index < advices.length; index++) {
-              const advice = advices[index]
-              if (advice.groupno == 0) {
-                // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
-                if (advice.parent_id > 0) {
-                  if (this.advice_groups.length > 0) {
-                    var parent_group = this.advice_groups[
-                    this.advice_groups.length - 1
-                      ]
-                    if (parent_group.advices.length > 0) {
-                      if (parent_group.advices[0].id == advice.parent_id) {
-                        parent_group.advices.push(advice)
-                      }
-                    }
-                  }
-                  continue
-                } else {
-                  if (group.group_no > 0) {
-                    this.advice_groups.push(group)
-                    group = this.newAdviceGroupObject()
-                  }
-
-                  initGroupBlock(group, advice)
-                  group.advices.push(advice)
-                  this.advice_groups.push(group)
-                  group = this.newAdviceGroupObject()
-                  continue
-                }
-              }
-
-              if (group.group_no > 0 && group.group_no != advice.groupno) {
-                this.advice_groups.push(group)
-                group = this.newAdviceGroupObject()
-              }
-              if (group.group_no == 0) {
-                initGroupBlock(group, advice)
-              }
-              if (group.group_no == advice.groupno) {
-                group.advices.push(advice)
-              }
-            }
-            if (group.group_no > 0) {
-              // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-              this.advice_groups.push(group)
-            }
-
-          }
+        this.requestDialysisRecord()
 
-
-        }
+        // if (advices.length > 0){
+        //
+        //   if (advices.length > 0) {
+        //     var group = this.newAdviceGroupObject()
+        //     var initGroupBlock = function (group, advice) {
+        //       group.group_no = advice.groupno
+        //       // group.start_time = advice.start_time
+        //       // group.advice_doctor = advice.advice_doctor
+        //       // group.exec_staff = advice.execution_staff
+        //       // group.exec_time = advice.execution_time
+        //       // group.checker = advice.checker
+        //     }
+        //     for (let index = 0; index < advices.length; index++) {
+        //       const advice = advices[index]
+        //       if (advice.groupno == 0) {
+        //         // 老版本的医嘱没有分组的概念，所以这一个 if 是解决这个问题的，将每个无分组的医嘱各自归为一组
+        //         if (advice.parent_id > 0) {
+        //           if (this.advice_groups.length > 0) {
+        //             var parent_group = this.advice_groups[
+        //             this.advice_groups.length - 1
+        //               ]
+        //             if (parent_group.advices.length > 0) {
+        //               if (parent_group.advices[0].id == advice.parent_id) {
+        //                 parent_group.advices.push(advice)
+        //               }
+        //             }
+        //           }
+        //           continue
+        //         } else {
+        //           if (group.group_no > 0) {
+        //             this.advice_groups.push(group)
+        //             group = this.newAdviceGroupObject()
+        //           }
+        //
+        //           initGroupBlock(group, advice)
+        //           group.advices.push(advice)
+        //           this.advice_groups.push(group)
+        //           group = this.newAdviceGroupObject()
+        //           continue
+        //         }
+        //       }
+        //
+        //       if (group.group_no > 0 && group.group_no != advice.groupno) {
+        //         this.advice_groups.push(group)
+        //         group = this.newAdviceGroupObject()
+        //       }
+        //       if (group.group_no == 0) {
+        //         initGroupBlock(group, advice)
+        //       }
+        //       if (group.group_no == advice.groupno) {
+        //         group.advices.push(advice)
+        //       }
+        //     }
+        //     if (group.group_no > 0) {
+        //       // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
+        //       this.advice_groups.push(group)
+        //     }
+        //
+        //   }
+        //
+        //
+        // }
 
       }
       ,