Merge branch '20220812' of http://git.shengws.com/csx/Vue_New into 2022-10-17_vue_schedule_branch

src/router/modules/dialysis.js

@@ -67,6 +67,17 @@ export default {
         noCache: true
       }
     },
+    {
+      path: '/dialysis/doctorAdvicePrint/one',
+      component: () => import('@/xt_pages/dialysis/doctorAdvicePrintOne'),
+      name: '透析医嘱打印',
+      hidden: true,
+      is_menu: false,
+      meta: {
+        title: '透析医嘱打印',
+        noCache: true
+      }
+    },
 
     // {
     //   path: '/dialysis/doctorAdviceStaticPrint',

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyTwo.vue

@@ -865,7 +865,7 @@
                     
                   </td>
                 </tr>
-                <tr>
+                <!-- <tr>
                <td style="text-align:left;" colspan="8" >
                  <span style="display:inline-block;margin-left:15px;">血管通路皮肤情况:
                    <label-box
@@ -905,7 +905,7 @@
                     ></label-box>
                  </span>
                </td>
-              </tr>
+              </tr> -->
                <!-- <tr>
                 <td style="text-align:left;" colspan="8">
                 <span style="display:inline-block;margin-left:15px;">皮肤:</span>

src/xt_pages/dialysis/batch_print/batch_print_order_thirtyTwo.vue

@@ -95,7 +95,7 @@
                         <td width="40">透析备注:</td>
                         <td width="500">
                             <div class="under-line">
-                            {{ record.prescription.dialysis_remark ? record.prescription.dialysis_remark : '' }}
+                            {{ record.prescription.dialysis_remark ? record.prescription.dialysis_remark : record.prescription.remark}}
                             </div>
                         </td>
                         </tr>

src/xt_pages/dialysis/details/DialysisPrescription.vue

@@ -551,6 +551,32 @@
             <span class="unit"  v-else>{{ reduce_amount != "0" ? "iu" : "" }}</span>
           </span>
         </li>
+
+        <li v-if="isShow('开药数量')">
+          <label>开药数量(支): </label>
+          <span class="content">{{this.prescription.prescribing_number}}</span>
+        </li>
+
+        <li v-if="isShow('处方钠')">
+          <label>处方钠: </label>
+          <span class="content">{{this.prescription.prescription_sodium}}</span>
+        </li>
+
+        <li v-if="isShow('开始钠')">
+          <label>开始钠: </label>
+          <span class="content">{{this.prescription.start_sodium}}</span>
+        </li>
+
+        <li v-if="isShow('钠曲线')">
+          <label>钠曲线: </label>
+          <span class="content">{{this.prescription.sodium_curve}}</span>
+        </li>
+
+        <li v-if="isShow('病情处理')">
+          <label>病情处理: </label>
+          <span class="content">{{this.prescription.treatment_remark}}</span>
+        </li>
+
        
       </ul>
     </div>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -40,7 +40,7 @@
         <li v-if="isShow('实际置换量')">
           <label>实际置换量 : </label>
           <span class="content">{{ actual_displacement }}</span>
-          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id != 13 || this.$store.getters.xt_user.template_info.template_id != 40">ml</span>
+          <span class="unit" v-if="this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21">ml</span>
           <span class="unit" v-else>L</span>
         </li>
         <li v-if="isShow('压迫后内瘘震颤')">

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

@@ -442,7 +442,7 @@
         <el-row :gutter="20"> -->
 
         <el-col :span="8" v-if="isShow('实际置换量')">
-          <el-form-item v-if="this.template_id == 20 || this.template_id == 21 || this.template_id == 13" label="实际置换量(ml): ">
+          <el-form-item v-if="this.template_id == 20 || this.template_id == 21" label="实际置换量(ml): ">
             <el-input v-model="form.actual_displacement"></el-input>
           </el-form-item>
           <el-form-item v-else label="实际置换量(L): ">

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

@@ -7,66 +7,93 @@
     width="854px"
   >
     <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
-    <el-form :model="receiveTreatmentAsses" label-width="80px">
-      <el-form-item label="入室方式 : " v-if="isShow('入室方式')">
-        <!--<el-radio-group v-model="receiveTreatmentAsses.way">-->
+    <el-form
+      :model="receiveTreatmentAsses"
+      ref="receiveTreatmentAsses"
+      label-width="86px"
+    >
+      <el-form-item
+        label="入室方式 : "
+        :prop="isName('入室方式')"
+        :rules="isCheckmust('入室方式')"
+        v-if="isShow('入室方式')"
+      >
+        <el-radio-group v-model="receiveTreatmentAsses.way">
         <el-radio
           v-for="(item, index) in way_arr"
           :key="index"
           :label="item.id"
-          v-model="receiveTreatmentAsses.way"
           >{{ item.name }}
         </el-radio>
-        <!--</el-radio-group>-->
+        </el-radio-group>
       </el-form-item>
-      <el-form-item label="病人意识 : " v-if="isShow('病人意识')">
-        <!--<el-radio-group v-model="receiveTreatmentAsses.consciousness">-->
+      <el-form-item
+        label="病人意识 : "
+        v-if="isShow('病人意识')"
+        :prop="isName('病人意识')"
+        :rules="isCheckmust('病人意识')"
+      >
+        <el-radio-group v-model="receiveTreatmentAsses.consciousness">
         <el-radio
           v-for="(item, index) in consciousness_arr"
           :key="index"
           :label="item.id"
-          v-model="receiveTreatmentAsses.consciousness"
           >{{ item.name }}
         </el-radio>
-        <!--</el-radio-group>-->
+        </el-radio-group>
 
         <!--<el-radio v-model="receiveTreatmentAsses.consciousness" label="1">清醒</el-radio>-->
         <!--<el-radio v-model="receiveTreatmentAsses.consciousness" label="2">嗜睡</el-radio>-->
         <!--<el-radio v-model="receiveTreatmentAsses.consciousness" label="3">昏迷</el-radio>-->
         <!--<el-radio v-model="receiveTreatmentAsses.consciousness" label="4">模糊</el-radio>-->
       </el-form-item>
-      <el-form-item label="病人食欲 : " v-if="isShow('病人食欲')">
+      <el-form-item
+        label="病人食欲 : "
+        :prop="isName('病人食欲')"
+        :rules="isCheckmust('病人食欲')"
+        v-if="isShow('病人食欲')"
+      >
+      <el-radio-group v-model="receiveTreatmentAsses.appetite">
         <el-radio
           v-for="(item, index) in appetite_arr"
           :key="index"
           :label="item.id"
-          v-model="receiveTreatmentAsses.appetite"
           >{{ item.name }}
         </el-radio>
-
+      </el-radio-group>
         <!--<el-radio v-model="receiveTreatmentAsses.appetite" label="1">正常</el-radio>-->
         <!--<el-radio v-model="receiveTreatmentAsses.appetite" label="2">减退</el-radio>-->
         <!--<el-radio v-model="receiveTreatmentAsses.appetite" label="3">恶心</el-radio>-->
         <!--<el-radio v-model="receiveTreatmentAsses.appetite" label="4">呕吐</el-radio>-->
         <!--<el-radio v-model="receiveTreatmentAsses.appetite" label="5">腹泻</el-radio>-->
       </el-form-item>
-      <el-form-item label="病人情况 : " v-if="isShow('病人情况')">
-        <el-radio v-model="receiveTreatmentAsses.condition" label="1"
+      <el-form-item
+        label="病人情况 : "
+        prop="condition"
+        :rules="isCheckmust('病人情况')"
+        v-if="isShow('病人情况')"
+      >
+      <el-radio-group v-model="receiveTreatmentAsses.condition">
+        <el-radio label="1"
           >住院</el-radio
         >
-        <el-radio v-model="receiveTreatmentAsses.condition" label="2"
+        <el-radio label="2"
           >门诊</el-radio
         >
-        <el-radio v-model="receiveTreatmentAsses.condition" label="3"
+        <el-radio label="3"
           >手术期</el-radio
         >
-        <el-radio v-model="receiveTreatmentAsses.condition" label="4"
+        <el-radio label="4"
           >急诊</el-radio
         >
+      </el-radio-group>
+
       </el-form-item>
 
       <el-form-item
         label="住院号 : "
+        :prop="isName('住院号')"
+        :rules="isCheckmust('住院号')"
         v-if="this.receiveTreatmentAsses.condition == '1'"
       >
         <el-input v-model="receiveTreatmentAsses.admission_number"></el-input>
@@ -74,43 +101,63 @@
 
       <el-form-item
         label="住院科室 : "
-        v-if="isShow('住院科室')&&this.receiveTreatmentAsses.condition == '1'"
+        :prop="isName('住院科室')"
+        :rules="isCheckmust('住院科室')"
+        v-if="isShow('住院科室') && this.receiveTreatmentAsses.condition == '1'"
       >
         <el-input v-model="receiveTreatmentAsses.his_department"></el-input>
       </el-form-item>
-      
+
       <el-form-item
         label="住院床位 : "
-        v-if="isShow('住院床位')&&this.receiveTreatmentAsses.condition == '1'"
+        :prop="isName('住院床位')"
+        :rules="isCheckmust('住院床位')"
+        v-if="isShow('住院床位') && this.receiveTreatmentAsses.condition == '1'"
       >
         <el-input v-model="receiveTreatmentAsses.his_bed"></el-input>
       </el-form-item>
-      
 
       <el-form-item
-        label="诊断:" v-if="isShow('诊断') && this.receiveTreatmentAsses.condition == '1'"
+        label="诊断:"
+        :prop="isName('诊断')"
+        :rules="isCheckmust('诊断')"
+        v-if="isShow('诊断') && this.receiveTreatmentAsses.condition == '1'"
       >
         <el-input v-model="receiveTreatmentAsses.diacrisis"></el-input>
       </el-form-item>
 
-      <el-form-item label="体位 : " v-if="isShow('体位')">
-        <el-radio
+      <el-form-item
+        label="体位 : "
+        :prop="isName('体位')"
+        :rules="isCheckmust('体位')"
+        v-if="isShow('体位')"
+      >
+      <el-radio-group v-model="receiveTreatmentAsses.posture">
+           <el-radio
           v-for="(item, index) in posture_arr"
           :key="index"
           :label="item.id"
-          v-model="receiveTreatmentAsses.posture"
           >{{ item.name }}
         </el-radio>
+      </el-radio-group>
+     
       </el-form-item>
 
-      <el-form-item label="病情: " v-if="isShow('病情')">
+      <el-form-item
+        label="病情: "
+        :prop="isName('病情')"
+        :rules="isCheckmust('病情')"
+        v-if="isShow('病情')"
+      >
+      <el-radio-group v-model="receiveTreatmentAsses.sick_condition">
         <el-radio
           v-for="(item, index) in sick_condition_arr"
           :key="index"
           :label="item.id"
-          v-model="receiveTreatmentAsses.sick_condition"
           >{{ item.name }}
         </el-radio>
+      </el-radio-group>
+
         <!--<el-radio v-model="receiveTreatmentAsses.sick_condition" label="1">一般</el-radio>-->
         <!--<el-radio v-model="receiveTreatmentAsses.sick_condition" label="2">严重</el-radio>-->
         <!--<el-radio v-model="receiveTreatmentAsses.sick_condition" label="3">危</el-radio>-->
@@ -119,6 +166,8 @@
       <el-form-item
         label-width="100px"
         label="其他病情 : "
+        :prop="isName('其他病情')"
+        :rules="isCheckmust('其他病情')"
         v-if="isShow('其他病情')"
       >
         <el-input
@@ -129,6 +178,8 @@
       <el-form-item
         label-width="150px"
         label="跌倒风险评估评分 : "
+        :prop="isName('跌倒风险评估评分')"
+        :rules="isCheckmust('跌倒风险评估评分')"
         v-if="isShow('跌倒风险评估评分')"
       >
         <el-input
@@ -137,24 +188,34 @@
         ></el-input>
       </el-form-item>
 
-      <el-form-item label="风险程度: " v-if="isShow('风险程度')">
-        <el-radio v-model="receiveTreatmentAsses.danger_level" label="1"
+      <el-form-item
+        label="风险程度: "
+        :prop="isName('风险程度')"
+        :rules="isCheckmust('风险程度')"
+        v-if="isShow('风险程度')"
+      >
+      <el-radio-group v-model="receiveTreatmentAsses.danger_level">
+        <el-radio label="1"
           >无</el-radio
         >
-        <el-radio v-model="receiveTreatmentAsses.danger_level" label="2"
+        <el-radio label="2"
           >低风险</el-radio
         >
-        <el-radio v-model="receiveTreatmentAsses.danger_level" label="3"
+        <el-radio label="3"
           >中度风险</el-radio
         >
-        <el-radio v-model="receiveTreatmentAsses.danger_level" label="4"
+        <el-radio label="4"
           >高风险</el-radio
         >
+      </el-radio-group>
+ 
       </el-form-item>
 
       <el-form-item
         label-width="150px"
         label="跌倒风险预防措施: "
+        :prop="isName('跌倒风险预防措施')"
+        :rules="isCheckmust('跌倒风险预防措施')"
         v-if="isShow('跌倒风险预防措施')"
       >
         <!--        <el-radio-->
@@ -164,6 +225,7 @@
         <!--          v-model="receiveTreatmentAsses.precaution"-->
         <!--          >{{ item.name }}-->
         <!--        </el-radio>-->
+        
         <el-checkbox-group v-model="precautionTwo">
           <el-checkbox
             v-for="item in precaution_arr"
@@ -176,53 +238,75 @@
       <el-form-item
         label-width="200px"
         label="其他跌倒风险预防措施 : "
+        :prop="isName('其他跌倒风险预防措施')"
+        :rules="isCheckmust('其他跌倒风险预防措施')"
         v-if="isShow('其他跌倒风险预防措施')"
       >
         <el-input v-model="receiveTreatmentAsses.precaution_other"></el-input>
       </el-form-item>
 
-      <el-form-item label="摄入量: " v-if="isShow('摄入量')">
+      <el-form-item
+        label="摄入量: "
+        :prop="isName('摄入量')"
+        :rules="isCheckmust('摄入量')"
+        v-if="isShow('摄入量')"
+      >
         <!--<el-radio v-model="receiveTreatmentAsses.intake" label="1">正常</el-radio>-->
         <!--<el-radio v-model="receiveTreatmentAsses.intake" label="2">减少</el-radio>-->
-
+       <el-radio-group v-model="receiveTreatmentAsses.intake">
         <el-radio
           v-for="(item, index) in intake_arr"
           :key="index"
           :label="item.id"
-          v-model="receiveTreatmentAsses.intake"
           >{{ item.name }}
         </el-radio>
+       </el-radio-group>
+
       </el-form-item>
-      <el-form-item label="营养状况: " v-if="isShow('营养状况')">
+      <el-form-item
+        label="营养状况: "
+        :prop="isName('营养状况')"
+        :rules="isCheckmust('营养状况')"
+        v-if="isShow('营养状况')"
+      >
         <!--<el-radio v-model="receiveTreatmentAsses.nutrition" label="1">正常</el-radio>-->
         <!--<el-radio v-model="receiveTreatmentAsses.nutrition" label="2">营养不良</el-radio>-->
-
+        <el-radio-group v-model="receiveTreatmentAsses.nutrition">
         <el-radio
           v-for="(item, index) in nutrition_arr"
           :key="index"
           :label="item.id"
-          v-model="receiveTreatmentAsses.nutrition"
           >{{ item.name }}
         </el-radio>
+        </el-radio-group>
+
       </el-form-item>
-      <el-form-item label="心理评估: " v-if="isShow('心理评估')">
+      <el-form-item
+        label="心理评估: "
+        :prop="isName('心理评估')"
+        :rules="isCheckmust('心理评估')"
+        v-if="isShow('心理评估')"
+      >
+      <el-radio-group v-model="receiveTreatmentAsses.psychological_assessment">
         <el-radio
-          v-model="receiveTreatmentAsses.psychological_assessment"
           label="1"
           >正常</el-radio
         >
         <el-radio
-          v-model="receiveTreatmentAsses.psychological_assessment"
           label="2"
           >异常</el-radio
         >
+      </el-radio-group>
+
       </el-form-item>
       <el-form-item
         label-width="150px"
         label="心理评估异常情况 : "
+        :prop="isName('心理评估异常情况')"
+        :rules="isCheckmust('心理评估异常情况')"
         v-if="
           isShow('心理评估异常情况') &&
-            receiveTreatmentAsses.psychological_assessment == 2
+          receiveTreatmentAsses.psychological_assessment == 2
         "
       >
         <el-input
@@ -233,27 +317,31 @@
       <el-form-item
         label-width="150px"
         label="其他心理评估 : "
+        :prop="isName('其他心理评估')"
+        :rules="isCheckmust('其他心理评估')"
         v-if="isShow('其他心理评估')"
       >
         <el-input
           v-model="receiveTreatmentAsses.psychological_other"
         ></el-input>
       </el-form-item>
-        <el-form-item label="是否跌倒: " v-if="isShow('是否跌倒')">
-        <el-radio
-          v-model="receiveTreatmentAsses.tumble"
-          label="1"
-          >是</el-radio>
-        <el-radio
-          v-model="receiveTreatmentAsses.tumble"
-          label="2"
-          >否
-        </el-radio>
+      <el-form-item
+        label="是否跌倒: "
+        :prop="isName('是否跌倒')"
+        :rules="isCheckmust('是否跌倒')"
+        v-if="isShow('是否跌倒')"
+      >
+      <el-radio-group v-model="receiveTreatmentAsses.tumble">
+        <el-radio label="1">是</el-radio>
+        <el-radio label="2">否</el-radio>
+      </el-radio-group>
+
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleCancle">取 消</el-button>
-      <el-button type="primary" v-if="hasPermission" @click="handleComfirm"
+      <!--v-if="hasPermission" -->
+      <el-button type="primary"  @click="handleComfirm('receiveTreatmentAsses')"
         >保 存</el-button
       >
     </div>
@@ -265,8 +353,7 @@ import { postAccepts } from "@/api/dialysis";
 import { uParseTime } from "@/utils/tools";
 import store from "@/store";
 import { getDataConfig } from "@/utils/data";
-import { parseTime } from '@/utils'
-
+import { parseTime } from "@/utils";
 import request from "@/utils/request";
 
 export default {
@@ -303,12 +390,12 @@ export default {
         precaution: "",
         precaution_other: "",
         admission_number: "",
-        diacrisis:"",
-        tumble:"",
-        his_department:"",
-        his_bed:"",
+        diacrisis: "",
+        tumble: "",
+        his_department: "",
+        his_bed: "",
       },
-      precautionTwo: []
+      precautionTwo: [],
     };
   },
   methods: {
@@ -326,9 +413,9 @@ export default {
       return false;
     },
     show(accepts) {
-      console.log("accepts333333",accepts)
-      if(accepts.id > 0){
-        accepts.tumble = accepts.tumble.toString()
+      console.log("accepts333333", accepts);
+      if (accepts.id > 0) {
+        accepts.tumble = accepts.tumble.toString();
       }
       this.accepts = accepts;
       // console.log("accepts", accepts);
@@ -359,9 +446,8 @@ export default {
           this.receiveTreatmentAsses[index] =
             this.receiver_treatment_access[index] + "";
         } else {
-          this.receiveTreatmentAsses[index] = this.receiver_treatment_access[
-            index
-          ];
+          this.receiveTreatmentAsses[index] =
+            this.receiver_treatment_access[index];
         }
       }
       this.isVisibility = true;
@@ -369,10 +455,10 @@ export default {
     hide() {
       this.isVisibility = false;
     },
-    handleCancle: function() {
+    handleCancle: function () {
       this.isVisibility = false;
     },
-    handleComfirm: function() {
+    handleComfirm: function (formName) {
       var arr = [];
       for (let i = 0; i < this.precaution_arr.length; i++) {
         for (let j = 0; j < this.precautionTwo.length; j++) {
@@ -399,36 +485,79 @@ export default {
           ParamsQuery["mode"] = "3";
         }
       }
-      // console.log("数据", this.precautionTwo);
-      postAccepts(ParamsQuery).then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg);
-          return false;
-        } else {
-          this.$notify({
-            title: "成功",
-            message: "提交成功",
-            type: "success",
-            duration: 2000
-          });
+      console.log("数据", ParamsQuery);
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          postAccepts(ParamsQuery).then((response) => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "提交成功",
+                type: "success",
+                duration: 2000,
+              });
 
-          let receive_treatment_asses_resp =
-            response.data.data.receiveTreatmentAsses;
+              let receive_treatment_asses_resp =
+                response.data.data.receiveTreatmentAsses;
 
-          //pror
-          var receiver_treatment_access = this.receiver_treatment_access;
-          for (var index in receive_treatment_asses_resp) {
-            // receiver_treatment_access[index] = receive_treatment_asses_resp[index];
-            this.$set(
-              receiver_treatment_access,
-              index,
-              receive_treatment_asses_resp[index]
-            );
-          }
-          this.hide();
+              //pror
+              var receiver_treatment_access = this.receiver_treatment_access;
+              for (var index in receive_treatment_asses_resp) {
+                // receiver_treatment_access[index] = receive_treatment_asses_resp[index];
+                this.$set(
+                  receiver_treatment_access,
+                  index,
+                  receive_treatment_asses_resp[index]
+                );
+              }
+              this.hide();
+            }
+          });
+        } else {
+          console.log("error submit!!");
+          return false;
         }
       });
     },
+    isName(name) {
+      let filedList = store.getters.xt_user.fileds;
+      for (let i = 0; i < filedList.length; i++) {
+        if (filedList[i].module == 2 && filedList[i].filed_name_cn == name) {
+          return filedList[i].filed_name;
+        }
+      }
+    },
+
+    isCheckmust(name) {
+      let filedList = store.getters.xt_user.fileds;
+      for (let i = 0; i < filedList.length; i++) {
+        // if (
+        //   filedList[i].module == 2){console.log(filedList[i],'filedList[i]')}
+        if (
+          filedList[i].module == 2 &&
+          filedList[i].filed_name_cn == name &&
+          filedList[i].is_write == 1
+        ) {
+          if (name == "风险程度"||name == "病人情况"||name == '心理评估') {
+          return [
+            { required: true, message: `请输入${name}`,trigger: ['blur','change'] },
+            {
+              required: true,
+              pattern: /^[1-9]\d*$/,
+              message: `请输入${name}`,
+              trigger: ['blur','change']
+            },
+          ];
+        }
+          return [{ required: true, message: `请输入${name}`,trigger: ['blur','change'] }];
+        }
+
+        
+      }
+    },
     getPermission() {
       request
         .get("/api/func_per/get", {
@@ -436,10 +565,10 @@ export default {
             create_url: "/api/dialysis/accepts?mode=1",
             modify_url: "/api/dialysis/accepts?mode=2",
             modify_other_url: "/api/dialysis/accepts?mode=3",
-            module: 2
-          }
+            module: 2,
+          },
         })
