Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/api/patient.js

   })
 }
 
-export function createRescueRecord(patient_id, content) {
+export function createRescueRecord(patient_id, content,record_date) {
   var params = {
     patient_id: patient_id,
-    content: content
+    content: content,
+    record_date:record_date,
   }
   return request({
     url: '/api/patient/rescue/create',
     method:"Get",
     params:params,
   })
-}
+}
+
+export function getPatientInspectionList(params){
+
+  return request({
+    url:"/api/patient/getpatientinspectionlist",
+    method:"get",
+    params:params
+  })
+}
+
+export function getInspectionByProjectId(params){
+ 
+  return request({
+    url:"/api/patient/getinspectionbyprojectid",
+    method:"get",
+    params:params
+  })
+}
+
+// export function getNewInspetingList(params){
+
+//   return request({
+//     url:"/api/patient/getnewinspetionlist",
+//     method:"get",
+//     params:params
+//   })
+// }

src/xt_pages/Pharmacy/PatientDispensing.vue

 
       <el-dialog
         title="药品追溯码"
+        @open="openDialog"
         :visible.sync="dialogVisibleOne"
          width="40%">
        <span>
         <el-input
+          ref="inputRef"
           @keyup.native="changeText"
           type="textarea"
           placeholder="请输入内容"
           v-model="textarea"
+          autofocus
           :rows="10"
         >
         </el-input>
     // this.selectedbydefault();
   },
   methods: {
+    openDialog(){
+      this.$nextTick(() => {
+        this.$refs.inputRef.$refs.input.focus()
+      });
+    },
     changevalue(row){
       var params = {
         id:row.ID,
        this.is_source = is_source
        this.textarea = DrugCode
        this.currentIndex = index
+      
        this.dialogVisibleOne = true
 
     },
       })
     },
     changeText(event){
+     
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
+       
         var textarea = ""
-        textarea += this.textarea + ","
+        textarea += this.textarea.replace(/^\s*[\r\n]|\r?\n\s*$/gm, '') + ","
+         
+      
+
+        if(this.$store.getters.xt_user.org.id == 10138 || this.$store.getters.xt_user.org.id==0){
+          var arr= []
+          arr = textarea.split(",")
+          var is_err_check = false
+          var i_index = ""
+          if(arr!=null && arr.length>0){
+            for(let i=0;i<arr.length;i++){
+               if(arr[i]!=""){
+                 if(arr[i].length!=20){
+                   this.$message.error("药品追溯码长度没有满足20位!")
+                   is_err_check = true
+                   i_index = i
+                 }
+               }
+
+            }
+          }
+          console.log("is_err_check+++++++++++++",is_err_check)
+          if(is_err_check == true){
+              arr.splice(i_index,1)
+          }
+          console.log("arr-------------------------",arr)
+          this.textarea = arr.join(",")
+        }else{
+
+          this.textarea = textarea
+        }
+        
 
-        this.textarea = textarea
+       
       }
 
 
 
 
   },
+  
 };
 </script>
 

src/xt_pages/data/components/addDrugs.vue

                     <el-form-item label="" style="visibility: hidden;">
                         <el-input style="width:160px;" placeholder="" maxlength="30"></el-input>
                     </el-form-item>
+
+                    <el-form-item label="扫码次数:" prop="scan_code">
+                        <el-input v-model="form.scan_code" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                    </el-form-item>
+                    <el-form-item label="药品标识码:" prop="drug_identification_code">
+                        <el-input v-model="form.drug_identification_code" style="width:160px;" placeholder="" maxlength="30"></el-input>
+                    </el-form-item>
                 </el-form>
             </el-tab-pane>
         </el-tabs>
           is_show:"",
           is_self_drug:"2",
           is_zero_flag:"",
-
+          scan_code:"",
+          drug_identification_code:""
         },
 
         rules: {
         form['is_show'] = this.form.is_show
         form['is_self_drug'] = parseInt(this.form.is_self_drug)
         form['is_zero_flag'] = parseInt(this.form.is_zero_flag)
-
+        form["scan_code"] = this.form.scan_code
+        form["drug_identification_code"] = this.form.drug_identification_code
 
 
         return form

src/xt_pages/data/components/drugs.vue

           bbx01:"",
           bby01:"",
           is_show:"",
+          scan_code:"",
+          drug_identification_code:"",
         },
         tempFormValue: {
           drug_name: '',//药品名称
                 this.formValue.is_self_drug = this.formValue.is_self_drug.toString()
               }
 
+              
+
 
               this.$refs.addDrugs.show(id, this.formValue)
 

src/xt_pages/dialysis/batch_print/batch_print_order_eightyone.vue

                         <div class="under_line"
                           style="width: 70px; text-align: center"
                         >
-                          <span>
-                           {{ record.assessment_after_dislysis &&
+                          <span v-if="record.assessment_before_dislysis.weight_before>0&&record.assessment_after_dislysis.weight_after>0">
+                           <!-- {{ record.assessment_after_dislysis &&
                             record.assessment_after_dislysis.weight_loss
                               ? record.assessment_after_dislysis.weight_loss
-                              : "/"}}
+                              : "/"}} -->
+                              {{
+                              record.assessment_after_dislysis && 
+                              record.assessment_before_dislysis&&
+                              (record.assessment_before_dislysis.weight_before  - record.assessment_after_dislysis.weight_after).toFixed(1)
+                                ?(record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after).toFixed(1)
+                                : "/"
+                            }}
                           </span>
 
                         </div>

src/xt_pages/dialysis/batch_print/batch_print_order_seventy.vue

                       class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                     >
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1" v-if="record.dialysis_order.puncture_nurse>0">
                         穿刺护士：
                         <div
                           class="under_line"
                           />
                         </div>
                       </div>
+                      <div class="inline_block" style="flex: 1" v-if="record.dialysis_order.change_nurse>0">
+                        换药护士：
+                        <div
+                          class="under_line"
+                          style="width: 80px; text-align: center"
+                        >
+                          <span
+                            v-if="
+                              setAdminUserES(
+                                record.dialysis_order,
+                                'change_nurse'
+                              ) == ''
+                            "
+                            >{{
+                              getAdminUser(
+                                record.dialysis_order,
+                                "change_nurse"
+                              )
+                                ? getAdminUser(
+                                    record.dialysis_order,
+                                    "change_nurse"
+                                  )
+                                : "/"
+                            }}</span
+                          >
+                          <img
+                            class="es-img"
+                            :src="
+                              setAdminUserES(
+                                record.dialysis_order,
+                                'change_nurse'
+                              )
+                            "
+                            alt=""
+                            srcset=""
+                            v-else
+                            :style="{'height': org_id==10597 ? '25px' : '30px'}"
+                          />
+                        </div>
+                      </div>
                       <div class="inline_block" style="flex: 1">
                         治疗护士：
                         <div

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

                           <td width="50">脉搏<br />(次/分)</td>
                           <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
                           <td width="50">血流量<br />(ml/min)</td>
-                          <td width="50" v-if="org_id == 10478 || org_id ==10510">动脉压<br />(mmHg)</td>
+                          <td width="50" v-if="org_id == 10478 || org_id ==10510 || org_id ==10735">动脉压<br />(mmHg)</td>
                           <td width="50">静脉压<br />(mmHg)</td>
                           <td width="50">跨膜压<br />(mmHg)</td>
                           <td width="60" v-if="org_id != 9836 && org_id!=10644">透析液温度(°C)
                               org_id!=10644 &&
                               org_id!=0&&
                               org_id!=10567 &&
-                              org_id!=10724
+                              org_id!=10724 &&
+                              org_id!=10735
                             "
                           >
                             电导度<br />(ms/cm)
                             }}
                           </td>
 
