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

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

       },
       show(pre, schedual, last, his_is_open,is_advice_open,admins) {
       
-        if(this.$store.getters.xt_user.template_info.org_id==10702){
+        if(this.$store.getters.xt_user.template_info.org_id==10702 || this.$store.getters.xt_user.template_info.org_id==10635){
           if(this.predialysis!=undefined){
             if(this.dialysisPrescription.target_ultrafiltration==0 || this.dialysisPrescription.target_ultrafiltration==""){
               this.dialysisPrescription.target_ultrafiltration = (this.predialysis.weight_before - this.predialysis.dry_weight - this.predialysis.additional_weight).toFixed(2)

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFive.vue

                   <td width="100">
                     <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('常规') > -1 ? true : prescription.dialysate_formulation_name.indexOf('低钙') > -1 ? true : false" showValue="2.0"></label-box>
                     <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('高钾') > -1 ? true : false" showValue="2.5"></label-box>
+                    <label-box :isChecked="prescription.dialysate_formulation_name.indexOf('钾3.0') > -1 ? true : false" showValue="3.0"></label-box>
                   </td>
                   <td width="10">)</td>
                   <td width="10">mmol/L</td>

src/xt_pages/org/orginfo.vue

             GetOrgInfo().then(response=>{
                 var res = response.data;
                 if (res.state === 1) {
+                   
                     this.formloading = false;
                     this.form.org_name = res.data.orginfo.org_name;
                     this.form.contact_name = res.data.orginfo.contact_name;
                     this.form.illness_list = [];
                     this.form.org_gallery = res.data.orginfo.org_gallery;
                     this.fileList = [];
-                    var gallery =  res.data.orginfo.gallery
+                    var gallery =  res.data.orginfo.org_gallery
+                    console.log("haaaaaaaaaaaaaaaaaa",gallery)
                     for (const index in gallery) {
                         var image = {id:gallery[index].id, name:gallery[index].id, url:gallery[index].type==1?gallery[index].url:gallery[index].url+'?vframe/jpg/offset/0/w/100/h/100'};
                         this.fileList.push(image);
                     }
+                    console.log("fileList-------------",fileList)
 
                     var illness = res.data.orginfo.illness.split(',');
                     for (const index in illness) {

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

     this.first_dialysis_date = this.getTime(
       this.patientInfo.first_dialysis_date
     );
-   
+    
+    console.log("case_history-----------------------------",this.case_history)
     if(this.case_history!=undefined){
       if(this.case_history.id == 0){
         this.primary_disease = this.LastCaseHistory.primary_disease
         console.log("patient------------------------",this.patientInfo)
         console.log("prescriptionInfo--------------------",this.prescriptionInfo)
         console.log("this.diagnoses",this.diagnoses)
-        if(this.befor!=undefined){
+        console.log("this.case_history",this.case_history)
+        if(this.case_history!=null && this.case_history.id == 0){
+          console.log("hhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")
+          if(this.befor!=undefined){
           if(this.case_history.temperature == 0){
             this.case_history.temperature =  this.befor.temperature?this.befor.temperature:""
           }
                console.log("诊断---------------------",this.diagnoses)
               this.case_history.diagnose = this.getDiagnosis(this.prescriptionInfo.diagnosis) 
            }
+         }
         }
+      
       },
       deep: true,
     },

src/xt_pages/qcd/basicInformationAnalysis.vue

                     <p>HDF+HP:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                     <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
+
+                 
                   <!-- <span v-if="item.mode_id == 'HFHD+HD'">
                       <p>HFHD+HD:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                       <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
                   </span>
 
+                  <span v-if="item.mode_id == 'HD(无肝素)'">
+                    <p>HD(无肝素):{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
+                  <span v-if="item.mode_id == 'HDF17H'">
+                    <p>HDF17H:{{item.count}}次({{(item.count/total*100).toFixed(2)}}%)</p>
+                    <el-progress :percentage="(item.count/total*100).toFixed(2)"></el-progress>
+                  </span>
+
 
                </div>
               </div>
             if(modedate[i].mode_id == 39){
               modedate[i].mode_id = "HF16"
             }
+            if(modedate[i].mode_id == 40){
+                modedate[i].mode_id = "HD(无肝素)"
+            }
+            if(modedate[i].mode_id == 41){
+                modedate[i].mode_id = "HDF17H"
+            }
             this.modetype = modedate
 
             // this.modesData.xAxis.push(modedate[i].mode_id)

src/xt_pages/qcd/treatmentControlAnalysis/components/TimePersonal.vue

             if(modeIdCount[i].mode_id == 39){
               modeIdCount[i].mode_id = "HF16"
             }
+            if(modeIdCount[i].mode_id == 40){
+              modeIdCount[i].mode_id = "HD(无肝素)"
+            }
+            if(modeIdCount[i].mode_id == 41){
+              modeIdCount[i].mode_id = "HDF17H"
+            }
           }
           this.modeIdCount = modeIdCount
 
             if(scheduleCount[i].mode_id == 39){
               scheduleCount[i].mode_id = "HF16"
             }
+            if(scheduleCount[i].mode_id == 40){
+              scheduleCount[i].mode_id = "HD(无肝素)"
+            }
+            if(scheduleCount[i].mode_id == 41){
+              scheduleCount[i].mode_id = "HDF17H"
+            }
           }
           this.scheduleCount = scheduleCount
           let dataInfo = {}
           patients[i].mode_id = "HDF80"
         }else if(patients[i].mode_id == 39){
           patients[i].mode_id = "HF16"
+        }else if(patients[i].mode_id == 40){
+          patients[i].mode_id = "HD(无肝素)"
+        }else if(patients[i].mode_id == 41){
+          patients[i].mode_id = "HDF17H"
         }
         
 
          this.DialysisData[i].HDF80 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF80")
          this.DialysisData[i].HF16 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HF16")
 
+         this.DialysisData[i].HD无肝素 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HD(无肝素)")
+
+         this.DialysisData[i].HDF17H = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF17H")
+
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
          this.DialysisData[i].total_count = this.getDialysisCount(this.DialysisData[i].patient_id)
        }
        console.log("hhh2323323232",this.DialysisData)
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','总数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','total_count']
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD无肝素','HDF17H','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD无肝素','HDF17H','total_count']
 
         const data = this.formatJson(filterVal, this.DialysisData)
 
          this.DialysisData[i].HDF80 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF80")
          this.DialysisData[i].HF16 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HF16")
 
+         this.DialysisData[i].HD无肝素 = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HD(无肝素)")
+
+          this.DialysisData[i].HDF17H = this.getScheduleHdModeIdCount(this.DialysisData[i].patient_id,"HDF17H")
+
          this.DialysisData[i].age = this.getAge(this.DialysisData[i].id_card_no)
          this.DialysisData[i].total_count = this.getScheduleDialysisCount(this.DialysisData[i].patient_id)
        }
        console.log("hhh2323323232",this.DialysisData)
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','总数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','total_count']
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD无肝素','HDF17H','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD无肝素','HDF17H','total_count']
 
         const data = this.formatJson(filterVal, this.DialysisData)
 
          this.scheduleList[i].HDF1000 = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF1000")
          this.scheduleList[i].HDF80 = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF80")
          this.scheduleList[i].HF16 = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HF16")
+         this.scheduleList[i].HD无肝素 = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HD(无肝素)")
+         this.scheduleList[i].HDF17H = this.getScheduleHdModeIdCount(this.scheduleList[i].patient_id,"HDF17H")
          this.scheduleList[i].age = this.getAge(this.scheduleList[i].id_card_no)
          this.scheduleList[i].total_count = this.getScheduleDialysisCount(this.scheduleList[i].patient_id)
        }
        console.log("hhh2323323232",this.scheduleList)
        import('@/vendor/Export2Excel').then(excel => {
-        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','','HDF80','HF16','总数']
-        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','total_count']
+        const tHeader = ['序号','姓名', '年龄', '透析号','HD','HDF','HD+HP','HP','HF','SCUF','IUF','HFHD','HFHD+HP','HFR','HDF+HP','CRRT','腹水回输','IUF+HD','UF','HD+','I-HDF','HD高通','CVVH','CVVHD','CVVHDF','PE','血浆胆红素吸附+HP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','','HDF80','HF16','HD无肝素','HDF17H','总数']
+        const filterVal = ['index','name', 'age', 'dialysis_no','HD','HDF','HDHP','HP','HF','SCUF','IUF','HFHD','HFHDHP','HFR','HDFHP','CRRT','OTR','IUF+HD','UF','HD+','I-HDF','HDGT','CVVH','CVVHD','CVVHDF','PE','XUEHP','HPD','HDP','PHF','HDF100','HDF600','HDF800','HDF1000','HDF80','HF16','HD无肝素','HDF17H','total_count']
 
         const data = this.formatJson(filterVal, this.scheduleList)
 

src/xt_pages/user/components/PatientSidebar.vue

               name: '1-3',
               label: '肾科检验'
             },
-            {
-              name: '4-12',
-              label: '新版肾科检验'
-            },
+            // {
+            //   name: '4-12',
+            //   label: '新版肾科检验'
+            // },
             {
               name: '4-1',
               label: '肾科检查'