新分支

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1379,6 +1379,7 @@
                           >
                           置换液的速度<br />(ml/h)
                           </td>
+                          <td width="50" v-if="org_id == 0 || org_id == 10375">置换率<br />(ml/h)</td>
                           <td width="50" v-if="org_id != 3877 && org_id != 10449">超滤量<br />(ml)</td>
                           <td width="50" v-if="org_id ==3877 || org_id ==10449">累计超滤量<br />(ml)</td>
                           <td
@@ -1562,7 +1563,9 @@
                                 : ""
                             }}
                           </td>
-
+                          <td width="50" v-if="org_id == 0 || org_id == 10375"><br />
+                            {{ monitor_record.replacement_rate?monitor_record.replacement_rate:"0" }}
+                          </td>
                           <td>
                             <span v-if="org_id == 9671 || org_id == 10440 || org_id == 10471">
                                 {{
@@ -1689,6 +1692,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td  v-if="org_id == 0 || org_id == 10375"> </td>
                         <td v-if="org_id == 9671 || org_id == 9919"></td>
                         <td
                           v-if="
@@ -1765,6 +1769,7 @@
                             执行人签名
                           </td>
                           <td style="font-size: 16px" width="10%">时间</td>
+                           <td style="font-size: 16px" width="10%" v-if="org_id == 10375 || org_id ==0">核对护士</td>
                         </tr>
                         <!-- <template v-for="group in doctor_advices" > -->
 
@@ -1872,6 +1877,29 @@
                                 getTime(advice[0].execution_time, " {h}:{i}")
                               }}</span>
                             </td>
+                            <td height="35px" v-if="org_id == 10375 || org_id == 0">
+                              <span
+                                v-if="
+                                  setAdminUserES(
+                                    advice[0],
+                                    'checker'
+                                  ) == ''
+                                "
+                                >{{
+                                  getAdminUser(advice[0], "checker")
+                                }}</span
+                              >
+                              <img
+                                class="es-img"
+                                :src="
+                                  setAdminUserES(advice[0], 'checker')
+                                "
+                                alt=""
+                                srcset=""
+                                v-else
+                                style="height: 40px"
+                              />
+                            </td>
                           </tr>
                         </template>
                       </tbody>
@@ -2399,7 +2427,7 @@
                       <div
                         class="inline_block"
                         style="flex: 1"
-                        v-if="org_id != 10223"
+                        v-if="org_id != 10223 || org_id!=10375"
                       >
                         透析中入量(L)：
                         <div
@@ -2657,6 +2685,40 @@
                           }}
                         </div>
                       </div>
+
+                  
+                    </div>
+
+                    <div
+                      class="row"
+                      style="padding: 2px 0; line-height: 23px; display: flex"
+                      v-if="org_id == 0 || org_id ==10375"
+                    >
+                      <div
+                        class="inline_block"
+                        style="flex: 1; display: inline-block"
+                      >
+                        宣教知识：
+                        <div
+                          class="under_line"
+                          style="
+                            width: 840px;
+                            line-height: 25px;
+                            text-align: left;
+                            margin-left: 2px;
+                            display: inline-block;
+                            white-space: normal;
+                          "
+                        >
+                          {{
+                            record.summer && record.summer.mission
+                              ? record.summer.mission
+                              : "/"
+                          }}
+                        </div>
+                      </div>
+
+                  
                     </div>
                   </td>
                 </tr>

src/xt_pages/dialysis/details/assessmentAfter.vue

@@ -17,8 +17,8 @@
           <span class="content" v-if="actual_ultrafiltration != '0'">{{
             actual_ultrafiltration
           }}</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445  ) " >ml</span>
