打印预览

src/api/dialysis.js

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

src/pages/main/PrintIndex.vue

@@ -13,7 +13,8 @@
       <DialysisPrintOrderOne style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==1"> </DialysisPrintOrderOne>
       <DialysisPrintOrderTwo style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==2||org_template_info.template_id ==0"></DialysisPrintOrderTwo>
       <DialysisPrintOrderFive style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==5"></DialysisPrintOrderFive>
-
+      <!--<DialysisPrintOrderSix style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==6"></DialysisPrintOrderSix>-->
+      <DialysisPrintOrderSix style="margin-top:60px;" v-bind:childResponse="childResponse" v-if="org_template_info.template_id ==6"></DialysisPrintOrderSix>
     </div>
   </div>
 </template>
@@ -29,10 +30,12 @@ import LabelBox from "./printItem/LabelBox";
 import DialysisPrintOrderOne from './template/DialysisPrintOrderOne';
 import DialysisPrintOrderTwo from './template/DialysisPrintOrderTwo';
 import DialysisPrintOrderFive from './template/DialysisPrintOrderFive';
+import DialysisPrintOrderSix from './template/DialysisPrintOrderSix'
 
 export default {
   name: "PrintIndex",
   components: {
+    DialysisPrintOrderSix,
     DialysisPrintOrderOne,
     DialysisPrintOrderTwo,
     DialysisPrintOrderFive,

src/pages/main/dialog/PrescriptionDialog.vue

@@ -516,6 +516,7 @@ import MsgTip from './subMenu/MsgTip'
         zhiShow: true,
         totalShow: true,
         huShow: true,
+        doctorAdvices:[],
         propForm: {
           title: '',
           list: [],
@@ -758,6 +759,7 @@ import MsgTip from './subMenu/MsgTip'
           CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
             var resp = rs.data
             if (resp.state == 1) {
+              this.doctorAdvices = resp.data.advices
 
             } else {
 
@@ -776,7 +778,7 @@ import MsgTip from './subMenu/MsgTip'
               } else {
                 Toast.success('提交成功')
 
-                this.$emit('prescription', response.data.data.prescription)
+                this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
                 this.finish()
               }
             })
@@ -794,8 +796,8 @@ import MsgTip from './subMenu/MsgTip'
                 Toast.success('提交成功')
 
                 this.$emit('advice')
-                this.$emit('longSolution', response.data.data.solution)
-                this.$emit('prescription', response.data.data.prescription)
+                this.$emit('longSolution', response.data.data.solution,this.doctorAdvices)
+                this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
                 this.finish()
               }
             })
@@ -814,7 +816,7 @@ import MsgTip from './subMenu/MsgTip'
               } else {
                 Toast.success('提交成功')
 
-                this.$emit('prescription', response.data.data.prescription)
+                this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
                 this.finish()
               }
             })
@@ -832,8 +834,8 @@ import MsgTip from './subMenu/MsgTip'
                 Toast.success('提交成功')
 
                 this.$emit('advice')
-                this.$emit('longSolution', response.data.data.solution)
-                this.$emit('prescription', response.data.data.prescription)
+                this.$emit('longSolution', response.data.data.solution,this.doctorAdvices)
+                this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
                 this.finish()
               }
             })
@@ -987,13 +989,13 @@ import MsgTip from './subMenu/MsgTip'
                 return false
               } else {
                 Toast.success('提交成功')
-                this.dialysisPrescription.creater = response.data.data.prescription.creater
 
-                this.$emit('prescription', response.data.data.prescription)
+                this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
                 this.finish()
               }
             })
           } else if (this.is_open == 1) {
+
             if (this.targetAdvices.length > 0) {
               //弹框推送提醒
               this.advicePropForm.list = this.targetAdvices
@@ -1005,7 +1007,8 @@ 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
@@ -1016,13 +1019,14 @@ import MsgTip from './subMenu/MsgTip'
                   return false
                 } else {
                   Toast.success('提交成功')
-                  this.dialysisPrescription.creater = response.data.data.prescription.creater
 
-                  this.$emit('prescription', response.data.data.prescription)
+                  this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
                   this.finish()
                 }
               })
             }
+
+
           } else if (this.is_open == 2) {
             if (this.waitUploadAdvices.length > 0) {
               this.advice_visibility = false
@@ -1038,6 +1042,7 @@ import MsgTip from './subMenu/MsgTip'
               CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
+                  this.doctorAdvices = resp.data.advices
 
                 } else {
 
@@ -1053,9 +1058,8 @@ import MsgTip from './subMenu/MsgTip'
                   return false
                 } else {
                   Toast.success('提交成功')
-                  this.dialysisPrescription.creater = response.data.data.prescription.creater
 
-                  this.$emit('prescription', response.data.data.prescription)
+                  this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
                   this.finish()
                 }
               })