-        .then(res => {
+        .then((res) => {
           // console.log(res);
           //console.log("接诊", this.accepts);
           if (res.data.state == 0) {
@@ -468,7 +597,7 @@ export default {
             }
           }
         });
-    }
+    },
   },
   props: {
     receiver_treatment_access: {
@@ -476,33 +605,34 @@ export default {
       type: Object,
       default: () => {
         return { id: 0 };
-      }
+      },
     },
     patient: {
       // 患者信息
       type: Object,
       default: () => {
         return { id: 0 };
-      }
-    }
+      },
+    },
   },
   watch: {
     isVisibility(val) {},
-    "receiver_treatment_access.id": function() {
+    "receiver_treatment_access.id": function () {
       if (this.receiver_treatment_access.id > 0) {
         for (var index in this.receiveTreatmentAsses) {
-          this.receiveTreatmentAsses[index] = this.receiver_treatment_access[
-            index
-          ];
+          this.receiveTreatmentAsses[index] =
+            this.receiver_treatment_access[index];
         }
       }
-    }
+    },
   },
   created() {
     // console.log("接诊评估", this.receiver_treatment_access);
     var date = this.$route.query && this.$route.query.date;
-    this.record_date = date ? uParseTime(date, "{y}-{m}-{d}") : parseTime(new Date(), '{y}-{m}-{d}');
-    console.log('this.record_date',this.record_date)
+    this.record_date = date
+      ? uParseTime(date, "{y}-{m}-{d}")
+      : parseTime(new Date(), "{y}-{m}-{d}");
+    console.log("this.record_date", this.record_date);
 
     this.way_arr = getDataConfig("hemodialysis", "way");
     this.consciousness_arr = getDataConfig("hemodialysis", "consciousness");
@@ -513,7 +643,7 @@ export default {
     // console.log("风险", this.precaution_arr);
     this.intake_arr = getDataConfig("hemodialysis", "intake");
     this.nutrition_arr = getDataConfig("hemodialysis", "nutrition");
-  }
+  },
 };
 </script>
 

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

@@ -24,19 +24,23 @@
       <el-form ref="assessmentBeforeDislysis" :model="assessmentBeforeDislysis" label-width="125px">
         <el-row :gutter="24">
           <el-col :span="8">
-            <el-form-item label="透前称重(kg)： " v-if="isShow('透前称重')">
+            <el-form-item label="透前称重(kg)： " :prop="isName('透前称重')"
+              :rules="isCheckmust('透前称重')" v-if="isShow('透前称重')">
               <el-input type="number" v-model="assessmentBeforeDislysis.weight_before"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="透前体重备注:" v-if="isShow('透前体重备注')">
+            <el-form-item label="透前体重备注:" :prop="isName('透前体重备注')"
+              :rules="isCheckmust('透前体重备注')" v-if="isShow('透前体重备注')">
               <el-input v-model="assessmentBeforeDislysis.weight_befor_remake"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
             <el-form-item label="干体重(kg)："
+             :prop="isName('干体重')"
+              :rules="isCheckmust('干体重')"
                           v-if="isShow('干体重')">
               <el-input type="number" v-model="assessmentBeforeDislysis.dry_weight" readonly
                         @focus="showDryWeightDialog"></el-input>
@@ -45,19 +49,23 @@
 
           <el-col :span="8">
             <el-form-item label="身高(cm)："
+              prop="height"
+              :rules="isCheckmust('身高')"
                           v-if="isShow('身高')">
               <el-input  v-model="assessmentBeforeDislysis.height"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="年龄(岁)：" v-if="isShow('年龄')">
+            <el-form-item label="年龄(岁)：" :prop="isName('年龄')"
+              :rules="isCheckmust('年龄')" v-if="isShow('年龄')">
               <el-input  v-model="assessmentBeforeDislysis.age" ></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="衣物重(kg)：" v-if="isShow('衣物重')">
+            <el-form-item label="衣物重(kg)：" :prop="isName('衣物重')"
+              :rules="isCheckmust('衣物重')" v-if="isShow('衣物重')">
               <el-input type="number" v-model="assessmentBeforeDislysis.additional_weight"></el-input>
             </el-form-item>
           </el-col>
@@ -69,7 +77,8 @@
 <!--          </el-col>-->
 
           <el-col :span="8">
-            <el-form-item label="透析机型号" v-if="isShow('透析机型号')">
+            <el-form-item label="透析机型号" :prop="isName('透析机型号')"
+              :rules="isCheckmust('透析机型号')" v-if="isShow('透析机型号')">
               <el-select v-model="assessmentBeforeDislysis.machine_type">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -80,40 +89,47 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('透析频次')">
-            <el-form-item label="透析频次(次/周):" v-if="this.$store.getters.xt_user.template_info.org_id != 10243">
+            <el-form-item label="透析频次(次/周):" :prop="isName('透析频次')"
+              :rules="isCheckmust('透析频次')" v-if="this.$store.getters.xt_user.template_info.org_id != 10243">
               <el-input v-model="assessmentBeforeDislysis.dialysis_count"></el-input>
             </el-form-item>
-            <el-form-item label="透析频次:" v-else>
+            <el-form-item label="透析频次:" :prop="isName('透析频次')"
+              :rules="isCheckmust('透析频次')" v-else>
               <el-input v-model="assessmentBeforeDislysis.dialysis_count"></el-input>
             </el-form-item>
           </el-col>
 
 
           <el-col :span="8">
-            <el-form-item label="体温(℃)：" v-if="isShow('体温')">
+            <el-form-item label="体温(℃)：" :prop="isName('体温')"
+              :rules="isCheckmust('体温')" v-if="isShow('体温')">
               <el-input type="number" v-model="assessmentBeforeDislysis.temperature"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="收缩压(mmHg)： " v-if="isShow('收缩压')">
+            <el-form-item label="收缩压(mmHg)： " :prop="isName('收缩压')"
+              :rules="isCheckmust('收缩压')" v-if="isShow('收缩压')">
               <el-input type="number" v-model="assessmentBeforeDislysis.systolic_blood_pressure"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <el-form-item label="舒张压(mmHg)： " v-if="isShow('舒张压')">
+            <el-form-item label="舒张压(mmHg)： " :prop="isName('舒张压')"
+              :rules="isCheckmust('舒张压')" v-if="isShow('舒张压')">
               <el-input type="number" v-model="assessmentBeforeDislysis.diastolic_blood_pressure"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="呼吸频率(次/分)：" v-if="isShow('呼吸频率')">
+            <el-form-item label="呼吸频率(次/分)：" :prop="isName('呼吸频率')"
+              :rules="isCheckmust('呼吸频率')" v-if="isShow('呼吸频率')">
               <el-input  v-model="assessmentBeforeDislysis.breathing_rate"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="脉搏(次/分)：" v-if="isShow('脉搏')">
+            <el-form-item label="脉搏(次/分)：" :prop="isName('脉搏')"
+              :rules="isCheckmust('脉搏')" v-if="isShow('脉搏')">
               <el-input type="number" v-model="assessmentBeforeDislysis.pulse_frequency"></el-input>
             </el-form-item>
           </el-col>
@@ -129,14 +145,16 @@
           </el-col> -->
 
           <el-col :span="8">
-            <el-form-item label="体液过多症状：" v-if="isShow('体液过多症状')">
+            <el-form-item label="体液过多症状：" :prop="isName('体液过多症状')"
+              :rules="isCheckmust('体液过多症状')" v-if="isShow('体液过多症状')">
               <el-input v-model="assessmentBeforeDislysis.humor_excessive_symptom" readonly
                         @focus="showInnerDialog('19')"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="血管通路： " v-if="isShow('血管通路')">
+            <el-form-item label="血管通路： " :prop="isName('血管通路')"
+              :rules="isCheckmust('血管通路')" v-if="isShow('血管通路')">
               <el-select v-model="assessmentBeforeDislysis.blood_access_part_opera_id">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -147,7 +165,8 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="血管通路部位： " v-if="isShow('血管通路部位')">
+            <el-form-item label="血管通路部位： " :prop="isName('血管通路部位')"
+              :rules="isCheckmust('血管通路部位')" v-if="isShow('血管通路部位')">
               <!-- <el-select v-model="assessmentBeforeDislysis.blood_access_part_id">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -159,14 +178,16 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="血管通路其他部位:" v-if="isShow('血管通路其他部位')">
+            <el-form-item label="血管通路其他部位:" :prop="isName('血管通路其他部位')"
+              :rules="isCheckmust('血管通路其他部位')" v-if="isShow('血管通路其他部位')">
               <el-input v-model="assessmentBeforeDislysis.venous_catheterization_part_other"></el-input>
             </el-form-item>
           </el-col>
 
 
           <el-col :span="8">
-            <el-form-item label="内瘘: " v-if="isShow('内瘘')">
+            <el-form-item label="内瘘: " :prop="isName('内瘘')"
+              :rules="isCheckmust('内瘘')" v-if="isShow('内瘘')">
               <el-input v-model="assessmentBeforeDislysis.internal_fistula" readonly
                         @focus="showInnerDialog('7')"></el-input>
             </el-form-item>
@@ -178,20 +199,23 @@
 
 
           <el-col :span="8" v-if="assessmentBeforeDislysis.is_hemorrhage == 1&&isShow('其他出血情况')">
-            <el-form-item label="其他出血情况： ">
+            <el-form-item label="其他出血情况： " :prop="isName('其他出血情况')"
+              :rules="isCheckmust('其他出血情况')">
               <el-input v-model="assessmentBeforeDislysis.hemorrhage_other"></el-input>
             </el-form-item>
           </el-col>
 
 
           <el-col :span="8">
-            <el-form-item label="血管通路(内瘘)其他:" v-if="isShow('血管通路(内瘘)其他')">
+            <el-form-item label="血管通路(内瘘)其他:" :prop="isName('血管通路(内瘘)其他')"
+              :rules="isCheckmust('血管通路(内瘘)其他')" v-if="isShow('血管通路(内瘘)其他')">
               <el-input v-model="assessmentBeforeDislysis.internal_fistula_other"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('血管杂音')">
-            <el-form-item label="血管杂音： ">
+            <el-form-item label="血管杂音： " :prop="isName('血管杂音')"
+              :rules="isCheckmust('血管杂音')">
               <el-select v-model="assessmentBeforeDislysis.blood_access_noise">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -207,7 +231,8 @@
 
 
           <el-col :span="8">
-            <el-form-item label="血管通路皮肤情况: " v-if="isShow('血管通路皮肤情况')">
+            <el-form-item label="血管通路皮肤情况: " :prop="isName('血管通路皮肤情况')"
+              :rules="isCheckmust('血管通路皮肤情况')" v-if="isShow('血管通路皮肤情况')">
               <el-input v-model="assessmentBeforeDislysis.internal_fistula_skin" readonly
                         @focus="showInnerDialog('8')"></el-input>
             </el-form-item>
@@ -216,7 +241,8 @@
 
           <el-col :span="8">
 
-            <el-form-item label="中心静脉置管： " v-if="isShow('中心静脉置管')">
+            <el-form-item label="中心静脉置管： " :prop="isName('中心静脉置管')"
+              :rules="isCheckmust('中心静脉置管')" v-if="isShow('中心静脉置管')">
               <el-select v-model="assessmentBeforeDislysis.venous_catheterization">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -229,14 +255,16 @@
 
 
           <el-col :span="8">
-            <el-form-item label="导管： " v-if="isShow('导管')">
+            <el-form-item label="导管： " :prop="isName('导管')"
+              :rules="isCheckmust('导管')" v-if="isShow('导管')">
               <el-input v-model="assessmentBeforeDislysis.catheter" @focus="showInnerDialog('4')"></el-input>
             </el-form-item>
           </el-col>
            
 
           <el-col :span="8">
-            <el-form-item label="导管维护： " v-if="isShow('导管维护')">
+            <el-form-item label="导管维护： " :prop="isName('导管维护')"
+              :rules="isCheckmust('导管维护')" v-if="isShow('导管维护')">
               <el-input v-model="assessmentBeforeDislysis.catheter_maintenance" @focus="showInnerDialog('18')"></el-input>
             </el-form-item>
           </el-col>
@@ -254,7 +282,8 @@
 
           <el-row :gutter="20"> -->
           <el-col :span="8">
-            <el-form-item label="导管打折： " v-if="isShow('导管打折')">
+            <el-form-item label="导管打折： " :prop="isName('导管打折')"
+              :rules="isCheckmust('导管打折')" v-if="isShow('导管打折')">
               <el-select v-model="assessmentBeforeDislysis.catheter_bend">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -281,21 +310,24 @@
           <el-row :gutter="20"> -->
 
           <el-col :span="8">
-            <el-form-item label="穿刺针： " v-if="isShow('穿刺针')">
+            <el-form-item label="穿刺针： " :prop="isName('穿刺针')"
+              :rules="isCheckmust('穿刺针')" 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-form-item label="针眼: " :prop="isName('针眼')"
+              :rules="isCheckmust('针眼')" v-if="isShow('针眼')">
               <el-input v-model="assessmentBeforeDislysis.pinholing" readonly
                         @focus="showInnerDialog('14')"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="穿刺方式： " v-if="isShow('穿刺方式')">
+            <el-form-item label="穿刺方式： " :prop="isName('穿刺方式')"
+              :rules="isCheckmust('穿刺方式')" v-if="isShow('穿刺方式')">
               <!-- <el-select v-model="assessmentBeforeDislysis.puncture_way">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -310,7 +342,8 @@
 
 
           <el-col :span="8">
-            <el-form-item label="出血： " v-if="isShow('出血')">
+            <el-form-item label="出血： " :prop="isName('出血')"
+              :rules="isCheckmust('出血')" v-if="isShow('出血')">
               <el-select v-model="assessmentBeforeDislysis.is_hemorrhage">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
                 <el-option label="是" value="1"></el-option>
@@ -321,7 +354,8 @@
 
 
           <el-col :span="8" v-if="assessmentBeforeDislysis.is_hemorrhage == 1&&isShow('出血选项')">
-            <el-form-item label="出血选项： ">
+            <el-form-item label="出血选项： " :prop="isName('出血选项')"
+              :rules="isCheckmust('出血选项')">
               <div>
                 <el-input v-model="assessmentBeforeDislysis.hemorrhage" @focus="showInnerDialog('6')"></el-input>
               </div>
@@ -331,7 +365,8 @@
 
 
            <el-col :span="8">
-            <el-form-item label="血栓：" v-if="isShow('血栓')">
+            <el-form-item label="血栓：" :prop="isName('血栓')"
+              :rules="isCheckmust('血栓')" v-if="isShow('血栓')">
               <el-select v-model="assessmentBeforeDislysis.thromubus_type" @change="changeThrombus">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
                 <el-option label="有" value="1"></el-option>
@@ -341,25 +376,29 @@
           </el-col>
           
           <el-col :span="8">
-            <el-form-item label="导管AV端约为(cm):" v-show="thrombuShow" label-width="200px">
+            <el-form-item label="导管AV端约为(cm):" :prop="isName('导管AV端各约')"
+              :rules="isCheckmust('导管AV端各约')" v-show="thrombuShow" label-width="200px">
               <el-input v-model="assessmentBeforeDislysis.thrombus_av" style="width:150px"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="导管A端约(cm):" v-show="thrombuShow">
+            <el-form-item label="导管A端约(cm):" :prop="isName('导管A端约')"
+              :rules="isCheckmust('导管A端约')" v-show="thrombuShow">
               <el-input v-model="assessmentBeforeDislysis.thromubus_a" style="width:150px"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="导管V端约(cm):" v-show="thrombuShow">
+            <el-form-item label="导管V端约(cm):" :prop="isName('导管V端约')"
+              :rules="isCheckmust('导管V端约')" v-show="thrombuShow">
               <el-input v-model="assessmentBeforeDislysis.thromubus_v" style="width:150px"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('皮肤')">
-            <el-form-item label="皮肤： ">
+            <el-form-item label="皮肤： " :prop="isName('皮肤')"
+              :rules="isCheckmust('皮肤')">
               <!-- <el-select v-model="assessmentBeforeDislysis.skin">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -375,14 +414,16 @@
 
 
           <el-col :span="8">
-            <el-form-item label="并发症： " v-if="isShow('并发症')">
+            <el-form-item label="并发症： " :prop="isName('并发症')"
+              :rules="isCheckmust('并发症')" v-if="isShow('并发症')">
 
               <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-form-item label="透析前症状： " :prop="isName('透析前症状')"
+              :rules="isCheckmust('透析前症状')" v-if="isShow('透析前症状')">
               <el-input v-model="assessmentBeforeDislysis.symptom_before_dialysis"
                         @focus="showInnerDialog('3')"></el-input>
             </el-form-item>
@@ -390,14 +431,16 @@
 
 
           <el-col :span="8">
-            <el-form-item label="前次透析后症状：" v-if="isShow('前次透析后症状')">
+            <el-form-item label="前次透析后症状：" :prop="isName('前次透析后症状')"
+              :rules="isCheckmust('前次透析后症状')" v-if="isShow('前次透析后症状')">
               <el-input v-model="assessmentBeforeDislysis.last_post_dialysis" @focus="showInnerDialog('1')"></el-input>
             </el-form-item>
           </el-col>
 
 
           <el-col :span="8" v-if="isShow('急诊')">
-            <el-form-item label="急诊： ">
+            <el-form-item label="急诊： " :prop="isName('急诊')"
+              :rules="isCheckmust('急诊')">
               <el-select v-model="assessmentBeforeDislysis.emergency_treatment">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -408,13 +451,15 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('其他急诊情况')">
-            <el-form-item label="其他急诊情况:">
+            <el-form-item label="其他急诊情况:" :prop="isName('其他急诊情况')"
+              :rules="isCheckmust('其他急诊情况')">
               <el-input v-model="assessmentBeforeDislysis.emergency_treatment_other"></el-input>
             </el-form-item>
           </el-col>
             
           <el-col :span="8" v-if="isShow('特殊处理情况')">
-            <el-form-item label="特殊处理情况:">
+            <el-form-item label="特殊处理情况:" :prop="isName('特殊处理情况')"
+              :rules="isCheckmust('特殊处理情况')">
               <el-input v-model="assessmentBeforeDislysis.special_treatment"></el-input>
             </el-form-item>
           </el-col>
@@ -423,7 +468,8 @@
           
 
           <el-col :span="8">
-            <el-form-item label="透析期间： " v-if="isShow('透析期间')">
+            <el-form-item label="透析期间： " :prop="isName('透析期间')"
+              :rules="isCheckmust('透析期间')" v-if="isShow('透析期间')">
               <el-input v-model="assessmentBeforeDislysis.dialysis_interphase" @focus="showInnerDialog('2')">>
               </el-input>
             </el-form-item>
@@ -431,7 +477,8 @@
 
           <el-col :span="8">
 
-            <el-form-item label="位置： " v-if="isShow('位置')">
+            <el-form-item label="位置： " :prop="isName('位置')"
+              :rules="isCheckmust('位置')" v-if="isShow('位置')">
               <el-select v-model="assessmentBeforeDislysis.venous_catheterization_part">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
 
@@ -443,7 +490,8 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('其他中心静脉导管')">
-            <el-form-item label="其他中心静脉导管:">
+            <el-form-item label="其他中心静脉导管:" :prop="isName('其他中心静脉导管')"
+              :rules="isCheckmust('其他中心静脉导管')">
               <div>
                 <el-input v-model="assessmentBeforeDislysis.ductus_arantii_other"></el-input>
               </div>
@@ -451,7 +499,8 @@
           </el-col>
          
           <el-col :span="8">
-            <el-form-item label="感染： " v-if="isShow('感染')">
+            <el-form-item label="感染： " :prop="isName('感染')"
+              :rules="isCheckmust('感染')" v-if="isShow('感染')">
               <el-select v-model="assessmentBeforeDislysis.is_infect">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
                 <el-option label="无" value="1"></el-option>
@@ -463,7 +512,8 @@
 
 
           <el-col :span="8" v-if="isShow('其他感染情况')">
-            <el-form-item label="其他感染情况:">
+            <el-form-item label="其他感染情况:" :prop="isName('其他感染情况')"
+              :rules="isCheckmust('其他感染情况')">
               <el-input v-model="assessmentBeforeDislysis.infect_other"></el-input>
             </el-form-item>
           </el-col>
@@ -472,7 +522,8 @@
 
 
           <el-col :span="8" v-if="isShow('外露')">
-            <el-form-item label="外露(cm):">
+            <el-form-item label="外露(cm):" :prop="isName('外露')"
+              :rules="isCheckmust('外露')">
               <el-input v-model="assessmentBeforeDislysis.exposed"></el-input>
             </el-form-item>
           </el-col>
@@ -482,7 +533,8 @@
 
 
           <el-col :span="8" v-if="isShow('其他皮肤情况')">
-            <el-form-item label="其他皮肤情况:">
+            <el-form-item label="其他皮肤情况:" :prop="isName('其他皮肤情况')"
+              :rules="isCheckmust('其他皮肤情况')">
               <el-input v-model="assessmentBeforeDislysis.skin_other"></el-input>
             </el-form-item>
           </el-col>
@@ -494,14 +546,16 @@
 
 
           <el-col :span="8">
-            <el-form-item label="导管缝线：" v-if="isShow('导管缝线')">
+            <el-form-item label="导管缝线：" :prop="isName('导管缝线')"
+              :rules="isCheckmust('导管缝线')" v-if="isShow('导管缝线')">
               <el-input v-model="assessmentBeforeDislysis.catheter_suture" @focus="showInnerDialog('15')"></el-input>
             </el-form-item>
           </el-col>
 
 
           <el-col :span="8" v-if="isShow('导管缝线(其他)')">