-          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445"  >L</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && (this.$store.getters.xt_user.template_info.template_id == 6 || this.$store.getters.xt_user.template_info.template_id == 9 || this.$store.getters.xt_user.template_info.template_id == 17 || this.$store.getters.xt_user.template_info.template_id == 20 || this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 22 || this.$store.getters.xt_user.template_info.template_id == 23 || this.$store.getters.xt_user.template_info.template_id == 24 || this.$store.getters.xt_user.template_info.template_id == 26 || this.$store.getters.xt_user.template_info.template_id == 28 || this.$store.getters.xt_user.template_info.template_id == 27 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id == 30 || this.$store.getters.xt_user.template_info.template_id == 31 || this.$store.getters.xt_user.template_info.template_id == 32 || this.$store.getters.xt_user.template_info.template_id == 34 || this.$store.getters.xt_user.template_info.template_id == 36 || this.$store.getters.xt_user.template_info.template_id == 38 || this.$store.getters.xt_user.template_info.template_id == 43 || this.$store.getters.xt_user.template_info.template_id == 44 || this.$store.getters.xt_user.template_info.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10340 ||  this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10430 ||  this.$store.getters.xt_user.template_info.org_id == 10432 ||  this.$store.getters.xt_user.template_info.org_id == 10441 ||  this.$store.getters.xt_user.template_info.org_id == 10445 ||  this.$store.getters.xt_user.template_info.org_id == 10495  ) " >ml</span>
+          <span class="unit" v-if=" actual_ultrafiltration != '0' && this.$store.getters.xt_user.template_info.template_id != 6 && this.$store.getters.xt_user.template_info.template_id != 9 && this.$store.getters.xt_user.template_info.template_id != 17 && this.$store.getters.xt_user.template_info.template_id != 20 && this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 22 && this.$store.getters.xt_user.template_info.template_id != 23 && this.$store.getters.xt_user.template_info.template_id != 24 && this.$store.getters.xt_user.template_info.template_id != 26 && this.$store.getters.xt_user.template_info.template_id != 28 && this.$store.getters.xt_user.template_info.template_id != 27 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id != 30 && this.$store.getters.xt_user.template_info.template_id != 31 && this.$store.getters.xt_user.template_info.template_id != 32 && this.$store.getters.xt_user.template_info.template_id != 34 && this.$store.getters.xt_user.template_info.template_id != 36 && this.$store.getters.xt_user.template_info.template_id != 38 && this.$store.getters.xt_user.template_info.template_id != 43 && this.$store.getters.xt_user.template_info.template_id != 44 && this.$store.getters.xt_user.template_info.template_id != 60 &&  this.$store.getters.xt_user.template_info.org_id != 9555  && this.$store.getters.xt_user.template_info.org_id != 10340 &&  this.$store.getters.xt_user.template_info.org_id!= 10387 &&  this.$store.getters.xt_user.template_info.org_id!= 10430 &&  this.$store.getters.xt_user.template_info.org_id!= 10432 &&  this.$store.getters.xt_user.template_info.org_id!= 10441 &&  this.$store.getters.xt_user.template_info.org_id!= 10445  &&  this.$store.getters.xt_user.template_info.org_id!= 10495"  >L</span>
         </li>
         <li v-if="isShow('导管')">
           <label>导管 : </label>

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

@@ -29,7 +29,7 @@
           <el-col :span="8" v-if="isShow('实际超滤量')">
             <el-form-item
               label="实际超滤量(ml): " :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')"
-              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410"  >
+              v-if=" this.template_id == 6 || this.template_id == 9 || this.template_id == 10 || this.template_id == 11  || this.template_id == 17 || this.template_id == 20 || this.template_id == 21 || this.template_id == 22 || this.template_id == 23 || this.template_id == 24 || this.template_id == 26 || this.template_id == 28 || this.template_id == 27 || this.template_id == 29 || this.template_id == 30 || this.template_id == 31 || this.template_id == 32 || this.template_id == 34 || this.template_id == 36 || this.template_id == 38 || this.template_id == 43 || this.template_id == 44 || this.template_id == 47 || this.template_id == 56 || this.template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10307 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 9555 || this.$store.getters.xt_user.template_info.org_id == 10387 || this.$store.getters.xt_user.template_info.org_id == 10430 || this.$store.getters.xt_user.template_info.org_id == 10432 || this.$store.getters.xt_user.template_info.org_id == 10441 || this.$store.getters.xt_user.template_info.org_id == 10445 || this.$store.getters.xt_user.template_info.org_id == 10410 || this.$store.getters.xt_user.template_info.org_id == 10495"  >
               <el-input v-model="form.actual_ultrafiltration"></el-input>
             </el-form-item>
             <el-form-item label="实际超滤量(L): " v-else :prop="isName('实际超滤量')" :rules="isCheckmust('实际超滤量')">
@@ -628,6 +628,12 @@
             </el-form-item>
         </el-col>
 
+        <el-col :span="24" v-if="isShow('备注')">
+            <el-form-item label="备注：" :prop="isName('备注')">
+              <el-input type="textarea" :rows="4" v-model="form.remark"></el-input>
+            </el-form-item>
+        </el-col>
+
       </el-form>
 
 
@@ -852,6 +858,7 @@ export default {
         machine_run:0,
         after_urea:"",
         accumulated_blood_volume:"",
+     
       },
       lapseList:[],
       leaveOfficeMethod:[],
