Merge branch 'superman' of http://git.shengws.com/zhangbj/xt_vue into superman

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

@@ -149,39 +149,34 @@
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="给药途径：">
-              <el-select v-model="form.delivery_way" :disabled="form.parent_id==0?false:true" filterable
-                         placeholder="请选择(输入可搜索)">
-                <el-option v-for="item in deliveryWayOptions" :key="item.id" :label="item.name " :value="item.name">
+            <el-form-item label="药品规格：">
+              <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>
               </el-select>
             </el-form-item>
+            <!-- <el-form-item label="医嘱内容：">
+                <el-input v-model="form.advice_desc"></el-input>
+            </el-form-item> -->
           </el-col>
+
           <el-col :span="8">
-            <el-form-item label="执行频率：">
-              <el-select v-model="form.execution_frequency" :disabled="form.parent_id==0?false:true" filterable
-                         placeholder="请选择(输入可搜索)">
-                <el-option v-for="item in executionFrequencyOptions" :key="item.id" :label="item.name "
-                           :value="item.name">
+            <el-form-item label="开药数量：">
+              <el-input v-model="form.prescribing_number" style="width: 40%;"></el-input>
+              <el-select v-model="form.prescribing_number_unit" style="width: 56%;" filterable placeholder="选择">
+                <el-option v-for="item in unitsOption" :key="item.id" :label="item.name " :value="item.name">
                 </el-option>
               </el-select>
+              <!-- <el-input v-model="form.prescribing_number_unit" style="width: 40%;"></el-input> -->
             </el-form-item>
           </el-col>
+
+
+
         </el-row>
 
         <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="药品规格：">
-              <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>
-              </el-select>
-            </el-form-item>
-            <!-- <el-form-item label="医嘱内容：">
-                <el-input v-model="form.advice_desc"></el-input>
-            </el-form-item> -->
-          </el-col>
           <el-col :span="8">
             <el-form-item label="单次用量：">
               <el-input v-model="form.single_dose" style="width: 40%;"></el-input>
@@ -193,16 +188,28 @@
               <!-- <el-input v-model="form.single_dose_unit" style="width: 40%;"></el-input> -->
             </el-form-item>
           </el-col>
+
           <el-col :span="8">
-            <el-form-item label="开药数量：">
-              <el-input v-model="form.prescribing_number" style="width: 40%;"></el-input>
-              <el-select v-model="form.prescribing_number_unit" style="width: 56%;" filterable placeholder="选择">
-                <el-option v-for="item in unitsOption" :key="item.id" :label="item.name " :value="item.name">
+            <el-form-item label="给药途径：">
+              <el-select v-model="form.delivery_way" :disabled="form.parent_id==0?false:true" filterable
+                         placeholder="请选择(输入可搜索)">
+                <el-option v-for="item in deliveryWayOptions" :key="item.id" :label="item.name " :value="item.name">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="执行频率：">
+              <el-select v-model="form.execution_frequency" :disabled="form.parent_id==0?false:true" filterable
+                         placeholder="请选择(输入可搜索)">
+                <el-option v-for="item in executionFrequencyOptions" :key="item.id" :label="item.name "
+                           :value="item.name">
                 </el-option>
               </el-select>
-              <!-- <el-input v-model="form.prescribing_number_unit" style="width: 40%;"></el-input> -->
             </el-form-item>
           </el-col>
+
+
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer" v-show="showAdviceForm">
@@ -860,6 +867,7 @@
             row.start_time,
             '{y}-{m}-{d} {h}:{i}'
           ),
+          advice_desc: row.advice_desc,
           advice_name: row.advice_name,
           drug_spec: row.drug_spec != 0 ? '' + row.drug_spec : '',
           drug_spec_unit: row.drug_spec_unit,

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

@@ -141,6 +141,12 @@
                   <span v-if="scope.row.parent_row==0">{{scope.row.execution_frequency}}</span>
                 </template>
               </el-table-column>
+
+              <!--<el-table-column label="医嘱嘱托" min-width="80" property="remark" align="center">-->
+                <!--<template slot-scope="scope">-->
+                  <!--<span v-if="scope.row.parent_row==0">{{scope.row.remark}}</span>-->
+                <!--</template>-->
+              <!--</el-table-column>-->
             </el-table>
           </el-col>
         </el-row>
@@ -229,6 +235,7 @@
                 <span v-if="scope.row.parent_row==0">{{scope.row.delivery_way}}</span>
               </template>
             </el-table-column>
