龙岗二院

src/pages/main/dialog/OrdersDialog.vue

@@ -78,7 +78,7 @@
                 >
                   <div class="txt">
                     <span>{{advice.advice_name }}</span>
-                    <span>{{ advice.advice_desc }}{{advice.drug_spec_unit}}</span>
+                    <span>{{ advice.drug_spec }}{{advice.drug_spec_unit}}</span>
                     <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                     <span v-if="advice.single_dose"
                     >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
@@ -381,7 +381,7 @@
           advice_desc: advice.advice_desc,
           remark: advice.remark,
           start_time: advice.start_time,
-          // drug_spec: String(advice.drug_spec),
+          drug_spec: String(advice.drug_spec),
           drug_spec_unit: advice.drug_spec_unit,
           delivery_way: advice.delivery_way,
           execution_frequency: advice.execution_frequency,
@@ -402,7 +402,7 @@
                     advice.advice_desc = resp_advice.advice_desc
                     advice.remark = resp_advice.remark;
                     advice.start_time = resp_advice.start_time;
-                    // advice.drug_spec = resp_advice.drug_spec;
+                    advice.drug_spec = resp_advice.drug_spec;
                     (advice.drug_spec_unit = resp_advice.drug_spec_unit),
                     (advice.delivery_way = resp_advice.delivery_way),
                       (advice.execution_frequency =
@@ -494,7 +494,7 @@
           start_time: subdrug.start_time,
           advice_name: subdrug.title,
           advice_desc: subdrug.advice_desc,
-          // drug_spec: String(subdrug.drug_spec),
+          drug_spec: String(subdrug.drug_spec),
           drug_spec_unit: subdrug.drug_spec_unit,
           single_dose: String(subdrug.single_dose),
           single_dose_unit: subdrug.single_dose_unit,
@@ -1139,7 +1139,7 @@
             title: advice.advice_name,
             advice_desc: advice.advice_desc,
             remark: advice.remark,
-            // drug_spec: advice.drug_spec,
+            drug_spec: advice.drug_spec,
             drug_spec_unit: advice.drug_spec_unit,
             delivery_way: advice.delivery_way,
             execution_frequency: advice.execution_frequency,
@@ -1167,7 +1167,7 @@
             advice_desc: advice.advice_desc,
             remark: advice.remark,
             start_time: advice.start_time,
-            // drug_spec: advice.drug_spec,
+            drug_spec: advice.drug_spec,
             drug_spec_unit: advice.drug_spec_unit,
             delivery_way: advice.delivery_way,
             execution_frequency: advice.execution_frequency,
@@ -1187,7 +1187,7 @@
               advice_desc: advice.advice_desc,
               remark: advice.remark,
 
-              // drug_spec: advice.drug_spec,
+              drug_spec: advice.drug_spec,
               drug_spec_unit: advice.drug_spec_unit,
               delivery_way: advice.delivery_way,
               execution_frequency: advice.execution_frequency,

src/pages/main/dialog/PrescriptionDialog.vue

@@ -718,22 +718,22 @@
           }
         })
         Toast.loading({forbidClick: true, duration: 0})
-        let ParamsQuery = this.dialysisPrescription;
-        ParamsQuery["patient"] = this.$route.query.patient_id;
-        ParamsQuery["record_date"] = this.record_date;
+        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;
+            Toast.fail(response.data.msg)
+            return false
           } else {
-            Toast.success("提交成功");
-            this.$emit("prescription", response.data.data.prescription);
+            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();
+            this.finish()
           }
-        });
+        })
       },
       menuComfirm: function (val) {
         this.visibility = false
@@ -851,7 +851,7 @@
         return anticoagulan_name
       },
       commitInfo: function () {
-        if(this.targetAdvices.length > 0) {
+        if (this.targetAdvices.length > 0) {
 
           if (this.prescription_prop.id == '') {
             if (this.status == 2) {
@@ -862,12 +862,13 @@
               this.isShowDialog = false
 
               for (let i = 0; i < this.advicePropForm.list.length; i++) {
-                if (this.advicePropForm.list[i].parent_id == 0) {
+                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}'),
@@ -880,7 +881,6 @@
               CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
-                  this.$emit('advice')
 
                 } else {
 
@@ -888,67 +888,80 @@
               })
 
               Toast.loading({forbidClick: true, duration: 0})
-              let ParamsQuery = this.dialysisPrescription;
-              ParamsQuery["patient"] = this.$route.query.patient_id;
-              ParamsQuery["record_date"] = this.record_date;
+              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;
+                  Toast.fail(response.data.msg)
+                  return false
                 } else {
-                  Toast.success("提交成功");
-                  this.$emit("prescription", response.data.data.prescription);
+                  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();
+                  this.finish()
 
                 }
-              });
+              })
             }
 
           } 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;
