新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -3680,27 +3680,27 @@ export default {
              
             }
 
-            var delghTwo = 0;
-            if (
-              this.records[recordIndex].advices &&
-              this.records[recordIndex].advices.length < 10
-            ) {
-              delghTwo = 10 - this.records[recordIndex].advices.length;
-            } else {
-              delghTwo = 0;
-            }
+            // var delghTwo = 0;
+            // if (
+            //   this.records[recordIndex].advices &&
+            //   this.records[recordIndex].advices.length < 8
+            // ) {
+            //   delghTwo = 8 - this.records[recordIndex].advices.length;
+            // } else {
+            //   delghTwo = 0;
+            // }
 
-            if (delghTwo > 0) {
-              if (
-                typeof this.records[recordIndex].advices === "undefined" ||
-                this.records[recordIndex].advices == null
-              ) {
-                this.records[recordIndex].advices = [];
-              }
-              for (let index = 0; index < delghTwo; index++) {
-                this.records[recordIndex].advices.push([]);
-              }
-            }
+            // if (delghTwo > 0) {
+            //   if (
+            //     typeof this.records[recordIndex].advices === "undefined" ||
+            //     this.records[recordIndex].advices == null
+            //   ) {
+            //     this.records[recordIndex].advices = [];
+            //   }
+            //   for (let index = 0; index < delghTwo; index++) {
+            //     this.records[recordIndex].advices.push([]);
+            //   }
+            // }
 
 
 

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -453,6 +453,7 @@
                   v-model="form.drug_spec_unit"
                   style="width: 100px;"
                   filterable
+                  clearable
                   placeholder="选择"
                 >
                   <el-option
@@ -474,6 +475,7 @@
                 v-model="form.prescribing_number_unit"
                 style="width: 56%;"
                 filterable
+                clearable
                 placeholder="选择"
               >
                 <el-option
@@ -493,6 +495,7 @@
                 v-model="form.single_dose_unit"
                 style="width: 56%;"
                 filterable
+                clearable
                 placeholder="选择"
               >
                 <el-option
@@ -511,6 +514,7 @@
                 v-model="form.delivery_way"
                 :disabled="form.parent_id == 0 ? false : true"
                 filterable
+                clearable
                 placeholder="请选择(输入可搜索)"
               >
                 <el-option
@@ -531,6 +535,7 @@
                 v-model="form.execution_frequency"
                 :disabled="form.parent_id == 0 ? false : true"
                 filterable
+                clearable
                 placeholder="请选择(输入可搜索)"
               >
                 <el-option
@@ -543,6 +548,13 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+           <el-col :span="12">
+            <el-form-item label="医嘱嘱托:" prop="remark">
+              <el-input v-model="form.remark" style="width:200px"></el-input>
+            </el-form-item>
+           </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer" v-show="showAdviceForm">
         <el-button @click="hideForm">取 消</el-button>
@@ -1020,6 +1032,7 @@
               this.doctor_advice[this.currentIndex].drug_id = advice.drug_id
               this.doctor_advice[this.currentIndex].drug_name_id = advice.drug_name_id
               this.doctor.advice[this.currentIndex].way = advice.way
+              
               this.currentIndex = -1
               return false
             }

src/xt_pages/dialysis/details/dialog/adviceDialog/EditGroupAdvice.vue

@@ -551,6 +551,14 @@
               </el-select>
             </el-form-item>
           </el-col>
+          
+        </el-row>
+        <el-row>
+           <el-col :span="12">
+            <el-form-item label="医嘱嘱托:" prop="remark">
+              <el-input v-model="nameForm.remark" style="width:200px"></el-input>
+            </el-form-item>
+           </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -933,7 +941,7 @@ export default {
               drug_name_id:_this.groupForm.drug_name_id,
               drug_id:_this.groupForm.drug_id,
               way:_this.groupForm.way,
-
+           
             };
             let mode = "2";
             if (

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -96,7 +96,7 @@
                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
                    </span>
                    <span v-if="main_collection.dialysissolution.anticoagulant == 17">
-                    {{main_collection.dialysissolution.anticoagulant_shouji}}iu
+                    {{main_collection.dialysissolution.anticoagulant_shouji}}mg
                    </span>
                  
                 </div>
@@ -149,7 +149,7 @@
                     {{main_collection.dialysissolution.anticoagulant_shouji}}iu
                    </span>
                    <span v-if="main_collection.prescription.anticoagulant == 17">
-                    {{main_collection.prescription.anticoagulant_shouji}}iu
+                    {{main_collection.prescription.anticoagulant_shouji}}mg
                    </span>
                  
                 </div>
@@ -204,7 +204,7 @@
                     iu/h
                    </span>
                    <span v-if="main_collection.dialysissolution.anticoagulant == 17">
-                    iu/h
+                    mg/h
                    </span>
               
                 </div>
@@ -260,7 +260,7 @@
                     iu/h
                    </span>
                    <span v-if="main_collection.prescription.anticoagulant == 17">
-                    iu/h
+                    mg/h
                    </span>
               
                 </div>
@@ -316,7 +316,7 @@
                    iu
                    </span>
                    <span v-if="main_collection.dialysissolution.anticoagulant == 17">
-                   iu
+                   mg
                    </span>
           
                 </div>
@@ -372,7 +372,7 @@
                    iu
                    </span>
                    <span v-if="main_collection.prescription.anticoagulant == 17">
-                   iu
+                   mg
                    </span>
           
                 </div>