+
             <el-table-column
               label="执行频率"
               min-width="80"
@@ -239,6 +246,8 @@
                 <span v-if="scope.row.parent_row==0">{{scope.row.execution_frequency}}</span>
               </template>
             </el-table-column>
+
+
           </el-table>
         </el-col>
       </el-row>
@@ -326,14 +335,14 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="单次用量 :" prop="single_dose">
+            <el-form-item label="开药数量 :" prop="prescribing_number">
               <el-col :span="8">
-                <el-input v-model="nameForm.single_dose"></el-input>
+                <el-input v-model="nameForm.prescribing_number"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
                 <el-select
-                  v-model="nameForm.single_dose_unit"
+                  v-model="nameForm.prescribing_number_unit"
                   filterable
                   clearable
                   allow-create
@@ -349,15 +358,16 @@
               </el-col>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
-            <el-form-item label="开药数量 :" prop="prescribing_number">
+            <el-form-item label="单次用量 :" prop="single_dose">
               <el-col :span="8">
-                <el-input v-model="nameForm.prescribing_number"></el-input>
+                <el-input v-model="nameForm.single_dose"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
                 <el-select
-                  v-model="nameForm.prescribing_number_unit"
+                  v-model="nameForm.single_dose_unit"
                   filterable
                   clearable
                   allow-create