+            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;
+                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.finish()
 
               }
-            });
+            })
           }
-        }else{
-          Toast.loading({forbidClick: true, duration: 0})
-          let ParamsQuery = this.dialysisPrescription;
-          ParamsQuery["patient"] = this.$route.query.patient_id;
-          ParamsQuery["record_date"] = this.record_date;
-          commitDialysisPrescription(ParamsQuery).then(response => {
-            if (response.data.state == 0) {
-              Toast.fail(response.data.msg);
-              return false;
-            } else {
-              Toast.success("提交成功");
-              this.$emit("prescription", response.data.data.prescription);
-              this.finish();
-
-            }
-          });
-
-
         }
-
-
-
       }, commitSolutionInfo: function () {
 
-        if(this.targetAdvices.length > 0) {
+        if (this.targetAdvices.length > 0) {
 
           if (this.prescription_prop.id == '') {
             if (this.status == 2) {
@@ -977,7 +990,7 @@
               CreateGroupAdvice(this.$route.query.patient_id, 0, params).then(rs => {
                 var resp = rs.data
                 if (resp.state == 1) {
-                  this.$emit('advice')
+
                 } else {
 
                 }
@@ -1001,7 +1014,7 @@
                   // }
                   // 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()
@@ -1029,8 +1042,6 @@
                   // }
                   // console.log(response.data.data.prescription)
 
-
-
                   this.$emit('longSolution', response.data.data.solution)
                   this.$emit('prescription', response.data.data.prescription)
                   this.finish()
@@ -1070,8 +1081,6 @@
 
         }
 
-
-
       }, finish: function () {
         this.$emit('finish')
       }, close: function () {
@@ -1313,6 +1322,12 @@
       MultipleSubMenu,
       // MultipleSubMenu,
       CheckBoxSubMenu
+    }, watch: {
+      isShowDialog (val) {
+        if (val) {
+          this.advice_visibility = false
+        }
+      }
     }
   }
 </script>

src/pages/main/dialog/modify_order/ModifyAdviceGroup.vue

@@ -44,7 +44,7 @@
             </tr>
             <tr v-for="(advice, index) in advices" :key="index" :class="{ 'row-class-active': index == current_advice_index }" @click="selectAdviceAction(index, advice)">
               <td :class="{ 'advice_name': advice.parent_id == 0, 'subdrug_name': advice.parent_id > 0 }">{{ advice.advice_name }}</td>
-              <td>{{ advice.advice_desc }}{{advice.drug_spec_unit}}</td>
+              <td>{{ advice.drug_spec }}{{advice.drug_spec_unit}}</td>
               <td>{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
               <td>{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
               <td>{{ advice.parent_id == 0 ? advice.delivery_way : "" }}</td>
@@ -225,7 +225,7 @@ export default {
           parent_id: this.current_advice.parent_id,
           title: this.current_advice.advice_name,
           advice_desc: this.current_advice.advice_desc,
-          // drug_spec: this.current_advice.drug_spec,
+          drug_spec: this.current_advice.drug_spec,
           drug_spec_unit: this.current_advice.drug_spec_unit,
           delivery_way: this.current_advice.delivery_way,
           execution_frequency: this.current_advice.execution_frequency,

src/pages/main/dialog/modify_order/modify_order_form.vue

@@ -22,8 +22,8 @@
             </div>
             <div class="cell">
               <label>药品规格</label>
-              <input class="inputBox" style="width:62.5%" v-model="order.advice_desc">
-              <!--<input type="number" onclick="this.select()" class="inputBox" style="width:60%" v-model="order.drug_spec">-->
+              <!--<input class="inputBox" style="width:62.5%" v-model="order.drug_spec">-->
+              <input type="number" onclick="this.select()" class="inputBox" style="width:60%" v-model="order.drug_spec">
               <input
                 type="text"
                 placeholder="单位"
@@ -219,7 +219,7 @@ export default {
         // record_time: "",
         title: "",
         advice_desc: "",
-        // drug_spec: "",
+        drug_spec: "",
         drug_spec_unit: "",
         remark:"",
         delivery_way: "",
@@ -261,7 +261,7 @@ export default {
 
       this.start_time_str = parseTime(order.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
 
-      // this.order.drug_spec = order.drug_spec;
+      this.order.drug_spec = order.drug_spec;
       this.order.drug_spec_unit = order.drug_spec_unit;
       this.order.delivery_way =
         order.delivery_way == undefined || order.delivery_way == null
@@ -306,6 +306,7 @@ export default {
           prescribing_number: this.order.prescribing_number,
           prescribing_number_unit: this.order.prescribing_number_unit,
           start_time:this.start_time_str,
+          drug_spec:this.order.drug_spec,
           drug_spec_unit:this.order.drug_spec_unit,
 
         });

src/pages/main/dialog/new_order/AddNewOrders.vue

@@ -52,7 +52,7 @@
                 <td
                   style="text-align: left; padding-left: 5px; padding-right: 5px;"
                 >{{ advice.title }}</td>
-                <td>{{ advice.advice_desc }}{{advice.drug_spec_unit}}</td>
+                <td>{{ advice.drug_spec }}{{advice.drug_spec_unit}}</td>
                 <td v-if="advice.prescribing_number">{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
                 <td v-else></td>
                 <td v-if="advice.single_dose">{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
@@ -69,7 +69,7 @@
                 <td
                   style="text-align: left; padding-right: 5px; padding-left: 25px;"
                 >{{ subdrug.title }}</td>
-                <td>{{ subdrug.advice_desc }} {{subdrug.drug_spec_unit}}</td>
+                <td>{{ subdrug.drug_spec }} {{subdrug.drug_spec_unit}}</td>
                 <td><span v-if="subdrug.prescribing_number">{{ subdrug.prescribing_number }}{{ subdrug.prescribing_number_unit }}</span></td>
                 <td><span v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</span></td>
                 <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
@@ -276,7 +276,7 @@ export default {
         var json = {
           advice_name: advice.title,
           advice_desc: advice.advice_desc,
-          // drug_spec: String(advice.drug_spec),
+          drug_spec: String(advice.drug_spec),
           drug_spec_unit: advice.drug_spec_unit,
           single_dose: String(advice.single_dose),
           single_dose_unit: advice.single_dose_unit,
@@ -292,7 +292,7 @@ export default {
           json.subdrugs.push({
             advice_name: subdrug.title,
             advice_desc: subdrug.advice_desc,
-            // drug_spec: String(subdrug.drug_spec),
+            drug_spec: String(subdrug.drug_spec),
             drug_spec_unit: subdrug.drug_spec_unit,
             single_dose: String(subdrug.single_dose),
             single_dose_unit: subdrug.single_dose_unit,
@@ -344,7 +344,7 @@ export default {
             id: adv.id,
             title: adv.advice_name,
             advice_desc: adv.advice_desc,
-            // drug_spec: adv.drug_spec,
+            drug_spec: adv.drug_spec,
             drug_spec_unit: adv.drug_spec_unit,
             delivery_way: adv.delivery_way,
             execution_frequency: adv.execution_frequency,
@@ -366,7 +366,7 @@ export default {
                 id: resp_adv.id,
                 title: resp_adv.advice_name,
                 advice_desc: resp_adv.advice_desc,
-                // drug_spec: resp_adv.drug_spec,
+                drug_spec: resp_adv.drug_spec,
                 drug_spec_unit: resp_adv.drug_spec_unit,
                 delivery_way: resp_adv.delivery_way,
                 execution_frequency: resp_adv.execution_frequency,

src/pages/main/dialog/new_order/order_form.vue

@@ -18,9 +18,9 @@
             </div>
             <div class="cell">
               <label>药品规格</label>
-              <input class="inputBox" style="width:62.5%" v-model="order.advice_desc">
+              <!--<input class="inputBox" style="width:62.5%" v-model="order.advice_desc">-->
 
-              <!--<input type="number" class="inputBox" style="width:62.5%" v-model="order.drug_spec">-->
+              <input type="number" class="inputBox" style="width:62.5%" v-model="order.drug_spec">
               <input
                 type="text"
                 placeholder="单位"
@@ -204,7 +204,7 @@ export default {
       order: {
         title: "",
         advice_desc: "",
-        // drug_spec: "",
+        drug_spec: "",
         drug_spec_unit: "",
         delivery_way: "",
         execution_frequency: "",
@@ -239,7 +239,7 @@ export default {
 
       this.order.title = "";
       this.order.advice_desc = "";
-      // this.order.drug_spec = "";
+      this.order.drug_spec = "";
       this.order.drug_spec_unit = "";
       this.order.delivery_way = "";
       this.order.execution_frequency = "";
@@ -256,7 +256,7 @@ export default {
 
       this.order.title = order.title;
       this.order.advice_desc = order.advice_desc;
-      // this.order.drug_spec = order.drug_spec;
+      this.order.drug_spec = order.drug_spec;
       this.order.drug_spec_unit = order.drug_spec_unit;
       this.order.delivery_way = order.delivery_way;
       this.order.execution_frequency = order.execution_frequency;
@@ -284,7 +284,7 @@ export default {
       this.order.advice_desc = "";
       this.order.remark = "";
 
-      // this.order.drug_spec = "";
+      this.order.drug_spec = "";
       this.order.drug_spec_unit = "";
       this.order.delivery_way =
         parent_delivery_way == undefined || parent_delivery_way == null
@@ -326,6 +326,8 @@ export default {
           prescribing_number: this.order.prescribing_number,
           prescribing_number_unit: this.order.prescribing_number_unit,
           remark: this.order.remark,
+          drug_spec: this.order.drug_spec,
+
           drug_spec_unit: this.order.drug_spec_unit,
 
         });
@@ -334,7 +336,7 @@ export default {
 
           title: this.order.title,
           advice_desc: this.order.advice_desc,
-          // drug_spec: this.order.drug_spec,
+          drug_spec: this.order.drug_spec,
           drug_spec_unit: this.order.drug_spec_unit,
           delivery_way: this.order.delivery_way,
           execution_frequency: this.order.execution_frequency,
@@ -352,7 +354,7 @@ export default {
           start_time: this.order.start_time,
           title: this.order.title,
           advice_desc: this.order.advice_desc,
-          // drug_spec: this.order.drug_spec,
+          drug_spec: this.order.drug_spec,
           drug_spec_unit: this.order.drug_spec_unit,
           delivery_way: this.order.delivery_way,
           execution_frequency: this.order.execution_frequency,

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

@@ -89,24 +89,21 @@
               val.child[i]['single'] = ''
             }
             name = name+"▲"+val.child[i].advice_name+""
-              + val.child[i].advice_desc
+              + val.child[i].drug_spec
               + val.child[i].drug_spec_unit
               + val.child[i].presc
               + val.child[i].single
-
-
           }
-          return  val.advice_name +"  "+ val.advice_desc+" "
+          return  val.advice_name +"  "+ val.drug_spec+" "
             + val.drug_spec_unit
             + prescribing_number
             + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark +name
 
-        }else{
-          return val.advice_name +"  "+ val.advice_desc+" "
+        } else {
+          return val.advice_name +"  "+ val.drug_spec+" "
             + val.drug_spec_unit
             + prescribing_number
             + " "+single_dose+" "+ " "+val.delivery_way+" "+ val.execution_frequency + val.remark
-
         }
 
 
@@ -137,17 +134,11 @@
           return cur
         }, [])
 
-
+        results
 
         return results
       },
-      itemClick: function (id) {
-        if (id == -2) {
-          this.$emit('menu-empty', this.getValue())
-        }
-        this.propsForm.selectId = id
-        this.$emit('menu-comfirm', this.getValue())
-      }
+
     },
     watch: {
       visibility (val) {

src/pages/main/today/TodayTab.vue

@@ -962,6 +962,7 @@
                       break
                     case 3://用今天的属于周几与推送类型为3的医嘱进行比较如果包含某个字符串，则设置为选中状态
                       let day = new Date().getDay()
+                      console.log(day)
                       let name =""
                       switch (day) {
                         case 1:
@@ -984,22 +985,27 @@
                         case 6:
                           name="周六"
                           break
-                        case 7:
+                        case 0:
                           name="周日"
                           break
                       }
+
+
                       if (this.longAdvices[i].week_day.indexOf(name) != -1){
+                        console.log("11111")
                         this.longAdvices[i]['isCheck'] = 1
                       }
                       break
                   }
                 }
 
+                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++) {
@@ -1010,6 +1016,7 @@
                     case 3://用今天的属于周几与推送类型为3的医嘱进行比较如果包含某个字符串，则加入到待上传数组里面
                       let day = new Date().getDay()
                       let name =""
+
                       switch (day) {
                         case 1:
                           name="周一"
@@ -1029,7 +1036,7 @@
                         case 6:
                           name="周六"
                           break
-                        case 7:
+                        case 0:
                           name="周日"
                           break
                       }
@@ -1040,11 +1047,6 @@
                   }
                 }
                 this.targetAdvices = dayAdvices.concat(advices_two)
-                console.log(dayAdvices)
-                console.log(advices_two)
-                console.log( this.targetAdvices)
-
-
                 break
             }
           } else {
@@ -1081,17 +1083,37 @@
         )
       }
       ,adviceFunc:function(){
-        console.log("111111")
-        this.requestDialysisRecord()
+
 
       },
       prescriptionFunc: function (val) {
+        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){
+            this.requestDialysisRecord()
+          }
+        }
+
         this.prescription = val
 
       }
       ,
       longSolutionFunc: function (val) {
         this.solution = val
+        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){
+            this.requestDialysisRecord()
+          }
+        }
 
       }
       ,

src/pages/main/today/statOrder.vue

@@ -23,7 +23,7 @@
             <td :class="advice.parent_id == 0 ? 'advice_content' : 'subadvice_content'">
               <span>{{advice.advice_name }}</span>
               <!-- <span>{{advice.drug_spec}}{{advice.drug_spec_unit}} * {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span> -->
-              <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+              <span>{{advice.drug_spec}}{{advice.drug_spec_unit}}</span>
               <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
               <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
               <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>