龙岗二院需求

src/store/getters.js

@@ -66,6 +66,7 @@ const getters = {
   good_unit: state => state.global_config.good_unit,
 
   temp_params: state => state.temp_params,
+  puncture_needle: state => state.global_config.puncture_needle,
 
 
 

src/store/modules/globalConfig.js

@@ -573,6 +573,12 @@ const global_config = {
       {id: 9, name: "皮下出血"},
     ],
 
+    puncture_needle: [
+      {id: 1, name: 'V钝针'},
+      {id: 2, name: 'V锐针'},
+      {id: 3, name: 'A锐针'},
+      {id: 4, name: 'A钝针'},
+    ],
 
   },
   mutations: {

src/xt_pages/data/druguseTemplate.vue

@@ -90,16 +90,18 @@
                 </template>
               </el-table-column>
 
+
               <el-table-column
                 prop="amount1"
                 align="center"
                 label="药品规格">
                   <!-- {{drugDesc(scope.row)}} -->
                   <template slot-scope="scope">
-                    <span v-if="scope.row.drug_spec">{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}}</span>
+                    <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
                   </template>
               </el-table-column>
 
+
               <el-table-column
                 prop="amount2"
                 width="90"
@@ -218,12 +220,9 @@
                     </template>
                   </el-table-column>
                   <el-table-column align="center" label="药品规格">
-
-                      <!-- {{drugDescTwo(scope.row)}} -->
                       <template slot-scope="scope">
-                        <span v-if="scope.row.drug_spec">{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}}</span>
+                        <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
                       </template>
-
                   </el-table-column>
                   <el-table-column prop="prescribing_number" align="center" label="开药数量">
                     <template slot-scope="scope" v-if="scope.row.prescribing_number != ''">
@@ -278,10 +277,13 @@
                       <el-input v-model="templateForm.advice_name"></el-input>
                     </el-form-item>
                   </el-col>
+
+
+
                   <el-col :span="12">
-                    <el-form-item label="药品规格 :" prop="drug_spec">
+                    <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="8">
-                        <el-input v-model="templateForm.drug_spec"></el-input>
+                        <el-input v-model="templateForm.advice_desc"></el-input>
                       </el-col>
                       <el-col class="line" :span="2">&nbsp;</el-col>
                       <el-col :span="14">
@@ -443,13 +445,12 @@
                     <el-form-item :label="edit_advice_name" required prop="advice_name">
                       <el-input v-model="templateFormEdit.advice_name"></el-input>
                     </el-form-item>
-
                   </el-col>
                   <el-col :span="12">
 
-                  <el-form-item label="药品规格 :" prop="drug_spec">
+                  <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="8">
-                        <el-input v-model="templateFormEdit.drug_spec"></el-input>
+                        <el-input v-model="templateFormEdit.advice_desc"></el-input>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
@@ -629,7 +630,7 @@
                   <el-table-column align="center" label="药品规格">
                       <!-- {{drugDesc(scope.row)}} -->
                       <template slot-scope="scope">
-                        <span v-if="scope.row.drug_spec">{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}}</span>
+                        <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
                       </template>
                   </el-table-column>
                   <el-table-column prop="prescribing_number" align="center" label="开药数量">
@@ -686,9 +687,9 @@
                   </el-col>
                   <el-col :span="12">
 