-                          <td v-if="org_id == 10478 || org_id ==10510">
+                          <td v-if="org_id == 10478 || org_id ==10510 || org_id == 10735">
                             {{
                               monitor_record.arterial_pressure
                                 ? monitor_record.arterial_pressure
                               org_id!=10644 &&
                               org_id!=0 &&
                               org_id!=10567 &&
-                              org_id!=10724
+                              org_id!=10724 &&
+                              org_id!=10735
 
 
                             "
                          </span>
 
                          <span v-if="org_id == 10551">{{
-                            record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis && 
+                            record.assessment_before_dislysis&&
                             record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after
                               ?record.assessment_before_dislysis.weight_before - record.assessment_after_dislysis.weight_after
                               : "/"

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

                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id != 10597&& this.$store.getters.xt_user.template_info.org_id != 10571 && this.$store.getters.xt_user.template_info.org_id != 10612 && this.$store.getters.xt_user.template_info.org_id != 10598 && this.$store.getters.xt_user.template_info.org_id != 10677 && this.$store.getters.xt_user.template_info.org_id != 10679 && this.$store.getters.xt_user.template_info.org_id != 10702 && this.$store.getters.xt_user.template_info.org_id != 10635 && this.$store.getters.xt_user.template_info.org_id != 10721 && this.$store.getters.xt_user.template_info.org_id != 10742 && this.$store.getters.xt_user.template_info.org_id != 10740 && this.$store.getters.xt_user.template_info.org_id != 10745">
                         <el-form-item label="处方脱水量(ml)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
                     </el-col>
 
                     <el-col :span="8"
-                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721">
+                            v-if="isShows('处方脱水量') && this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id ==10571 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10598 || this.$store.getters.xt_user.template_info.org_id ==10612 || this.$store.getters.xt_user.template_info.org_id ==10677 || this.$store.getters.xt_user.template_info.org_id==10679 || this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10740 || this.$store.getters.xt_user.template_info.org_id==10742  || this.$store.getters.xt_user.template_info.org_id==10745">
                         <el-form-item label="处方脱水量(L)：" prop="prescription_water" :rules="isCheckmust('处方脱水量')">
                             <el-input
                                     type="number"
         this.pre = pre
         // console.log("pre1", pre);
         this.getPermission()
-        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10735){
+        if(this.$store.getters.xt_user.template_info.org_id==10164 || this.$store.getters.xt_user.template_info.org_id==10721 || this.$store.getters.xt_user.template_info.org_id==10635 || this.$store.getters.xt_user.template_info.org_id==0 || this.$store.getters.xt_user.template_info.org_id == 10726 || this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731 || this.$store.getters.xt_user.template_info.org_id == 10735 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742|| this.$store.getters.xt_user.template_info.org_id == 10745){
           this.getPatientBefor()
         }
 
           var prescription = response.data.data.prescription
           if(patientBefor!=undefined){
 
-            if(this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731){
+            if(this.$store.getters.xt_user.template_info.org_id == 10727  || this.$store.getters.xt_user.template_info.org_id == 10731 ||this.$store.getters.xt_user.template_info.org_id == 10740 ||this.$store.getters.xt_user.template_info.org_id == 10742||this.$store.getters.xt_user.template_info.org_id == 10745 ){
               if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               
                  this.dialysisPrescription.target_ultrafiltration = ((patientBefor.weight_before - patientBefor.dry_weight - patientBefor.additional_weight).toFixed(0))*1000
-                 console.log("hhhhhhhhhhhhhhhhhh",this.dialysisPrescription.target_ultrafiltration)
+                
               }
             }else{
               if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){

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

                 org_id == 10599 || 
                 org_id == 10612 ||
                 org_id == 10617 ||
-                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206) &&
+                org_id ==10580 || org_id ==10629 || org_id==10677 || org_id ==10667 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id ==10090 || org_id ==10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id == 10740 || org_id == 10742|| org_id == 10745 ) &&
                 org_id!=10387
             "
           >
               && org_id!=10432 && org_id!=10445
               && org_id!=10410 && org_id!=10495 &&
                org_id!=10485 && org_id!=10395 && org_id!=10375
-               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206)
+               && org_id!=10480  && org_id!=10551 && org_id!=10597 && org_id!=10599 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10697 && org_id!=10635  && org_id!=10702  && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727  && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745)
               || org_id == 10387
             "
           >
                 org_id == 10410 ||
                 org_id == 10495  ||
                 org_id == 10395
-                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206)
+                || org_id == 10485 || org_id == 10375 || org_id ==10480 || org_id ==10551 || org_id ==10597 || org_id ==10599 || org_id ==10612 || org_id==10617 || org_id ==10580 || org_id ==10629 || org_id ==10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id ==10727 || org_id == 10206 || org_id ==10702 || org_id ==10740 || org_id == 10742 || org_id == 10745)
                 && org_id!=10387
             "
           >
               org_id!=10432 &&
               org_id!=10445 &&
               org_id!=10410 && org_id!=10495
-              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206) ||
+              && org_id!=10485 && org_id!=10395 && org_id!=10375 && org_id!=10480 && org_id!=10551 && org_id!=10597 && org_id!=10599&& org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10629 && org_id!=10677 && org_id!=10667 && org_id!=10693  && org_id!=10697  && org_id!=10635  && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740&& org_id!=10742&& org_id!=10745 ) ||
               org_id == 10387
             "
           >
                 org_id== 10432 ||
                 org_id== 10445 ||
                 org_id== 10410 ||
-                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206) &&
+                org_id == 10485 || org_id == 10375 || org_id == 10480 || org_id == 10551 || org_id ==10612 || org_id ==10580 || org_id ==10617 || org_id ==10667 || org_id == 10693 || org_id ==10697 || org_id ==10635 || org_id ==10702 || org_id == 10090 || org_id == 10723 || org_id == 10721 || org_id == 10727 || org_id == 10206 || org_id ==10740 || org_id ==10742 || org_id == 10745) &&
                 org_id!=10387
             "
           >
               org_id!=10445 &&
               org_id!=10410 &&
               org_id!=10485 &&
-              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206)
+              org_id!=10375 &&  org_id!=10480 &&  org_id!=10551 && org_id!=10612 && org_id!=10617 && org_id!=10580 && org_id!=10667 && org_id!=10693 && org_id!=10697 && org_id!=10635 && org_id!=10702 && org_id!=10090 && org_id!=10723 && org_id!=10721 && org_id!=10727 && org_id!=10206 && org_id!=10740 && org_id!=10742 && org_id!=10745)
               || org_id == 10387
             "
           >
                 org_id == 10599 ||
                 org_id ==10612 || 
                 org_id ==10617 || 
-                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206)
+                org_id==10580 || org_id ==10629 || org_id == 10677 || org_id == 10667 || org_id == 10693 || org_id == 10697 || org_id == 10635 || org_id == 10702 || org_id == 10090 || org_id ==10723 || org_id == 10721 || org_id == 10727 || org_id ==10206 || org_id == 10740 || org_id == 10742 || org_id == 10745)
                 && org_id!=10387 && org_id!=10694
             "
           >
               org_id!=10723 &&
               org_id!=10721 &&
               org_id!=10727 &&
-              org_id!=10206
+              org_id!=10206 &&
+              org_id!=10740 &&
+              org_id!=10742 &&
+              org_id!=10745
               )
               || org_id == 10387 || org_id == 10694
             "

src/xt_pages/dialysis/details/dialysisMonitoring.vue

           <th v-if="isShow('血流量1')" width="92px">血流量(ml/min)</th>
           <th v-if="isShow('跨膜压')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
           <th v-if="isShow('跨膜压1')" width="76px">跨膜压({{monitores[0]&&monitores[0]['transmembrane_pressure_type'] == 2 ? 'kpa' : 'mmHg'}})</th>
-          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || 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 == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 " width="76px" > 超滤量(ml)</th>
-          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && 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!=10432  && 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!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471"  width="76px"> 超滤量(L) </th>
+          <th v-if=" isShow('超滤量') &&(template_id == 6 || template_id == 9 || template_id == 10 || template_id == 11 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 27 || template_id == 28 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 32 || template_id == 34 || template_id == 35 || template_id == 36 || template_id == 38 || template_id == 39 || template_id == 40  || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47 || template_id == 48 || this.$store.getters.xt_user.template_info.org_id == 9555 || template_id == 53 || template_id == 54 || template_id == 56 || template_id == 60 || template_id == 65 || this.$store.getters.xt_user.template_info.org_id == 10340  || this.$store.getters.xt_user.template_info.org_id == 10432 || 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 == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10599 || this.$store.getters.xt_user.template_info.org_id == 10597  || this.$store.getters.xt_user.template_info.org_id == 10612  || this.$store.getters.xt_user.template_info.org_id == 10617  || this.$store.getters.xt_user.template_info.org_id == 10580  || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677  || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635  || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206) &&this.$store.getters.xt_user.template_info.org_id!=10387 &&this.$store.getters.xt_user.template_info.org_id!=10471 &&this.$store.getters.xt_user.template_info.org_id!=10742 &&this.$store.getters.xt_user.template_info.org_id!=10740 &&this.$store.getters.xt_user.template_info.org_id!=10745 " width="76px" > 超滤量(ml)</th>
+          <th v-if=" isShow('超滤量') && (template_id != 6 && template_id != 9 && template_id != 10 && template_id != 11 && template_id != 13 && template_id != 17 && template_id != 18 && template_id != 19 && template_id != 20 && template_id != 21 && template_id != 22 && template_id != 23 && template_id != 24 && template_id != 26 && template_id !=27 && template_id!=28 && template_id!=29 && template_id!=30 && template_id!=31 && template_id!=32 && template_id!=34 && template_id!=35 && template_id!=36 && template_id!=38 && template_id != 39 && template_id != 40  && template_id != 41 && template_id != 43 && template_id != 44 && template_id != 46  && template_id != 47 && template_id != 48 && template_id != 53  && template_id != 54  && template_id != 56  && template_id != 60 && template_id != 65 && 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!=10432  && 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!=10485  && this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10599  && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 &&  this.$store.getters.xt_user.template_info.org_id!=10721 && this.$store.getters.xt_user.template_info.org_id!=10727 && this.$store.getters.xt_user.template_info.org_id!=10206) || this.$store.getters.xt_user.template_info.org_id == 10387 ||  this.$store.getters.xt_user.template_info.org_id == 10471 ||   this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742 || this.$store.getters.xt_user.template_info.org_id == 10745"  width="76px"> 超滤量(L) </th>
           <th v-if=" isShow('超滤量1')"  width="76px"> 超滤量(ml) </th>