@@ -416,6 +426,15 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <!--<el-row>-->
+          <!--<el-col :span="12">-->
+            <!--<el-form-item label="医嘱嘱托 :" prop="delivery_way">-->
+              <!--<el-input v-model="nameForm.remark"></el-input>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+        <!--</el-row>-->
+
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="nameFormVisible = false">取消</el-button>
@@ -481,6 +500,7 @@ export default {
           prescribing_number_unit: '',
           delivery_way: '',
           execution_frequency: '',
+          remark:'',
           isEdit: 0,
           index: 0,
           id: 0,
@@ -697,6 +717,8 @@ export default {
                         _this.groupForm.adviceNames[index].children[j].delivery_way = _this.nameForm.delivery_way
                         _this.groupForm.adviceNames[index].children[j].execution_frequency = _this.nameForm.execution_frequency
 
+                        _this.groupForm.adviceNames[index].children[j].remark = _this.nameForm.remark
+
                         _this.$set(_this.groupForm.adviceNames[index].children, j, _this.groupForm.adviceNames[index].children[j])
                         break
                       }
@@ -716,6 +738,7 @@ export default {
                     _this.groupForm.adviceNames[index].prescribing_number_unit = _this.nameForm.prescribing_number_unit
                     _this.groupForm.adviceNames[index].delivery_way = _this.nameForm.delivery_way
                     _this.groupForm.adviceNames[index].execution_frequency = _this.nameForm.execution_frequency
+                    _this.groupForm.adviceNames[index].remark = _this.nameForm.remark
 
                     _this.$set(_this.groupForm.adviceNames, index, _this.groupForm.adviceNames[index])
                     break
@@ -771,6 +794,7 @@ export default {
           prescribing_number_unit: '',
           delivery_way: this.groupSelectRow.delivery_way,
           execution_frequency: this.groupSelectRow.execution_frequency,
+          remark:'',
           isEdit: 0,
           index: 0,
           children: [],
@@ -809,7 +833,8 @@ export default {
             index: this.groupSelectRow.index,
             id: this.groupSelectRow.id,
             children: [],
-            parent_row: this.groupSelectRow.parent_row
+            parent_row: this.groupSelectRow.parent_row,
+            remark: this.groupSelectRow.remark
             // row_key:this.groupSelectRow.row_key,
           }
           this.nameFormTitle = '修改医嘱内容'
@@ -828,6 +853,7 @@ export default {
             isEdit: 0,
             index: 0,
             id: 0,
+            remark:'',
             children: [],
             parent_row: 0
           }

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

@@ -140,6 +140,12 @@
                   <span v-if="scope.row.parent_row==0">{{scope.row.execution_frequency}}</span>
                 </template>
               </el-table-column>
+
+              <el-table-column label="医嘱嘱托" min-width="80" property="remark" align="center">
+                <template slot-scope="scope">
+                  <span v-if="scope.row.parent_row==0">{{scope.row.remark}}</span>
+                </template>
+              </el-table-column>
             </el-table>
           </el-col>
         </el-row>
@@ -318,14 +324,14 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="单次用量 :" prop="single_dose">
+            <el-form-item label="开药数量 :" prop="prescribing_number">
               <el-col :span="8">
-                <el-input v-model="nameForm.single_dose"></el-input>
+                <el-input v-model="nameForm.prescribing_number"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
                 <el-select
-                  v-model="nameForm.single_dose_unit"
+                  v-model="nameForm.prescribing_number_unit"
                   filterable
                   clearable
                   allow-create
@@ -341,15 +347,16 @@
               </el-col>
             </el-form-item>
           </el-col>
+
           <el-col :span="12">
-            <el-form-item label="开药数量 :" prop="prescribing_number">
+            <el-form-item label="单次用量 :" prop="single_dose">
               <el-col :span="8">
-                <el-input v-model="nameForm.prescribing_number"></el-input>
+                <el-input v-model="nameForm.single_dose"></el-input>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="14">
                 <el-select
-                  v-model="nameForm.prescribing_number_unit"
+                  v-model="nameForm.single_dose_unit"
                   filterable
                   clearable
                   allow-create
@@ -365,6 +372,7 @@
               </el-col>
             </el-form-item>
           </el-col>
+
         </el-row>
         <el-row>
           <el-col :span="12">

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

@@ -1183,7 +1183,7 @@
           weight_before = this.predialysis.weight_before
         }
 
-        if(weight_before > 0){
+        if(weight_before > 0 && last_weight_after > 0){
           this.add_weight = parseFloat(weight_before - last_weight_after).toFixed(2)
         }
 

src/xt_pages/user/dialysisRecord.vue

@@ -235,7 +235,7 @@
           >
             <template slot-scope="scope"
               ><span>{{
-                getNurseName(scope.row.start_nurse)
+              scope.row.role.user_name
               }}</span></template
             >
           </el-table-column>
@@ -247,7 +247,7 @@
           >
             <template slot-scope="scope"
               ><span>{{
-                getDoctorName(scope.row.treatment_summary)
+                getDoctorName(scope.row.prescription.creater)
               }}</span></template
             >
           </el-table-column>
@@ -336,7 +336,7 @@
                 <td>{{ setAnticoagulantsConfit(item.prescription) }}</td>
                 <td>{{ item.prescription.dialyzer_perfusion_apparatus }}</td>
                 <td>{{ getNurseName(item.start_nurse) }}</td>
-                <td>{{ getDoctorName(item.treatment_summary) }}</td>
+                <td>{{ getDoctorName(item.prescription.creater) }}</td>
               </tr>
             </tbody>
           </table>
@@ -412,13 +412,19 @@ export default {
       fetchAllDoctorAndNurse().then(response => {
         if (response.data.state == 1) {
           this.doctorOptions =
-            response.data.data.doctors === null
+            response.data.data.doctors == null
               ? []
               : response.data.data.doctors;
           this.nurseOptions =
-            response.data.data.nursers === null
+            response.data.data.nursers == null
               ? []
               : response.data.data.nursers;
+
+          console.log(response.data.data)
+
+
+
+
         }
       });
     },
@@ -528,11 +534,11 @@ export default {
       }
       return models.join("，");
     },
-    getDoctorName(summary) {
+    getDoctorName(creater) {
       var dl = this.doctorOptions.length;
       if (dl > 0) {
         for (let index = 0; index < dl; index++) {
-          if ((this.doctorOptions[index].id = summary.zl_doctor)) {
+          if ((this.doctorOptions[index].id = creater)) {
             return this.doctorOptions[index].name;
           }
         }
@@ -543,7 +549,9 @@ export default {
       var dl = this.nurseOptions.length;
       if (dl > 0) {
         for (let index = 0; index < dl; index++) {
-          if ((this.nurseOptions[index].id = start_nurse)) {
+
+          if (this.nurseOptions[index].id = start_nurse) {
+
             return this.nurseOptions[index].name;
           }
         }
@@ -591,11 +599,14 @@ export default {
     this.vascularAccess = this.$store.getters.vascular_access;
     this.vascularAccessDesc = this.$store.getters.vascular_access_desc;
 
-    this.fetchAllDoctorAndNurse();
-    this.getPatientDialysisRecords();
 
     var xtuser = this.$store.getters.xt_user;
     this.orgname = xtuser.org.org_name;
+  },mounted(){
+
+    this.fetchAllDoctorAndNurse();
+    this.getPatientDialysisRecords();
+
   }
 };
 </script>