-                <el-form-item label="药品规格 :" prop="drug_spec">
+                <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="9">
-                        <el-input v-model="templateForm.drug_spec"></el-input>
+                        <el-input v-model="templateForm.advice_desc"></el-input>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
@@ -1247,7 +1248,7 @@
         },
 
         templateFormEdit: {
-          frequency_type: '',
+          frequency_type: 0,
           day_count: '',
           weekday: [],
           week_days: '',

src/xt_pages/dialysis/batch_print/batch_print_order.vue

@@ -598,8 +598,7 @@
                           <div>▲</div>
                           <div>
                             <span>{{child.advice_name }}</span>
-                            <span>{{child.advice_desc}}</span>
-                            <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                            <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                             <span
                               v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                             <span
@@ -650,8 +649,7 @@
                           <div>▲</div>
                           <div>
                             <span>{{child.advice_name }}</span>
-                            <span>{{child.advice_desc}}</span>
-                            <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                            <span v-if="child.advice_desc">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
                             <span
                               v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                             <span

src/xt_pages/dialysis/batch_print/batch_print_order_five.vue

@@ -983,7 +983,7 @@
                     </td>
                     <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                       <span>{{advice.advice_name }}</span>
-                      <span>{{advice.advice_desc}}</span>
+                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
                       <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                       <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                       <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
@@ -1085,7 +1085,9 @@
                       </td>
                       <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                         <span>{{advice.advice_name }}</span>
-                        <span>{{advice.advice_desc}}</span>
+                        <!--<span>{{advice.advice_desc}}</span>-->
+                        <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+
                         <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                         <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                         <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>

src/xt_pages/dialysis/batch_print/batch_print_order_five_two.vue

@@ -315,8 +315,8 @@
                     </td>
                     <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                       <span>{{advice.advice_name }}</span>
-                      <span>{{advice.advice_desc}}</span>
-                      <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
+                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+                       <!--<span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                       <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                       <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                       <span v-if="advice.parent_id == 0  &&advice.children && advice.children.length == 0">{{advice.delivery_way}}</span>
@@ -417,7 +417,7 @@
                       </td>
                       <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                         <span>{{advice.advice_name }}</span>
-                        <span>{{advice.advice_desc}}</span>
+                        <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
                         <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                         <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                         <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>

src/xt_pages/dialysis/batch_print/batch_print_order_other_two.vue

@@ -298,8 +298,7 @@
                     </td>
                     <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                       <span>{{advice.advice_name }}</span>
-                      <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
-                      <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
+                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{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 != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
                       <span v-if="advice.parent_id == 0  &&advice.children && advice.children.length == 0">{{advice.delivery_way}}</span>
@@ -402,7 +401,7 @@
                     </td>
                     <td height="60px" class="advice-name" style="padding-left:7px;" :colspan="advice.children && advice.children.length > 0 || advice.parent_id > 0 ? 1 :2" v-if="advice.isShow == 2">
                       <span>{{advice.advice_name }}</span>
-                      <span>{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
+                      <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
                       <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                       <span v-if="advice.prescribing_number">* {{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
                       <span v-if="advice.single_dose != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -92,6 +92,12 @@
           <span class="content" v-if="pulse_frequency!='0'">{{ pulse_frequency }}</span>
           <span class="unit" v-if="pulse_frequency!='0'">次/分</span>
         </li>
+        <li v-if="isShow('呼吸频率')">
+          <label>呼吸频率 : </label>
+          <span class="content" v-if="breathing_rate !='0'">{{ breathing_rate }}</span>
+          <span class="unit" v-if="breathing_rate !='0'">次/min</span>
+        </li>
+
         <li v-if="isShow('实际治疗时长')">
           <label>实际治疗时长 : </label>
           <span class="content" v-if="actual_treatment_hour!='0'">{{ actual_treatment_hour }}时</span>
@@ -366,6 +372,12 @@
           return '-'
           break
       }
+    },breathing_rate:function(){
+      if (this.record.id == 0) {
+        return '-'
+      }
+      return this.record.breathing_rate
+
     },
     temperature: function() {
       if (this.record.id == 0) {

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -93,6 +93,11 @@
           <span class="content">{{getBloodAccessNoise(this.record.blood_access_noise)}}</span>
         </li>
 
+        <li v-if="isShow('穿刺针')">
+          <label>穿刺针 : </label>
+          <span class="content">{{this.record.puncture_needle}}</span>
+        </li>
+
         <li v-if="isShow('穿刺方式')">
           <label>穿刺方式 : </label>
           <span class="content">{{getWay(this.record.puncture_way)}}</span>

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

@@ -42,6 +42,12 @@
               <el-input v-model="form.pulse_frequency"></el-input>
             </el-form-item>
           </el-col>
+
+          <el-col :span="8" v-if="isShow('呼吸频率')">
+            <el-form-item label="呼吸频率(次/min): " >
+              <el-input v-model="form.breathing_rate"></el-input>
+            </el-form-item>
+          </el-col>
         <!-- </el-row>
 
         <el-row :gutter="20"> -->
@@ -470,7 +476,8 @@
           disequilibrium_syndrome_option: '',
           arterial_tube: '',
           intravenous_tube: '',
-          dialyzer: ''
+          dialyzer: '',
+          breathing_rate:'',
 
         }
       }
@@ -512,6 +519,9 @@
           if (this.assessment_after_dislysis['pulse_frequency'] == 0) {
             this.form['pulse_frequency'] = ''
           }
+          if (this.assessment_after_dislysis['breathing_rate'] == 0) {
+            this.form['breathing_rate'] = ''
+          }
           if (this.assessment_after_dislysis['actual_ultrafiltration'] == 0) {
             this.form['actual_ultrafiltration'] = ''
           }
@@ -583,6 +593,8 @@
         data['remark'] = this.form.remark
         data['dialysis_order_id'] = this.form.dialysis_order_id ? parseFloat(this.form.dialysis_order_id) : 0
 
+        data['breathing_rate'] = this.form.breathing_rate ? parseFloat(this.form.breathing_rate) : 0
+
 
         data['dialysis_process'] = this.form.dialysis_process ? parseFloat(this.form.dialysis_process) : 0
         data['in_advance_minute'] = this.form.in_advance_minute ? parseFloat(this.form.in_advance_minute) : 0

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

@@ -142,7 +142,7 @@
         <el-row :gutter="20">
           <el-col :span="8">
             <el-form-item label="药品规格：">
-              <el-input v-model="form.drug_spec" style="width: 40%;"></el-input>
+              <el-input v-model="form.advice_desc" style="width: 40%;"></el-input>
               <el-select v-model="form.drug_spec_unit" style="width: 56%;" filterable placeholder="选择">
                 <el-option v-for="item in unitsOption" :key="item.id" :label="item.name " :value="item.name">
                 </el-option>
@@ -746,7 +746,7 @@ export default {
           advice_date: this.record_date,
           start_time: uParseTime(
             this.currentRow.start_time,
-            '{y}-{m}-{d} {h}:{i}:{s}'
+            '{y}-{m}-{d} {h}:{i}'
           ),
           advice_name: '',
           drug_spec: '',
@@ -783,7 +783,7 @@ export default {
           advice_date: this.record_date,
           start_time: uParseTime(
             this.currentRow.start_time,
-            '{y}-{m}-{d} {h}:{i}:{s}'
+            '{y}-{m}-{d} {h}:{i}'
           ),
           advice_name: '',
           drug_spec: '',
@@ -820,7 +820,7 @@ export default {
           ),
           start_time: uParseTime(
             row.start_time,
-            '{y}-{m}-{d} {h}:{i}:{s}'
+            '{y}-{m}-{d} {h}:{i}'
           ),
           advice_name: row.advice_name,
           drug_spec: row.drug_spec != 0 ? '' + row.drug_spec : '',
@@ -1269,21 +1269,22 @@ export default {
         let tempSingleDoseDesc = ''
         const tempDrugSpecDesc = ''
         let tempPrescribingNumberDesc = ''
+        let tempDrugDesc = ''
+
+
 
         if (row.single_dose) {
           tempSingleDoseDesc = ' 单次用量 ' + '  ' + row.single_dose + '' + row.single_dose_unit
         }
-        // if(row.drug_spec){
-        //   tempDrugSpecDesc = "  "+row.drug_spec + "" + row.drug_spec_unit
-        // }
+
         if (row.prescribing_number) {
           tempPrescribingNumberDesc = '*' + row.prescribing_number + '' + row.prescribing_number_unit
         }
 
         if (isChild == 1) { // 不是子药
-          return row.advice_name + row.advice_desc + tempDrugSpecDesc + tempPrescribingNumberDesc + tempSingleDoseDesc + ' ' + row.delivery_way + ' ' + row.execution_frequency
+          return row.advice_name + row.advice_desc + row.drug_spec_unit + tempPrescribingNumberDesc + tempSingleDoseDesc + ' ' + row.delivery_way + ' ' + row.execution_frequency
         } else { // 是子药
-          return row.advice_name + row.advice_desc + tempDrugSpecDesc + tempPrescribingNumberDesc + tempSingleDoseDesc
+          return row.advice_name + row.advice_desc + row.drug_spec_unit +  tempPrescribingNumberDesc + tempSingleDoseDesc
         }
       }
 

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

@@ -91,11 +91,17 @@
               ></el-table-column>
 
               <el-table-column
-                label="规格"
-                property="advice_desc"
+                label="药品规格"
                 align="center"
 
-              ></el-table-column>
+              >
+                <template slot-scope="scope">
+                  <span
+                    v-if="scope.row.advice_desc"
+                  >{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                </template>
+
+              </el-table-column>
               <!-- <el-table-column label="药品规格*数量" min-width="80" property="drug_spec" align="center">
                 <template slot-scope="scope">
                   <span
@@ -194,10 +200,16 @@
               align="center"
             ></el-table-column>
             <el-table-column
-              label="规格"
-              property="advice_desc"
+              label="药品规格"
               align="center"
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                  <span
+                    v-if="scope.row.advice_desc"
+                  >{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+              </template>
+
+            </el-table-column>
             <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
               <template slot-scope="scope">
                   <span
@@ -285,12 +297,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="规格 :" prop="advice_desc">
-              <el-input v-model="nameForm.advice_desc"></el-input>
-            </el-form-item>
-            <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+            <!--<el-form-item label="规格 :" prop="advice_desc">-->
+              <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
+            <!--</el-form-item>-->
+           <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="8">
-                <el-input v-model="nameForm.drug_spec"></el-input>
+                <el-input v-model="nameForm.advice_desc"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
@@ -309,7 +321,7 @@
                   ></el-option>
                 </el-select>
               </el-col>
-            </el-form-item> -->
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>

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

@@ -90,11 +90,17 @@
                 style="word-break: keep-all;white-space:nowrap;"
               ></el-table-column>
               <el-table-column
-                label="规格"
+                label="药品规格"
                 property="advice_desc"
                 align="center"
 
-              ></el-table-column>
+              >
+                <template slot-scope="scope">
+                  <span
+                    v-if="scope.row.advice_desc"
+                  >{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+                </template>
+              </el-table-column>
               <!-- <el-table-column label="药品规格*数量" min-width="80" property="drug_spec" align="center">
                 <template slot-scope="scope">
                   <span
@@ -188,8 +194,14 @@
               label="规格"
               align="center"
 
-              property="advice_desc"
-            ></el-table-column>
+            >
+              <template slot-scope="scope">
+                  <span
+                    v-if="scope.row.advice_desc"
+                  >{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
+              </template>
+
+            </el-table-column>
             <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
               <template slot-scope="scope">
                   <span
@@ -277,12 +289,12 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="规格 :" prop="advice_desc">
-              <el-input v-model="nameForm.advice_desc"></el-input>
-            </el-form-item>
-            <!-- <el-form-item label="药品规格 :" prop="drug_spec">
+            <!--<el-form-item label="规格 :" prop="advice_desc">-->
+              <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
+            <!--</el-form-item>-->
+            <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="8">
-                <el-input v-model="nameForm.drug_spec"></el-input>
+                <el-input v-model="nameForm.advice_desc"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
@@ -301,7 +313,7 @@
                   ></el-option>
                 </el-select>
               </el-col>
-            </el-form-item> -->
+            </el-form-item>
           </el-col>
         </el-row>
         <el-row>

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

@@ -161,6 +161,12 @@
             <el-input v-model="assessmentBeforeDislysis.complication" @focus="showInnerDialog('5')"></el-input>
           </el-form-item>
         </el-col>
+
+        <el-col :span="8">
+          <el-form-item label="穿刺针： " v-if="isShow('穿刺针')">
+            <el-input v-model="assessmentBeforeDislysis.puncture_needle" @focus="showInnerDialog('11')"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item label="前次透析后：" v-if="isShow('前次透析后')">
             <el-input v-model="assessmentBeforeDislysis.last_post_dialysis" @focus="showInnerDialog('1')"></el-input>
@@ -431,6 +437,7 @@ export default {
         puncture_method:[],
         isVisibiltyForCruorDialog: false,
         assessmentBeforeDislysis: {
+          puncture_needle:'',
           catheter_bend: '',
           internal_fistula_skin: '',
           weight_before: '',
@@ -617,6 +624,14 @@ export default {
             this.InnerDialogProps.selected = this.assessmentBeforeDislysis.ductus_arantii
             this.InnerDialogProps.isShowTextArea = false
 
+            break
+          case '11': //
+            this.InnerDialogProps.values =  this.$store.getters.puncture_needle
+            this.InnerDialogProps.titles = '穿刺针'
+            this.InnerDialogProps.type = 'puncture_needle'
+            this.InnerDialogProps.selected = this.assessmentBeforeDislysis.puncture_needle
+            this.InnerDialogProps.isShowTextArea = false
+
             break
         }
       }, innerDialogComfirm: function(val) {
@@ -656,6 +671,9 @@ export default {
           case 'ductus_arantii':
             this.assessmentBeforeDislysis.ductus_arantii = val.value.join(',')
             break
+          case 'puncture_needle':
+            this.assessmentBeforeDislysis.puncture_needle = val.value.join(',')
+            break
 
 
 

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

@@ -198,7 +198,7 @@
         <el-row :gutter="20" > -->
 
         <el-col :span="8" v-if="isShows('体液过多其他症状')">
-          <el-form-item label="其他体液过多症状">
+          <el-form-item label="体液过多其他症状">
             <el-input v-model="dialysisPrescription.body_fluid_other"></el-input>
           </el-form-item>
         </el-col>

src/xt_pages/dialysis/details/statOrder.vue

@@ -21,7 +21,7 @@
           <span v-if="advice.parent_id>0">&nbsp;&nbsp;&nbsp;&nbsp;</span>
           <span >&nbsp;{{advice.advice_name }}</span>
           <span >{{advice.advice_desc}}</span>
-          <!-- <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span> -->
+           <span v-if="advice.advice_desc">{{advice.advice_desc}}{{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 != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
           <span >{{advice.delivery_way}}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderFour.vue

@@ -907,7 +907,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
@@ -974,7 +974,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderOne.vue

@@ -836,7 +836,7 @@
               <td class="advice-name">
                 <span v-if="advice[0].parent_id>0">└</span>
                 <span>{{advice[0].advice_name }}</span>
-                <span>{{advice[0].advice_desc}}{{advice[0].drug_spec_unit}}</span>
+                <span v-if="advice[0].advice_desc">{{advice[0].advice_desc}}{{advice[0].drug_spec_unit}}</span>
                 <!-- <span v-if="advice[0].drug_spec">{{advice[0].drug_spec}}{{advice[0].drug_spec_unit}}</span> -->
                 <span v-if="advice[0].prescribing_number">* {{advice[0].prescribing_number}}{{advice[0].prescribing_number_unit}}</span>
                 <span
@@ -847,8 +847,8 @@
                   <div>▲</div>
                   <div>
                     <span>{{child.advice_name }}</span>
-                    <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
@@ -915,7 +915,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>

src/xt_pages/dialysis/template/DialysisPrintOrderThree.vue

@@ -882,7 +882,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>
@@ -949,7 +949,7 @@
                   <div>
                     <span>{{child.advice_name }}</span>
                     <span>{{child.advice_desc}}</span>
-                    <span v-if="child.drug_spec">{{child.drug_spec}}{{child.drug_spec_unit}}</span>
+                    <span v-if="child.advice_desc">{{child.advice_desc}}{{child.drug_spec_unit}}</span>
                     <span
                       v-if="child.prescribing_number">* {{child.prescribing_number}}{{child.prescribing_number_unit}}</span>
                     <span v-if="child.single_dose != 0">单次用量 {{child.single_dose}}{{child.single_dose_unit}}</span>

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -104,10 +104,10 @@
               ></el-table-column>
               <el-table-column
                 label="药品规格"
-                property="drug_spec"
+                property="advice_desc"
               >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.drug_spec">{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}}</span>
+                  <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
                 </template>
               </el-table-column>
 
@@ -199,10 +199,10 @@
             ></el-table-column>
             <el-table-column
               label="药品规格"
-              property="drug_spec"
+              property="advice_desc"
             >
               <template slot-scope="scope">
-                <span v-if="scope.row.drug_spec">{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}}</span>
+                <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
               </template>
 
             </el-table-column>
@@ -296,9 +296,9 @@
             <!--<el-form-item label="规格 :" prop="advice_desc">-->
               <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
             <!--</el-form-item>-->
-             <el-form-item label="药品规格 :" prop="drug_spec">
+             <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="8">
-                <el-input v-model="nameForm.drug_spec"></el-input>
+                <el-input v-model="nameForm.advice_desc"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
@@ -910,6 +910,7 @@
                       prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                       delivery_way: _this.nameForm.delivery_way,
                       execution_frequency: _this.nameForm.execution_frequency,
+                      template_id:"D" + new Date().getTime() + this.getRandValue(),
 
                       frequency_type: _this.nameForm.frequency_type,
                       day_count: _this.nameForm.day_count.toString(),
@@ -1053,8 +1054,20 @@
             _this.nameFormVisible = false;
           }
         });
-      },
+      },getRandValue(){
+        var charactors="1234567890";
+
+        var value='',i;
+
+        for(let j=1;j<=4;j++){
+
+          i = parseInt(10*Math.random());
 
+          value = value + charactors.charAt(i);
+
+        }
+        return value
+      },
       openGroupChild() {
         if (this.groupSelectRow === null) {
 
@@ -1137,6 +1150,7 @@
             prescribing_number_unit: "",
             delivery_way: "",
             execution_frequency: "",
+            template_id:"",
             isEdit: 0,
             index: 0,
             id: 0,
@@ -1395,6 +1409,7 @@
             prescribing_number_unit: this.allSelectedTemplate[index].prescribing_number_unit,
             delivery_way: this.allSelectedTemplate[index].delivery_way,
             execution_frequency: this.allSelectedTemplate[index].execution_frequency,
+
             isEdit: 0,
             id: 0,
             children: [],

src/xt_pages/user/doctorAdvice.vue

@@ -141,9 +141,9 @@
 
                     </template>
                 </el-table-column> -->
-        <el-table-column label="药品规格" width="180" property="drug_spec" align="center">
+        <el-table-column label="药品规格" width="180" property="advice_desc" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.drug_spec!=0">{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}}</span>
+            <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
           </template>
         </el-table-column>
         <el-table-column label="开药数量" width="180" property="prescribing_number" align="center">
@@ -353,9 +353,9 @@
                                 <span v-if="scope.row.prescribing_number!=0">*{{scope.row.prescribing_number}}{{scope.row.prescribing_number_unit}}</span>
                             </template>
                         </el-table-column> -->
-                <el-table-column label="药品规格" min-width="80" property="drug_spec" align="center">
+                <el-table-column label="药品规格" min-width="80" property="advice_desc" align="center">
                   <template slot-scope="scope">
-                    <span v-if="scope.row.drug_spec">{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}}</span>
+                    <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
                   </template>
                 </el-table-column>
                 <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
@@ -443,10 +443,10 @@
               ></el-table-column>
               <el-table-column
                 label="药品规格"
-                property="drug_spec"
+                property="advice_desc"
               >
                 <template slot-scope="scope">
-                  <span v-if="scope.row.drug_spec">{{scope.row.drug_spec}}{{scope.row.drug_spec_unit}}</span>
+                  <span v-if="scope.row.advice_desc">{{scope.row.advice_desc}}{{scope.row.drug_spec_unit}}</span>
                 </template>
               </el-table-column>
               <el-table-column label="开药数量" min-width="80" property="prescribing_number" align="center">
@@ -542,9 +542,9 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="药品规格 :" prop="drug_spec">
+              <el-form-item label="药品规格 :" prop="advice_desc">
                 <el-col :span="8">
-                  <el-input v-model="nameForm.drug_spec"></el-input>
+                  <el-input v-model="nameForm.advice_desc"></el-input>
                 </el-col>
                 <el-col class="line" :span="2">&nbsp;</el-col>
                 <el-col :span="14">
@@ -709,9 +709,9 @@
             </el-col>
 
             <el-col :span="12">
-              <el-form-item label="药品规格 :" prop="drug_spec">
+              <el-form-item label="药品规格 :" prop="advice_desc">
                 <el-col :span="9">
-                  <el-input v-model="adviceForm.drug_spec"></el-input>
+                  <el-input v-model="adviceForm.advice_desc"></el-input>
                 </el-col>
                 <el-col class="line" :span="1">&nbsp;</el-col>
                 <el-col :span="14">
@@ -909,7 +909,7 @@
             <td style="text-align:left">
               <span v-if="advice.parent_id>0">▲</span>
               <span>{{advice.advice_name }}</span>
-              <span>{{advice.advice_desc}}</span>
+              <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
               <!-- <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span> -->
               <span
                 v-if="advice.prescribing_number">*{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
@@ -1021,7 +1021,7 @@
               <span v-if="advice.parent_id>0">▲</span>
               <span>{{advice.advice_name }}</span>
               <span>{{advice.advice_desc}}</span>
-              <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span>
+              <span v-if="advice.advice_desc">{{advice.advice_desc}}{{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 != 0">单次用量 {{advice.single_dose}}{{advice.single_dose_unit}}</span>
@@ -1141,7 +1141,7 @@
               <span>{{advice.advice_name }}</span>
               <span>{{advice.advice_desc}}</span>
               <span v-if="advice.single_dose">{{advice.single_dose}}{{advice.single_dose_unit}}</span>
-              <span v-if="advice.drug_spec">{{advice.drug_spec}}{{advice.drug_spec_unit}}</span>
+              <span v-if="advice.advice_desc">{{advice.advice_desc}}{{advice.drug_spec_unit}}</span>
               <span
                 v-if="advice.prescribing_number">*{{advice.prescribing_number}}{{advice.prescribing_number_unit}}</span>
               <span>{{advice.delivery_way}}</span>
@@ -1285,6 +1285,7 @@
           advice_name: '',
           advice_desc: '',
           single_dose: '',
+          template_id: 0,
           single_dose_unit: '',
           prescribing_number: '',
           prescribing_number_unit: '',
@@ -1304,6 +1305,8 @@
           prescribing_number_unit: '',
           delivery_way: '',
           execution_frequency: '',
+          template_id: 0,
+
           isEdit: 0,
           index: 0,
           id: 0,
@@ -1763,7 +1766,8 @@
             execution_frequency: '',
             day_count: '',
             week_days: '',
-            frequency_type: '',
+            frequency_type: 0,
+            template_id:'',
             isEdit: 0,
             index: 0,
             id: 0,
@@ -2571,7 +2575,6 @@
             )
           }
         }
-
         //下面两步的作用是为了上选中的数据的输出顺序不变
         for (const index in this.selectedTemp.list) {
           this.$refs.selecttemplatetable.toggleRowSelection(
@@ -2585,7 +2588,6 @@
             }
           }
         }
-
         for (const index in this.selectedTemp.list) {
           this.$refs.selecttemplatetable.toggleRowSelection(
             this.selectedTemp.list[index]
@@ -2734,6 +2736,7 @@
         }
       },
       newAddTempForm() {
+        console.log(this.adviceTemplateMaps)
         this.allSelectedTemplate = []
         var thisRowKey = 0
         for (const indexs in this.adviceTemplateMaps) {
@@ -2741,6 +2744,7 @@
           for (const index in adviceTemplate.DoctorAdviceTemplate) {
             if (adviceTemplate.DoctorAdviceTemplate[index].selection) {
               thisRowKey++
+              console.log(adviceTemplate.DoctorAdviceTemplate[index].id)
               var item = {
                 advice_name:
                 adviceTemplate.DoctorAdviceTemplate[index].advice_name,
@@ -2770,6 +2774,7 @@
                 day_count: adviceTemplate.DoctorAdviceTemplate[index].day_count,
                 frequency_type: adviceTemplate.DoctorAdviceTemplate[index].frequency_type,
                 week_days: adviceTemplate.DoctorAdviceTemplate[index].week_days,
+                template_id:"T"+adviceTemplate.DoctorAdviceTemplate[index].id,
 
                 isEdit: 0,
                 id: 0,
@@ -2788,6 +2793,8 @@
                   thisRowKey++
                   var child = {
                     advice_id: children[key].id,
+                    template_id:"T"+children[key].id,
+
                     advice_name: children[key].advice_name,
                     advice_desc: children[key].advice_desc,
                     single_dose: '' + children[key].single_dose,
@@ -2811,6 +2818,7 @@
                 this.$set(item, 'children', item.children)
               }
               this.allSelectedTemplate.unshift(item)
+              console.log(this.allSelectedTemplate)
               adviceTemplate.DoctorAdviceTemplate[index].selection = false
             }
           }
@@ -2833,7 +2841,9 @@
             continue
           }
           this.rowKey++
+          console.log(this.allSelectedTemplate[index])
           var item = {
+            template_id: this.allSelectedTemplate[index].template_id,
             advice_name: this.allSelectedTemplate[index].advice_name,
             advice_desc: this.allSelectedTemplate[index].advice_desc,
             single_dose: '' + this.allSelectedTemplate[index].single_dose,
@@ -2866,6 +2876,7 @@
               for (const key in children) {
                 this.rowKey++
                 var child = {
+                  template_id: children[key].template_id,
                   advice_name: children[key].advice_name,
                   advice_desc: children[key].advice_desc,
                   single_dose: '' + children[key].single_dose,
@@ -2889,6 +2900,10 @@
           }
           this.groupForm.adviceNames.push(item)
         }
+
+        console.log(this.groupForm)
+
+
         this.templateFormVisible = false
         //清除数据源的选中记录
       },
@@ -3146,6 +3161,8 @@
                 }
               } else {
 
+                _this.nameForm.template_id =  "D" + new Date().getTime() + this.getRandValue()
+
                 if (_this.nameForm.frequency_type == 1) {
                   _this.nameForm.frequency_type = _this.nameForm.frequency_type
                   _this.nameForm.day_count = '0'
@@ -3305,6 +3322,19 @@
           }
         })
 
+      },getRandValue(){
+        var charactors="1234567890";
+
+        var value='',i;
+
+        for(let j=1;j<=4;j++){
+
+          i = parseInt(10*Math.random());
+
+          value = value + charactors.charAt(i);
+
+        }
+        return value
       }
     },
     watch: {

src/xt_pages/workforce/remind_print.vue

@@ -137,8 +137,8 @@
             single_dose = ' 单次用量 ' + doctor_advice[i].single_dose + doctor_advice[i].single_dose_unit
           }
 
-          if (doctor_advice[i].drug_spec > 0) {
-            drug_spec =  doctor_advice[i].drug_spec + doctor_advice[i].drug_spec_unit
+          if (doctor_advice[i].advice_desc > 0) {
+            drug_spec =  doctor_advice[i].advice_desc + doctor_advice[i].drug_spec_unit
           }
 
           name = name + doctor_advice[i].advice_name +" "+ drug_spec +" " + prescribing_number + single_dose + doctor_advice[i].delivery_way+" "+ doctor_advice[i].execution_frequency + doctor_advice[i].remark +"\n"