csx 5 jaren geleden
bovenliggende
commit
b179c46121

+ 2 - 0
src/pages/advice/DialysisAdviceTable.vue Bestand weergeven

94
               <span v-if="advice.single_dose"> 单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
94
               <span v-if="advice.single_dose"> 单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
95
               <span >{{advice.delivery_way}}</span>
95
               <span >{{advice.delivery_way}}</span>
96
               <span >{{advice.execution_frequency}}</span>
96
               <span >{{advice.execution_frequency}}</span>
97
+              <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{advice.remark}})</span>
98
+
97
             </td>
99
             </td>
98
             <td>{{ advice.parent_id == 0 ? parseTime(advice.execution_time, "{m}-{d} {h}:{i}") : "" }}</td>
100
             <td>{{ advice.parent_id == 0 ? parseTime(advice.execution_time, "{m}-{d} {h}:{i}") : "" }}</td>
99
             <td>{{ advice.parent_id == 0 ? getName(advice.execution_staff) : "" }}</td>
101
             <td>{{ advice.parent_id == 0 ? getName(advice.execution_staff) : "" }}</td>

+ 8 - 0
src/pages/main/dialog/OrdersDialog.vue Bestand weergeven

73
                     >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
73
                     >单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
74
                     <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
74
                     <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
75
                     <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
75
                     <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
76
+                    <span v-if="advice.parent_id == 0 && advice.remark.length > 0">({{advice.remark}})</span>
77
+
76
                   </div>
78
                   </div>
77
                 </td>
79
                 </td>
78
 
80
 