-            <el-form-item label="导管缝线(其他):">
+            <el-form-item label="导管缝线(其他):" :prop="isName('导管缝线(其他)')"
+              :rules="isCheckmust('导管缝线(其他)')">
               <el-input v-model="assessmentBeforeDislysis.catheter_suture_other"></el-input>
             </el-form-item>
           </el-col>
@@ -509,7 +563,8 @@
 
 
           <el-col :span="8" v-if="isShow('尿量')">
-            <el-form-item label="尿量(ml):">
+            <el-form-item label="尿量(ml):" :prop="isName('尿量')"
+              :rules="isCheckmust('尿量')">
               <el-input v-model="assessmentBeforeDislysis.urine_volume"></el-input>
             </el-form-item>
           </el-col>
@@ -518,26 +573,30 @@
 
 
           <el-col :span="8">
-            <el-form-item label="水肿：" v-if="isShow('水肿')">
+            <el-form-item label="水肿：" :prop="isName('水肿')"
+              :rules="isCheckmust('水肿')" v-if="isShow('水肿')">
               <el-input v-model="assessmentBeforeDislysis.edema" @focus="showInnerDialog('16')"></el-input>
             </el-form-item>
           </el-col>
 
          <el-col :span="8">
-            <el-form-item label="预增脱水量(L):" v-if="isShow('预增脱水量')">
+            <el-form-item label="预增脱水量(L):" :prop="isName('预增脱水量')"
+              :rules="isCheckmust('预增脱水量')" v-if="isShow('预增脱水量')">
              <el-input v-model="assessmentBeforeDislysis.dehydration"></el-input>
             </el-form-item>
           </el-col>
 
 
           <el-col :span="8">
-            <el-form-item label="透析前药物:" v-if="isShow('透析前药物')">
+            <el-form-item label="透析前药物:" :prop="isName('透析前药物')"
+              :rules="isCheckmust('透析前药物')" v-if="isShow('透析前药物')">
              <el-input v-model="assessmentBeforeDislysis.pre_dialysis_drugs"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="围手术期:" v-if="isShow('围手术期')">
+            <el-form-item label="围手术期:" :prop="isName('围手术期')"
+              :rules="isCheckmust('围手术期')" v-if="isShow('围手术期')">
               <el-select v-model="assessmentBeforeDislysis.period">
                 <el-option :key="0" label="请选择" :value="0"></el-option>
                 <el-option label="无" value="1"></el-option>
@@ -547,13 +606,15 @@
           </el-col>
           
           <el-col :span="8">
-            <el-form-item label="预计进食量(g):" v-if="isShow('预计进食量')">
+            <el-form-item label="预计进食量(g):" :prop="isName('预计进食量')"
+              :rules="isCheckmust('预计进食量')" v-if="isShow('预计进食量')">
              <el-input v-model="assessmentBeforeDislysis.estimated_food_intake"></el-input>
             </el-form-item>
           </el-col>
 
          <el-col :span="8">
-            <el-form-item label="透析期间血压:" v-if="isShow('透析期间血压')">
+            <el-form-item label="透析期间血压:" :prop="isName('透析期间血压')"
+              :rules="isCheckmust('透析期间血压')" v-if="isShow('透析期间血压')">
              <el-input v-model="assessmentBeforeDislysis.blood_pressure_during_dialysis"></el-input>
             </el-form-item>
           </el-col>
@@ -561,26 +622,30 @@
      
 
            <el-col :span="8" v-if="isShow('透前尿素')">
-            <el-form-item label="透前尿素(mmol/L):" label-width="150px">
+            <el-form-item label="透前尿素(mmol/L):" :prop="isName('透前尿素')"
+              :rules="isCheckmust('透前尿素')" label-width="150px">
               <el-input v-model="assessmentBeforeDislysis.urea_befor"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('住院科室')">
-            <el-form-item label="住院科室:" label-width="150px">
+            <el-form-item label="住院科室:" :prop="isName('住院科室')"
+              :rules="isCheckmust('住院科室')" label-width="150px">
               <el-input v-model="assessmentBeforeDislysis.his_department"></el-input>
             </el-form-item>
           </el-col>
 
          <el-col :span="8" v-if="isShow('住院床位')">
-            <el-form-item label="住院床位:" label-width="150px">
+            <el-form-item label="住院床位:" :prop="isName('住院床位')"
+              :rules="isCheckmust('住院床位')" label-width="150px">
               <el-input v-model="assessmentBeforeDislysis.his_bed"></el-input>
             </el-form-item>
           </el-col>
           
         
           <el-col :span="8">
-            <el-form-item label="抽吸:" v-if="isShow('抽吸')">
+            <el-form-item label="抽吸:" :prop="isName('抽吸')"
+              :rules="isCheckmust('抽吸')" v-if="isShow('抽吸')">
               <el-input v-model="assessmentBeforeDislysis.suction" @focus="showInnerDialog('20')"></el-input>
             </el-form-item>
           </el-col>
@@ -589,7 +654,8 @@
  
          
           <el-col :span="24">
-            <el-form-item label="备注： ">
+            <el-form-item label="备注： " :prop="isName('备注')"
+              :rules="isCheckmust('备注')">
               <el-input type="textarea" v-model="assessmentBeforeDislysis.remark" :rows="5"></el-input>
             </el-form-item>
           </el-col>
@@ -601,7 +667,8 @@
       </el-form>
       <span slot="footer" class="dialog-footer">
                 <el-button @click="handleCancle">取 消</el-button>
-                <el-button type="primary" v-if="hasPermission" @click="handleComfirm">保 存</el-button>
+                 <!-- v-if="hasPermission" -->
+                <el-button type="primary" @click="handleComfirm('assessmentBeforeDislysis')">保 存</el-button>
             </span>
     </el-dialog>
 
@@ -811,6 +878,42 @@
 
     },
     methods: {
+    isName(name) {
+      let filedList = store.getters.xt_user.fileds;
+      for (let i = 0; i < filedList.length; i++) {
+        if (filedList[i].module == 3 && filedList[i].filed_name_cn == name) {
+          return filedList[i].filed_name;
+        }
+      }
+    },
+
+    isCheckmust(name) {
+      let filedList = store.getters.xt_user.fileds;
+
+      for (let i = 0; i < filedList.length; i++) {
+        if (
+          filedList[i].module == 3 &&
+          filedList[i].filed_name_cn == name &&
+          filedList[i].is_write == 1&&
+          filedList[i].is_show == 1
+        ) {
+          console.log(filedList[i],'false')
+          if (name == "血管通路"||name == "导管打折"||name == '出血'||name == '血栓'||name == '围手术期'||name=='血管杂音'||name=='急诊'||name=='中心静脉导置管') {
+          return [
+            { required: true, message: `请输入${name}` },
+            {
+              required: true,
+              pattern: /^[1-9]\d*$/,
+              message: `请输入${name}`,
+            },
+          ];
+        }
+          return [{ required: true ,message:`请输入${name}`, trigger: ['blur','change'] }];
+          
+        }
+      }
+    },
+      
       setLastRecord(lastPredialysisEvaluation, lastDryWeightDislysis) {
         this.lastPredialysisEvaluation = lastPredialysisEvaluation
         this.lastDryWeightDislysis = lastDryWeightDislysis
@@ -827,9 +930,9 @@
       },
 
       show(assessment, lastDryWeightDislysis,last_predialysis_evaluation) {
+        let filedList = store.getters.xt_user.fileds;
+        console.log(filedList,'filedList')
         this.lastPredialysisEvaluation = last_predialysis_evaluation
-       
-       
         console.log("获取上次数据",this.lastPredialysisEvaluation, this.$store.getters.xt_user.org.id )
         if(this.lastPredialysisEvaluation != null) {
         // if(this.lastPredialysisEvaluation.remark == "" && this.$store.getters.xt_user.org.id == 10307){
@@ -1205,8 +1308,7 @@
       innerDialogCancle: function() {
         this.InnerDialogProps.visibility = false
       }, 
-      handleComfirm: function() {
-
+      handleComfirm(formName) {
         var arr = this.assessmentBeforeDislysis
         for (let i = 0; i < this.machineType.length; i++) {
           if (arr.machine_type == this.machineType[i].id) {
@@ -1214,10 +1316,14 @@
           }
         }
         const ParamsQuery = arr
-        ParamsQuery['patient'] = this.patient.id
+         console.log("params",ParamsQuery)
+         this.$refs.assessmentBeforeDislysis.validate((valid) => {
+          if (valid) {
+            ParamsQuery['patient'] = this.patient.id
         ParamsQuery['record_date'] = this.record_date
         ParamsQuery['mode'] = '1'
 
+
         if (this.predialysis_evaluation.id == 0) {
           ParamsQuery['mode'] = '1'
         } else {
@@ -1261,6 +1367,13 @@
             this.hide()
           }
         })
+          } else {
+            return false;
+          }
+        });
+        
+        
+        
       }, handleCancle: function() {
         this.isVisibility = false
       }, showDryWeightDialog: function() {
@@ -1340,6 +1453,8 @@
          this.thrombuShow = false
         }
       }
+
+      
     },
     created() {
   

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

@@ -490,6 +490,13 @@
 
                     </el-col>
 
+                    <el-col :span="8"
+                            v-if="isShows('开药数量')">
+                        <el-form-item label="开药数量(支)：">
+                            <el-input type="number" v-model="dialysisPrescription.prescribing_number"></el-input>
+                        </el-form-item>
+                    </el-col>
+
 
                     <el-col :span="8"
                             v-if="isShows('置换量') && ((this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 46 || this.$store.getters.xt_user.template_info.template_id == 53)&& this.$store.getters.xt_user.template_info.org_id!=10441)"
@@ -974,6 +981,52 @@
                   </el-col>
               </el-row>
 
+              <el-row :gutter="20">
+                    <el-col :span="8" v-if="isShows('处方钠')">
+                        <el-form-item label="处方钠： ">
+                            <el-input
+                                  
+                                    v-model="dialysisPrescription.prescription_sodium"
+                                    :rows="5"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8"  v-if="isShows('开始钠')">
+                        <el-form-item label="开始钠： ">
+                            <el-input
+                                 
+                                    v-model="dialysisPrescription.start_sodium"
+                                    :rows="5"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="8" v-if="isShows('钠曲线')">
+                        <el-form-item label="钠曲线： ">
+                            <el-input
+                                  
+                                    v-model="dialysisPrescription.sodium_curve"
+                                    :rows="5"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+              <el-row :gutter="20">
+                    <el-col :span="24"  v-if="isShows('病情处理')">
+                        <el-form-item  label="病情处理： ">
+                            <el-input
+                                    type="textarea"
+                                    v-model="dialysisPrescription.treatment_remark"
+                                    :rows="5"
+                            ></el-input>
+                        </el-form-item>
+                    </el-col>
+                </el-row>
+
+               
+
+
+
                 <el-row :gutter="20">
                     <el-col :span="24">
                         <el-form-item label="备注： ">
@@ -1501,6 +1554,11 @@
           add_amount:"",
           reduce_amount:"",
           dialysis_remark:"",
+          prescribing_number:"",
+          treatment_remark:"",
+          prescription_sodium:"",
+          start_sodium:"",
+          sodium_curve:"",
         },
 
         anticoagulant: {
@@ -2334,6 +2392,8 @@ mu
               this.dialysisPrescription.sodium = 138
               this.dialysisPrescription.bicarbonate = 31.1
               this.dialysisPrescription.dialysate_flow = 500
+              this.dialysisPrescription.dialysate_temperature = 36.5
+              this.dialysisPrescription.prescribing_number = 1
             }
             if(this.$store.getters.xt_user.org.id == 10447){
               this.dialysisPrescription.dialysate_flow = 500
@@ -2358,7 +2418,10 @@ mu
             this.dialysisPrescription.package = last.package
             this.dialysisPrescription.a_liquid = last.a_liquid
             this.zongliang = last.anticoagulant_zongliang
-            this.remark = last.remark
+            if(this.$store.getters.xt_user.template_info.org_id!=10013  && this.$store.getters.xt_user.template_info.org_id!=10014){
+              this.remark = last.remark
+            }
+           
             weight_before = 0
 
           }

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

@@ -5,13 +5,14 @@
       </div> -->
       <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
       <el-form :model="form" label-width="100px"  :rules="drugdicRules"  ref="form">
-        <el-form-item label="下机护士">
+        <el-form-item label="下机护士" >
           <el-select v-model="form.nurse_id" :disabled="!(dialysis_order.id != 0)">
             <el-option v-for="(admin, index) in admins" :key="index" :value="admin.id" :label="admin.name"></el-option>
           </el-select>
         </el-form-item>
 
-        <el-form-item label="下机时间 :" style="width:275px">
+        <el-form-item label="下机时间 :" :prop="isName('下机时间')"
+              :rules="isCheckmust('下机时间')" style="width:275px">
           <el-date-picker
             type="datetime"
             format="yyyy-MM-dd HH:mm"
@@ -22,23 +23,27 @@
           ></el-date-picker>
         </el-form-item>
 
-        <el-form-item label="穿刺处血肿:" v-if="isShowFiled('穿刺处血肿')" :label-width="150">
+        <el-form-item label="穿刺处血肿:" :prop="isName('穿刺处血肿')"
+              :rules="isCheckmust('穿刺处血肿')" v-if="isShowFiled('穿刺处血肿')" :label-width="150">
            <el-radio-group v-model="form.puncture_point_haematoma">
               <el-radio :label="1">有</el-radio>
               <el-radio :label="2">无</el-radio>
            </el-radio-group>
         </el-form-item>
 
-        <el-form-item label="内瘘: " v-if="isShowFiled('内瘘')">
+        <el-form-item label="内瘘: " :prop="isName('内瘘')"
+              :rules="isCheckmust('内瘘')" v-if="isShowFiled('内瘘')">
             <el-input v-model="form.internal_fistula" readonly  @focus="showInnerDialog('7')" style="width:200px"></el-input>
         </el-form-item>
 
 
-        <el-form-item label="导管: " v-if="isShowFiled('导管')">
+        <el-form-item label="导管: " :prop="isName('导管')"
+              :rules="isCheckmust('导管')" v-if="isShowFiled('导管')">
           <el-input v-model="form.catheter" @focus="showInnerDialog('4')" style="width:200px"></el-input>
         </el-form-item>
 
-        <el-form-item label="透析器凝血: " v-if="isShowFiled('透析器凝血')">
+        <el-form-item label="透析器凝血: " :prop="isName('透析器凝血')"
+              :rules="isCheckmust('透析器凝血')" v-if="isShowFiled('透析器凝血')">
           <el-input
             style="width:200px"
             v-model="form.cruor"
@@ -47,7 +52,8 @@
           ></el-input>
        </el-form-item>
 
-        <el-form-item label="宣教知识：" v-if="isShowFiled('宣教知识')">
+        <el-form-item label="宣教知识：" :prop="isName('宣教知识')"
+              :rules="isCheckmust('宣教知识')" v-if="isShowFiled('宣教知识')">
           <el-select @change="dialysisAfterTeachSelectChange" v-model="form.mission_id">
             <el-option
               v-for="(item, index) in education"
@@ -60,7 +66,8 @@
      
       <el-row :gutter="20">
         <el-col v-if="isShowFiled('宣教知识')">
-          <el-form-item>
+          <el-form-item :prop="isName('宣教知识')"
+              :rules="isCheckmust('宣教知识')">
             <el-input
               type="textarea"
               v-model="form.mission"
@@ -168,13 +175,13 @@
         type: Object
       }
     },
-    created() {
+      created() {
       this.education = getDataConfig('education', 'education')
       this.internal_fistula = getDataConfig('hemodialysis', 'internal_fistula')
       this.catheter = getDataConfig('hemodialysis', 'catheter')
       this.cruorOptions = getDataConfig('hemodialysis', 'cruor')
-    },
-    watch: {
+      },
+      watch: {
       'dialysis_order.id': function() {
         if (this.dialysis_order.id == 0) {
           this.form.nurse_id = 0
@@ -196,8 +203,29 @@
         },
         deep:true
       }
+      },
+      methods: {
+      isName(name) {
+      let filedList = store.getters.xt_user.fileds;
+      for (let i = 0; i < filedList.length; i++) {
+        if (filedList[i].module == 9 && filedList[i].filed_name_cn == name) {
+          return filedList[i].filed_name;
+        }
+      }
     },
-    methods: {
+
+    isCheckmust(name) {
+      let filedList = store.getters.xt_user.fileds;
+      for (let i = 0; i < filedList.length; i++) {
+        if (
+          filedList[i].module == 9 &&
+          filedList[i].filed_name_cn == name &&
+          filedList[i].is_write == 1
+            ) {
+          return [{ required: true ,message:`请输入${name}` }];
+            }
+          }
+        },
          dialysisAfterTeachSelectChange: function(values) {
           if (this.form.mission == '') {
             this.form.mission = values
@@ -409,6 +437,8 @@
                 this.$message.error(resp.msg)
               }
             })
+          }else{
+            return false
           }
         })
     

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

@@ -879,7 +879,8 @@
       <el-form v-show="edit" ref="form" :model="form" label-width="130px">
         <el-row :gutter="20">
           <el-col :span="8" v-if="isShow('监测时间')">
-            <el-form-item label="监测时间：">
+            <el-form-item label="监测时间：" :prop="isName('监测时间')"
+              :rules="isCheckmust('监测时间')">
               <!-- {{ monitor_date_str }}
                 <el-time-picker v-model="form.monitoring_time" :clearable="false" arrow-control :picker-options="{format: 'HH:mm'}" prefix-icon="" value-format="HH:mm" style="width: 60%;">
                 </el-time-picker> -->
@@ -894,29 +895,34 @@
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="isShow('体温')">
-            <el-form-item label="体温(℃)：">
+            <el-form-item label="体温(℃)：" :prop="isName('体温')"
+              :rules="isCheckmust('体温')">
               <el-input v-model="form.temperature"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('收缩压')">
-            <el-form-item label="收缩压(mmHg)：">
+            <el-form-item label="收缩压(mmHg)：" :prop="isName('收缩压')"
+              :rules="isCheckmust('收缩压')">
               <el-input v-model="form.systolic_bp"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="isShow('舒张压')">
-            <el-form-item label="舒张压(mmHg)：">
+            <el-form-item label="舒张压(mmHg)：" :prop="isName('舒张压')"
+              :rules="isCheckmust('舒张压')">
               <el-input v-model="form.diastolic_bp"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('脉搏')">
-            <el-form-item label="脉搏(次/分)：">
+            <el-form-item label="脉搏(次/分)：" :prop="isName('脉搏')"
+              :rules="isCheckmust('脉搏')">
               <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="呼吸频率(次/分)：">
+            <el-form-item label="呼吸频率(次/分)：" :prop="isName('呼吸频率')"
+              :rules="isCheckmust('呼吸频率')">
               <el-input v-model="form.breathing_rated"></el-input>
             </el-form-item>
           </el-col>
@@ -924,6 +930,8 @@
             <el-form-item
               v-if="form.venous_pressure_type == 2"
               label="静脉压(kpa)："
+               :prop="isName('静脉压')"
+              :rules="isCheckmust('静脉压')"
             >
               <el-input
                 style="width: 140px"
@@ -936,7 +944,8 @@
                 >切换</el-button
               >
             </el-form-item>
-            <el-form-item v-else label="静脉压(mmHg)：">
+            <el-form-item v-else label="静脉压(mmHg)：" :prop="isName('静脉压')"
+              :rules="isCheckmust('静脉压')">
               <el-input
                 style="width: 140px"
                 v-model="form.venous_pressure"
@@ -953,6 +962,8 @@
             <el-form-item
               v-if="form.arterial_pressure_type == 2"
               label="动脉压(kpa)："
+               :prop="isName('动脉压')"
+              :rules="isCheckmust('动脉压')"
             >
               <el-input
                 style="width: 140px"
@@ -965,7 +976,8 @@
                 >切换</el-button
               >
             </el-form-item>
-            <el-form-item v-else label="动脉压(mmHg)：">
+            <el-form-item v-else label="动脉压(mmHg)：" :prop="isName('动脉压')"
+              :rules="isCheckmust('动脉压')">
               <el-input
                 style="width: 140px"
                 v-model="form.arterial_pressure"
@@ -980,7 +992,8 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('血流量')">
-            <el-form-item label="血流量(ml/min)：">
+            <el-form-item label="血流量(ml/min)：" :prop="isName('血流量')"
+              :rules="isCheckmust('血流量')">
               <el-input v-model="form.blood_flow_volume"></el-input>
             </el-form-item>
           </el-col>
@@ -989,6 +1002,8 @@
             <el-form-item
               v-if="form.transmembrane_pressure_type == 2"
               label="跨膜压(kpa)："
+               :prop="isName('跨膜压')"
+              :rules="isCheckmust('跨膜压')"
             >
               <el-input
                 style="width: 140px"
@@ -1001,7 +1016,8 @@
                 >切换</el-button
               >
             </el-form-item>
-            <el-form-item v-else label="跨膜压(mmHg)：">
+            <el-form-item v-else label="跨膜压(mmHg)：" :prop="isName('跨膜压')"
+              :rules="isCheckmust('跨膜压')">
               <el-input
                 style="width: 140px"
                 v-model="form.transmembrane_pressure"
@@ -1053,7 +1069,8 @@
                 org_id== 10445)
             "
           >
-            <el-form-item label="超滤率(ml/h)">
+            <el-form-item label="超滤率(ml/h)" :prop="isName('超滤率')"
+              :rules="isCheckmust('超滤率')">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
@@ -1095,7 +1112,8 @@
               org_id!=10445
             "
           >
-            <el-form-item label="超滤率(L/h)">
+            <el-form-item label="超滤率(L/h)" :prop="isName('超滤率')"
+              :rules="isCheckmust('超滤率')">
               <el-input v-model="form.ultrafiltration_rate"></el-input>
             </el-form-item>
           </el-col>
@@ -1147,7 +1165,8 @@
                 org_id == 10445)
             "
           >
-            <el-form-item label="超滤量(ml)：">
+            <el-form-item label="超滤量(ml)：" :prop="isName('超滤量')"
+              :rules="isCheckmust('超滤量')">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
           </el-col>