@@ -1070,9 +1074,8 @@ import MsgTip from './subMenu/MsgTip'
                   return false
                 } else {
                   Toast.success('提交成功')
-                  this.dialysisPrescription.creater = response.data.data.prescription.creater
 
-                  this.$emit('prescription', response.data.data.prescription)
+                  this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
                   this.finish()
                 }
               })
@@ -1081,7 +1084,8 @@ import MsgTip from './subMenu/MsgTip'
           }
 
         } else {
-          if (this.dialysisPrescription.creater == 0) {
+
+          if (this.prescription_prop.creater == 0) {
             if (this.is_open == 0) {
               Toast.loading({forbidClick: true, duration: 0})
               let ParamsQuery = this.dialysisPrescription
@@ -1094,7 +1098,7 @@ import MsgTip from './subMenu/MsgTip'
                 } else {
                   Toast.success('提交成功')
 
-                  this.$emit('prescription', response.data.data.prescription)
+                  this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
                   this.finish()
 
                 }
@@ -1126,7 +1130,7 @@ import MsgTip from './subMenu/MsgTip'
                   } else {
                     Toast.success('提交成功')
 
-                    this.$emit('prescription', response.data.data.prescription)
+                    this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
                     this.finish()
 
                   }
@@ -1150,6 +1154,7 @@ import MsgTip from './subMenu/MsgTip'
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                   var resp = rs.data
                   if (resp.state == 1) {
+                    this.doctorAdvices = resp.data.advices
 
                   } else {
 
@@ -1170,7 +1175,8 @@ import MsgTip from './subMenu/MsgTip'
 
                   }
                 })
-              } else {
+              }
+              else {
                 Toast.loading({forbidClick: true, duration: 0})
                 let ParamsQuery = this.dialysisPrescription
                 ParamsQuery['patient'] = this.$route.query.patient_id
@@ -1181,7 +1187,7 @@ import MsgTip from './subMenu/MsgTip'
                     return false
                   } else {
                     Toast.success('提交成功')
-                    this.$emit('prescription', response.data.data.prescription)
+                    this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
                     this.finish()
 
                   }
@@ -1201,15 +1207,12 @@ import MsgTip from './subMenu/MsgTip'
                 return false
               } else {
                 Toast.success('提交成功')
-                this.$emit('prescription', response.data.data.prescription)
+                this.$emit('prescription', response.data.data.prescription,this.doctorAdvices)
                 this.finish()
 
               }
             })
 
-
-
-
           }
 
 
@@ -1289,6 +1292,8 @@ import MsgTip from './subMenu/MsgTip'
               CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
+                  this.doctorAdvices = resp.data.advices
+
 
                 } else {
 
@@ -1336,7 +1341,7 @@ import MsgTip from './subMenu/MsgTip'
           }
 
         } else {
-          if (this.dialysisPrescription.creater == 0) {
+          if (this.prescription_prop.creater == 0) {
             if (this.is_open == 0) {
               Toast.loading({forbidClick: true, duration: 0})
               let ParamsQuery = this.dialysisPrescription
@@ -1409,6 +1414,8 @@ import MsgTip from './subMenu/MsgTip'
                 CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                   var resp = rs.data
                   if (resp.state == 1) {
+                    this.doctorAdvices = resp.data.advices
+
 
                   } else {
 

src/pages/main/today/TodayTab.vue

@@ -274,6 +274,7 @@
           {value: '9', label: ' 透后评估', showPopup: false},
           {value: '10', label: ' 治疗小结', showPopup: false}
         ],
+        isPullData: 1,
         config: {},//库存自动扣减
         operators: [], //操作人
         patient: {}, // 患者信息
@@ -768,6 +769,13 @@
             var predialysis_evaluation = resp.data.predialysis_evaluation // 透前评估
             var doctor_advices = resp.data.doctor_advices // 临时医嘱
 
+
+            if(prescription == null || prescription.creater == 0){
+              this.isPullData = 1
+            }else{
+              this.isPullData = 2
+            }
+
             this.goodInfos = resp.data.goodInfos
 
             for (let i = 0; i < doctor_advices.length; i++) {
@@ -1022,16 +1030,137 @@
       , adviceFunc: function () {
 
       },
-      prescriptionFunc: function (val) {
-        this.requestDialysisRecord()
-
+      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)
+            }
+
+          }
+
+
+        }
 
       }
       ,
       longSolutionFunc: function (val) {
         this.solution = val
-        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)
+            }
+
+          }
+
+
+        }
 
       }
       ,