286
         EditDoctorAdvice(advice.id, {
288
         EditDoctorAdvice(advice.id, {
287
           advice_name: advice.title,
289
           advice_name: advice.title,
288
           advice_desc: advice.advice_desc,
290
           advice_desc: advice.advice_desc,
291
+          remark:advice.remark,
289
           // drug_spec: String(advice.drug_spec),
292
           // drug_spec: String(advice.drug_spec),
290
           // drug_spec_unit: advice.drug_spec_unit,
293
           // drug_spec_unit: advice.drug_spec_unit,
291
           delivery_way: advice.delivery_way,
294
           delivery_way: advice.delivery_way,
305
                 if (advice.id == resp_advice.id) {
308
                 if (advice.id == resp_advice.id) {
306
                   advice.advice_name = resp_advice.advice_name;
309
                   advice.advice_name = resp_advice.advice_name;
307
                   advice.advice_desc = resp_advice.advice_desc;
310
                   advice.advice_desc = resp_advice.advice_desc;
311
+                  advice.remark = resp_advice.remark;
312
+
308
                   // advice.drug_spec = resp_advice.drug_spec;
313
                   // advice.drug_spec = resp_advice.drug_spec;
309
                   // (advice.drug_spec_unit = resp_advice.drug_spec_unit),
314
                   // (advice.drug_spec_unit = resp_advice.drug_spec_unit),
310
                   (advice.delivery_way = resp_advice.delivery_way),
315
                   (advice.delivery_way = resp_advice.delivery_way),
837
             parent_id: advice.parent_id,
842
             parent_id: advice.parent_id,
838
             title: advice.advice_name,
843
             title: advice.advice_name,
839
             advice_desc: advice.advice_desc,
844
             advice_desc: advice.advice_desc,
845
+            remark: advice.remark,
840
             // drug_spec: advice.drug_spec,
846
             // drug_spec: advice.drug_spec,
841
             // drug_spec_unit: advice.drug_spec_unit,
847
             // drug_spec_unit: advice.drug_spec_unit,
842
             delivery_way: advice.delivery_way,
848
             delivery_way: advice.delivery_way,
855
               parent_id: advice.parent_id,
861
               parent_id: advice.parent_id,
856
               title: advice.advice_name,
862
               title: advice.advice_name,
857
               advice_desc: advice.advice_desc,
863
               advice_desc: advice.advice_desc,
864
+              remark: advice.remark,
865
+
858
               // drug_spec: advice.drug_spec,
866
               // drug_spec: advice.drug_spec,
859
               // drug_spec_unit: advice.drug_spec_unit,
867
               // drug_spec_unit: advice.drug_spec_unit,
860
               delivery_way: advice.delivery_way,
868
               delivery_way: advice.delivery_way,

+ 2 - 4
src/pages/main/dialog/modify_order/ModifyAdviceGroup.vue Bestand weergeven

266
       EditDoctorAdvice(advice.id, {
266
       EditDoctorAdvice(advice.id, {
267
         advice_name: advice.title,
267
         advice_name: advice.title,
268
         advice_desc: advice.advice_desc,
268
         advice_desc: advice.advice_desc,
269
-        // drug_spec: String(advice.drug_spec),
270
-        // drug_spec_unit: advice.drug_spec_unit,
269
+        remark:advice.remark,
271
         delivery_way: advice.delivery_way,
270
         delivery_way: advice.delivery_way,
272
         execution_frequency: advice.execution_frequency,
271
         execution_frequency: advice.execution_frequency,
273
         single_dose: String(advice.single_dose),
272
         single_dose: String(advice.single_dose),
281
           this.current_advice
280
           this.current_advice
282
           this.current_advice.advice_name = resp_advice.advice_name
281
           this.current_advice.advice_name = resp_advice.advice_name
283
           this.current_advice.advice_desc = resp_advice.advice_desc
282
           this.current_advice.advice_desc = resp_advice.advice_desc
284
-          // this.current_advice.drug_spec = resp_advice.drug_spec
285
-          // this.current_advice.drug_spec_unit = resp_advice.drug_spec_unit,
283
+          this.current_advice.remark = resp_advice.remark
286
           this.current_advice.delivery_way = resp_advice.delivery_way,
284
           this.current_advice.delivery_way = resp_advice.delivery_way,
287
           this.current_advice.execution_frequency = resp_advice.execution_frequency,
285
           this.current_advice.execution_frequency = resp_advice.execution_frequency,
288
           this.current_advice.single_dose = resp_advice.single_dose,
286
           this.current_advice.single_dose = resp_advice.single_dose,

+ 13 - 2
src/pages/main/dialog/modify_order/modify_order_form.vue Bestand weergeven

83
                 @focus="selectExecFrequencyAction"
83
                 @focus="selectExecFrequencyAction"
84
               ></el-input>
84
               ></el-input>
85
             </div>
85
             </div>
86
+
87
+            <div class="cell" v-show="order.parent_id == 0">
88
+              <label>医嘱嘱托</label>
89
+              <input
90
+                class="inputBox"
91
+                style="width:100%"
92
+                v-model="order.remark"
93
+              >
94
+            </div>
86
           </div>
95
           </div>
87
         </div>
96
         </div>
88
       </div>
97
       </div>
196
         advice_desc: "",
205
         advice_desc: "",
197
         // drug_spec: "",
206
         // drug_spec: "",
198
         // drug_spec_unit: "",
207
         // drug_spec_unit: "",
208
+        remark:"",
199
         delivery_way: "",
209
         delivery_way: "",
200
         execution_frequency: "",
210
         execution_frequency: "",
201
         single_dose: "",
211
         single_dose: "",
221
       this.order.parent_id = order.parent_id;
231
       this.order.parent_id = order.parent_id;
222
       this.order.title = order.title;
232
       this.order.title = order.title;
223
       this.order.advice_desc = order.advice_desc;
233
       this.order.advice_desc = order.advice_desc;
234
+      this.order.remark = order.remark;
235
+
224
       // this.order.drug_spec = order.drug_spec;
236
       // this.order.drug_spec = order.drug_spec;
225
       // this.order.drug_spec_unit = order.drug_spec_unit;
237
       // this.order.drug_spec_unit = order.drug_spec_unit;
226
       this.order.delivery_way =
238
       this.order.delivery_way =
258
           parent_id: this.order.parent_id,
270
           parent_id: this.order.parent_id,
259
           title: this.order.title,
271
           title: this.order.title,
260
           advice_desc: this.order.advice_desc,
272
           advice_desc: this.order.advice_desc,
261
-          // drug_spec: this.order.drug_spec,
262
-          // drug_spec_unit: this.order.drug_spec_unit,
273
+          remark:this.order.remark,
263
           delivery_way: this.order.delivery_way,
274
           delivery_way: this.order.delivery_way,
264
           execution_frequency: this.order.execution_frequency,
275
           execution_frequency: this.order.execution_frequency,
265
           single_dose: this.order.single_dose,
276
           single_dose: this.order.single_dose,

+ 3 - 1
src/pages/main/dialog/new_order/AddNewOrders.vue Bestand weergeven

15
             <span @click="deleteOrderAction">删除医嘱内容</span>
15
             <span @click="deleteOrderAction">删除医嘱内容</span>
16
       </div>
16
       </div>
17
       <div class="DialogContent choose" style="height: 6.2rem;" >
17
       <div class="DialogContent choose" style="height: 6.2rem;" >
18
-        <div class="content clearfix">  
18
+        <div class="content clearfix">
19
           <div style="overflow: hidden;">
19
           <div style="overflow: hidden;">
20
             <div class="cell" style="margin-top: 0;">
20
             <div class="cell" style="margin-top: 0;">
21
               <label>医嘱类型</label>
21
               <label>医嘱类型</label>
283
           prescribing_number_unit: advice.prescribing_number_unit,
283
           prescribing_number_unit: advice.prescribing_number_unit,
284
           delivery_way: advice.delivery_way,
284
           delivery_way: advice.delivery_way,
285
           execution_frequency: advice.execution_frequency,
285
           execution_frequency: advice.execution_frequency,
286
+          remark : advice.remark,
286
           subdrugs: []
287
           subdrugs: []
287
         };
288
         };
288
         for (let s_i = 0; s_i < advice.subdrugs.length; s_i++) {
289
         for (let s_i = 0; s_i < advice.subdrugs.length; s_i++) {
445
       this.show_dialog_key = 0;
446
       this.show_dialog_key = 0;
446
       order.id = 0;
447
       order.id = 0;
447
       order.subdrugs = [];
448
       order.subdrugs = [];
449
+      console.log(order)
448
       this.advices.push(order);
450
       this.advices.push(order);
449
     },
451
     },
450
     didModifyOrder: function(order) {
452
     didModifyOrder: function(order) {

+ 25 - 4
src/pages/main/dialog/new_order/order_form.vue Bestand weergeven

63
               >
63
               >
64
             </div>
64
             </div>
65
 
65
 
66
+
67
+
68
+
66
             <div class="cell" v-show="order.parent_id == 0">
69
             <div class="cell" v-show="order.parent_id == 0">
67
               <label>给药途径</label>
70
               <label>给药途径</label>
68
               <el-input
71
               <el-input
83
                 @focus="selectExecFrequencyAction"
86
                 @focus="selectExecFrequencyAction"
84
               ></el-input>
87
               ></el-input>
85
             </div>
88
             </div>
89
+
90
+            <div class="cell" v-show="order.parent_id == 0">
91
+              <label>医嘱嘱托</label>
92
+              <input
93
+                class="inputBox"
94
+                style="width:100%"
95
+                v-model="order.remark"
96
+              >
97
+            </div>
98
+
86
           </div>
99
           </div>
87
         </div>
100
         </div>
88
       </div>
101
       </div>
198
         single_dose_unit: "",
211
         single_dose_unit: "",
199
         prescribing_number: "",
212
         prescribing_number: "",
200
         prescribing_number_unit: "",
213
         prescribing_number_unit: "",
214
+        remark:"",
201
 
215
 
202
         // 在新增子药才用到的字段
216
         // 在新增子药才用到的字段
203
         parent_id: 0, // 父医嘱ID
217
         parent_id: 0, // 父医嘱ID
232
       this.order.single_dose_unit = "";
246
       this.order.single_dose_unit = "";
233
       this.order.prescribing_number = "";
247
       this.order.prescribing_number = "";
234
       this.order.prescribing_number_unit = "";
248
       this.order.prescribing_number_unit = "";
249
+      this.order.remark = "";
250
+
235
     },
251
     },
236
     showWithEdit: function(order) {
252
     showWithEdit: function(order) {
237
       this.mode = 2;
253
       this.mode = 2;
247
       this.order.single_dose_unit = order.single_dose_unit;
263
       this.order.single_dose_unit = order.single_dose_unit;
248
       this.order.prescribing_number = order.prescribing_number;
264
       this.order.prescribing_number = order.prescribing_number;
249
       this.order.prescribing_number_unit = order.prescribing_number_unit;
265
       this.order.prescribing_number_unit = order.prescribing_number_unit;
266
+      this.order.remark = order.remark;
267
+
250
     },
268
     },
251
     showWithNewSubDrug: function(
269
     showWithNewSubDrug: function(
252
       parent_id,
270
       parent_id,
263
       this.order.start_time = parent_start_time;
281
       this.order.start_time = parent_start_time;
264
       this.order.title = "";
282
       this.order.title = "";
265
       this.order.advice_desc = "";
283
       this.order.advice_desc = "";
284
+      this.order.remark = "";
285
+
266
       // this.order.drug_spec = "";
286
       // this.order.drug_spec = "";
267
       // this.order.drug_spec_unit = "";
287
       // this.order.drug_spec_unit = "";
268
       this.order.delivery_way =
288
       this.order.delivery_way =
298
         this.$emit("did-create-new", {
318
         this.$emit("did-create-new", {
299
           title: this.order.title,
319
           title: this.order.title,
300
           advice_desc: this.order.advice_desc,
320
           advice_desc: this.order.advice_desc,
301
-          // drug_spec: this.order.drug_spec,
302
-          // drug_spec_unit: this.order.drug_spec_unit,
303
           delivery_way: this.order.delivery_way,
321
           delivery_way: this.order.delivery_way,
304
           execution_frequency: this.order.execution_frequency,
322
           execution_frequency: this.order.execution_frequency,
305
           single_dose: this.order.single_dose,
323
           single_dose: this.order.single_dose,
306
           single_dose_unit: this.order.single_dose_unit,
324
           single_dose_unit: this.order.single_dose_unit,
307
           prescribing_number: this.order.prescribing_number,
325
           prescribing_number: this.order.prescribing_number,
308
-          prescribing_number_unit: this.order.prescribing_number_unit
326
+          prescribing_number_unit: this.order.prescribing_number_unit,
327
+          remark: this.order.remark
309
         });
328
         });
310
       } else if (this.mode == 2) {
329
       } else if (this.mode == 2) {
311
         this.$emit("did-modify", {
330
         this.$emit("did-modify", {
318
           single_dose: this.order.single_dose,
337
           single_dose: this.order.single_dose,
319
           single_dose_unit: this.order.single_dose_unit,
338
           single_dose_unit: this.order.single_dose_unit,
320
           prescribing_number: this.order.prescribing_number,
339
           prescribing_number: this.order.prescribing_number,
321
-          prescribing_number_unit: this.order.prescribing_number_unit
340
+          prescribing_number_unit: this.order.prescribing_number_unit,
341
+          remark: this.order.remark
342
+
322
         });
343
         });
323
       } else if (this.mode == 3) {
344
       } else if (this.mode == 3) {
324
         this.$emit("did-create-subdrug", {
345
         this.$emit("did-create-subdrug", {

+ 4 - 2
src/pages/main/today/statOrder.vue Bestand weergeven

26
               <span>{{advice.advice_desc}}</span>
26
               <span>{{advice.advice_desc}}</span>
27
               <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
27
               <span v-if="advice.prescribing_number">{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
28
               <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
28
               <span v-if="advice.single_dose">单次用量{{advice.single_dose}}{{advice.single_dose_unit}}</span>
29
-              <span>{{advice.delivery_way}}</span>
30
-              <span>{{advice.execution_frequency}}</span>
29
+              <span v-if="advice.parent_id == 0">{{advice.delivery_way}}</span>
30
+              <span v-if="advice.parent_id == 0">{{advice.execution_frequency}}</span>
31
+              <span v-if="advice.parent_id == 0&&advice.remark.length > 0">({{advice.remark}})</span>
32
+
31
             </td>
33
             </td>
32
 
34
 
33
             <td>{{parseTime(advice.execution_time, "{m}-{d} {h}:{i}")}}</td>
35
             <td>{{parseTime(advice.execution_time, "{m}-{d} {h}:{i}")}}</td>