@@ -1199,13 +1218,15 @@
               org_id!=10445
             "
           >
-            <el-form-item label="超滤量(L)：">
+            <el-form-item label="超滤量(L)：" :prop="isName('超滤量')"
+              :rules="isCheckmust('超滤量')">
               <el-input v-model="form.ultrafiltration_volume"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('钠浓度')">
-            <el-form-item label="钠浓度(mmol/L)：">
+            <el-form-item label="钠浓度(mmol/L)：" :prop="isName('钠浓度')"
+              :rules="isCheckmust('钠浓度')">
               <el-input v-model="form.sodium_concentration"></el-input>
             </el-form-item>
           </el-col>
@@ -1213,7 +1234,8 @@
 
           <el-row :gutter="20"> -->
           <el-col :span="8" v-if="isShow('透析液温度')">
-            <el-form-item label="透析液温度(℃)：">
+            <el-form-item label="透析液温度(℃)：" :prop="isName('透析液温度')"
+              :rules="isCheckmust('透析液温度')">
               <el-input v-model="form.dialysate_temperature"></el-input>
             </el-form-item>
           </el-col>
@@ -1236,7 +1258,8 @@
               org_id!=10445
             "
           >
-            <el-form-item label="置换率(L/h)：">
+            <el-form-item label="置换率(L/h)：" :prop="isName('置换率')"
+              :rules="isCheckmust('置换率')">
               <el-input v-model="form.replacement_rate"></el-input>
             </el-form-item>
           </el-col>
@@ -1259,12 +1282,14 @@
                 org_id!=10445)
             "
           >
-            <el-form-item label="置换率(ml/min)：">
+            <el-form-item label="置换率(ml/min)：" :prop="isName('置换率')"
+              :rules="isCheckmust('置换率')">
               <el-input v-model="form.replacement_rate"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="isShow('置换量') && template_id == 43">
-            <el-form-item label="置换量(ml/h)：">
+            <el-form-item label="置换量(ml/h)：" :prop="isName('置换量')"
+              :rules="isCheckmust('置换量')">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>
           </el-col>
@@ -1289,7 +1314,8 @@
               org_id!=10445
             "
           >
-            <el-form-item label="置换量(L)：">
+            <el-form-item label="置换量(L)：" :prop="isName('置换量')"
+              :rules="isCheckmust('置换量')">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>
           </el-col>
@@ -1316,60 +1342,70 @@
                 org_id ==10445)
             "
           >
-            <el-form-item label="置换量(ml)：">
+            <el-form-item label="置换量(ml)：" :prop="isName('置换量')"
+              :rules="isCheckmust('置换量')">
               <el-input v-model="form.displacement_quantity"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('电导度')">
-            <el-form-item label="电导度(mS/m)：">
+            <el-form-item label="电导度(mS/m)：" :prop="isName('电导度')"
+              :rules="isCheckmust('电导度')">
               <el-input v-model="form.conductivity"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('置换液流量') && template_id != 27">
-            <el-form-item label="置换液流量(ml/h)：">
+            <el-form-item label="置换液流量(ml/h)：" :prop="isName('置换液流量')"
+              :rules="isCheckmust('置换液流量')">
               <el-input v-model="form.displacement_flow_quantity"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="8" v-if="isShow('置换液流量') && template_id == 27">
-            <el-form-item label="置换液流量(ml/min)：">
+            <el-form-item label="置换液流量(ml/min)：" :prop="isName('置换液流量')"
+              :rules="isCheckmust('置换液流量')">
               <el-input v-model="form.displacement_flow_quantity"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('透析液流量')">
-            <el-form-item label="透析液流量(ml/h)：">
+            <el-form-item label="透析液流量(ml/h)：" :prop="isName('透析液流量')"
+              :rules="isCheckmust('透析液流量')">
               <el-input v-model="form.dialysate_flow"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('SpO₂')">
-            <el-form-item label="SpO₂(%)：">
+            <el-form-item label="SpO₂(%)：" :prop="isName('SpO₂')"
+              :rules="isCheckmust('SpO₂')">
               <el-input v-model="form.blood_oxygen_saturation"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('血糖')">
-            <el-form-item label="血糖(mmol/L)：">
+            <el-form-item label="血糖(mmol/L)：" :prop="isName('血糖')"
+              :rules="isCheckmust('血糖')">
               <el-input v-model="form.blood_sugar"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('肝素用量余量')">
-            <el-form-item label="肝素用量余量(ml):">
+            <el-form-item label="肝素用量余量(ml):" :prop="isName('肝素用量余量')"
+              :rules="isCheckmust('肝素用量余量')">
               <el-input v-model="form.heparin"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('肝素量')">
-            <el-form-item label="肝素量(mg):">
+            <el-form-item label="肝素量(mg):" :prop="isName('肝素量')"
+              :rules="isCheckmust('肝素量')">
               <el-input v-model="form.heparin_amount"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('抗凝剂')">
-            <el-form-item label="抗凝剂：">
+            <el-form-item label="抗凝剂：" :prop="isName('抗凝剂')"
+              :rules="isCheckmust('抗凝剂')">
               <div style="display: flex">
                 <el-select
                   v-model="form.monitor_anticoagulant"
@@ -1392,7 +1428,8 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('血压监测部位')">
-            <el-form-item label="血压监测部位：">
+            <el-form-item label="血压监测部位：" :prop="isName('血压监测部位')"
+              :rules="isCheckmust('血压监测部位')">
               <div style="display: flex">
                 <el-select
                   v-model="form.blood_pressure_monitoring_site"
@@ -1411,7 +1448,8 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('并发症')">
-            <el-form-item label="并发症">
+            <el-form-item label="并发症" :prop="isName('并发症')"
+              :rules="isCheckmust('并发症')">
               <div style="display: flex">
                 <el-select
                   v-model="form.complication"
@@ -1430,49 +1468,57 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('累计血容量') && (template_id == 41 || org_id == 9671 || org_id == 9538 || org_id == 10340)">
-            <el-form-item label="累计血容量(L)：">
+            <el-form-item label="累计血容量(L)：" :prop="isName('累计血容量')"
+              :rules="isCheckmust('累计血容量')">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('累计血容量') && (template_id  != 41 && template_id !=9671 && org_id!=9538 && org_id!=10340)">
-            <el-form-item label="累计血容量(ml)：">
+            <el-form-item label="累计血容量(ml)：" :prop="isName('累计血容量')"
+              :rules="isCheckmust('累计血容量')">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('血容量')">
-            <el-form-item label="血容量(L)：">
+            <el-form-item label="血容量(L)：" :prop="isName('血容量')"
+              :rules="isCheckmust('血容量')">
               <el-input v-model="form.accumulated_blood_volume"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('血温监测')">
-            <el-form-item label="血温监测">
+            <el-form-item label="血温监测" :prop="isName('血温监测')"
+              :rules="isCheckmust('血温监测')">
               <el-input v-model="form.blood_temperature"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('尿素监测')">
-            <el-form-item label="尿素监测">
+            <el-form-item label="尿素监测" :prop="isName('尿素监测')"
+              :rules="isCheckmust('尿素监测')">
               <el-input v-model="form.urea_monitoring"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('血浓量')">
-            <el-form-item label="血浓量">
+            <el-form-item label="血浓量" :prop="isName('血浓量')"
+              :rules="isCheckmust('血浓量')">
               <el-input v-model="form.blood_thickness"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('血压监测')">
-            <el-form-item label="血压监测">
+            <el-form-item label="血压监测" :prop="isName('血压监测')"
+              :rules="isCheckmust('血压监测')">
               <el-input v-model="form.blood_monitor"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="8" v-if="isShow('脱水')">
-            <el-form-item label="脱水(L):">
+            <el-form-item label="脱水(L):" :prop="isName('脱水')"
+              :rules="isCheckmust('脱水')">
               <el-input v-model="form.dehydration"></el-input>
             </el-form-item>
           </el-col>
@@ -1481,13 +1527,15 @@
 
           <el-row :gutter="20"> -->
           <el-col :span="24" v-if="isShow('KT/V')">
-            <el-form-item label="KT/V(在线)：">
+            <el-form-item label="KT/V(在线)：" :prop="isName('KT/V')"
+              :rules="isCheckmust('KT/V')">
               <el-input type="textarea" :rows="4" v-model="form.ktv"></el-input>
             </el-form-item>
           </el-col>
 
           <el-col :span="24" v-if="isShow('URR')">
-            <el-form-item label="URR：">
+            <el-form-item label="URR：" :prop="isName('URR')"
+              :rules="isCheckmust('URR')">
               <el-input type="textarea" :rows="4" v-model="form.urr"></el-input>
             </el-form-item>
           </el-col>
@@ -1495,7 +1543,8 @@
 
           <el-row :gutter="20"> -->
           <el-col :span="24" v-if="isShow('病情变化')">
-            <el-form-item label="病情变化：">
+            <el-form-item label="病情变化：" :prop="isName('病情变化')"
+              :rules="isCheckmust('病情变化')">
               <el-select
                 v-model="symptom_selecteds"
                 style="width: 100%"
@@ -1515,7 +1564,8 @@
           <!-- </el-row>
           <el-row :gutter="20"> -->
           <el-col :span="24" v-if="isShow('病情变化')">
-            <el-form-item>
+            <el-form-item :prop="isName('病情变化')"
+              :rules="isCheckmust('病情变化')">
               <el-input
                 type="textarea"
                 :rows="4"
@@ -1529,7 +1579,8 @@
           <el-row :gutter="20"> -->
 
           <el-col :span="24" v-if="isShow('处理')">
-            <el-form-item label="处理：">
+            <el-form-item label="处理：" :prop="isName('处理')"
+              :rules="isCheckmust('处理')">
               <el-select
                 v-model="dispose_selecteds"
                 style="width: 100%"
@@ -1550,7 +1601,8 @@
           <!-- </el-row>
           <el-row :gutter="20"> -->
           <el-col :span="24" v-if="isShow('处理')">
-            <el-form-item>
+            <el-form-item :prop="isName('处理')"
+              :rules="isCheckmust('处理')">
               <el-input
                 type="textarea"
                 :rows="4"
@@ -1564,7 +1616,8 @@
 
           <el-row :gutter="20"> -->
           <el-col :span="24" v-if="isShow('结果')">
-            <el-form-item label="结果：">
+            <el-form-item label="结果：" :prop="isName('结果')"
+              :rules="isCheckmust('结果')">
               <el-select
                 v-model="result_selecteds"
                 style="width: 100%"
@@ -1584,7 +1637,8 @@
           <!-- </el-row>
           <el-row :gutter="20"> -->
           <el-col :span="24" v-if="isShow('结果')">
-            <el-form-item>
+            <el-form-item :prop="isName('结果')"
+              :rules="isCheckmust('结果')">
               <el-input
                 type="textarea"
                 :rows="4"
@@ -1598,7 +1652,7 @@
 
       <div slot="footer" class="dialog-footer" v-show="edit">
         <el-button @click="cancelEditAction">取 消</el-button>
-        <el-button :loading="loading" type="primary"  @click="submitAction">保 存</el-button>
+        <el-button :loading="loading" type="primary"  @click="submitAction('form')">保 存</el-button>
       </div>
       <!--</div>-->
     </el-dialog>