@@ -1174,6 +1181,7 @@ export default {
           data["after_urea"] = this.form.after_urea
           data["pip_coagulation"] = this.form.pip_coagulation
           data["accumulated_blood_volume"] = this.form.accumulated_blood_volume
+       
           console.log("Data",data)
           console.log("Paramsquery",data)
 

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

@@ -796,17 +796,17 @@ export default {
     changeBox(val) {
       var arr = [];
       var str = val.join(";");
-      if (str.indexOf("透析器/灌流器") != -1 && this.prescription != null) {
+      if (str.indexOf("透析器/灌流器/滤过器") != -1 && this.prescription != null) {
         arr.push(
-          "透析器/灌流器:" +
+          "透析器/灌流器/滤过器:" +
             (this.prescription.dialyzer_perfusion_apparatus
               ? this.prescription.dialyzer_perfusion_apparatus
               : "")
         );
       }
 
-      if (str.indexOf("透析器/灌流器") != -1 && this.prescription == null) {
-        arr.push("透析器/灌流器:");
+      if (str.indexOf("透析器/灌流器/滤过器") != -1 && this.prescription == null) {
+        arr.push("透析器/灌流器/滤过器:");
       }
 
       if (str.indexOf("穿刺针") != -1 && this.predialysis_evaluation.id != 0) {
@@ -1366,7 +1366,7 @@ export default {
       if (this.prescription != null && this.prescription.id != 0) {
         if (this.prescription.dialyzer_perfusion_apparatus != "" ||this.prescription.dialysis_dialyszers != "" || this.prescription.dialysis_irrigation != "") {
 
-          if(this.org_id == 10440 || this.org_id == 0){
+          if(this.org_id == 10440){
             this.diazes = "透析器/灌流器:";
             this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus;
             this.diazes = this.diazes + this.prescription.dialysis_dialyszers + this.prescription.dialysis_irrigation + "  " +"批号:"+ " ";
@@ -1374,15 +1374,12 @@ export default {
             console.log("hhahahahhahahahawowoowowowowo--------",this.diazes)
           }
 
-          if(this.org_id!=0 && this.org_id!=10440){
+          if(this.org_id!=10440){
            
-            this.diazes = "透析器/灌流器:";
-            this.diazes =
-              this.diazes + this.prescription.dialyzer_perfusion_apparatus;
-            this.diazes =
-              this.diazes +
-              this.prescription.dialysis_dialyszers +
-              this.prescription.dialysis_irrigation 
+            this.diazes = "透析器/灌流器/滤过器:";
+            this.diazes = this.diazes + this.prescription.dialyzer_perfusion_apparatus;
+            this.diazes = this.diazes + this.prescription.dialysis_dialyszers + this.prescription.dialysis_irrigation + this.prescription.dialysis_strainer
+
           }
         
         } else {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -1467,6 +1467,7 @@
                           <span v-if="org_id == 0 || org_id == 10490"> 置换液的速度<br />(ml/h)</span> 
                         </td>
                         <td width="50" v-if="org_id == 10121">SpO₂<br />(%)</td>
+                        <td width="50" v-if="org_id == 10375 || org_id == 0">置换率<br />(ml/h)</td>
                         <td width="50" v-if="org_id != 3877 && org_id != 10449 && org_id != 0">超滤量<br />(ml)</td>
                         <td width="50" v-if="org_id ==3877 || org_id == 10449 || org_id ==0">累计超滤量<br />(ml)</td>
                         <td v-if="(prescription.mode_id == 2 ||prescription.mode_id == 5 ||prescription.mode_id == 12) &&org_id!=10478 && org_id!=0" width="50">
@@ -1565,7 +1566,9 @@
                         </td>
 
                       
-
+                        <td v-if="org_id == 10375 || org_id == 0"><br />
+                          {{ monitor.replacement_rate? monitor.replacement_rate: ""}}
+                        </td>
                         <td>
                           <span v-if="org_id!=9671 && org_id!=10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: ""}}</span>
                           <span v-if="org_id==9671 || org_id==10440"> {{ monitor.ultrafiltration_volume? monitor.ultrafiltration_volume: "0"}}</span>
@@ -1657,6 +1660,7 @@
                         <td></td>
                         <td></td>
                         <td></td>
+                        <td v-if="org_id == 10375 || org_id == 0"><br /></td>
                         <td v-if="org_id == 9671 || org_id == 9919"></td>
                         <td
                           v-if="
@@ -1732,7 +1736,7 @@
                         <td
                           style="font-size: 16px"
                           width="10%"
-                          v-if="org_id == 10223 || org_id == 9538"
+                          v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375"
                         >
                           核对护士
                         </td>
@@ -1823,7 +1827,7 @@
                             getTime(advice.execution_time, "{h}:{i}")
                           }}</span>
                         </td>
-                        <td height="32px" v-if="org_id == 10223 || org_id == 9538">
+                        <td height="32px" v-if="org_id == 10223 || org_id == 9538 || org_id == 0 || org_id ==10375">
                           <span v-if="setAdminUserES(advice.checker) == ''">{{
                             getAdminUser(advice.checker)
                           }}</span>
@@ -2417,7 +2421,7 @@
                     <div
                       class="inline_block"
                       style="flex: 1"
-                      v-if="org_id != 10223"
+                      v-if="org_id != 10223 || org_id!=10375"
                     >
                       透析中入量(L)：
                       <div
@@ -2613,6 +2617,34 @@
                       </div>
                     </div>
                   </div>
+                  <div
+                    class="row"
+                    style="padding: 2px 0; line-height: 23px; display: flex"
+                  >
+                    <div
+                      class="inline_block"
+                      style="flex: 1; display: inline-block"
+                    >
+                      宣教知识：
+                      <div
+                        class="under_line"
+                        style="
+                          width: 860px;
+                          line-height: 25px;
+                          text-align: left;
+                          margin-left: 2px;
+                          display: inline-block;
+                          white-space: normal;
+                        "
+                      >
+                        {{
+                          summary.mission
+                            ? summary.mission
+                            : "/"
+                        }}
+                      </div>
+                    </div>
+                  </div>
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"

src/xt_pages/medicalScheduling/index.vue

@@ -485,7 +485,7 @@ export default {
             })
         },
         hangdleClick(val,index,num){
-        //  console.log("val",val)
+          console.log("val",val)
          this.docobj = val
          if(this.getTimestamp(this.weekDayArr[num]) < this.timeNow){
             this.$message.error("过去日期不可以编辑")
@@ -864,7 +864,6 @@ export default {
                     let tempArr = [], newArr = []
                     for (let i = 0; i < staffList.length; i++) {
                         if (tempArr.indexOf(staffList[i].user_name) == -1) {
-                            console.log("tempArr",staffList[i].user_name)
                             newArr.push({
                                 user_name: staffList[i].user_name,
                                 admin_user_id:staffList[i].admin_user_id,
@@ -875,6 +874,7 @@ export default {
                             })
                             tempArr.push(staffList[i].user_name);
                         } else {
+                            console.log("staffList",staffList[i].user_name)
                             for (let j = 0; j < newArr.length; j++) {
                                 if (newArr[j].admin_user_id == staffList[i].admin_user_id) {
                                     newArr[j].list.push({class_name:staffList[i].class_name,admin_user_id:staffList[i].admin_user_id,schedule_week:staffList[i].schedule_week,user_type:staffList[i].doctor_type,class_attributes:staffList[i].class_attributes})
@@ -882,8 +882,9 @@ export default {
                             }
                         }
                     }
-                    console.log("newArr22o2o2o2o2wo",newArr)
+                    
                     let arrTen = [...newArr]
+                    console.log("newArr22o2o2o2o2wo",arrTen)
                     let newNurse = []
                     let newDoctor = []
                     arrTen.map(item => {
@@ -895,6 +896,7 @@ export default {
                         }
                     })
                     //护士
+                    console.log("newNurse",newNurse)
                     newNurse.sort(this.compare('admin_user_id'))
                     let newNurseTableData = []
                     this.nurseTableData.map(item => {
@@ -903,6 +905,7 @@ export default {
                         }
                     })
                     newNurseTableData.sort(this.compare('admin_user_id'))
+                    console.log("newNurseTableData",newNurseTableData)
                     newNurseTableData.map((item,index) => {
                         if (newNurse[index] && item.admin_user_id == newNurse[index].admin_user_id) {
 
@@ -911,8 +914,8 @@ export default {
                         }
                     })
                     newNurse.sort(this.compare('sort'))
-                    console.log("newNurse",newNurse)
-                    //医生
+                  
+                    // //医生
                     newDoctor.sort(this.compare('admin_user_id'))
                     let newDoctorTableData = []
                     this.doctorTableData.map(item => {

src/xt_pages/workforce/components/nextTableWeeks.vue

@@ -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 ==10375){
          var zone = this.zone
           var newArr = []
           for(let i=0;i<this.zoneList.length;i++){

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 || this.org_id == 0){
+        if(this.org_id == 9671 || this.org_id == 9675 || this.org_id == 10340 || this.org_id == 0 || this.org_id == 10375){
          var zone = this.zone
           console.log("zone23232",zone)
           var newArr = []