-          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || 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 == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
-          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && 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!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
+          <th v-if="isShow('超滤率') && (template_id ==6 || template_id == 65 || template_id == 10 || template_id == 11 || template_id == 12 || template_id == 13 || template_id == 17 || template_id == 18 || template_id == 19 || template_id == 20 || template_id == 21 || template_id == 22 || template_id == 23 || template_id == 24 || template_id == 26 || template_id == 29 || template_id == 30 || template_id == 31 || template_id == 34 || template_id == 35 || template_id == 38 || template_id == 41 || template_id == 43 || template_id == 44 || template_id == 46 || template_id == 47  || template_id == 48  || template_id == 53 || template_id == 54 || template_id == 56  || template_id == 60 || this.$store.getters.xt_user.template_info.org_id == 10432 || 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 == 10485 || this.$store.getters.xt_user.template_info.org_id == 10375 || this.$store.getters.xt_user.template_info.org_id == 10480 || this.$store.getters.xt_user.template_info.org_id == 10597 || this.$store.getters.xt_user.template_info.org_id == 10599  || this.$store.getters.xt_user.template_info.org_id == 10612 || this.$store.getters.xt_user.template_info.org_id == 10617 || this.$store.getters.xt_user.template_info.org_id == 10580 || this.$store.getters.xt_user.template_info.org_id == 10629 || this.$store.getters.xt_user.template_info.org_id == 10677 || this.$store.getters.xt_user.template_info.org_id == 10667 || this.$store.getters.xt_user.template_info.org_id == 10693 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10697 || this.$store.getters.xt_user.template_info.org_id == 10635 || this.$store.getters.xt_user.template_info.org_id == 10702 || this.$store.getters.xt_user.template_info.org_id == 10721 || this.$store.getters.xt_user.template_info.org_id == 10727 || this.$store.getters.xt_user.template_info.org_id == 10206 || this.$store.getters.xt_user.template_info.org_id == 10740 || this.$store.getters.xt_user.template_info.org_id == 10742) && this.$store.getters.xt_user.template_info.org_id!=10387" width="50px"> 超滤率 <br />(ml/h) </th>
+          <th v-if="isShow('超滤率') && (template_id !=6 && template_id !=65 && template_id !=10 && template_id !=11 && template_id !=12 && template_id !=13 && template_id !=17 && template_id !=18 && template_id !=19 && template_id !=20 && template_id !=21 && template_id !=22 && template_id !=23 && template_id !=24 && template_id !=26 && template_id !=29 && template_id !=30 && template_id !=31 && template_id !=34 && template_id !=35 && template_id !=38  && template_id !=41 && template_id !=43 && template_id !=44 && template_id !=46 && template_id !=47 &&  template_id !=48 &&  template_id !=53 &&  template_id !=54 &&  template_id !=56 &&  template_id !=60 && this.$store.getters.xt_user.template_info.org_id!=10432  && 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!=10485 &&this.$store.getters.xt_user.template_info.org_id!=10375 && this.$store.getters.xt_user.template_info.org_id!=10480 && this.$store.getters.xt_user.template_info.org_id!=10597 && this.$store.getters.xt_user.template_info.org_id!=10599 && this.$store.getters.xt_user.template_info.org_id!=10612 && this.$store.getters.xt_user.template_info.org_id!=10617 && this.$store.getters.xt_user.template_info.org_id!=10580 && this.$store.getters.xt_user.template_info.org_id!=10629 && this.$store.getters.xt_user.template_info.org_id!=10679 && this.$store.getters.xt_user.template_info.org_id!=10667 && this.$store.getters.xt_user.template_info.org_id!=10693 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10697 && this.$store.getters.xt_user.template_info.org_id!=10635 && this.$store.getters.xt_user.template_info.org_id!=10702 && this.$store.getters.xt_user.template_info.org_id!=10721  && this.$store.getters.xt_user.template_info.org_id!=10727  && this.$store.getters.xt_user.template_info.org_id!=10206 && this.$store.getters.xt_user.template_info.org_id!=10740 && this.$store.getters.xt_user.template_info.org_id!=10742 ) || this.$store.getters.xt_user.template_info.org_id==10387" width="50px"> 超滤率 <br />(L/h) </th>
           <th v-if="isShow('超滤率2')" width="92px">超滤率(ml/h)</th>
           <th v-if="isShow('钠浓度')" width="92px">钠浓度(mmol/L)</th>
           <th v-if="isShow('钠浓度1')" width="92px">钠浓度(mmol/L)</th>

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

       var end_time =   moment().endOf('month').format("YYYY-MM-DD")
        var params = {
         start_time:start_time,
-        end_time:end_time,
+        end_time:this.$route.query && this.$route.query.xtdate,
         patient_id:this.$route.query && this.$route.query.patient_id,
        }