@@ -1743,6 +1797,34 @@ export default {
    
   },
   methods: {
+      isName(name) {
+      let filedList = store.getters.xt_user.fileds;
+      for (let i = 0; i < filedList.length; i++) {
+        if (filedList[i].module == 4 && filedList[i].filed_name_cn == name) {
+          return filedList[i].filed_name;
+        }
+      }
+    },
+
+    isCheckmust(name) {
+      let filedList = store.getters.xt_user.fileds;
+      for (let i = 0; i < filedList.length; i++) {
+        if (
+          filedList[i].module == 4
+          &&filedList[i].filed_name_cn == name 
+          &&filedList[i].is_write == 1
+        ) {
+          // console.log(filedList[i].is_write,'false')
+          // console.log(name,filedList[i].filed_name_cn,'难道不一样吗')
+          return [{ required: true ,message:`请输入${name}` }];
+        } 
+        // else {
+        //   console.log(name,filedList[i].filed_name_cn,'难道不一样吗')
+        //   // console.log(filedList[i].is_write,'true')
+        //   return [{ required:false}];
+        // }
+      }
+    },
     venousPressureChange(type) {
       if (type == 1) {
         this.form.venous_pressure = Math.ceil(
@@ -2203,9 +2285,11 @@ export default {
       }
     },
 
-    submitAction: function () {
+    submitAction: function (form) {
       // TODO loading
-      this.loading = true
+        this.$refs[form].validate((valid) => {
+          if (valid) {
+            this.loading = true
       console.log("aaaa")
       var is_new = this.form.id;
       this.form.operate_time = parseInt(this.form.operate_time / 1000);
@@ -2500,6 +2584,13 @@ export default {
         }
       );
       this.loading = false
+          } else {
+            console.log('error submit!!');
+            return false;
+          }
+        });
+
+      
     },
 
     symptomTextareaBlur: function () {

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

@@ -7,10 +7,14 @@
     :modal-append-to-body="false"
   >
     <div class="warnTxt" v-if="showTxt != ''">{{ showTxt }}</div>
-    <el-form :model="treatmentSummary">
+    <el-form :model="treatmentSummary" ref="treatmentSummary">
       <el-row :gutter="20">
         <el-col :span="24" v-if="isShow('宣教知识')">
-          <el-form-item label="宣教知识：">
+          <el-form-item
+            label="宣教知识："
+            :prop="isName('宣教知识')"
+            :rules="isCheckmust('宣教知识')"
+          >
             <el-select @change="dialysisAfterTeachSelectChange" v-model="value">
               <el-option
                 v-for="(item, index) in education"
@@ -24,7 +28,10 @@
       </el-row>
       <el-row :gutter="20">
         <el-col v-if="isShow('宣教知识')">
-          <el-form-item>
+          <el-form-item
+            :prop="isName('宣教知识')"
+            :rules="isCheckmust('宣教知识')"
+          >
             <el-input
               type="textarea"
               v-model="treatmentSummary.mission"
@@ -35,7 +42,11 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24" v-if="isShow('透析小结')">
-          <el-form-item label="透析小结：">
+          <el-form-item
+            label="透析小结："
+            :prop="isName('透析小结')"
+            :rules="isCheckmust('透析小结')"
+          >
             <el-select @change="dialysisSummarySelectChange" v-model="value2">
               <el-option
                 v-for="(item, index) in summary"
@@ -49,7 +60,10 @@
       </el-row>
       <el-row :gutter="20">
         <el-col v-if="isShow('透析小结')">
-          <el-form-item>
+          <el-form-item
+            :prop="isName('透析小结')"
+            :rules="isCheckmust('透析小结')"
+          >
             <el-input
               type="textarea"
               v-model="treatmentSummary.dialysis_summary"
@@ -60,7 +74,11 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24" v-if="isShow('透析护理记录')">
-          <el-form-item label="透析护理记录:">
+          <el-form-item
+            label="透析护理记录:"
+            :prop="isName('透析护理记录')"
+            :rules="isCheckmust('透析护理记录')"
+          >
             <el-select
               @change="dialysisNusingRecordSelectChange"
               v-model="value3"
@@ -77,7 +95,10 @@
       </el-row>
       <el-row :gutter="20">
         <el-col v-if="isShow('透析护理记录')">
-          <el-form-item>
+          <el-form-item
+            :prop="isName('透析护理记录')"
+            :rules="isCheckmust('透析护理记录')"
+          >
             <el-input
               type="textarea"
               v-model="treatmentSummary.nursing_record"
@@ -88,7 +109,11 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="24" v-if="isShow('特殊记录')">
-          <el-form-item label="特殊记录:">
+          <el-form-item
+            label="特殊记录:"
+            :prop="isName('特殊记录')"
+            :rules="isCheckmust('特殊记录')"
+          >
             <el-select
               @change="dialysisSpecialRecordSelectChange"
               v-model="value4"
@@ -105,7 +130,10 @@
       </el-row>
       <el-row :gutter="20">
         <el-col v-if="isShow('特殊记录')">
-          <el-form-item>
+          <el-form-item
+            :prop="isName('特殊记录')"
+            :rules="isCheckmust('特殊记录')"
+          >
             <el-input
               type="textarea"
               v-model="treatmentSummary.special_record"
@@ -117,7 +145,10 @@
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button @click="handleCancle">取 消</el-button>
-      <el-button type="primary" @click="handleComfirm" v-if="hasPermission"
+      <el-button
+        type="primary"
+        @click="handleComfirm('treatmentSummary')"
+        v-if="hasPermission"
         >保 存</el-button
       >
     </div>
@@ -125,239 +156,269 @@
 </template>
 
 <script>
-import { getDataConfig } from '@/utils/data'
-import { postTreatmentsummary } from '@/api/dialysis'
-import { uParseTime } from '@/utils/tools'
-import store from '@/store'
-import request from '@/utils/request'
-import { parseTime } from '@/utils'
+import { getDataConfig } from "@/utils/data";
+import { postTreatmentsummary } from "@/api/dialysis";
+import { uParseTime } from "@/utils/tools";
+import store from "@/store";
+import request from "@/utils/request";
+import { parseTime } from "@/utils";
 
 export default {
-  name: 'treatmentSummaryDialog',
+  name: "treatmentSummaryDialog",
 
   props: {
     treatment_summary: {
       // 治疗小结
       type: Object,
       default: () => {
-        return { id: 0 }
-      }
+        return { id: 0 };
+      },
     },
     patient: {
       // 患者信息
       type: Object,
       default: () => {
-        return { id: 0 }
-      }
+        return { id: 0 };
+      },
     },
   },
   data() {
     return {
-      showTxt: '',
+      showTxt: "",
       hasPermission: true,
-      value: '',
-      value2: '',
-      value3: '',
-      value4: '',
+      value: "",
+      value2: "",
+      value3: "",
+      value4: "",
       isVisibility: false,
-      record_date: '',
+      record_date: "",
       education: [],
       summary: [],
       nursingRecord: [],
       specialRecord: [],
       treatmentSummary: {
-        mission: '',
-        dialysis_summary: '',
-        sj_nurse: '',
-        zl_nurse: '',
-        hd_nurse: '',
-        xj_nurse: '',
-        zl_doctor: '',
-        nursing_record: '',
-        special_record: ''
+        mission: "",
+        dialysis_summary: "",
+        sj_nurse: "",
+        zl_nurse: "",
+        hd_nurse: "",
+        xj_nurse: "",
+        zl_doctor: "",
+        nursing_record: "",
+        special_record: "",
       },
       //
-      date:''
-    }
+      date: "",
+    };
   },
   methods: {
-    show(record,date) {
-      this.isVisibility = true
-      this.record = record
-      
-      if(date){
-        this.date = date
-        this.record_date = uParseTime(this.date, '{y}-{m}-{d}')
-       
+    isName(name) {
+      let filedList = store.getters.xt_user.fileds;
+      for (let i = 0; i < filedList.length; i++) {
+        if (filedList[i].module == 6 && filedList[i].filed_name_cn == name) {
+          return filedList[i].filed_name;
+        }
       }
-      
-      console.log('治疗小结', record)
-      this.getPermission()
+    },
+
+    isCheckmust(name) {
+      let filedList = store.getters.xt_user.fileds;
+      for (let i = 0; i < filedList.length; i++) {
+        if (
+          filedList[i].module == 6 &&
+          filedList[i].filed_name_cn == name &&
+          filedList[i].is_write == 1
+        ) {
+          return [{ required: true, message: `请输入${name}` }];
+        }
+      }
+    },
+    show(record, date) {
+      this.isVisibility = true;
+      this.record = record;
+
+      if (date) {
+        this.date = date;
+        this.record_date = uParseTime(this.date, "{y}-{m}-{d}");
+      }
+
+      console.log("治疗小结", record);
+      this.getPermission();
     },
     hide() {
-      this.isVisibility = false
+      this.isVisibility = false;
     },
-    dialysisAfterTeachSelectChange: function(values) {
-      if (this.treatmentSummary.mission == '') {
-        this.treatmentSummary.mission = values
+    dialysisAfterTeachSelectChange: function (values) {
+      if (this.treatmentSummary.mission == "") {
+        this.treatmentSummary.mission = values;
       } else {
         if (this.treatmentSummary.mission.indexOf(values) == -1) {
           if (
             this.treatmentSummary.mission
               .charAt(this.treatmentSummary.mission.length - 1)
-              .indexOf('。') == -1
+              .indexOf("。") == -1
           ) {
             this.treatmentSummary.mission =
-              this.treatmentSummary.mission + ',' + values
+              this.treatmentSummary.mission + "," + values;
           } else {
             this.treatmentSummary.mission =
-              this.treatmentSummary.mission + values
+              this.treatmentSummary.mission + values;
           }
         }
       }
     },
-    dialysisSummarySelectChange: function(values) {
-      if (this.treatmentSummary.dialysis_summary == '') {
-        this.treatmentSummary.dialysis_summary = values
+    dialysisSummarySelectChange: function (values) {
+      if (this.treatmentSummary.dialysis_summary == "") {
+        this.treatmentSummary.dialysis_summary = values;
       } else {
        
         if (this.treatmentSummary.dialysis_summary.indexOf(values) == -1) {
           if (
             this.treatmentSummary.dialysis_summary
               .charAt(this.treatmentSummary.dialysis_summary.length - 1)
-              .indexOf('。') == -1
+              .indexOf("。") == -1
           ) {
             this.treatmentSummary.dialysis_summary =
-              this.treatmentSummary.dialysis_summary + ',' + values
+              this.treatmentSummary.dialysis_summary + "," + values;
           } else {
             this.treatmentSummary.dialysis_summary =
-              this.treatmentSummary.dialysis_summary + ',' + values
+              this.treatmentSummary.dialysis_summary + "," + values;
             this.treatmentSummary.dialysis_summary =
-              this.treatmentSummary.dialysis_summary + values
+              this.treatmentSummary.dialysis_summary + values;
           }
         }
       }
     },
-    dialysisNusingRecordSelectChange: function(values) {
-      if (this.treatmentSummary.nursing_record == '') {
-        this.treatmentSummary.nursing_record = values
+    dialysisNusingRecordSelectChange: function (values) {
+      if (this.treatmentSummary.nursing_record == "") {
+        this.treatmentSummary.nursing_record = values;
       } else {
         if (this.treatmentSummary.nursing_record.indexOf(values) == -1) {
           if (
             this.treatmentSummary.nursing_record
               .charAt(this.treatmentSummary.nursing_record.length - 1)
-              .indexOf('。') == -1
+              .indexOf("。") == -1
           ) {
             this.treatmentSummary.nursing_record =
-              this.treatmentSummary.nursing_record + ',' + values
+              this.treatmentSummary.nursing_record + "," + values;
           } else {
             this.treatmentSummary.nursing_record =
-              this.treatmentSummary.nursing_record + ',' + values
+              this.treatmentSummary.nursing_record + "," + values;
             this.treatmentSummary.nursing_record =
-              this.treatmentSummary.nursing_record + values
+              this.treatmentSummary.nursing_record + values;
           }
         }
       }
     },
     dialysisSpecialRecordSelectChange(values) {
-      if (this.treatmentSummary.special_record == '') {
-        this.treatmentSummary.special_record = values
+      if (this.treatmentSummary.special_record == "") {
+        this.treatmentSummary.special_record = values;
       } else {
         if (this.treatmentSummary.special_record.indexOf(values) == -1) {
           if (
             this.treatmentSummary.special_record
               .charAt(this.treatmentSummary.special_record.length - 1)
-              .indexOf('。') == -1
+              .indexOf("。") == -1
           ) {
             this.treatmentSummary.special_record =
-              this.treatmentSummary.special_record + ',' + values
+              this.treatmentSummary.special_record + "," + values;
           } else {
             this.treatmentSummary.special_record =
-              this.treatmentSummary.special_record + ',' + values
+              this.treatmentSummary.special_record + "," + values;
             this.treatmentSummary.special_record =
-              this.treatmentSummary.special_record + values
+              this.treatmentSummary.special_record + values;
           }
         }
       }
     },
-    handleCancle: function() {
-      this.isVisibility = false
+    handleCancle: function () {
+      this.isVisibility = false;
     },
-    handleComfirm: function() {
-      const ParamsQuery = this.treatmentSummary
-      ParamsQuery['patient'] = this.patient.id
-      ParamsQuery['record_date'] = this.record_date
-      ParamsQuery['mode'] = '1'
-      if (this.treatment_summary.id > 0) {
-        ParamsQuery['mode'] = '2'
-        if (
-          this.treatment_summary.creater != this.$store.getters.xt_user.user.id
-        ) {
-          ParamsQuery['mode'] = '3'
-        }
-      }
-      postTreatmentsummary(ParamsQuery).then(response => {
-        if (response.data.state == 0) {
-          this.$message.error(response.data.msg)
-          return false
-        } else {
-          this.$notify({
-            title: '成功',
-            message: '提交成功',
-            type: 'success',
-            duration: 2000
-          })
-
-          const summary_resp = response.data.data.summary
-          // prop
-          var treatment_summary = this.treatment_summary
-          for (var index in summary_resp) {
-            // treatment_summary[index] = summary_resp[index];
-            this.$set(treatment_summary, index, summary_resp[index])
+    handleComfirm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          const ParamsQuery = this.treatmentSummary;
+          ParamsQuery["patient"] = this.patient.id;
+          ParamsQuery["record_date"] = this.record_date;
+          ParamsQuery["mode"] = "1";
+          if (this.treatment_summary.id > 0) {
+            ParamsQuery["mode"] = "2";
+            if (
+              this.treatment_summary.creater !=
+              this.$store.getters.xt_user.user.id
+            ) {
+              ParamsQuery["mode"] = "3";
+            }
           }
+          postTreatmentsummary(ParamsQuery).then((response) => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "提交成功",
+                type: "success",
+                duration: 2000,
+              });
 
-          this.hide()
+              const summary_resp = response.data.data.summary;
+              // prop
+              var treatment_summary = this.treatment_summary;
+              for (var index in summary_resp) {
+                // treatment_summary[index] = summary_resp[index];
+                this.$set(treatment_summary, index, summary_resp[index]);
+              }
+
+              this.hide();
+            }
+          });
+        } else {
+          console.log("error submit!!");
+          return false;
         }
-      })
+      });
     },
     getPermission() {
-      request.get('/api/func_per/get', {
+      request
+        .get("/api/func_per/get", {
           params: {
-            create_url: '/api/dialysis/treatmentsummary?mode=1',
-            modify_url: '/api/dialysis/treatmentsummary?mode=2',
-            modify_other_url: '/api/dialysis/treatmentsummary?mode=3',
-            module: 9
-          }
-        }).then(res => {
+            create_url: "/api/dialysis/treatmentsummary?mode=1",
+            modify_url: "/api/dialysis/treatmentsummary?mode=2",
+            modify_other_url: "/api/dialysis/treatmentsummary?mode=3",
+            module: 9,
+          },
+        })
+        .then((res) => {
           if (res.data.state == 0) {
-            this.hasPermission = false
+            this.hasPermission = false;
           } else if (res.data.state == 1) {
-            if (this.record.id != '' && this.record.creater != 0) {
+            if (this.record.id != "" && this.record.creater != 0) {
               // 有数据
               if (this.record.creater == this.$store.getters.user.admin.id) {
                 // 创建人是自己
                 if (res.data.data.is_has_modify == false) {
-                  this.hasPermission = false
-                  this.showTxt = '你没有修改治疗小结权限'
+                  this.hasPermission = false;
+                  this.showTxt = "你没有修改治疗小结权限";
                 }
               } else {
                 // 创建人不是自己
                 if (res.data.data.is_has_modify_other == false) {
-                  this.hasPermission = false
-                  this.showTxt = '你没有修改他人治疗小结权限'
+                  this.hasPermission = false;
+                  this.showTxt = "你没有修改他人治疗小结权限";
                 }
               }
-            } else if (this.record.id == '' || this.record.creater == 0) {
+            } else if (this.record.id == "" || this.record.creater == 0) {
               if (res.data.data.is_has_create == false) {
-                this.hasPermission = false
-                this.showTxt = '你没有新增治疗小结权限'
+                this.hasPermission = false;
+                this.showTxt = "你没有新增治疗小结权限";
               }
             }
           }
-        })
+        });
     },
     isShow(name) {
-      var filedList = store.getters.xt_user.fileds
+      var filedList = store.getters.xt_user.fileds;
 
       for (let i = 0; i < filedList.length; i++) {
         if (
@@ -365,73 +426,71 @@ export default {
           filedList[i].filed_name_cn == name &&
           filedList[i].is_show == 1
         ) {
-          return true
+          return true;
         }
       }
-      return false
-    }
+      return false;
+    },
   },
   watch: {
     isVisibility(val) {},
-    'treatment_summary.id': {
+    "treatment_summary.id": {
       immediate: true,
-      deep:true,
-      handler(oldVal,newVal) {
-        if(oldVal == newVal){
+      deep: true,
+      handler(oldVal, newVal) {
+        if (oldVal == newVal) {
           for (var index in this.treatmentSummary) {
-            this.treatmentSummary[index] = this.treatment_summary[index]
+            this.treatmentSummary[index] = this.treatment_summary[index];
           }
         }
         if (this.treatment_summary.id > 0) {
           for (var index in this.treatmentSummary) {
-            this.value = ''
-            this.value2 = ''
-            this.value3 = ''
-            this.value4 = ''
-            this.treatmentSummary[index] = this.treatment_summary[index]
+            this.value = "";
+            this.value2 = "";
+            this.value3 = "";
+            this.value4 = "";
+            this.treatmentSummary[index] = this.treatment_summary[index];
           }
-        }else if(this.treatment_summary.id == 0){
+        } else if (this.treatment_summary.id == 0) {
           for (var index in this.treatmentSummary) {
             // this.treatmentSummary[index] = this.treatment_summary[index]
-            this.value = ''
-            this.value2 = ''
-            this.value3 = ''
-            this.value4 = ''
+            this.value = "";
+            this.value2 = "";
+            this.value3 = "";
+            this.value4 = "";
             this.treatmentSummary = {
-              mission: '',
-              dialysis_summary: '',
-              sj_nurse: '',
-              zl_nurse: '',
-              hd_nurse: '',
-              xj_nurse: '',
-              zl_doctor: '',
-              nursing_record: '',
-              special_record: ''
-            }
+              mission: "",
+              dialysis_summary: "",
+              sj_nurse: "",
+              zl_nurse: "",
+              hd_nurse: "",
+              xj_nurse: "",
+              zl_doctor: "",
+              nursing_record: "",
+              special_record: "",
+            };
           }
-          
         }
-      }
-    }
+      },
+    },
   },
   created() {
-    this.education = getDataConfig('education', 'education')
-    this.summary = getDataConfig('summary', 'summary')
+    this.education = getDataConfig("education", "education");
+    this.summary = getDataConfig("summary", "summary");
 
-    this.nursingRecord = getDataConfig('nursing_record', 'nursing_record')
+    this.nursingRecord = getDataConfig("nursing_record", "nursing_record");
 
-    this.specialRecord = getDataConfig('special_record', 'special_record')
+    this.specialRecord = getDataConfig("special_record", "special_record");
 
     // var date = this.$route.query && this.$route.query.date
     // this.record_date = uParseTime(date, '{y}-{m}-{d}')
 
-    if(this.$route.query && this.$route.query.date){
-      var date = this.$route.query && this.$route.query.date
-      this.record_date = uParseTime(date, '{y}-{m}-{d}')
+    if (this.$route.query && this.$route.query.date) {
+      var date = this.$route.query && this.$route.query.date;
+      this.record_date = uParseTime(date, "{y}-{m}-{d}");
     }
-    
-  }
-}
+  },
+};
 </script>
 
 <style scoped>

src/xt_pages/dialysis/doctorAdvicePrintOne.vue

@@ -0,0 +1,791 @@
+<template>
+    <div class="main-contain">
+        <div class="position">
+        <bread-crumb :crumbs="crumbs"></bread-crumb>
+        <el-row style="float:right;">
+            <el-col :span="24">
+            <el-button size="small" icon="el-icon-printer" type="primary" @click="printAction">打印</el-button>
+            </el-col>
+        </el-row>
+        </div>
+        <div class="app-container" style="background-color: white;" v-show="show">
+            <div id="dialysisTable">
+                <div class="order_title_panl">
+                    <span class="main_title">透析医嘱</span>
+                </div>
+                <p style="width: 960px;text-align: right;margin: 0 auto 10px;">日期：{{ time }}</p>
+                <table class="table dialysisTable" border="1" cellspacing="0" cellpadding="0">
+                    <tr>
+                    <th width="20px">姓名</th>
+                    <th width="100px">医嘱内容</th>
+                     <th width="50px">执行护士</th>
+                    </tr>
+                    <template v-for="(schedules, zone_name, index) in scheduleMap">
+                    <tr :key="index">
+                        <td>{{ zone_name }}</td>
+                        <td></td>
+                        <td></td>
+                       
+                    </tr>
+                    <template v-for="schedule in schedules">
+                        <template v-for="(group, group_index) in schedule.new_advice">
+                        <tr v-for="(advice, advice_index) in group.advices" :key="advice_index">
+                            <td
+                            v-if="advice_index == 0"
+                            :rowspan="group.advices.length"
+                            >{{ advice.parent_id == 0 ? schedule.patient.name : "" }}
+                            <br>
+                            （{{ advice.parent_id == 0 ? schedule.dialysis_no : ""}}）
+                             {{getAge(schedule) }}岁
+                            <br>
+                            <span v-if="schedule.mode_id == 1">(HD)</span>
+                            <span v-if="schedule.mode_id == 2">(HDF)</span>
+                            <span v-if="schedule.mode_id == 3">(HD+HP)</span>
+                            <span v-if="schedule.mode_id == 4">(HP)</span>
+                            <span v-if="schedule.mode_id == 5">(HF)</span>
+                            <span v-if="schedule.mode_id == 6">(SCUF)</span>
+                            <span v-if="schedule.mode_id == 7">(IUF)</span>
+                            <span v-if="schedule.mode_id == 8">(HFHD)</span>
+                            <span v-if="schedule.mode_id == 9">(HFHD+HP)</span>
+                            <span v-if="schedule.mode_id == 10">(PHF)</span>
+                            <span v-if="schedule.mode_id == 11">(HFR)</span>
+                            <span v-if="schedule.mode_id == 12">(HDF+HP)</span>
+                            <span v-if="schedule.mode_id == 13">(CRRT)</span>
+                            <span v-if="schedule.mode_id == 14">(腹水回输)</span>
+                            <span v-if="schedule.mode_id == 24">I-HDF</span>
+                            </td>
+                          
+                   
+                            <td
+                            :class="
+                                advice.parent_id == 0
+                                ? 'advice_content'
+                                : 'subadvice_content'
+                            "
+                            >
+                            <span>{{ advice.advice_name }}</span>
+                           
+                            <span v-if="advice.single_dose">
+                                单次用量 {{ advice.single_dose
+                                }}{{ advice.single_dose_unit }}
+                            </span>
+                            <span v-if="advice.prescribing_number>0">总量:</span>
+                            <span v-if="advice.prescribing_number">
+                                {{ advice.prescribing_number
+                                }}{{ advice.prescribing_number_unit }}
+                            </span>
+                            <span>{{ advice.delivery_way }}</span>
+                            <span>{{ advice.execution_frequency }}</span>
+                           
+                            </td>
+                            <td>{{ getName(advice.execution_staff) }}</td>
+                           
+                        </tr>
+                        </template>
+                    </template>
+                    </template>
+                </table>
+            </div>
+        </div>
+
+          <div class="app-container" style="background-color: white;" v-show="showOne">
+            <div id="dialysisTable">
+                <div class="order_title_panl">
+                    <span class="main_title">透析医嘱</span>
+                </div>
+                <p style="width: 960px;text-align: right;margin: 0 auto 10px;">日期：{{ time }}</p>
+                <table class="table dialysisTable" border="1" cellspacing="0" cellpadding="0">
+                    <tr>
+                    <th width="20px">姓名</th>
+                    <th width="100px">医嘱内容</th>
+                    <th width="20px">执行护士</th>
+                    </tr>
+                    <template v-for="(schedules, zone_name, index) in scheduleMap">
+                    <tr :key="index">
+                        <td>{{ zone_name }}</td>
+                        <td></td>
+                        <td></td>
+                    </tr>
+                    <template v-for="schedule in schedules">
+                        <template v-for="(group, group_index) in schedule.new_advice">
+                        <tr v-for="(advice, advice_index) in group.advices" :key="advice_index">
+                            <td
+                            v-if="advice_index == 0"
+                            :rowspan="group.advices.length"
+                            >{{ advice.parent_id == 0 ? schedule.patient.name : "" }}
+                            <br>
+                            （{{ advice.parent_id == 0 ? schedule.dialysis_no : ""}}）
+                            {{getAge(schedule) }}岁
+                            <br>
+                            <span v-if="schedule.mode_id == 1">(HD)</span>
+                            <span v-if="schedule.mode_id == 2">(HDF)</span>
+                            <span v-if="schedule.mode_id == 3">(HD+HP)</span>
+                            <span v-if="schedule.mode_id == 4">(HP)</span>
+                            <span v-if="schedule.mode_id == 5">(HF)</span>
+                            <span v-if="schedule.mode_id == 6">(SCUF)</span>
+                            <span v-if="schedule.mode_id == 7">(IUF)</span>
+                            <span v-if="schedule.mode_id == 8">(HFHD)</span>
+                            <span v-if="schedule.mode_id == 9">(HFHD+HP)</span>
+                            <span v-if="schedule.mode_id == 10">(PHF)</span>
+                            <span v-if="schedule.mode_id == 11">(HFR)</span>
+                            <span v-if="schedule.mode_id == 12">(HDF+HP)</span>
+                            <span v-if="schedule.mode_id == 13">(CRRT)</span>
+                            <span v-if="schedule.mode_id == 14">(腹水回输)</span>
+                            <span v-if="schedule.mode_id == 24">I-HDF</span>
+                            </td>
+                           
+                           
+                            <td v-if="advice_index == 0" :rowspan="group.advices.length">
+                            {{
+                            advice.parent_id == 0
+                            ? parseTime(advice.start_time, "{m}-{d} {h}:{i}")
+                            : ""
+                            }}
+                            </td>
+                            <td
+                            :class="
+                                advice.parent_id == 0
+                                ? 'advice_content'
+                                : 'subadvice_content'
+                            "
+                            >
+                            <span>{{ advice.advice_name }}</span>
+                            
+                            <span v-if="advice.single_dose">
+                                单次用量 {{ advice.single_dose
+                                }}{{ advice.single_dose_unit }}
+                            </span>
+                            <span v-if="advice.prescribing_number>0">总量:</span>
+                            <span v-if="advice.prescribing_number">
+                                {{ advice.prescribing_number
+                                }}{{ advice.prescribing_number_unit }}
+                            </span>
+                            <span>{{ advice.delivery_way }}</span>
+                            <span>{{ advice.execution_frequency }}</span>
+                           
+                            </td>
+                            <td>{{ getName(advice.execution_staff) }}</td>
+                        </tr>
+                        </template>
+                    </template>
+                    </template>
+                </table>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script>
+import BreadCrumb from '@/xt_pages/components/bread-crumb'
+import { getSchedualDoctors } from '@/api/advice'
+import { parseTime } from '@/utils'
+import { jsGetAge } from "@/utils/tools";
+import print from 'print-js'
+const moment = require('moment')
+export default {
+    components:{
+        BreadCrumb
+    },
+    data(){
+        return{
+            crumbs: [
+                { path: false, name: '药品' },
+                { path: false, name: '打印' }
+            ],
+            tableData:[],
+            start_time:"",
+            end_time:"",
+            print_time:moment(new Date()).add('year', 0).format('YYYY-MM-DD'),
+
+            zone_selected: 0,
+            scheduleMap:[],
+            time:'',
+            show:true,
+            showOne:false,
+            delivery_way:"",
+            org_id:0,
+        }
+    },
+    methods:{
+        getAge: function (val) {
+            var thisLen = val.patient.id_card_no.length;
+            var birth = "";
+            if (thisLen == 15) {
+                birth = "19" + val.patient.id_card_no.substr(6, 6);
+            } else {
+                birth = val.patient.id_card_no.substr(6, 8);
+            }
+            var birthtwo =
+                birth.substr(0, 4) +
+                "-" +
+                birth.substr(4, 2) +
+                "-" +
+                birth.substr(6, 2);
+
+            var age = jsGetAge(birthtwo, "-");
+            return age;
+        },
+        printAction: function() {
+            const style = '@media print { .dialysisTable{width:960px;margin: 0 auto;text-align: center;border-collapse: collapse;}.order_title_panl {text-align: center;.main_title {font-size: 18px;line-height: 40px;font-weight: 500;}}.dialysisTable tr{padding: 10px 0;}.dialysisTable th {color: #000;padding: 0;margin: 0;height: 30px;}.dialysisTable tr td {padding: 12px 0;}.subadvice_content {text-align: left;padding-left: 25px !important;padding-right: 5px !important;}.advice_content {text-align: left;padding-left: 5px !important;padding-right: 5px !important;padding: 15px 5px !important;} }'
+
+            printJS({
+            printable: 'dialysisTable',
+            type: 'html',
+            documentTitle: '  ',
+            style: style,
+            scanStyles: false
+            })
+        },
+        requestSchedualDoctors (time) {
+            let newTime =  moment(time).format('YYYY-MM-DD')
+            getSchedualDoctors({
+            date: newTime,
+            patient_type: 0,
+            advice_type: 2,
+            delivery_way:this.delivery_way,
+            }).then(rs => {
+                var resp = rs.data
+                if (resp.state == 1) {
+                this.admin_user = resp.data.adminUser
+                var config = resp.data.config
+                let project_config = resp.data.project_config
+                // console.log('project_config',resp.data.project_config)
+                if(project_config.is_open == 1){
+                    this.project = resp.data.project
+                    resp.data.hisAdvices.map((item,index) => {
+                    item.new_advice = item.new_advice ? item.new_advice : []
+                      if(this.org_id!=9671 && this.org_id!= 10318){
+                        if(this.project[index].project.length > 0){
+                            this.project[index].project.map(it => {
+                            let obj = {
+                                advice_doctor: it.doctor,
+                                start_time:it.start_time,
+                                advice_name: it.type == 2 ? it.project.project_name : it.good_info.good_name,
+                                execution_time:it.execution_time,
+                                execution_state:it.execution_state,
+                                execution_staff:it.execution_staff,
+                                check_time:it.check_time,
+                                check_state:it.check_state,
+                                checker:it.checker,
+                                created_time:it.ctime,
+                                remark:'',
+                                id:it.id,
+                                parent_id:0,
+                                groupno:0
+                            }
+                        
+                            item.doctor_advice.push(obj)
+                            })
+                        }
+                    }
+                   })
+                }
+                if(config.is_open == 0 || config.is_open == 2){
+
+                   var schedulesArr = resp.data.scheduals
+                   let schedules = []
+                   var ids = this.$store.getters.temp_params.advice_ids
+                   console.log('ids',ids)
+                   schedulesArr.map(item => {
+                    if(ids.indexOf(item.patient_id) > -1){
+                        schedules.push(item)
+                    }
+
+                })
+
+                for (let i = 0; i < schedules.length; i++) {
+                    schedules[i].dialysis_no = schedules[i].patient.dialysis_no
+                }
+
+
+                var arr = []
+                for (let j = 0; j < schedules.length; j++) {
+                    arr.push(schedules[j].dialysis_no)
+                }
+                arr.sort(function (a, b) {
+                    return a - b
+                })
+
+
+                var arrTwo = []
+                for (let i = 0; i < arr.length; i++) {
+                    for (let j = 0; j < schedules.length; j++) {
+                    if (arr[i] == schedules[j].dialysis_no) {
+                        arrTwo.push(schedules[j])
+                    }
+                    }
+                }
+
+                arrTwo.map((item, index) => {
+
+                    item.doctor_advice.sort(this.compare('start_time'))
+                })
+
+
+                const res = new Map()
+                let a = arrTwo.filter(
+                    a => !res.has(a.dialysis_no) && res.set(a.dialysis_no, 1)
+                )
+
+
+
+                schedules = a
+                var zoneMap = {}
+                var scheduleMap = {}
+                for (let index = 0; index < schedules.length; index++) {
+                    const schedule = schedules[index]
+                    if (schedule.doctor_advice.length == 0) {
+                    continue
+                    }
+                    if (scheduleMap[schedule.device_number.zone.name] == null) {
+                    scheduleMap[schedule.device_number.zone.name] = []
+                    }
+                    scheduleMap[schedule.device_number.zone.name].push(schedule)
+                    if (zoneMap[schedule.device_number.zone.name] == null) {
+                    zoneMap[schedule.device_number.zone.name] =
+                        schedule.device_number.zone
+                    }
+                }
+
+                var zones = []
+                zones.push({ value: 0, text: '全部分区' })
+                for (var zoneName in zoneMap) {
+                    zones.push({ value: zoneMap[zoneName].id, text: zoneName })
+                }
+
+                zones = zones.sort(function (a, b) {
+                    return a.value > b.value
+                })
+                this.zones = zones
+                for (var key in scheduleMap) {
+                    let mapArr = scheduleMap[key]
+                    for (let i = 0; i < mapArr.length; i++) {
+                    mapArr[i]['new_advice'] = []
+                    }
+                }
+
+                for (var key in scheduleMap) {
+                    let mapArr = scheduleMap[key]
+                    for (let i = 0; i < mapArr.length; i++) {
+                    var maps = mapArr[i]
+                    var resp_advices = maps.doctor_advice
+                    if (resp_advices.length > 0) {
+                        var newGroupObject = function () {
+                        return Object.assign(
+                            {},
+                            {
+                            group_no: 0,
+                            advices: []
+                            }
+                        )
+                        }
+                        var initGroupBlock = function (group, advice) {
+                        group.group_no = advice.groupno
+                        }
+
+                        var advice_groups = []
+                        var group = newGroupObject()
+                        for (let index = 0; index < resp_advices.length; index++) {
+                        const advice = resp_advices[index]
+                        if (advice.groupno == 0) {
+                            // 老版本的医嘱
+                            if (advice.parent_id > 0) {
+                            if (advice_groups.length > 0) {
+                                var parent_group = advice_groups[advice_groups.length - 1]
+                                if (parent_group.advices.length > 0) {
+                                if (parent_group.advices[0].id == advice.parent_id) {
+                                    parent_group.advices.push(advice)
+                                }
+                                }
+                            }
+                            continue
+                            } else {
+                            if (group.group_no > 0) {
+                                advice_groups.push(group)
+                                group = newGroupObject()
+                            }
+
+                            initGroupBlock(group, advice)
+                            group.advices.push(advice)
+                            advice_groups.push(group)
+                            group = newGroupObject()
+                            continue
+                            }
+                        } else {
+                            if (group.group_no > 0 && group.group_no != advice.groupno) {
+                            advice_groups.push(group)
+                            group = newGroupObject()
+                            }
+                            if (group.group_no == 0) {
+                            initGroupBlock(group, advice)
+                            }
+                            if (group.group_no == advice.groupno) {
+                            group.advices.push(advice)
+                            }
+                        }
+                        }
+                        if (group.group_no > 0) {
+                        // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加
+                        advice_groups.push(group)
+                        }
+                        advice_groups = advice_groups
+                    } else {
+                        advice_groups = []
+                    }
+                    maps.new_advice = advice_groups
+                    }
+                 }
+
+
+                 this.scheduleMap = scheduleMap
+                }
+
+                 if(config.is_open == 1){
+                   var schedulesArr = resp.data.hisAdvices
+                   let schedules = []
+                   var ids = this.$store.getters.temp_params.advice_ids
+                   console.log('ids',ids)
+                   schedulesArr.map(item => {
+                    if(ids.indexOf(item.patient_id) > -1){
+                        schedules.push(item)
+                    }
+
+                })
+
+                for (let i = 0; i < schedules.length; i++) {
+                    schedules[i].dialysis_no = schedules[i].patient.dialysis_no
+                }
+
+
+                var arr = []
+                for (let j = 0; j < schedules.length; j++) {
+                    arr.push(schedules[j].dialysis_no)
+                }
+                arr.sort(function (a, b) {
+                    return a - b
+                })
+
+
+                var arrTwo = []
+                for (let i = 0; i < arr.length; i++) {
+                    for (let j = 0; j < schedules.length; j++) {
+                    if (arr[i] == schedules[j].dialysis_no) {
+                        arrTwo.push(schedules[j])
+                    }
+                    }
+                }
+
+                arrTwo.map((item, index) => {
+
+                    item.doctor_advice.sort(this.compare('start_time'))
+                })
+
+
+                const res = new Map()
+                let a = arrTwo.filter(
+                    a => !res.has(a.dialysis_no) && res.set(a.dialysis_no, 1)
+                )
+
+
+
+                schedules = a
+                var zoneMap = {}
+                var scheduleMap = {}
+                for (let index = 0; index < schedules.length; index++) {
+                    const schedule = schedules[index]
+                    if (schedule.doctor_advice.length == 0) {
+                    continue
+                    }
+                    if (scheduleMap[schedule.device_number.zone.name] == null) {
+                    scheduleMap[schedule.device_number.zone.name] = []
+                    }
+                    scheduleMap[schedule.device_number.zone.name].push(schedule)
+                    if (zoneMap[schedule.device_number.zone.name] == null) {
+                    zoneMap[schedule.device_number.zone.name] =
+                        schedule.device_number.zone
+                    }
+                }
+
+                var zones = []
+                zones.push({ value: 0, text: '全部分区' })
+                for (var zoneName in zoneMap) {
+                    zones.push({ value: zoneMap[zoneName].id, text: zoneName })
+                }
+
+                zones = zones.sort(function (a, b) {
+                    return a.value > b.value
+                })
+                this.zones = zones
+                for (var key in scheduleMap) {
+                    let mapArr = scheduleMap[key]
+                    for (let i = 0; i < mapArr.length; i++) {
+                    mapArr[i]['new_advice'] = []
+                    }
+                }
+
+                for (var key in scheduleMap) {
+                    let mapArr = scheduleMap[key]
+                    for (let i = 0; i < mapArr.length; i++) {
+                    var maps = mapArr[i]
+                    var resp_advices = maps.doctor_advice
+                    if (resp_advices.length > 0) {
+                        var newGroupObject = function () {
+                        return Object.assign(
+                            {},
+                            {
+                            group_no: 0,
+                            advices: []
+                            }
+                        )
+                        }
+                        var initGroupBlock = function (group, advice) {
+                        group.group_no = advice.groupno
+                        }
+
+                        var advice_groups = []
+                        var group = newGroupObject()
+                        for (let index = 0; index < resp_advices.length; index++) {
+                        const advice = resp_advices[index]
+                        if (advice.groupno == 0) {
+                            // 老版本的医嘱
+                            if (advice.parent_id > 0) {
+                            if (advice_groups.length > 0) {
+                                var parent_group = advice_groups[advice_groups.length - 1]
+                                if (parent_group.advices.length > 0) {
+                                if (parent_group.advices[0].id == advice.parent_id) {
+                                    parent_group.advices.push(advice)
+                                }
+                                }
+                            }
+                            continue
+                            } else {
+                            if (group.group_no > 0) {
+                                advice_groups.push(group)
+                                group = newGroupObject()
+                            }
+
+                            initGroupBlock(group, advice)
+                            group.advices.push(advice)
+                            advice_groups.push(group)
+                            group = newGroupObject()
+                            continue
+                            }
+                        } else {
+                            if (group.group_no > 0 && group.group_no != advice.groupno) {
+                            advice_groups.push(group)
+                            group = newGroupObject()
+                            }
+                            if (group.group_no == 0) {
+                            initGroupBlock(group, advice)
+                            }
+                            if (group.group_no == advice.groupno) {
+                            group.advices.push(advice)
+                            }
+                        }
+                        }
+                        if (group.group_no > 0) {
+                        // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加
+                        advice_groups.push(group)
+                        }
+                        advice_groups = advice_groups
+                    } else {
+                        advice_groups = []
+                    }
+                    maps.new_advice = advice_groups
+                    }
+                 }
+
+
+                     this.scheduleMap = scheduleMap
+                 }
+
+
+                }
+            })
+        },
+        compare (property) {
+            return function (a, b) {
+                var value1 = a[property]
+                var value2 = b[property]
+                return value1 - value2
+            }
+        },
+        parseTime: function (time, layout) {
+            if (time == 0) {
+                return ''
+            }
+            return parseTime(time, layout)
+        },
+        getName (val) {
+            for (let i = 0; i < this.admin_user.length; i++) {
+                if (this.admin_user[i].id == val) {
+                    return this.admin_user[i].name
+                }
+            }
+        },
+    },
+    computed: {
+    filtedScheduals: function () {
+        var scheduleMap = new Object()
+        if (this.zone_selected == 0) {
+            for (const key in this.scheduleMap) {
+            scheduleMap[key] = this.scheduleMap[key]
+            }
+        } else {
+            var zone_name = this.zones[this.zone_selected].text
+            scheduleMap[zone_name] = this.scheduleMap[zone_name]
+        }
+
+        if (this.schedule_type_selected != 0) {
+            var _scheduleMap = {}
+            for (const key in scheduleMap) {
+            var origin_schedules = scheduleMap[key]
+            var schedules = []
+            for (let index = 0; index < origin_schedules.length; index++) {
+                const schedule = origin_schedules[index]
+                if (schedule.schedule_type == this.schedule_type_selected) {
+                schedules.push(schedule)
+                }
+            }
+            if (schedules.length > 0) {
+                _scheduleMap[key] = schedules
+            }
+            }
+
+            scheduleMap = _scheduleMap
+        }
+        for (var key in scheduleMap) {
+            let mapArr = scheduleMap[key]
+            for (let i = 0; i < mapArr.length; i++) {
+            mapArr[i]['new_advice'] = []
+            }
+        }
+
+        for (var key in scheduleMap) {
+            let mapArr = scheduleMap[key]
+            for (let i = 0; i < mapArr.length; i++) {
+            var maps = mapArr[i]
+            var resp_advices = maps.doctor_advice
+            if (resp_advices.length > 0) {
+                var newGroupObject = function () {
+                return Object.assign(
+                    {},
+                    {
+                    group_no: 0,
+                    advices: []
+                    }
+                )
+                }
+                var initGroupBlock = function (group, advice) {
+                group.group_no = advice.groupno
+                }
+
+                var advice_groups = []
+                var group = newGroupObject()
+                for (let index = 0; index < resp_advices.length; index++) {
+                const advice = resp_advices[index]
+                if (advice.groupno == 0) {
+                    // 老版本的医嘱
+                    if (advice.parent_id > 0) {
+                    if (advice_groups.length > 0) {
+                        var parent_group = advice_groups[advice_groups.length - 1]
+                        if (parent_group.advices.length > 0) {
+                        if (parent_group.advices[0].id == advice.parent_id) {
+                            parent_group.advices.push(advice)
+                        }
+                        }
+                    }
+                    continue
+                    } else {
+                    if (group.group_no > 0) {
+                        advice_groups.push(group)
+                        group = newGroupObject()
+                    }
+
+                    initGroupBlock(group, advice)
+                    group.advices.push(advice)
+                    advice_groups.push(group)
+                    group = newGroupObject()
+                    continue
+                    }
+                } else {
+                    if (group.group_no > 0 && group.group_no != advice.groupno) {
+                    advice_groups.push(group)
+                    group = newGroupObject()
+                    }
+                    if (group.group_no == 0) {
+                    initGroupBlock(group, advice)
+                    }
+                    if (group.group_no == advice.groupno) {
+                    group.advices.push(advice)
+                    }
+                }
+                }
+                if (group.group_no > 0) {
+                // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加
+                advice_groups.push(group)
+                }
+                advice_groups = advice_groups
+            } else {
+                advice_groups = []
+            }
+            maps.new_advice = advice_groups
+            }
+        }
+        console.log("222222",scheduleMap)
+        return scheduleMap
+        }
+    },
+    created(){
+      var time = this.$route.query.time
+      var delivery_way = this.$route.query.delivery_way
+      this.delivery_way = delivery_way
+      this.time = moment(time).format('YYYY-MM-DD')
+      console.log(11,this.$route.query)
+      this.requestSchedualDoctors(time)
+      this.org_id = this.$store.getters.xt_user.template_info.org_id;
+    }
+}
+</script>
+
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+.dialysisTable{
+    width:960px;
+    margin: 0 auto;
+    text-align: center;
+    border-collapse: collapse;
+}
+.order_title_panl {
+    text-align: center;
+
+    .main_title {
+      font-size: 18px;
+      line-height: 40px;
+      font-weight: 500;
+    }
+}
+.dialysisTable tr{
+    padding: 10px 0;
+}
+.dialysisTable th {
+    color: #000;
+    padding: 0;
+    margin: 0;
+    height: 30px;
+}
+.dialysisTable tr td {
+    padding: 12px 0;
+}
+.subadvice_content {
+    text-align: left;
+    padding-left: 25px !important;
+    padding-right: 5px !important;
+}
+.advice_content {
+    text-align: left;
+    padding-left: 5px !important;
+    padding-right: 5px !important;
+    padding: 15px 5px !important;
+}
+</style>

src/xt_pages/dialysis/newDoctorAdvice.vue

@@ -1088,7 +1088,17 @@ export default {
         if(name == '全部'){
           name = ""
        }
-      this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
+      
+       if(this.org_id == 9671 || this.org_id == 10340 || this.org_id == 0){
+        this.$router.push({ path: "/dialysis/doctorAdvicePrint/one",query:{time: new Date(this.time).getTime(),delivery_way:name} });
+       }
+
+       if(this.org_id != 9671 && this.org_id != 10340 && this.org_id!=0){
+        this.$router.push({ path: "/dialysis/doctorAdvicePrint",query:{time: new Date(this.time).getTime(),delivery_way:name} });
+       }
+
+
+    
 
     },
     signPrintAction:function(){
@@ -1468,7 +1478,7 @@ export default {
        this.requestSchedualDoctors(this.time);
      },
     handleRowClick (row) {
-     console.log("row232323232",row)
+    
     },
     tableRowClassName({row, rowIndex}) {
         row.index = rowIndex
@@ -1478,7 +1488,7 @@ export default {
        
       },
     handleCurrentChangeList(row){
-      console.log("row233232232332",row)
+     
       this.selecting_schs.push(row)
       this.current_row= row
       this.is_status = 2

src/xt_pages/dialysis/template/DialysisPrintOrderFiftyOne.vue

@@ -1097,7 +1097,7 @@
                               </div>
                               mmol/L
                             </div>
-                            <div class="inline_block" style="margin-left: 10px">
+                            <!-- <div class="inline_block" style="margin-left: 10px">
                              透析液流量：
                               <div
                                 class="under_line"
@@ -1110,7 +1110,7 @@
                                 }}
                               </div>
                               ml/min
-                            </div>
+                            </div> -->
                           </div>
                           <div
                             class="row"

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -827,7 +827,7 @@
             </td>
           </tr>
 
-          <tr>
+          <!-- <tr>
             <td style="text-align: left" colspan="8">
               <span style="display: inline-block; margin-left: 15px">
                 血管通路皮肤情况:
@@ -866,12 +866,11 @@
                   "
                   showValue="肿"
                 ></label-box>
-                <!-- 其他: -->
               </span>
             </td>
-          </tr>
+          </tr> -->
 
-          <tr>
+          <!-- <tr>
             <td style="text-align: left" colspan="8">
               <span style="display: inline-block; margin-left: 15px"
                 >出血影响因素:</span
@@ -924,7 +923,7 @@
               >其他:
               <span>{{ predialysis.hemorrhage_other }}</span>
             </td>
-          </tr>
+          </tr> -->
         </table>
 
         <table class="print-table" border="1" style="line-height: 30px">
@@ -1084,6 +1083,13 @@
                   showValue="3级"
                   :isChecked="afterdialysis.cruor.indexOf('透析器-3级') > -1"
                 ></label-box
+                ><label-box
+                  showValue="无"
+                  :isChecked="afterdialysis.cruor.indexOf('透析器-3级') <= -1&&
+                  afterdialysis.cruor.indexOf('透析器-2级') <= -1&&
+                  afterdialysis.cruor.indexOf('透析器-1级') <= -1&&
+                  afterdialysis.cruor.indexOf('透析器-0级') <= -1"
+                ></label-box
                 >&nbsp;&nbsp;
                 {{ getCruor(afterdialysis.cruor) }}
               </span>

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyTwo.vue

@@ -80,7 +80,7 @@
              <td width="40">透析备注:</td>
              <td width="500">
                <div class="under-line">
-                {{prescription.dialysis_remark?prescription.dialysis_remark:"" }}
+                 {{prescription.dialysis_remark?prescription.dialysis_remark:prescription.remark }}
               </div>
              </td>
            

src/xt_pages/hospitalStation/components/deskPrescription.vue

@@ -2400,7 +2400,7 @@ export default {
                 }
               }
 
-la
+
 
               let prescription = []
 

src/xt_pages/stock/drugs/components/drugQuery.vue

@@ -1053,10 +1053,9 @@ export default {
           this.tableList[i].manufacturer_name = this.getManufacturName(this.tableList[i].manufacturer)
 
           this.tableList[i].stock_in_count = this.getStockIn(this.tableList[i].drug_stock_count, this.tableList[i].max_unit, this.tableList[i].min_unit,this.tableList[i].min_number);
-
-          this.tableList[i].stock_out_count = this.getStockOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number,this.tableList[i].drug_cancel_stock_info)
+          this.tableList[i].stock_out_count =  this.getActCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
           this.tableList[i].cancle_out_count = this.getCancleOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
-          this.tableList[i].act_cout =  this.getActCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
+          this.tableList[i].act_cout =  this.getStockOut(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number,this.tableList[i].drug_cancel_stock_info)
           this.tableList[i].over_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
           this.tableList[i].sum_count = this.getOverCount(this.tableList[i].drug_stock_count,this.tableList[i].max_unit,this.tableList[i].min_unit,this.tableList[i].min_number)
         }

src/xt_pages/workforce/components/editTableData.vue

@@ -2257,6 +2257,7 @@ export default {
         name: null,
       },
       cellflag: 0,
+      schedulesGroup:[],
     };
   },
 
@@ -3943,8 +3944,296 @@ export default {
       this.$nextTick(() => {
         this.$refs.table.doLayout();
       });
+      
+      if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877){
+
+        //灌流 HD+HP
+        var Mon_M = 0
+        var Mon_A = 0
+        var Mon_N = 0
+
+        var Tue_M =0
+        var Tue_A = 0
+        var Tue_N = 0
+
+        var Wed_M = 0
+        var Wed_A = 0
+        var Wed_N = 0
+
+        var Thurs_M = 0
+        var Thurs_A = 0
+        var Thurs_N = 0
+
+        var Fri_M = 0
+        var Fri_A = 0
+        var Fri_N = 0
+
+        var Sat_M = 0
+        var Sat_A = 0
+        var Sat_N = 0
+
+        var Sun_M = 0
+        var Sun_A = 0
+        var Sun_N = 0
+
+        //血滤 HDF
+        var Mon_M_One = 0
+        var Mon_A_One = 0
+        var Mon_N_One = 0
+
+        var Tue_M_One =0
+        var Tue_A_One = 0
+        var Tue_N_One = 0
+
+        var Wed_M_One = 0
+        var Wed_A_One = 0
+        var Wed_N_One = 0
+
+        var Thurs_M_One = 0
+        var Thurs_A_One = 0
+        var Thurs_N_One = 0
+
+        var Fri_M_One = 0
+        var Fri_A_One = 0
+        var Fri_N_One = 0
+
+        var Sat_M_One = 0
+        var Sat_A_One = 0
+        var Sat_N_One = 0
+
+        var Sun_M_One = 0
+        var Sun_A_One = 0
+        var Sun_N_One= 0
+
+        if(this.schedulesGroup!=null && this.schedulesGroup.length >0){
+          
+          for(let i=0;i<this.schedulesGroup.length;i++){
+            //灌流
+            //礼拜一上午
+            if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+              Mon_M = this.schedulesGroup[i].Count
+            }
+            //礼拜一下午
+            if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+              Mon_A = this.schedulesGroup[i].Count
+            }
+            //礼拜一晚上
+            if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+              Mon_N = this.schedulesGroup[i].Count
+            }
+
+            //礼拜二上午
+            if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+              Tue_M = this.schedulesGroup[i].Count
+            }
+            //礼拜二下午
+            if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 2&& this.schedulesGroup[i].mode_id == 3){
+              Tue_A = this.schedulesGroup[i].Count
+            }
+            //礼拜二晚上
+            if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+              Tue_N = this.schedulesGroup[i].Count
+            }
+
 
-      return sums;
+            //礼拜三上午
+            if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+              Wed_M = this.schedulesGroup[i].Count
+            }
+            //礼拜三下午
+            if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+              Wed_A = this.schedulesGroup[i].Count
+            }
+            //礼拜三晚上
+            if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+              Wed_N = this.schedulesGroup[i].Count
+            }
+
+            //礼拜四上午
+            if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+              Thurs_M = this.schedulesGroup[i].Count
+            }
+            //礼拜四下午
+            if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+              Thurs_A = this.schedulesGroup[i].Count
+            }
+            //礼拜四晚上
+            if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+              Thurs_N = this.schedulesGroup[i].Count
+            }
+
+            //礼拜五上午
+            if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+              Fri_M = this.schedulesGroup[i].Count
+            }
+            //礼拜五下午
+            if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+              Fri_A = this.schedulesGroup[i].Count
+            }
+            //礼拜五晚上
+            if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+              Fri_N = this.schedulesGroup[i].Count
+            }
+
+
+            //礼拜六上午
+            if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 1  && this.schedulesGroup[i].mode_id == 3){
+              Sat_M = this.schedulesGroup[i].Count
+            }
+            //礼拜六下午
+            if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 2  && this.schedulesGroup[i].mode_id == 3){
+              Sat_A = this.schedulesGroup[i].Count
+            }
+            //礼拜六晚上
+            if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 3  && this.schedulesGroup[i].mode_id == 3){
+              Sat_N  = this.schedulesGroup[i].Count
+            }
+
+            //礼拜日上午
+            if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 1  && this.schedulesGroup[i].mode_id == 3){
+              Sun_M = this.schedulesGroup[i].Count
+            }
+            //礼拜日下午
+            if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 2  && this.schedulesGroup[i].mode_id == 3){
+              Sun_A = this.schedulesGroup[i].Count
+            }
+            //礼拜日晚上
+            if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 3  && this.schedulesGroup[i].mode_id == 3){
+              Sun_N = this.schedulesGroup[i].Count
+            }
+
+
+            //血滤
+              //礼拜一上午
+            if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Mon_M_One = this.schedulesGroup[i].Count
+            }
+            //礼拜一下午
+            if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+              Mon_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜一晚上
+            if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+              Mon_N_One = this.schedulesGroup[i].Count
+            }
+
+            //礼拜二上午
+            if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Tue_M_One = this.schedulesGroup[i].Count
+            }
+            //礼拜二下午
+            if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 2&& this.schedulesGroup[i].mode_id == 2){
+              Tue_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜二晚上
+            if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+              Tue_N_One = this.schedulesGroup[i].Count
+            }
+
+
+            //礼拜三上午
+            if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Wed_M_One = this.schedulesGroup[i].Count
+            }
+            //礼拜三下午
+            if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+              Wed_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜三晚上
+            if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+              Wed_N_One = this.schedulesGroup[i].Count
+            }
+
+            //礼拜四上午
+            if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Thurs_M_One = this.schedulesGroup[i].Count
+              
+            }
+            //礼拜四下午
+            if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+              Thurs_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜四晚上
+            if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+              Thurs_N_One = this.schedulesGroup[i].Count
+            }
+
+            //礼拜五上午
+            if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Fri_M_One = this.schedulesGroup[i].Count
+            }
+            //礼拜五下午
+            if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+              Fri_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜五晚上
+            if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+              Fri_N_One = this.schedulesGroup[i].Count
+            }
+
+
+            //礼拜六上午
+            if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Sat_M_One = this.schedulesGroup[i].Count
+            }
+            //礼拜六下午
+            if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+              Sat_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜六晚上
+            if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+             Sat_N_One  = this.schedulesGroup[i].Count
+            }
+
+            //礼拜日上午
+            if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+              Sun_M_One = this.schedulesGroup[i].Count
+            }
+            //礼拜日下午
+            if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+              Sun_A_One = this.schedulesGroup[i].Count
+            }
+            //礼拜日晚上
+            if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+              Sun_N_One = this.schedulesGroup[i].Count
+            }
+
+        }
+      }
+
+            sums[2] = "总人数:"+ sums[2]  +"人"+ " " + "灌流:"+Mon_M +"人" +" "+ "血滤:" + Mon_M_One +"人"
+            sums[3] = "总人数:"+ sums[3]  +"人"+ " " + "灌流:"+Mon_A +"人" +" "+ "血滤:" + Mon_A_One  +"人" 
+            sums[4] = "总人数:"+ sums[4]  +"人"+ " " + "灌流:"+Mon_N +"人" +" "+ "血滤:" + Mon_N_One +"人"  
+
+            sums[5] = "总人数:"+ sums[5]  +"人"+ " " + "灌流:"+Tue_M +"人" +" "+ "血滤:" + Tue_M_One +"人"  
+            sums[6] = "总人数:"+ sums[6]  +"人"+ " " + "灌流:"+Tue_A +"人" +" "+ "血滤:" + Tue_A_One +"人"  
+            sums[7] = "总人数:"+ sums[7]  +"人"+ " " + "灌流:"+Tue_N +"人" +" "+ "血滤:" + Tue_N_One +"人"  
+
+            sums[8] = "总人数:"+ sums[8]  +"人"+ " " + "灌流:"+Wed_M +"人" +" "+ "血滤:" + Wed_M_One +"人"  
+            sums[9] = "总人数:"+ sums[9]  +"人"+ " " + "灌流:"+Wed_A +"人" +" "+ "血滤:" + Wed_A_One  +"人"  
+            sums[10] = "总人数:"+ sums[10]  +"人"+ " " + "灌流:"+Wed_N +"人" +" "+ "血滤:" +Wed_N_One +"人"  
+
+            sums[11] = "总人数:"+ sums[11]  +"人"+ " " + "灌流:"+Thurs_M +"人" +" "+ "血滤:" + Thurs_M_One +"人"  
+            sums[12] = "总人数:"+ sums[12]  +"人"+ " " + "灌流:"+Thurs_A +"人" +" "+ "血滤:" + Thurs_A_One  +"人"  
+            sums[13] = "总人数:"+ sums[13]  +"人"+ " " + "灌流:"+Thurs_N +"人" +" "+ "血滤:" + Thurs_N_One +"人"  
+
+            sums[14] = "总人数:"+ sums[14]  +"人"+ " " + "灌流:"+Fri_M +"人" +" "+ "血滤:" + Fri_M_One +"人"  
+            sums[15] = "总人数:"+ sums[15]  +"人"+ " " + "灌流:"+Fri_A +"人" +" "+ "血滤:" + Fri_A_One +"人"  
+            sums[16] = "总人数:"+ sums[16]  +"人"+ " " + "灌流:"+Fri_N +"人" +" "+ "血滤:" + Fri_N_One +"人"  
+
+            sums[17] = "总人数:"+ sums[17]  +"人"+ " " + "灌流:"+Sat_M +"人" +" "+ "血滤:" + Sat_M_One +"人"  
+            sums[18] = "总人数:"+ sums[18]  +"人"+ " " + "灌流:"+Sat_A +"人" +" "+ "血滤:" + Sat_A_One +"人"  
+            sums[19] = "总人数:"+ sums[19]  +"人"+ " " + "灌流:"+Sat_N +"人" +" "+ "血滤:" + Sat_N_One +"人"  
+
+            sums[20] = "总人数:"+ sums[20]  +"人"+ " " + "灌流:"+Sun_M +"人" +" "+ "血滤:" + Sun_M_One +"人"  
+            sums[21] = "总人数:"+ sums[21]  +"人"+ " " + "灌流:"+Sun_A +"人" +" "+ "血滤:" + Sun_A_One +"人"  
+            sums[22] = "总人数:"+ sums[22]  +"人"+ " " + "灌流:"+Sun_N +"人" +" "+ "血滤:" + Sun_N_One +"人"  
+            return sums;
+        }
+
+      if(this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 0 && this.$store.getters.xt_user.template_info.org_id != 3877){
+        return sums;
+      }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       var that = this;
@@ -4013,7 +4302,8 @@ export default {
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
-
+          var schedulesGroup = response.data.data.schedulesGroup
+          this.schedulesGroup = schedulesGroup
           var that = this;
 
           this.scheduleZone.forEach(function (zone, index) {

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -344,6 +344,9 @@ export default {
           return value1 - value2;
       }
      },
+     getTimestamp(time) { //把时间日期转成时间戳
+      return (new Date(time)).getTime()
+    },
     getNextScheduleWeekDay() {
        this.loading = true
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
@@ -363,22 +366,19 @@ export default {
           str = zone.join(",")
         }
 
-        var now_time = parseInt(this.week_type) * 86400 + this.start_time
-        
+       
         let weekOfDay = parseInt(moment().format('E'))
         let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
-        console.log("卡 is h2323233232",new Date(next_monday))
+        
         let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
-        console.log("下周日",next_sunday.valueOf())
-        // const params = {
-        //   start_time:moment().week(moment().week() + 1).startOf('week').unix(),
-        //   end_time:moment().week(moment().week() + 1).endOf('week').unix(),
-        //   week_type:this.week_type,
-        //   week_time:this.week_time,
-        //   zone:str,
-        //   record_date:this.getTime(now_time)
-        // }
 
+        console.log("开始时间++++++++",(this.getTimestamp(next_monday)/1000)-28800)
+
+        var now_time = parseInt(this.week_type - 1)*86400 + (this.getTimestamp(next_monday)/1000 -28800)
+        console.log("now_time------------------",now_time)
+
+       
+      
        const params = {
           start_time:next_monday,
           end_time:next_sunday,
@@ -665,7 +665,7 @@ export default {
     },
     signPrint() {
         
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 0){
          var zone = this.zone
           var newArr = []
           for(let i=0;i<this.zoneList.length;i++){
@@ -683,7 +683,7 @@ export default {
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+2
           })
           }
-        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340){
+        if(this.org_id!=9671 && this.org_id!=9675 && this.org_id!=10340 && this.org_id!=0){
           var zone = this.zone
         var newArr = []
         for(let i=0;i<this.zoneList.length;i++){

src/xt_pages/workforce/components/tableData.vue

@@ -387,7 +387,7 @@
           ></schedule-item>
         </el-table-column>
       </el-table-column>
-
+    
 <!--      <el-table-column-->
 <!--        prop="total"-->
 <!--        label="总数"-->
@@ -870,7 +870,7 @@ export default {
       isShowShangWu:true,
       isShowXiaWu:true,
       isShowWanShang:true,
-
+      schedulesGroup:[]
 
     };
   },
@@ -895,7 +895,7 @@ export default {
         this.isShowXiaWu = true
         this.isShowWanShang = true
       }
-      console.log(this.source_scheduleZone)
+      // console.log(this.source_scheduleZone)
       //删除对应数据
       var list = this.source_scheduleZone
       var list1 = this.source_scheduleZone
@@ -968,9 +968,9 @@ export default {
 
 
     }, week_type:function () {
-      console.log(this.week_type)
-      console.log(this.schedule_type)
-      console.log(this.scheduleZone)
+      // console.log(this.week_type)
+      // console.log(this.schedule_type)
+      // console.log(this.scheduleZone)
 
       this.isShowOne = false
       this.isShowTwo = false
@@ -1064,7 +1064,7 @@ export default {
           var partitions = response.data.data.partitions
           console.log("partitions",partitions)
           this.theWeek.thisWeek = response.data.data.theWeek
-          console.log("这个周",response.data.data.theWeek)
+          
           this.theWeek.lastWeek = this.theWeek.thisWeek - 1
           this.theWeek.nextWeek = this.theWeek.thisWeek + 1
           this.theWeek.nextTwoWeek = this.theWeek.thisWeek + 2
@@ -1086,6 +1086,7 @@ export default {
                   cut: jihao.number,
                   jihao_id: jihao.id,
                   sort:jihao.sort,
+
                   Mon_M: {
                     schedule_id: 0,
                     mode_id: 0,
@@ -1093,6 +1094,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Mon_A: {
                     schedule_id: 0,
@@ -1101,6 +1104,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Mon_N: {
                     schedule_id: 0,
@@ -1109,6 +1114,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Tue_M: {
                     schedule_id: 0,
@@ -1117,6 +1124,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Tue_A: {
                     schedule_id: 0,
@@ -1125,6 +1134,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Tue_N: {
                     schedule_id: 0,
@@ -1133,6 +1144,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Wed_M: {
                     schedule_id: 0,
@@ -1141,6 +1154,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Wed_A: {
                     schedule_id: 0,
@@ -1149,6 +1164,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Wed_N: {
                     schedule_id: 0,
@@ -1157,6 +1174,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Thurs_M: {
                     schedule_id: 0,
@@ -1165,6 +1184,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Thurs_A: {
                     schedule_id: 0,
@@ -1173,6 +1194,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Thurs_N: {
                     schedule_id: 0,
@@ -1181,6 +1204,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Fri_M: {
                     schedule_id: 0,
@@ -1189,6 +1214,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Fri_A: {
                     schedule_id: 0,
@@ -1197,6 +1224,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Fri_N: {
                     schedule_id: 0,
@@ -1205,6 +1234,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Sat_M: {
                     schedule_id: 0,
@@ -1213,6 +1244,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Sat_A: {
                     schedule_id: 0,
@@ -1221,6 +1254,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Sat_N: {
                     schedule_id: 0,
@@ -1229,6 +1264,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Sun_A: {
                     schedule_id: 0,
@@ -1237,6 +1274,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Sun_N: {
                     schedule_id: 0,
@@ -1245,6 +1284,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   Sun_M: {
                     schedule_id: 0,
@@ -1253,6 +1294,8 @@ export default {
                     patient_id: 0,
                     patient: '',
                     dialysis_machine_name:'',
+                    schedule_date:"",
+                    Count:0,
                   },
                   total: 0
                 }
@@ -1262,9 +1305,10 @@ export default {
               })
             })
           }
-          console.log("34455555566666",this.scheduleZone)
+          
           this.scheduleZone.sort(this.compare('sort'))
           this.source_scheduleZone = this.scheduleZone
+          console.log("34455555566666",this.source_scheduleZone)
         })
      },
 
@@ -1312,9 +1356,13 @@ export default {
       this.getSchedulePatients();
     },
     getSummaries(param) {
+    
+     
       const { columns, data } = param;
       const sums = [];
+    
       columns.forEach((column, index) => {
+       
         if (index === 0 ) {
           sums[index] = "总数";
           return;
@@ -1325,20 +1373,7 @@ export default {
         }
 
         const values = data.map(item => item[column.property]);
-        console.log(values)
-        // if (index === 23) {
-        //   sums[index] = values.reduce((prev, curr) => {
-        //     const value = Number(curr);
-        //     if (!isNaN(value)) {
-        //       return prev + curr;
-        //     } else {
-        //       return prev;
-        //     }
-        //   }, 0);
-        //   sums[index];
-        //   return;
-        // }
-
+        
         sums[index] = values.reduce((prev, curr) => {
           if (typeof curr["mode_id"] === "undefined") {
             return prev;
@@ -1355,8 +1390,296 @@ export default {
       this.$nextTick(() => {
         this.$refs.table.doLayout();
       });
+    if(this.$store.getters.xt_user.template_info.org_id == 9671 || this.$store.getters.xt_user.template_info.org_id == 0 || this.$store.getters.xt_user.template_info.org_id == 3877){
+
+      //灌流 HD+HP
+      var Mon_M = 0
+      var Mon_A = 0
+      var Mon_N = 0
+
+      var Tue_M =0
+      var Tue_A = 0
+      var Tue_N = 0
+
+      var Wed_M = 0
+      var Wed_A = 0
+      var Wed_N = 0
+
+      var Thurs_M = 0
+      var Thurs_A = 0
+      var Thurs_N = 0
+
+      var Fri_M = 0
+      var Fri_A = 0
+      var Fri_N = 0
+
+      var Sat_M = 0
+      var Sat_A = 0
+      var Sat_N = 0
+
+      var Sun_M = 0
+      var Sun_A = 0
+      var Sun_N = 0
+
+      //血滤 HDF
+      var Mon_M_One = 0
+      var Mon_A_One = 0
+      var Mon_N_One = 0
+
+      var Tue_M_One =0
+      var Tue_A_One = 0
+      var Tue_N_One = 0
+
+      var Wed_M_One = 0
+      var Wed_A_One = 0
+      var Wed_N_One = 0
+
+      var Thurs_M_One = 0
+      var Thurs_A_One = 0
+      var Thurs_N_One = 0
+
+      var Fri_M_One = 0
+      var Fri_A_One = 0
+      var Fri_N_One = 0
+
+      var Sat_M_One = 0
+      var Sat_A_One = 0
+      var Sat_N_One = 0
+
+      var Sun_M_One = 0
+      var Sun_A_One = 0
+      var Sun_N_One= 0
+
+      if(this.schedulesGroup!=null && this.schedulesGroup.length >0){
+        
+        for(let i=0;i<this.schedulesGroup.length;i++){
+          //灌流
+          //礼拜一上午
+          if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+            Mon_M = this.schedulesGroup[i].Count
+          }
+           //礼拜一下午
+           if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+            Mon_A = this.schedulesGroup[i].Count
+          }
+           //礼拜一晚上
+           if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+            Mon_N = this.schedulesGroup[i].Count
+          }
+
+           //礼拜二上午
+           if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+            Tue_M = this.schedulesGroup[i].Count
+          }
+           //礼拜二下午
+           if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 2&& this.schedulesGroup[i].mode_id == 3){
+            Tue_A = this.schedulesGroup[i].Count
+          }
+           //礼拜二晚上
+           if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+            Tue_N = this.schedulesGroup[i].Count
+          }
+
+
+          //礼拜三上午
+          if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+            Wed_M = this.schedulesGroup[i].Count
+          }
+           //礼拜三下午
+           if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+            Wed_A = this.schedulesGroup[i].Count
+          }
+           //礼拜三晚上
+           if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+            Wed_N = this.schedulesGroup[i].Count
+          }
+
+           //礼拜四上午
+          if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+            Thurs_M = this.schedulesGroup[i].Count
+          }
+           //礼拜四下午
+           if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+            Thurs_A = this.schedulesGroup[i].Count
+          }
+           //礼拜四晚上
+           if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+            Thurs_N = this.schedulesGroup[i].Count
+          }
+
+           //礼拜五上午
+          if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 3){
+            Fri_M = this.schedulesGroup[i].Count
+          }
+           //礼拜五下午
+           if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 3){
+            Fri_A = this.schedulesGroup[i].Count
+          }
+           //礼拜五晚上
+           if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 3){
+            Fri_N = this.schedulesGroup[i].Count
+          }
+
+
+          //礼拜六上午
+           if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 1  && this.schedulesGroup[i].mode_id == 3){
+            Sat_M = this.schedulesGroup[i].Count
+          }
+           //礼拜六下午
+           if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 2  && this.schedulesGroup[i].mode_id == 3){
+            Sat_A = this.schedulesGroup[i].Count
+          }
+           //礼拜六晚上
+           if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 3  && this.schedulesGroup[i].mode_id == 3){
+            Sat_N = this.schedulesGroup[i].Count
+          }
+
+           //礼拜日上午
+          if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 1  && this.schedulesGroup[i].mode_id == 3){
+            Sun_M = this.schedulesGroup[i].Count
+          }
+           //礼拜日下午
+           if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 2  && this.schedulesGroup[i].mode_id == 3){
+            Sun_A = this.schedulesGroup[i].Count
+          }
+           //礼拜日晚上
+           if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 3  && this.schedulesGroup[i].mode_id == 3){
+            Sun_N = this.schedulesGroup[i].Count
+          }
+
+
+           //血滤
+            //礼拜一上午
+          if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Mon_M_One = this.schedulesGroup[i].Count
+          }
+           //礼拜一下午
+           if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+            Mon_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜一晚上
+           if(this.schedulesGroup[i].schedule_week == 1 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Mon_N_One = this.schedulesGroup[i].Count
+          }
+
+           //礼拜二上午
+           if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Tue_M_One = this.schedulesGroup[i].Count
+          }
+           //礼拜二下午
+           if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 2&& this.schedulesGroup[i].mode_id == 2){
+            Tue_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜二晚上
+           if(this.schedulesGroup[i].schedule_week == 2 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Tue_N_One = this.schedulesGroup[i].Count
+          }
+
+
+          //礼拜三上午
+          if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Wed_M_One = this.schedulesGroup[i].Count
+          }
+           //礼拜三下午
+           if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+            Wed_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜三晚上
+           if(this.schedulesGroup[i].schedule_week == 3 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Wed_N_One = this.schedulesGroup[i].Count
+          }
 
+           //礼拜四上午
+          if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Thurs_M_One = this.schedulesGroup[i].Count
+            
+          }
+           //礼拜四下午
+           if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+            Thurs_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜四晚上
+           if(this.schedulesGroup[i].schedule_week == 4 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Thurs_N_One = this.schedulesGroup[i].Count
+          }
+
+           //礼拜五上午
+          if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Fri_M_One = this.schedulesGroup[i].Count
+          }
+           //礼拜五下午
+           if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+            Fri_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜五晚上
+           if(this.schedulesGroup[i].schedule_week == 5 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Fri_N_One = this.schedulesGroup[i].Count
+          }
+
+
+          //礼拜六上午
+           if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Sat_M_One = this.schedulesGroup[i].Count
+          }
+           //礼拜六下午
+           if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+            Sat_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜六晚上
+           if(this.schedulesGroup[i].schedule_week == 6 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Sat_N_One = this.schedulesGroup[i].Count
+          }
+
+           //礼拜日上午
+          if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 1 && this.schedulesGroup[i].mode_id == 2){
+            Sun_M_One = this.schedulesGroup[i].Count
+          }
+           //礼拜日下午
+           if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 2 && this.schedulesGroup[i].mode_id == 2){
+            Sun_A_One = this.schedulesGroup[i].Count
+          }
+           //礼拜日晚上
+           if(this.schedulesGroup[i].schedule_week == 7 && this.schedulesGroup[i].schedule_type == 3 && this.schedulesGroup[i].mode_id == 2){
+            Sun_N_One = this.schedulesGroup[i].Count
+          }
+  
+        }
+      }
+
+      sums[2] = "总人数:"+ sums[2]  +"人"+ " " + "灌流:"+Mon_M +"人" +" "+ "血滤:" + Mon_M_One +"人"
+      sums[3] = "总人数:"+ sums[3]  +"人"+ " " + "灌流:"+Mon_A +"人" +" "+ "血滤:" + Mon_A_One +"人" 
+      sums[4] = "总人数:"+ sums[4]  +"人"+ " " + "灌流:"+Mon_N +"人" +" "+ "血滤:" + Mon_N_One +"人"  
+
+      sums[5] = "总人数:"+ sums[5]  +"人"+ " " + "灌流:"+Tue_M +"人" +" "+ "血滤:" + Tue_M_One +"人"  
+      sums[6] = "总人数:"+ sums[6]  +"人"+ " " + "灌流:"+Tue_A +"人" +" "+ "血滤:" + Tue_A_One +"人"  
+      sums[7] = "总人数:"+ sums[7]  +"人"+ " " + "灌流:"+Tue_N +"人" +" "+ "血滤:" + Tue_N_One +"人"  
+
+      sums[8] = "总人数:"+ sums[8]  +"人"+ " " + "灌流:"+Wed_M +"人" +" "+ "血滤:" + Wed_M_One +"人"  
+      sums[9] = "总人数:"+ sums[9]  +"人"+ " " + "灌流:"+ Wed_A +"人" +" "+ "血滤:" + Wed_A_One +"人"  
+      sums[10] = "总人数:"+ sums[10]  +"人"+ " " + "灌流:"+Wed_N +"人" +" "+ "血滤:" +Wed_N_One +"人"  
+
+      sums[11] = "总人数:"+ sums[11]  +"人"+ " " + "灌流:"+Thurs_M +"人" +" "+ "血滤:" + Thurs_M_One +"人"  
+      sums[12] = "总人数:"+ sums[12]  +"人"+ " " + "灌流:"+Thurs_A +"人" +" "+ "血滤:" + Thurs_A_One +"人"  
+      sums[13] = "总人数:"+ sums[13]  +"人"+ " " + "灌流:"+Thurs_N +"人" +" "+ "血滤:" + Thurs_N_One +"人"  
+
+      sums[14] = "总人数:"+ sums[14]  +"人"+ " " + "灌流:"+Fri_M +"人" +" "+ "血滤:" + Fri_M_One +"人"  
+      sums[15] = "总人数:"+ sums[15]  +"人"+ " " + "灌流:"+Fri_A +"人" +" "+ "血滤:" + Fri_A_One +"人"  
+      sums[16] = "总人数:"+ sums[16]  +"人"+ " " + "灌流:"+Fri_N +"人" +" "+ "血滤:" + Fri_N_One +"人"  
+
+      sums[17] = "总人数:"+ sums[17]  +"人"+ " " + "灌流:"+Sat_M +"人" +" "+ "血滤:" + Sat_M_One +"人"  
+      sums[18] = "总人数:"+ sums[18]  +"人"+ " " + "灌流:"+Sat_A +"人" +" "+ "血滤:" + Sat_A_One +"人"  
+      sums[19] = "总人数:"+ sums[19]  +"人"+ " " + "灌流:"+Sat_N +"人" +" "+ "血滤:" + Sat_N_One +"人"  
+
+      sums[20] = "总人数:"+ sums[20]  +"人"+ " " + "灌流:"+Sun_M +"人" +" "+ "血滤:" + Sun_M_One +"人"  
+      sums[21] = "总人数:"+ sums[21]  +"人"+ " " + "灌流:"+Sun_A +"人" +" "+ "血滤:" + Sun_A_One +"人"  
+      sums[22] = "总人数:"+ sums[22]  +"人"+ " " + "灌流:"+Sun_N +"人" +" "+ "血滤:" + Sun_N_One +"人"  
       return sums;
+
+      }
+      
+      if(this.$store.getters.xt_user.template_info.org_id != 9671 && this.$store.getters.xt_user.template_info.org_id != 0 && this.$store.getters.xt_user.template_info.org_id != 3877){
+        return sums;
+      }
     },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
 