+       console.log("param================",params)
       getDialysisTotalCount(params).then(response=>{
         if(response.data.state == 1){
           var order =  response.data.data.order

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
                     <div >
-                      <div class="inline_block" style="flex: 1">
+                      <div class="inline_block" style="flex: 1" v-if="dialysisOrder.puncture_nurse>0">
                         穿刺护士：
                         <div
                           class="under_line"
                           />
                         </div>
                       </div>
+                      <div class="inline_block" style="flex: 1" v-if="dialysisOrder.change_nurse>0">
+                        换药护士：
+                        <div
+                          class="under_line"
+                          style="width: 90px; text-align: center"
+                        >
+                          <span
+                            style="height: 30px; display: inline-block"
+                            v-if="
+                              setAdminUserES(
+                                dialysisOrder == null
+                                  ? 0
+                                  : dialysisOrder.change_nurse
+                              ) == ''
+                            "
+                          >
+                            {{
+                              getAdminUser(
+                                dialysisOrder == null
+                                  ? 0
+                                  : dialysisOrder.change_nurse
+                              )
+                            }}</span
+                          >
+                          <img
+                            :style="{'height':org_id==10597 ? '25px':'35px'}"
+                            :src="
+                              setAdminUserES(
+                                dialysisOrder == null
+                                  ? 0
+                                  : dialysisOrder.change_nurse
+                              )
+                            "
+                            alt=""
+                            srcset=""
+                            v-else
+                          />
+                        </div>
+                      </div>
                     </div>
 
                     <div>

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

                         <td width="50">脉搏<br />(次/分)</td>
                         <td width="50" v-if="org_id!=10489">呼吸<br />(次/分)</td>
                         <td width="50">血流量<br />(ml/min)</td>
-                        <td width="50" v-if="org_id==10478 || org_id == 10598 || org_id ==10510">
+                        <td width="50" v-if="org_id==10478 || org_id == 10598 || org_id ==10510 || org_id == 10735">
                           动脉压<br />({{
                             monitors[0] &&
                             monitors[0]["venous_pressure_type"] == 2
                         <td width="60" v-if="org_id == 9919">血温(°C)</td>
                         <td width="60" v-if="org_id == 9671">血温(°C)</td>
                         <td width="60" v-if="org_id!=9836&&org_id!=9919&&org_id!=9671 && org_id!=10644">透析液温度(°C)</td>
-                        <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644">
-                          <span v-if="org_id !=10469 && org_id!=10490 && org_id!=10567 && org_id!=0 && org_id!=10724 "> 电导度<br />(ms/cm)</span>
+                        <td width="50" v-if="org_id != 10121 &&  org_id!=10600 && org_id!=10644 && org_id!=10735">
+                          <span v-if="org_id !=10469 && org_id!=10490 && org_id!=10567 && org_id!=0 && org_id!=10724"> 电导度<br />(ms/cm)</span>
                           <span v-if="org_id ==10469 || org_id == 0 || org_id == 10567 || org_id==10724"> 钠浓度<br />(mmol/L)</span>
                           <span v-if="org_id == 10490"> 置换液的速度<br />(ml/h)</span>
                         </td>
                         <td>{{ monitor.pulse_frequency? monitor.pulse_frequency: ""}}</td>
                         <td v-if="org_id!=10489">{{monitor.breathing_rate ? monitor.breathing_rate : ""}}</td>
                         <td>{{monitor.blood_flow_volume? monitor.blood_flow_volume: ""}}</td>
-                        <td v-if="org_id ==10478 || org_id == 10598 || org_id ==10510">
+                        <td v-if="org_id ==10478 || org_id == 10598 || org_id ==10510 || org_id ==10735">
                           {{
                             monitor.arterial_pressure
                               ? monitor.arterial_pressure
                         </td>
 
 
-                        <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600 && org_id!=10644">
+                        <td v-if="org_id != 9538 &&org_id != 10121 &&org_id!=10600 && org_id!=10644 && org_id!=10735">
                           <span v-if="org_id!=0&&org_id!=10469 && org_id!=10490 && org_id!=10567 && org_id!=10724"> {{ monitor.conductivity ? monitor.conductivity : "" }}</span>
                           <span v-if="org_id==10469 || org_id == 10567 || org_id == 0 || org_id == 10724"> {{ monitor.sodium_concentration ? monitor.sodium_concentration : "" }}</span>
                           <span v-if="org_id==10490"> {{ monitor.replacement_speed ? monitor.replacement_speed : "" }}</span>
                             : "/"
                            }}
                          </span> -->
-                         <span>
+                         <span v-if="predialysis&&predialysis.weight_before>0&&afterdialysis&&afterdialysis.weight_after>0">
                           {{(predialysis.weight_before - afterdialysis.weight_after).toFixed(2)}}
                          </span>
 
          window.open(fileURL);//打开ppf文件
        }
      },
-     compare (property) {
-       return function (a, b) {
-           var value1 = a[property]
-           var value2 = b[property]
-           return value1 - value2
-       }
-     },
+   
 
      openPdf(blob) {
        const objectUrl = URL.createObjectURL(blob);
               newHisArr[i].advice_name_str = ""
               newHisArr[i].advice_name_str = newHisArr[i].project_team + (newHisArr[i].prescription_id).toString()
             }
-            console.log("newHisArr===================================",newHisArr)
+            // console.log("newHisArr===================================",newHisArr)
+
+
+            // newHisArr.sort(this.compareOne('id'))
+            // newHisArr.map((item, index) => {
+            //   console.log("item=----------------",item)
+            //   // item.sort(this.compare('execution_time'))
+            // })
 
             var ordHisArr = this.getQuChong(newHisArr)
 
         console.log("this.totollength",this.totollength)
 
 
-        if (this.totollength > 18) {
+        if (this.totollength > 20) {
           var temp_advice_length = this.doctor_advices.length
           var doctor_advices_1 = [];
           var doctor_advices_2 = [];
       }
       // })
     },
+    compare (property) {
+      return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
+      }
+     },
+
+     compareOne (property) {
+      return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
+      }
+     },
      getQuChong(tempArr) {
       let result = [];
         let obj = {};

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

               <span v-if="prescription.anticoagulant == '枸橼酸钠'">mg</span>
               <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
               <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
-              <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
+              <span v-if="prescription.anticoagulant == '普通肝素'">
+                <span v-if="org_id == 10028">iu</span>
+                <span v-if="org_id != 10028">mg</span>
+              </span>
               <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
               <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
               <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>&nbsp;
               <span v-if="prescription.anticoagulant == '枸橼酸钠'">ml/h</span>
               <span v-if="prescription.anticoagulant == '阿加曲班'">mg/h</span>
               <span v-if="prescription.anticoagulant == '低分子肝素'">iu/h</span>
-              <span v-if="prescription.anticoagulant == '普通肝素'">mg/h</span>
+              <span v-if="prescription.anticoagulant == '普通肝素'">
+                <span v-if="org_id == 10028">iu/h</span>
+                <span v-if="org_id != 10028">mg/h</span>
+              </span>
               <span v-if="prescription.anticoagulant == '无肝素'">mg/h</span>
               <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu/h</span>
               <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu/h</span>&nbsp;
               <span v-if="prescription.anticoagulant == '枸橼酸钠'">mg</span>
               <span v-if="prescription.anticoagulant == '阿加曲班'">mg</span>
               <span v-if="prescription.anticoagulant == '低分子肝素'">iu</span>
-              <span v-if="prescription.anticoagulant == '普通肝素'">mg</span>
+              <span v-if="prescription.anticoagulant == '普通肝素'">
+                <span v-if="org_id == 10028">iu</span>
+                <span v-if="org_id != 10028">mg</span>
+              </span>
               <span v-if="prescription.anticoagulant == '无肝素'">mg</span>
               <span v-if="prescription.anticoagulant == '低分子肝素钙'">iu</span>
               <span v-if="prescription.anticoagulant == '低分子肝素钠'">iu</span>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                        type="primary">查询备案信息
             </el-button>
 
-            <el-button  size="small"  v-if="(org_id == 10138 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10278 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)"
+            <el-button  size="small"  v-if="(org_id == 10138 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10278 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10028 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2) || (org_id == 10610 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)  || (org_id == 9504 && this.order.is_upload_diagnose == 0 && this.order.order_status == 2)"
                         @click="openZF(1)"
                         type="primary">自费门诊就医上传(4205)
             </el-button>
 
-            <el-button  size="small" v-if="(org_id == 10138  && this.order.is_upload_success == 0 && this.order.order_status == 2) || (org_id == 10278  && this.order.is_upload_success == 0 && this.order.order_status == 2) "
+            <el-button  size="small" v-if="(org_id == 10138   && this.order.order_status == 2) || (org_id == 10278  && this.order.order_status == 2) || (org_id == 10028 && this.order.order_status == 2) || (org_id == 10610 && this.order.order_status == 2)  || (org_id == 9504 && this.order.order_status == 2)"
                         @click="openZF(2)"
                         type="primary">自费上传确认(4203)
             </el-button>
         { value: '1111', label: '精一' },
         { value: '1112', label: '精二' },
         { value: '1112', label: '精二' },
+        { value: '999999', label: '自费' },
         { value: '118801', label: '118801' },
 
 
         { value: '1402', label: '门诊特殊病(1402)' },
         { value: '1401', label: '门诊慢性病(1401)' },
         { value: '2302', label: '异地就医(2302)' },
-        { value: '0', label: '自费' },
+        // { value: '0', label: '自费' },
+        { value: '999999', label: '自费' },
         { value: '118801', label: '118801' },
 
 
           }
         })
       } else {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610) {
           axios.get('http://127.0.0.1:9532/api/register/get', {
             params: forms,
             headers: {
           })
         }
       } else if (index == 6) {
-        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278) {
+        if (this.$store.getters.xt_user.org_id == 9504 || this.$store.getters.xt_user.org_id == 10138 || this.$store.getters.xt_user.org_id == 10028 || this.$store.getters.xt_user.org_id == 10088 || this.$store.getters.xt_user.org_id == 10278 || this.$store.getters.xt_user.org_id == 10610) {
           this.$refs.register9504.show()
         } else {
           if(this.$store.getters.xt_user.org_id == 10721 || this.org_id == 0){

src/xt_pages/outpatientCharges/statementTemplate/printFour.vue

               </div>
               <div class="actionBar">
                   <div>收费员：{{info.charge_admin.user_name}}</div>
-                  <div>日期：{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</div>
+<!--                  <div>日期：{{info.setl_time ? info.setl_time.split(' ')[0] : ''}}</div>-->
+                 <div>日期：{{getTime(info.new_order.settle_accounts_date,"{y}-{m}-{d}")?getTime(info.new_order.settle_accounts_date,"{y}-{m}-{d}"):""}}</div>
               </div>
           </div>
 

src/xt_pages/outpatientCharges/summary.vue

         </el-table-column>
         <el-table-column align="center" width="80" prop="name" label="实收金额">
           <template slot-scope="scope">{{
-              scope.row.medfee_sumamt.toFixed(2)
+              scope.row.medfee_sumamt.toFixed(2) - scope.row.discount_price.toFixed(2) -     scope.row.preferential_price.toFixed(2)
             }}
           </template>
         </el-table-column>
               参保号: order.his_patient.id_card_no,
               属地名称: insuplc_admdvs_name,
               应收金额: order.medfee_sumamt,
-              实收金额: order.medfee_sumamt,
+              // scope.row.medfee_sumamt.toFixed(2) - scope.row.discount_price.toFixed(2) -     scope.row.preferential_price.toFixed(2)
+
+              实收金额: order.medfee_sumamt - order.discount_price -  order.preferential_price,
               医保统筹金额: order.hifp_pay,
               大额基金金额: order.hifob_pay,
               大病基金金额: order.hifmi_pay,
               参保所属医保区划: order.his_patient.insuplc_admdvs,
               参保号: order.his_patient.id_card_no,
               应收金额: order.medfee_sumamt,
-              实收金额: order.medfee_sumamt,
+              实收金额: order.medfee_sumamt - order.discount_price -  order.preferential_price,
               医保统筹金额: order.hifp_pay,
               大额基金金额: order.hifob_pay,
               大病基金金额: order.hifmi_pay,

src/xt_pages/user/components/PatientSidebar.vue

             //   name: '3-3',
             //   label: '体格检查新'
             // },
-            //  {
-            //   name: '3-5',
-            //   label: '病程记录新'
-            //  },
+             {
+              name: '3-5',
+              label: '病程记录新'
+             },
             {
               name: '1-11',
               label: '首次病程记录'
             {
               name: '1-2',
               label: '病程记录'
-            }, {
+            }, 
+            {
               name: '1-5',
               label: '抢救记录'
             }, {

src/xt_pages/user/courseOfDisease_new.vue

           <el-button type="primary" @click="toMonitorPint">应用</el-button>
           <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
           <el-button type="primary" @click="template_save">保存模板</el-button> -->
-          <el-button type="primary" @click="toContentPint(2)">应用</el-button>
+          <!-- <el-button type="primary" @click="toContentPint(2)">应用</el-button> -->
           <el-button @click="blood_dialog = false">取消</el-button>
         </span>
       </el-dialog>
                  @current-change="summaryChange"
                  @selection-change="selectionchange2"
                 style="width: 100%">
+                <el-table-column type="selection"width="55">
+                </el-table-column>
                 <el-table-column prop="date" label="透析日期"  width="" align="center">
                   <template slot-scope="scope" a>
                       {{ getTime(scope.row.schedule_date) }}
         <span slot="footer" class="dialog-footer" style="text-align: center;">
           <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
           <el-button type="primary" @click="template_save">保存模板</el-button> -->
-          <el-button type="primary" @click="toContentPint(3)">应用</el-button>
           <el-button type="primary" @click="toSummaryPint">应用</el-button>
           <el-button @click="summary_dialog = false">取消</el-button>
         </span>
               <div class="Second_title">方案详情</div>
               <div style="">
                 <keep-alive>
-                  <ueditor ref="editor" id="editors" :content="option_context"></ueditor>
+                  <ueditor ref="editorOne" id="editors" :content="option_context"></ueditor>
                 </keep-alive>
               </div>
             </div>
           </div>
         </div>
         <span slot="footer" class="dialog-footer" style="text-align: center;">
-          <el-button type="primary" @click="toContentPint">应用</el-button>
+          <el-button type="primary" @click="toSystemContentPint">应用</el-button>
           <el-button @click="option_dialog = false">取消</el-button>
         </span>
       </el-dialog>
               医嘱类型:
               <el-select v-model="advice_type" @change="type_chang" placeholder="请选择" style="width: 120px;">
                 <el-option
+                
                   v-for="item in type_option"
                   :key="item.value"
                   :label="item.label"
               :data="adviceList"
               :highlight-current-row="true"
                 ref="weight_table"
-                @selection-change="selectionchange5"
+              @selection-change="selectionchange5"
               style="width: 100%">
               <el-table-column type="selection"width="55">
               </el-table-column>
-              <el-table-column prop="date" label="开始时间"  width="">
+              <el-table-column prop="date" label="开始时间"  width="" align="center">
                 <template slot-scope="scope">
                     {{ getTimeThree(scope.row.start_time) }}
                  </template>
               </el-table-column>
-              <el-table-column prop="name" label="医嘱名称"  width="">
+              <el-table-column prop="name" label="医嘱名称"  width="" align="center">
                 <template slot-scope="scope">
-                    {{ getTimeThree(scope.row.advice_name) }}
+                    {{scope.row.advice_name }}
                  </template>
               </el-table-column>
-              <el-table-column prop="guige" label="规格"  width="">
+              <el-table-column prop="guige" label="规格"  width="" align="center">
                 <template slot-scope="scope">
-                    {{ getTimeThree(scope.row.advice_desc) }}
+                    {{scope.row.advice_desc}}
                  </template>
               </el-table-column>
-              <el-table-column prop="danci" label="单次用量"  width="">
+              <el-table-column prop="danci" label="单次用量"  width="" align="center">
                 <template slot-scope="scope">
                   <span v-if="scope.row.single_dose>0">{{ scope.row.single_dose }}</span>
                  </template>
               </el-table-column>
-              <el-table-column prop="geiyao" label="给药途径"  width="">
+              <el-table-column prop="geiyao" label="给药途径"  width="" align="center">
                 <template slot-scope="scope">
                     {{scope.row.delivery_way}}
                  </template>
               </el-table-column>
-              <el-table-column prop="pinlv" label="执行频率"  width="">
+              <el-table-column prop="pinlv" label="执行频率"  width="" align="center">
                 <template slot-scope="scope">
                     {{scope.row.execution_frequency }}
                  </template>
               </el-table-column>
-              <el-table-column prop="beizhu" label="备注"  width="">
+              <el-table-column prop="beizhu" label="备注"  width="" align="center">
                 <template slot-scope="scope">
                     {{scope.row.remark}}
                  </template>
               </el-table-column>
-              <el-table-column prop="tingzhi" label="停止时间/执行时间"  width="">
+              <el-table-column prop="tingzhi" label="停止时间/执行时间"  width="" align="center">
                 <template slot-scope="scope">
                   <span v-if="scope.row.advice_type == 1">
                     {{ getTimeThree(scope.row.stop_time) }}
 
                  </template>
               </el-table-column>
-              <el-table-column prop="yuanyin" label="停止原因"  width="">
+              <el-table-column prop="yuanyin" label="停止原因"  width="" align="center">
                 <template slot-scope="scope">
                    <span v-if="scope.row.advice_type == 1">
                     {{scope.row.remark }}
 
                  </template>
               </el-table-column>
-              <el-table-column prop="yisheng" label="停止医生"  width="">
+              <el-table-column prop="yisheng" label="停止医生"  width="" align="center">
                 <template slot-scope="scope">
                   <span v-if="scope.row.advice_type == 1">
                     {{ getDocName(scope.row.advice_doctor) }}
             </el-table>
           </div>
         </div>
-        <span slot="footer" class="dialog-footer" style="text-align: center;">
-          <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
-          <el-button type="primary" @click="template_save">保存模板</el-button> -->
-          <el-button type="primary" @click="toContentPint">应用</el-button>
+        <span slot="footer" class="dialog-footer" style="text-align: center;" align="center">
+          <el-button type="primary" @click="toAdviceContentPint">应用</el-button>
           <el-button @click="advice_dialog = false">取消</el-button>
         </span>
       </el-dialog>
               </el-date-picker>
             </div>
             <div style="text-align: right;margin-bottom: 10px;">
-              <el-button type="primary" size="small">
+              <el-button type="primary" size="small" @click="toInspection">
                 查询
               </el-button>
             </div>
                   <div class="Second_title">检验项目</div>
                 </div>
                 <div style="flex: 1;text-align: right;">
-                  全选<el-checkbox v-model="checked"></el-checkbox>
+                  全选<el-checkbox v-model="checked" @change="changeInspetion"></el-checkbox>
                 </div>
               </div>
               <div>
-                <el-collapse v-model="activeNames" @change="handleChange" v-for="(item,index) in Inspectlist" :key="item.id">
-                  <el-collapse-item :title="item.name" :name="item.id">
+                <el-collapse v-model="activeNames" @change="handleChange" v-for="(item,index) in newInspectionList" :key="item.id">
+                  <el-collapse-item :title="item.project_name" :name="item.project_id">
                     <ul>
-                      <li v-for="i in item.child" class="inspect" @click="childclick(i.date)">{{ i.date }}</li>
+                      <li v-for="i in item.child" class="inspect" @click="childclick(i)">{{getTime(i.inspect_date)}}</li>
                     </ul>
                   </el-collapse-item>
                 </el-collapse>
             <div style="width: 72%;margin-left: 10px;">
               <div class="Second_title">内容</div>
               <div class="blood_text" style="" >
-                <div v-html="weight_context"></div>
+                <div v-html="inspect_context"></div>
                 <!-- {{ blood_context }} -->
               </div>
             </div>
         <span slot="footer" class="dialog-footer" style="text-align: center;">
           <!-- <el-button type="danger" @click="template_dele">删除模板</el-button>
           <el-button type="primary" @click="template_save">保存模板</el-button> -->
-          <el-button type="primary" @click="toContentPint">应用</el-button>
+          <el-button type="primary" @click="toInpectionContentPint">应用</el-button>
           <el-button @click="Inspect_dialog = false">取消</el-button>
         </span>
       </el-dialog>
     getSummarySearchList,
     getPatientDryWeightList,
     getDilaysisSystemList,
-    getPatientAdviceList
+    getPatientAdviceList,
+    getPatientInspectionList,
+    getInspectionByProjectId,
+    
   } from '@/api/patient'
   import { fetchMoibleAllDoctorAndNurse } from "@/api/doctor";
   import { parseTime } from '@/utils'
         monitor_blood_context:"",
         summaryList:[],
         dryWeightList:[],
-        adviceList:[]
+        adviceList:[],
+        newInspectionList:[],
+        newInspectionListOne:[],
+        inspect_context:"",
+        inspectionList:[],
+        newIds:[],
+        adviceNewList:[],
+        all_select:0,
+        systemPrescritpionList:[]
       }
     },
     created() {
 
         }
       },
-      toContentPint(val){
-
-
+      toAdviceContentPint(val){
+       
         console.log('blood_context',this.blood_context,this.template_content);
-        this.template_content = this.template_content +'<br/>'+ this.blood_context+'<br/>'+this.summary_context +'<br/>' +this.advice_context
+        this.template_content = this.template_content +'<br/>'+ this.blood_context+'<br/>'+this.summary_context +'<br/>' +this.advice_context+'<br/>'+this.option_context
         this.$refs.editor.contents = this.template_content
         const iframe = document.getElementsByClassName('edui-editor-iframeholder')[0].getElementsByTagName('iframe')[0].contentDocument.getElementsByTagName('body')[0]
         console.log('document.getElementsByClassName',);
-        if(val == 6){
+       
             this.$nextTick(()=>{
                 const new_list=document.createElement('table')
                 new_list.style.cssText='border:1px solid black;border-collapse:collapse;width:100%';
                 newListItem1.appendChild(new_td9);
                 newListItem1.appendChild(new_td10);
                 new_list.appendChild(newListItem1)
-              for(let i in this.adviceRows){
-                let newListItem2 = document.createElement('tr');
-                let new_td1 = document.createElement('td');
-                let new_td2 = document.createElement('td');
-                let new_td3 = document.createElement('td');
-                let new_td4 = document.createElement('td');
-                let new_td5 = document.createElement('td');
-                let new_td6 = document.createElement('td');
-                let new_td7 = document.createElement('td');
-                let new_td8 = document.createElement('td');
-                let new_td9 = document.createElement('td');
-                let new_td10 = document.createElement('td');
-                new_td1.textContent =this.adviceRows[i].date
-                new_td2.textContent =this.adviceRows[i].name
-                new_td3.textContent =this.adviceRows[i].guige
-                new_td4.textContent =this.adviceRows[i].danci
-                new_td5.textContent =this.adviceRows[i].geiyao
-                new_td6.textContent =this.adviceRows[i].pinlv
-                new_td7.textContent =this.adviceRows[i].beizhu
-                new_td8.textContent =this.adviceRows[i].tingzhi
-                new_td9.textContent =this.adviceRows[i].yuanyin
-                new_td10.textContent =this.adviceRows[i].yisheng
-                newListItem2.appendChild(new_td1);
-                newListItem2.appendChild(new_td2);
-                newListItem2.appendChild(new_td3);
-                newListItem2.appendChild(new_td4);
-                newListItem2.appendChild(new_td5);
-                newListItem2.appendChild(new_td6);
-                newListItem2.appendChild(new_td7);
-                newListItem2.appendChild(new_td8);
-                newListItem2.appendChild(new_td9);
-                newListItem2.appendChild(new_td10);
-                new_list.appendChild(newListItem2)
-              }
+
+               if(this.adviceList!=null && this.adviceList.length>0 && this.all_select == 0){
+                for(let i in this.adviceList){
+                    let newListItem2 = document.createElement('tr');
+                    let new_td1 = document.createElement('td');
+                    let new_td2 = document.createElement('td');
+                    let new_td3 = document.createElement('td');
+                    let new_td4 = document.createElement('td');
+                    let new_td5 = document.createElement('td');
+                    let new_td6 = document.createElement('td');
+                    let new_td7 = document.createElement('td');
+                    let new_td8 = document.createElement('td');
+                    let new_td9 = document.createElement('td');
+                    let new_td10 = document.createElement('td');
+                    new_td1.textContent =this.getTimeThree(this.adviceList[i].start_time) 
+                    new_td2.textContent =this.adviceList[i].advice_name
+                    new_td3.textContent =this.adviceList[i].advice_desc
+                    new_td4.textContent =this.adviceList[i].single_dose
+                    new_td5.textContent =this.adviceList[i].delivery_way
+                    new_td6.textContent =this.adviceList[i].execution_frequency
+                    new_td7.textContent =this.adviceList[i].remark
+                    if(this.adviceList[i].advice_type == 1){
+                      new_td8.textContent =this.getTimeThree(this.adviceList[i].stop_time) 
+                    }else{
+                      new_td8.textContent =this.getTimeThree(this.adviceList[i].execution_time) 
+                    }
+                    new_td9.textContent =this.adviceList[i].stop_reason
+                    new_td10.textContent =this.getDocName(this.adviceList[i].advice_doctor) 
+                    newListItem2.appendChild(new_td1);
+                    newListItem2.appendChild(new_td2);
+                    newListItem2.appendChild(new_td3);
+                    newListItem2.appendChild(new_td4);
+                    newListItem2.appendChild(new_td5);
+                    newListItem2.appendChild(new_td6);
+                    newListItem2.appendChild(new_td7);
+                    newListItem2.appendChild(new_td8);
+                    newListItem2.appendChild(new_td9);
+                    newListItem2.appendChild(new_td10);
+                    new_list.appendChild(newListItem2)
+                 }
+               } 
+
+               if(this.adviceNewList!=null && this.adviceNewList.length>0 && this.all_select == 1){
+                for(let i in this.adviceNewList){
+                    let newListItem2 = document.createElement('tr');
+                    let new_td1 = document.createElement('td');
+                    let new_td2 = document.createElement('td');
+                    let new_td3 = document.createElement('td');
+                    let new_td4 = document.createElement('td');
+                    let new_td5 = document.createElement('td');
+                    let new_td6 = document.createElement('td');
+                    let new_td7 = document.createElement('td');
+                    let new_td8 = document.createElement('td');
+                    let new_td9 = document.createElement('td');
+                    let new_td10 = document.createElement('td');
+                    new_td1.textContent =this.getTimeThree(this.adviceNewList[i].start_time) 
+                    new_td2.textContent =this.adviceNewList[i].advice_name
+                    new_td3.textContent =this.adviceNewList[i].advice_desc
+                    new_td4.textContent =this.adviceNewList[i].single_dose
+                    new_td5.textContent =this.adviceNewList[i].delivery_way
+                    new_td6.textContent =this.adviceNewList[i].execution_frequency
+                    new_td7.textContent =this.adviceNewList[i].remark
+                    if(this.adviceNewList[i].advice_type == 1){
+                      new_td8.textContent =this.getTimeThree(this.adviceNewList[i].stop_time) 
+                    }else{
+                      new_td8.textContent =this.getTimeThree(this.adviceNewList[i].execution_time) 
+                    }
+                    new_td9.textContent =this.adviceNewList[i].stop_reason
+                    new_td10.textContent =this.getDocName(this.adviceNewList[i].advice_doctor) 
+                    newListItem2.appendChild(new_td1);
+                    newListItem2.appendChild(new_td2);
+                    newListItem2.appendChild(new_td3);
+                    newListItem2.appendChild(new_td4);
+                    newListItem2.appendChild(new_td5);
+                    newListItem2.appendChild(new_td6);
+                    newListItem2.appendChild(new_td7);
+                    newListItem2.appendChild(new_td8);
+                    newListItem2.appendChild(new_td9);
+                    newListItem2.appendChild(new_td10);
+                    new_list.appendChild(newListItem2)
+                 }
+               }
+            
               const cont = iframe.getElementsByClassName('advice_table')[0]
               cont.appendChild(new_list)
-              // iframe.appendChild(new_list)
               console.log('iframe.appendChild(new_list)',cont);
               console.log('this.advice_context',this.advice_context);
             })
 
-        }
-        this.library_dialog = false
+        
+        this.advice_dialog = false
       },
       getCurrentChangeOne(val){
-        console.log("val================",val)
         this.$refs.editor.contents = val.content
         this.record_date = this.getTime(val.record_time)
         this.admin_user_id = val.recorder
            this.admin_user_id = ""
         }
         this.id = val.id
+        this.ids = val.id
       },
       getCurrentChangeTwo(val){
 
      rowclick(){
 
       },
-      prints(){
-
-      },
+     
       saveTemplate(){
 
         var params = {
 
       },
 
-      getAutoPatientContent(){
+      autotext_click(){
         if(this.start_date == ""){
           this.$message.error("请选择开始时间")
         }
 
           dialysisIrrigationStr =  JSON.stringify(dialysisIrrigationObj).replace(/^{|}$/g, '')
 
+      
 
         //  医嘱
         if(this.longAdvice!=null && this.longAdvice.length>0){
                 if(this.longAdvice[i].advice_type == 1){
                   this.longAdvice[i].advice_type_name = "长期医嘱"
                 }
+                if(this.longAdvice[i].advice_type == 2){
+                  this.longAdvice[i].advice_type_name = "长期医嘱"
+                }
                 if(this.longAdvice[i].stop_state == 1){
                   this.longAdvice[i].stop_state_name = "停用"
                 }
             }
         }
 
+         
+        //抗凝剂
+
+        var anticoagulant_str =""
+        if(this.groupPrescriptionList!=null && this.groupPrescriptionList.length>0){
+           
+            for(let i=0;i<this.groupPrescriptionList.length;i++){
+               anticoagulant_str += this.getAnticoagulantName(this.groupPrescriptionList[i].anticoagulant) +"," + "剂量:" +this.groupPrescriptionList[i].MinZongLiang +this.getAnticoagulantUnit(this.groupPrescriptionList[i].anticoagulant)+ "~" +this.groupPrescriptionList[i].MaxZongLiang + this.getAnticoagulantUnit(this.groupPrescriptionList[i].anticoagulant)
+            }
+        }
+
+
+          //透前
+          var befor_total =0
+        var cha_weight = 0
+        var pingjun_weight = 0
+        if(this.berforList!=null){
+          befor_total = this.berforList.length
+          for(let i=0;i<this.berforList.length;i++){
+             cha_weight += this.berforList[i].weight_before - this.berforList[i].WeightAfter
+          }
+        }
+        
+        pingjun_weight = (cha_weight/befor_total).toFixed(2)
+       
+        //透后凝血
+        var cruorNewArr = []
+        if(this.afterList!=null && this.afterList.length>0){
+           for(let i=0;i<this.afterList.length;i++){
+            cruorNewArr.push(this.afterList[i].cruor)
+           }
+        }
+      
+       let dialysisCrruorObj = {}
+        let dialysisCrruorStr = ""
+        if(cruorNewArr!=null && cruorNewArr.length>0){
+          cruorNewArr.forEach(item => {
+            dialysisCrruorObj[item] = (dialysisCrruorObj[item] + 1) || 1
+            })
+          }
+      
+
+        dialysisCrruorStr =  JSON.stringify(dialysisCrruorObj).replace(/^{|}$/g, '')
+       
+        //监测
+        var blood_flow_volume_total = 0
+        var ultrafiltration_volume_total = 0
+        var ultrafiltration_rate_total = 0
+        var total_length = 0
+        var pingjun_blood_flow_volume = 0
+        var pingjun_ultrafiltration_volume_total = 0
+        var pingjun_ultrafiltration_rate_total = 0
+        if(this.monitorList!=null && this.monitorList.length>0){
+          for(let i=0;i<this.monitorList.length;i++){
+            blood_flow_volume_total+=this.monitorList[i].blood_flow_volume
+            ultrafiltration_volume_total+=this.monitorList[i].ultrafiltration_volume
+            ultrafiltration_rate_total += this.monitorList[i].ultrafiltration_rate
+            total_length = this.monitorList.length
+          }
+        }
+        pingjun_blood_flow_volume =  (blood_flow_volume_total/total_length).toFixed(2)
+        if(pingjun_blood_flow_volume=="NaN"){
+          pingjun_blood_flow_volume = ""
+        }
+        pingjun_ultrafiltration_volume_total = (ultrafiltration_volume_total/total_length).toFixed(2)
+        if(pingjun_ultrafiltration_volume_total=="NaN"){
+          pingjun_ultrafiltration_volume_total = ""
+        }
+        pingjun_ultrafiltration_rate_total = (ultrafiltration_rate_total/total_length).toFixed(2)
+        if(pingjun_ultrafiltration_rate_total == "NaN"){ 
+          pingjun_ultrafiltration_rate_total = ""
+        }
+        var dry_weight_str = ""
+        //干体重
+        if(this.dryweightList!=null && this.dryweightList.length>0){
+           for(let i=0;i<this.dryweightList.length;i++){
+            dry_weight_str =  this.getTimeOne(this.dryweightList[i].ctime)+" " +this.dryweightList[i].adjusted_value.slice(4,6)+ this.dryweightList[i].adjusted_value.slice(0,3)+"kg" + "调整到" +" "+ this.dryweightList[i].dry_weight+"kg"+","
+           }
+        } 
+
+        //血管通路
+        var vascularAccess_str = ""
+        var created_time = ""
+      
+        if(this.patientVascularAccess!=undefined){
+          vascularAccess_str  = this.patientVascularAccess.blood_access_part_id + this.patientVascularAccess.blood_access_part_opera_id
+          created_time  = this.getTime(this.patientVascularAccess.first_start_time)
+        }
+
+        //并发症
+        var complication = ""
+        if(this.lastBefor!=undefined){
+            complication = this.lastBefor.complication
+        }
+
+
+
         if(this.inpectionList!=null&& this.inpectionList.length>0){
            for(let i=0;i<this.inpectionList.length;i++){
             this.inpectionList[i].group_no = ""
                 newListItem6.style.cssText= 'width: 10%;display: inline-block;padding: 5px 0;'
                 newListItem1.textContent = this.longAdvice[i].advice_name;
                 newListItem2.textContent = this.longAdvice[i].advice_type_name;
-                newListItem3.textContent = this.getTime(this.longAdvice[i].start_time)
+                newListItem3.textContent = this.getTime(this.longAdvice[i].created_time)
                 newListItem4.textContent = this.longAdvice[i].single_dose +this.longAdvice[i].single_dose_unit ;
                 newListItem5.textContent = this.longAdvice[i].execution_frequency;
                 newListItem6.textContent = this.longAdvice[i].stop_state_name;
           }
         })
          this.AuToShow = true
-
-
+      
+       }
+       })
       },
       blood_chang(val){
         if(val == 1){
       }, onRowClick(row, event, column) {
         this.table_current_index = row.index
       },
-      print(){
+      prints(){
         if(this.ids.length == 0){
           this.$message.error('请选择要打印的病程')
           return
       },
       type_chang(val){
         this.advice_type = val
+        this.getPatientAdviceList()
       },
       status_chang(val){
         this.advice_status = val
+        this.getPatientAdviceList()
       },
       selectionchange(val){
         this.bloodRows = val
         console.log('血压',this.bloodRows);
       },
       selectionchange2(val){
+       
         this.summaryRows = val
-        this.getsummary(val)
-        console.log('透析小结',this.summaryRows);
+        this.summary_context=""
+        if(val!=null){
+          // if(val.summary!=null && val.summary!=undefined){
+          //   this.summary_context = val.summary.dialysis_summary
+          // }
+          for(let i=0;i<val.length;i++){
+            this.summary_context += val[i].summary.dialysis_summary+"</br>"
+          }
+         this.summary_context = this.summary_context
+
+        }
+        // this.getsummary(val)
+        // console.log('透析小结',this.summaryRows);
       },
       selectionchange3(val){
         this.weightRows = val
         console.log('透析小结',this.weightRows);
       },
       selectionchange4(val){
+        
         this.optionRows = val
         this.getoption(val)
         console.log('透析小结',this.weightRows);
       },
       selectionchange5(val){
+       
         this.adviceRows = val
+        this.getNewPatientAdviceList(val)
       },
       gettext(val){
         const arr= []
         this.weight_context = `${arr.join('<br/>')}`
       },
       getoption(val){
+       
+        var newArr = []
+        for(let i=0;i<this.systemPrescritpionList.length;i++){
+          for(let j=0;j<val.length;j++){
+            if(val[j].mode == this.systemPrescritpionList[i].mode_name){
+              newArr.push(this.systemPrescritpionList[i])
+            }
+          }
+         
+        }
         const arr= []
-        if(val.length>0){
-          for(let i in val){
+       
+        if(newArr.length>0){
+          for(let i=0;i<newArr.length;i++){
             const text = `<table border="1" style="border-collapse: collapse;width: 100%;">
-      <tr><td colspan="4">HD，每周3次，启用</td></tr>
+      <tr><td colspan="4">${newArr[i].mode_name}，启用</td></tr>
       <tr>
-        <td>透析时长（h）：4</td>
-        <td>置换方式：</td>
-        <td>血流量（ml/min）：250</td>
+        <td>透析时长：${newArr[i].dialysis_duration_hour}时${newArr[i].dialysis_duration_minute}分</td>
+        <td>置换方式：${newArr[i].displace_name}</td>
+        <td>血流量（ml/min）：${newArr[i].blood_flow_volume}</td>
         <td></td>
       </tr>
       <tr>
-        <td>血透器：空心纤维血液透析器B-18BHF(B-18BHF)</td>
-        <td>血滤器：</td>
-        <td>灌流器：</td>
-        <td>透析液流量（ml/min）：500</td>
+        <td>透析器：${newArr[i].dialysis_dialyszers}</td>
+        <td>灌流器：${newArr[i].dialysis_irrigation}</td>
+        <td>透析液流量（ml/min）：${newArr[i].dialysate_flow}</td>
       </tr>
       <tr>
-        <td>钾（mmol/L）：2.0</td>
-        <td>钠（mmol/L）：138</td>
-        <td>钙（mmol/L）：1.5</td>
-        <td>碳酸氢根（mmol/L）：32</td>
+        <td>钾（mmol/L）：${newArr[i].kalium}</td>
+        <td>钠（mmol/L）：${newArr[i].sodium}</td>
+        <td>钙（mmol/L）：${newArr[i].calcium}</td>
+        <td>碳酸氢根（mmol/L）：${newArr[i].bicarbonates}</td>
       </tr>
       <tr>
-        <td>抗凝剂：低分子肝素</td>
-        <td>首剂（iu）：4500</td>
-        <td>维持（iu）： 0</td>
-        <td>总量（iu）：4500</td>
+        <td>抗凝剂：${newArr[i].anticoagulant_name}</td>
+        <td>首剂（iu）：${newArr[i].anticoagulant_shouji}</td>
+        <td>维持（iu）：${newArr[i].anticoagulant_weichi}</td>
+        <td>总量（iu）：${newArr[i].anticoagulant_zongliang}</td>
       </tr>
-      <tr><td colspan="4">抗凝剂公式：自定义维持时长（H）</td></tr>
+      <tr><td colspan="4"></td></tr>
             </table>`
             arr.push(text)
           }
         }
         const contenttext = `${arr.join('<br/>')}`
         this.option_context = contenttext
-        console.log('option_context',this.option_context);
-        this.$refs.editor.contents = this.option_context
+        // console.log('option_context',this.option_context);
+        this.$refs.editorOne.contents = this.option_context
       },
       // 血压搜索
       bloodsearch(val){
         })
       },
       option_click(val){
-        console.log("valoo00000000000",val)
+   
         this.option_dialog =true
         // this.start_date1 = this.timeForMat(7)
         // this.end_date1 = this.getTime(new Date())
           <tr><td>1</td><td>高尿酸血症</td></tr>
           <tr><td>2</td><td>继发性甲状旁腺功能亢进</td></tr>
         </table>`
-        this.new_content = text
-        this.$refs.editor.contents = this.new_content
+        // this.$refs.editor.contents = this.new_content
+        this.$refs.editor.contents = this.$refs.editor.contents +text
       },
       hospital_click(){
         const text = `<p style="line-height: 50px;display: flex;"><span style="display: inline-block;flex: 1;">住院日期:</span><span style="display: inline-block;flex: 1;">出院日期:</span></p>
     <p style="line-height: 50px;display: flex;"><span style="display: inline-block;flex: 1;">入院诊断:</span><span style="display: inline-block;flex: 1;">出院诊断:</span></p>`
-        this.new_content = text
-        this.$refs.editor.contents = this.new_content
+       
+        this.$refs.editor.contents =  this.$refs.editor.contents + text
       },
       Inspect_click(){
         this.Inspect_dialog = true
       handleChange(val){
 
       },
-      childclick(eve){
-        console.log('eve',eve);
-        // const inspect_arr = []
-        if(this.InspectRows.length ==0){
-          this.InspectRows.push(eve)
-        }else{
-          let index = this.InspectRows.findIndex((obj) => obj.c_id === eve.c_id && obj.pater_id == eve.pater_id);
-          if (index === -1) {
-            this.InspectRows.push(eve);
-          } else {
-            this.InspectRows.splice(index, 1);
+      childclick(i){
+      
+          var params = {
+            patient_id:i.patient_id,
+            project_id:i.project_id,
+            inspect_date:i.inspect_date,
+
           }
-        }
-        this.getinspect(this.InspectRows)
-        console.log('检查',this.InspectRows.includes(eve));
+        getInspectionByProjectId(params).then(response=>{
+          if(response.data.state == 1){
+            var inspection =  response.data.data.inspection
+            var inspection_str = i.project_name + "-"+"检验日期:"+this.getTime(i.inspect_date)+";"
+            if(inspection!=null && inspection.length>0){
+              for(let i=0;i<inspection.length;i++){
+                if(inspection[i].inspect_value!=""){
+                  inspection_str += inspection[i].item_name+":" + inspection[i].inspect_value+","
+                }
+               
+              }
+            }
+            this.inspect_context = inspection_str
+            
+          }
+        })
+        // // const inspect_arr = []
+        // if(this.InspectRows.length ==0){
+        //   this.InspectRows.push(eve)
+        // }else{
+        //   let index = this.InspectRows.findIndex((obj) => obj.c_id === eve.c_id && obj.pater_id == eve.pater_id);
+        //   if (index === -1) {
+        //     this.InspectRows.push(eve);
+        //   } else {
+        //     this.InspectRows.splice(index, 1);
+        //   }
+        // }
+        // this.getinspect(this.InspectRows)
+        // console.log('检查',this.InspectRows.includes(eve));
+      },
+      toInpectionContentPint(){
+        this.$refs.editor.contents = this.$refs.editor.contents +this.inspect_context
+        this.Inspect_dialog = false
       },
       getinspect(val){
         const arr = []
         }
       },
       check_change(){
-        console.log('this',this.checked);
+
         const arr = []
         if(this.checked==true){
           for(let i in this.Inspectlist){
           this.InspectRows = []
         }
         this.getinspect(this.InspectRows)
-        console.log('this',this.InspectRows);
-      }
-
-        // if(val != ''){
-        //   for(let i in this.Inspectlist){
-        //   }
-        // }
+        // console.log('this',this.InspectRows);
       },
-
-
     //血压
     getMonitorSearchList(){
 
           patient_id:this.patient_id,
         }
         getDilaysisSystemList(params).then(response=>{
+           if(response.data.state == 1){
+              this.systemPrescritpionList = []
+              var systemPrescritpionList =  response.data.data.prescription
+              
+              if(systemPrescritpionList!=null && systemPrescritpionList.length>0){
+                 for(let i=0;i<systemPrescritpionList.length;i++){
+                   systemPrescritpionList[i].mode_name = ""
+                   systemPrescritpionList[i].mode_name = this.getModeId(systemPrescritpionList[i].mode_id)
+                   systemPrescritpionList[i].displace_name = this.getDisplaceLiqu(systemPrescritpionList[i].displace_liqui)
+                   systemPrescritpionList[i].anticoagulant_name = this.getAnticoagulantName(systemPrescritpionList[i].anticoagulant)
+                 }
+              }
+              this.systemPrescritpionList = systemPrescritpionList
 
+           }
         })
       },
+      getDisplaceLiqu(id){
+        var  displace_liqui_List = this.$store.getters.displace_liqui
+
+        var name = ""
+        for(let i=0;i<displace_liqui_List.length;i++){
+          if(id == displace_liqui_List[i].id){
+            name = displace_liqui_List[i].name
+          }
+        }
+        return name
+      },
       getPatientAdviceList(){
+        var ids = this.newIds.join()  
         var params = {
           start_time:this.start_date1,
           end_time:this.end_date1,
           patient_id:this.patient_id,
           advice_type:this.advice_type,
+          advice_status:this.advice_status,
         }
         getPatientAdviceList(params).then(response=>{
           if(response.data.state == 1){
           }
         })
       },
+      getNewPatientAdviceList(val){
+        
+         var newArr= []
+         for(let i=0;i<val.length;i++){
+           for(let j=0;j<this.adviceList.length;j++){
+             if(val[i].id == this.adviceList[j].id){
+                newArr.push(this.adviceList[j])
+             }
+           }
+         }
+         
+         
+         this.adviceNewList = []
+         this.adviceNewList = newArr
+         this.all_select = 1
+
+      },
       handleMonitorChange(val){
 
          var str = ""
       toMonitorPint(){
         this.$refs.editor.contents = this.$refs.editor.contents+this.monitor_blood_context
         this.blood_dialog = false
-      }
-
+      },
+      toInspection(){
+          var params = {
+            start_time:this.start_date1,
+            end_time:this.end_date1,
+            patient_id:this.patient_id,
+          }
+        getPatientInspectionList(params).then(response=>{
+           if(response.data.state == 1){
+             
+             var groupList = response.data.data.groupList
+             var inspection = response.data.data.inspection
+             this.inspectionList = inspection
+            
+             if(groupList.length!=null && groupList.length>0){
+                for(let i=0;i<groupList.length;i++){
+                  groupList[i].child = []
+                  for(let j=0;j<inspection.length;j++){
+                    if(groupList[i].project_id == inspection[j].project_id && groupList[i].inspect_date == inspection[j].inspect_date){
+                      groupList[i].child.push(inspection[j])
+                    }
+                  }
+                }
+             }
+        
+             for(let i=0;i<groupList.length;i++){
+               for(let j=0;j<groupList[i].child.length;j++){
+                  groupList[i].child =this.getInspection(groupList[i].child) 
+               }
+             }
+      
+             this.newInspectionList = groupList 
+          
+           }
+        })
+      },
+      getInspection(tempArr) {
+          let newArr = [];
+          for (let i = 0; i < tempArr.length; i++) {
+              if (newArr.indexOf(tempArr[i].inspect_date) == -1) {
+                  newArr.push(tempArr[i].inspect_date);
+              } else {
+                  tempArr.splice(i, 1);
+                  i--;
+              };
+          };
+          return tempArr;
+      },
+      changeInspetion(){
+      
+        for(let i=0;i<this.newInspectionList.length;i++){
+           this.newInspectionList[i].childOne =[]
+          for(let j=0;j<this.inspectionList.length;j++){
+            if(this.newInspectionList[i].project_id == this.inspectionList[j].project_id &&this.newInspectionList[i].inspect_date== this.inspectionList[j].inspect_date ){
+                this.newInspectionList[i].childOne.push(this.inspectionList[j])
+            }
+          }
+        }
+       
+         var new_inspection_str =""
+        if(this.newInspectionList!=null&& this.newInspectionList.length>0){
+           for(let i=0;i<this.newInspectionList.length;i++){
+            if(this.newInspectionList[i].childOne!=null && this.newInspectionList[i].childOne.length>0){
+              new_inspection_str += "<br/>"+ this.newInspectionList[i].project_name +"-" +"检验日期:"+ this.getTime(this.newInspectionList[i].childOne[0].inspect_date) +" "
+              for(let j=0;j<this.newInspectionList[i].childOne.length;j++){
+                if(this.newInspectionList[i].childOne[j].inspect_value!=""){
+                  new_inspection_str+= this.newInspectionList[i].childOne[j].item_name+":" + this.newInspectionList[i].childOne[j].inspect_value+","+" "
+                }
+                
+              }
+            }
+              
+           } 
+        }
+         this.inspect_context = new_inspection_str
+      },
+      toSystemContentPint(){
+       
+        this.$refs.editor.contents = this.$refs.editor.contents +this.option_context
+        this.option_dialog = false
+      },
+    
 
     },
     beforeMount(){
     },
     mounted(){
 
-    }
+    },
+  
 
   }
 </script>

src/xt_pages/user/rescueRecord.vue

       >
         <div>
           <div class="new_record_form">
-            <diV>
+            <div style="margin-bottom: 10px;">
+              <span class="filter_title">抢救时间:</span>
+              <el-date-picker
+                size="small"
+                type="date"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                placeholder="选择开始时间"
+                style="width:150px"
+                v-model="record_date"
+              ></el-date-picker>
+            </div>
+            <div>
               <span class="filter_title">日常抢救:</span>
               <el-select
                 v-model="select_template"
         <div>
           <div class="new_record_form">
             <diV>
+              <div style="margin-bottom: 10px;">
+              <span class="filter_title">抢救时间:</span>
+              <el-date-picker
+                size="small"
+                type="date"
+                format="yyyy-MM-dd"
+                value-format="yyyy-MM-dd"
+                placeholder="选择开始时间"
+                style="width:150px"
+                v-model="record_date"
+              ></el-date-picker>
+            </div>
               <span class="filter_title">日常抢救:</span>
               <el-select
                 v-model="select_template"
   modifyCoursePrint
 } from "@/api/patient";
 import { parseTime } from "@/utils";
+import { uParseTime } from '@/utils/tools'
 const moment = require('moment')
 export default {
   name: "RescueRecord",
 
       selectingRows: [],
       id:0,
+      record_date:""
     };
   },
   created() {
         return;
       }
       this.uploading_new_record = true;
-      createRescueRecord(this.patient_id, this.new_content)
+      createRescueRecord(this.patient_id, this.new_content,this.record_date)
         .then(rs => {
           this.uploading_new_record = false;
           var resp = rs.data;
          if(response.data.state == 1){
             var rescueRecord =  response.data.data.rescueRecord
             console.log("rescueRecord",rescueRecord)
+            this.record_date = this.getTime(rescueRecord.record_time)
             this.new_content = rescueRecord.content
             this.edit_show_dialog = true
          }
       var params = {
         id:this.id,
         content:this.new_content,
+        record_date:this.record_date,
       }
       modifyCoursePrint(params).then(response=>{
          if(response.data.state == 1){
           return
        }
        this.$router.push({ path: "/rescue/record/print?id="+this.id+"&patient_id="+this.patient_id});
-    }
+    },
+    getTime (time) {
+      return uParseTime(time, '{y}-{m}-{d}')
+    },
 
   }
 };