@@ -1426,7 +1749,13 @@ export default {
           this.weekDays = response.data.data.days;
           this.toDay = response.data.data.today;
           var theSchedules = response.data.data.schdules;
+        
+          var schedulesGroup = response.data.data.schedulesGroup
+          this.schedulesGroup = schedulesGroup
+
+
 
+     
           var that = this;
 
           this.scheduleZone.forEach(function(zone, index) {
@@ -1437,6 +1766,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Mon_A = {
               mode_id: 0,
@@ -1444,6 +1775,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Mon_N = {
               mode_id: 0,
@@ -1451,6 +1784,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Tue_M = {
               mode_id: 0,
@@ -1458,6 +1793,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Tue_A = {
               mode_id: 0,
@@ -1465,6 +1802,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Tue_N = {
               mode_id: 0,
@@ -1472,6 +1811,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Wed_M = {
               mode_id: 0,
@@ -1479,6 +1820,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Wed_A = {
               mode_id: 0,
@@ -1486,6 +1829,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Wed_N = {
               mode_id: 0,
@@ -1493,6 +1838,9 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
+              
             };
             that.scheduleZone[index].Thurs_M = {
               mode_id: 0,
@@ -1500,6 +1848,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Thurs_A = {
               mode_id: 0,
@@ -1507,6 +1857,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Thurs_N = {
               mode_id: 0,
@@ -1514,6 +1866,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Fri_M = {
               mode_id: 0,
@@ -1521,6 +1875,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Fri_A = {
               mode_id: 0,
@@ -1528,6 +1884,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Fri_N = {
               mode_id: 0,
@@ -1535,6 +1893,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Sat_M = {
               mode_id: 0,
@@ -1542,6 +1902,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Sat_A = {
               mode_id: 0,
@@ -1549,6 +1911,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Sat_N = {
               mode_id: 0,
@@ -1556,6 +1920,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Sun_A = {
               mode_id: 0,
@@ -1563,6 +1929,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Sun_N = {
               mode_id: 0,
@@ -1570,6 +1938,8 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
             that.scheduleZone[index].Sun_M = {
               mode_id: 0,
@@ -1577,11 +1947,14 @@ export default {
               patient_id: 0,
               patient: "",
               dialysis_machine_name:"",
+              schedule_date:"",
+              Count:0,
             };
 
 
 
 
+
             that.scheduleZone[index].total = 0;
 
             if (response.data.data.schdules.length > 0) {
@@ -1605,11 +1978,8 @@ export default {
                       patient: schedule.patient,
                       dialysis_machine_name:schedule.dialysis_machine_name,
                       patient_contagions: schedule.patient_contagions,
-                      mode_name:
-                        typeof that.modeOptions[schedule.mode_id] ===
-                        "undefined"
-                          ? ""
-                          : that.modeOptions[schedule.mode_id].name
+                      schedule_date:schedule.schedule_date,
+                      mode_name: typeof that.modeOptions[schedule.mode_id] ==="undefined"? "": that.modeOptions[schedule.mode_id].name
                     };
                     that.scheduleZone[index].total += 1;
 
@@ -1621,7 +1991,7 @@ export default {
           });
 
           this.source_scheduleZone = this.scheduleZone
-
+          console.log("------------aaaa",this.source_scheduleZone)
         } else {
           this.$message.error("网络错误");
           return false;
@@ -2457,7 +2827,7 @@ export default {
         start_sch:first_monday,
         end_sch:end_monday,
       };
-      console.log("params",params)
+      // console.log("params",params)
       getSearchResult(params).then(response => {
         if (response.data.state == 1) {
           this.schedulePatients = response.data.data.schdules;
@@ -2676,7 +3046,7 @@ export default {
     }
     var nowDate = year + "-" + month + "-" + day
     var date = new Date(nowDate + " 00:00:00")
-    console.log("date23232323232323",date.getTime()/1000)
+   
     this.now_time = date.getTime()/1000
     this.getAllZones()
 

src/xt_pages/workforce/components/tableDataModeTwo.vue

@@ -1039,7 +1039,7 @@ export default {
             })
           })
         }
-        console.log("34455555566666",this.scheduleZone)
+        // console.log("34455555566666",this.scheduleZone)
         this.scheduleZone.sort(this.compare('sort'))
       })
     },

src/xt_pages/workforce/components/tableWeeks.vue

@@ -888,7 +888,7 @@
       ,
       signPrint() {
 
-        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 0){
          var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []

src/xt_pages/workforce/next_remind_print.vue

@@ -155,74 +155,84 @@
       this.modeOptions = this.$store.getters.treatment_mode
       this.anticoagulants_confit = this.$store.getters.anticoagulants_confit
       this.week_type = this.$route.query.week_type
-      var now_time = parseInt(this.week_type) * 86400 + this.start_time
-      // console.log("now_time23233232322323",now_time)
-      this.now_time = now_time
+      // var now_time = parseInt(this.week_type) * 86400 + this.start_time
+      // // console.log("now_time23233232322323",now_time)
+      // this.now_time = now_time
       this.week_time  = this.$route.query.week_time
       this.zone = this.$route.query.zone
       this.pre_status = this.$route.query.prestatus
       this.loading = true;
-      let weekOfDay = parseInt(moment().format('E'))
-      let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
-      let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
-      const params = {
-          week_type:this.week_type,
-          week_time:this.week_time,
-          start_time:next_monday,
-          end_time:next_sunday,
-          zone:this.zone,
-          record_date:this.getTime(now_time)
-        }
-    //  console.log("下周打印时间",params)
-      getNextScheduleWeekDay(params).then(rs => {
-        var resp = rs.data
-        console.log(resp)
-        if (resp.state == 1) {
-         var scheduleData = resp.data.schedule
-
-          if(this.pre_status == 0){
-              for(let i=0;i<scheduleData.length;i++){
-              scheduleData[i].sort = scheduleData[i].number.sort
-            }
-            var arr =   scheduleData.sort(this.compare('sort'))
-           
-            this.scheduleData = arr
+
+      this.getNextScheduleWeekDay()
+
+    
+    },
+    methods: {
+      getTimestamp(time) { //把时间日期转成时间戳
+        return (new Date(time)).getTime()
+      },
+      getNextScheduleWeekDay(){
+        let weekOfDay = parseInt(moment().format('E'))
+        let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
+        let next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
+        var now_time = parseInt(this.week_type - 1)*86400 + (this.getTimestamp(next_monday)/1000 -28800)
+        const params = {
+            week_type:this.week_type,
+            week_time:this.week_time,
+            start_time:next_monday,
+            end_time:next_sunday,
+            zone:this.zone,
+            record_date:this.getTime(now_time)
           }
-          if(this.pre_status == 1){
-            var newList = []
-            for(let i=0;i<scheduleData.length;i++){
-              if(scheduleData.prescription.id > 0){
-                 newList.push(scheduleData[i])
+      console.log("下周打印时间",params)
+        getNextScheduleWeekDay(params).then(rs => {
+          var resp = rs.data
+          console.log(resp)
+          if (resp.state == 1) {
+          var scheduleData = resp.data.schedule
+
+            if(this.pre_status == 0){
+                for(let i=0;i<scheduleData.length;i++){
+                scheduleData[i].sort = scheduleData[i].number.sort
               }
+              var arr =   scheduleData.sort(this.compare('sort'))
+            
+              this.scheduleData = arr
             }
-            var arr =   newList.sort(this.compare('sort'))
-           
-            this.scheduleData = arr
-          }
-
-          if(this.pre_status == 2){
-            var newList = []
-            for(let i=0;i<scheduleData.length;i++){
-              if(scheduleData.prescription.id == 0){
-                 newList.push(scheduleData[i])
+            if(this.pre_status == 1){
+              var newList = []
+              for(let i=0;i<scheduleData.length;i++){
+                if(scheduleData.prescription.id > 0){
+                  newList.push(scheduleData[i])
+                }
               }
+              var arr =   newList.sort(this.compare('sort'))
+            
+              this.scheduleData = arr
             }
-            var arr =   newList.sort(this.compare('sort'))
-           
-            this.scheduleData = arr
+
+            if(this.pre_status == 2){
+              var newList = []
+              for(let i=0;i<scheduleData.length;i++){
+                if(scheduleData.prescription.id == 0){
+                  newList.push(scheduleData[i])
+                }
+              }
+              var arr =   newList.sort(this.compare('sort'))
             
+              this.scheduleData = arr
+              
+            }
+            this.loading = false
+          } else {
+            this.$message.error(resp.msg)
           }
-          this.loading = false
-        } else {
-          this.$message.error(resp.msg)
-        }
-      }).catch(err => {
-        this.$message.error(err)
-      })
+        }).catch(err => {
+          this.$message.error(err)
+        })
 
-    
-    },
-    methods: {
+      },
+   
       getAdvice:function(doctor_advice) {
         if (doctor_advice != null) {
 

src/xt_pages/workforce/printOne.vue

@@ -46,11 +46,14 @@
                   <td :width="td_1_width">分区</td>
 
                   <td :width="td_3_width">病人姓名</td>
+
+                  <td :width="td_3_width">统计</td>
                 </tr>
               </thead>
               <tbody>
                 <tr v-for="(it, i) in item.zones" :key="i">
                   <td :width="td_1_width">
+                    总人数: {{getZonePatient(it.partition_id)}}<span v-if="getZonePatient(it.partition_id)>0">人</span><br>
                     {{ getZoneName(it.partition_id) }}
                   </td>
                   <td :width="td_3_width" valign="top">
@@ -64,6 +67,26 @@
                       </div>
                     </div>
                   </td>
+                  <td :width="td_3_width">
+                     
+                    <span v-if="getMonPatient(it.partition_id)>0 || getMonAfterPatient(it.partition_id)>0 || getNightPatient(it.partition_id) >0"></span> 血滤(HDF):<br>
+                     <span v-if="getMonPatient(it.partition_id)>0">上午:{{getMonPatient(it.partition_id)}}人</span><br>
+                      {{getMonPatientName(it.partition_id)}} <br>
+                     <span v-if="getMonAfterPatient(it.partition_id)>0">下午：{{getMonAfterPatient(it.partition_id)}}人</span>  <br>
+                       {{getMonAfterPatientName(it.partition_id) }} <br>
+                     <span v-if="getNightPatient(it.partition_id) >0">晚上：{{getNightPatient(it.partition_id)}}人 </span> <br>
+                        {{getNightPatientName(it.partition_id) }}
+
+
+                     <br>
+                     <span v-if="getMonPatientOne(it.partition_id)>0 || getMonAfterPatientOne(it.partition_id)>0 || getNightPatientOne(it.partition_id) >0">灌流(HD+HP):</span><br>
+                     <span v-if="getMonPatientOne(it.partition_id)>0">上午:{{getMonPatientOne(it.partition_id)}}人</span><br>
+                      {{getMonPatientNameOne(it.partition_id)}} <br>
+                     <span v-if="getMonAfterPatientOne(it.partition_id)>0">下午：{{getMonAfterPatientOne(it.partition_id)}}人</span>  <br>
+                       {{getMonAfterPatientNameOne(it.partition_id) }} <br>
+                     <span v-if="getNightPatientOne(it.partition_id) >0">晚上：{{getNightPatientOne(it.partition_id)}}人 </span> <br>
+                      {{getNightPatientNameOne(it.partition_id) }}
+                  </td>
                 </tr>
               </tbody>
             </table>
@@ -491,7 +514,7 @@ export default {
                 }
               }
             }
-            console.log('arr23322332', arr)
+            console.log('排班数据------------------', arr)
 
             this.tableData = arr
           }
@@ -684,6 +707,212 @@ export default {
         }
       }
       return name
+    },
+    getZonePatient(partition_id){
+       
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id){
+               arr.push(this.list[i])
+           }
+        }
+      }
+
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+
+    },
+    getMonPatient(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 2 && this.list[i].schedule_type ==1){
+               arr.push(this.list[i])
+           }
+        }
+      }
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+    },
+    getMonPatientOne(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 3 && this.list[i].schedule_type ==1){
+               arr.push(this.list[i])
+           }
+        }
+      }
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+    },
+    getMonPatientName(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 2 && this.list[i].schedule_type ==1){
+               arr.push(this.list[i].name)
+           }
+        }
+      }
+      if(arr.length >0){
+        var str = arr.join(",")
+        return str
+      }else{
+        return ""
+      }
+    },
+    getMonPatientNameOne(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 3 && this.list[i].schedule_type ==1){
+               arr.push(this.list[i].name)
+           }
+        }
+      }
+      if(arr.length >0){
+        var str = arr.join(",")
+        return str
+      }else{
+        return ""
+      }
+    },
+    getMonAfterPatient(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 2 && this.list[i].schedule_type ==2){
+               arr.push(this.list[i])
+           }
+        }
+      }
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+    },
+    getMonAfterPatientOne(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 3 && this.list[i].schedule_type ==2){
+               arr.push(this.list[i])
+           }
+        }
+      }
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+    },
+    getMonAfterPatientName(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 2 && this.list[i].schedule_type ==2){
+               arr.push(this.list[i].name)
+           }
+        }
+      }
+      if(arr.length >0){
+        var str = arr.join(",")
+        return str
+      }else{
+        return ""
+      }
+    },
+
+    getMonAfterPatientNameOne(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 3 && this.list[i].schedule_type ==2){
+               arr.push(this.list[i].name)
+           }
+        }
+      }
+      if(arr.length >0){
+        var str = arr.join(",")
+        return str
+      }else{
+        return ""
+      }
+    },
+
+    getNightPatient(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 2 && this.list[i].schedule_type ==3){
+               arr.push(this.list[i])
+           }
+        }
+      }
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+    },
+    getNightPatientOne(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 3 && this.list[i].schedule_type ==3){
+               arr.push(this.list[i])
+           }
+        }
+      }
+      if(arr.length >0){
+         return arr.length
+      }else{
+        return ""
+      }
+    },
+    getNightPatientName(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 2 && this.list[i].schedule_type ==3){
+               arr.push(this.list[i].name)
+           }
+        }
+      }
+      if(arr.length >0){
+        var str = arr.join(",")
+        return str
+      }else{
+        return ""
+      }
+    },
+    getNightPatientNameOne(partition_id){
+      var arr = []
+      if(this.list!=null && this.list.length >0){
+        for(let i=0;i<this.list.length;i++){
+           if(partition_id == this.list[i].partition_id && this.list[i].mode_id == 3 && this.list[i].schedule_type ==3){
+               arr.push(this.list[i].name)
+           }
+        }
+      }
+      if(arr.length >0){
+        var str = arr.join(",")
+        return str
+      }else{
+        return ""
+      }
     }
   }
 }

src/xt_pages/workforce/remind_print_setting.vue

@@ -501,6 +501,9 @@
          }
       })
      },
+     getTimestamp(time) { //把时间日期转成时间戳
+        return (new Date(time)).getTime()
+    },
     getNextScheduleWeekDay() {
         const start = moment().weekday(1).format('YYYY-MM-DD'); //本周一
         const end = moment().weekday(7).format('YYYY-MM-DD')
@@ -517,7 +520,10 @@
         // if(zone != 0){
         //   str = zone.join(",")
         // }
-        var now_time = parseInt(this.week_type) * 86400 + this.start_time
+        // var now_time = parseInt(this.week_type) * 86400 + this.start_time
+        let weekOfDay = parseInt(moment().format('E'))
+        let next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD');
+        var now_time = parseInt(this.week_type - 1)*86400 + (this.getTimestamp(next_monday)/1000 -28800)
         const params = {
           start_time:moment().week(moment().week() + 1).startOf('week').unix(),
           end_time:moment().week(moment().week() + 1).endOf('week').unix(),

src/xt_pages/workforce/remind_print_setting_one.vue

@@ -154,7 +154,7 @@
                     <span>上次脱水量：{{ main_collection.prescription.target_ultrafiltration }}ml</span>
                 </div>
                 <div class="printCell" v-if="org_id==9671 || org_id==9675 || org_id==10340">
-                    <span>上次透析时长：{{ main_collection.lastafterweight.actual_treatment_hour }}小时{{ main_collection.lastafterweight.actual_treatment_minute }}分钟</span>
+                    <span v-if="main_collection.lastafterweight!=undefined">上次透析时长：{{ main_collection.lastafterweight.actual_treatment_hour }}小时{{ main_collection.lastafterweight.actual_treatment_minute }}分钟</span>
                 </div>
                 <div class="printCell">身份证:
                     <span v-if="type ==1">{{main_collection.patient.id_card_no}} </span>
@@ -183,7 +183,7 @@
                 
                 <div class="printCell">
                   <span>
-                    分区/床号
+                    分区/床号：
                     <span  style="width:auto;">{{main_collection.zone.name}}/</span>
                     {{ main_collection.number.number }}
                     <!-- <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
@@ -192,6 +192,16 @@
                   </span>
                  
                 </div>
+
+                <div class="printCell">
+                  <span>
+                    排班备注：
+                    <span  style="width:auto;">
+                      {{ main_collection.dialysis_order.schedule_remark }}
+                    </span>
+                  </span>
+                 
+                </div>
               
               </div>
            </div>
@@ -498,14 +508,20 @@
         // if(zone != 0){
         //   str = zone.join(",")
         // }
-        var now_time = parseInt(this.week_type) * 86400 + this.start_time
+        const loading = this.$loading({
+          lock: true,
+          text: "加载中...",
+          spinner: "el-icon-loading",
+          background: "rgba(0, 0, 0, 0.7)"
+        });
+        // var now_time = parseInt(this.week_type) * 86400 + this.start_time
 
         const weekOfDay = parseInt(moment().format('E'))
         const next_monday = moment().add((7 - weekOfDay) + 1, 'days').format('YYYY-MM-DD')
         console.log('卡 is h2323233232', this.toStamp(next_monday))
         const next_sunday = moment().add((7 - weekOfDay) + 7, 'days').format('YYYY-MM-DD')
         console.log('下周日', this.toStamp(next_sunday))
-
+        var now_time = parseInt(this.week_type - 1)*86400 + (this.getTimestamp(next_monday)/1000 -28800)
         const params = {
           start_time: this.toStamp(next_monday),
           end_time: this.toStamp(next_sunday),
@@ -524,6 +540,7 @@
         getNextScheduleWeekDayOne(params).then(response => {
           this.scheduleData = []
           if (response.data.state == 1) {
+            loading.close()
             var scheduleData = response.data.data.schedule
 
             for (let i = 0; i < scheduleData.length; i++) {
@@ -716,7 +733,10 @@
         const myDate = new Date(date).getTime() / 1000 - 28800
         // const stmapEg = Date.parse(myDate) / 1000
         return myDate
-      }
+      },
+      getTimestamp(time) { //把时间日期转成时间戳
+      return (new Date(time)).getTime()
+    },
 
     }
   }

src/xt_permission.js

@@ -12,19 +12,19 @@ const permissionWhiteList = loginWhiteList.concat(['/']) // 权限验证白名
 
 router.beforeEach((to, from, next) => {
   // 线上注释
-  // if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
-  //   store.dispatch('VerifyConfigList', []).then(() => {
-  //     next()
-  //   })
-  // }
-  // if (store.getters.permission_routers === undefined) {
-  //   store.dispatch('xt_GenerateRoutes', []).then(() => {
-  //     next()
-  //   })
-  // } else {
-  //   next()
-  // }
-  // return
+  if (!store.getters.configlist || store.getters.configlist === undefined || store.getters.configlist.length <= 0) {
+    store.dispatch('VerifyConfigList', []).then(() => {
+      next()
+    })
+  }
+  if (store.getters.permission_routers === undefined) {
+    store.dispatch('xt_GenerateRoutes', []).then(() => {
+      next()
+    })
+  } else {
+    next()
+  }
+  return
   // 线上注释
   NProgress.start()
   // console.log(store.getters.current_role_urls.indexOf(to.path))