Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

src/store/modules/globalConfig.js

@@ -834,6 +834,36 @@ const global_config = {
         calcium: 1,
         bicarbonate: 1
       },
+      42: {
+        id: 42,
+        name: 'HD(1)',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
+      43: {
+        id: 43,
+        name: 'HD(2)',
+        dialysis_duration: 1,
+        replacement_way: 1,
+        hemodialysis_machine: 2,
+        blood_filter: 1,
+        perfusion_apparatus: 2,
+        blood_flow_volume: 1,
+        dialysate_flow: 1,
+        kalium: 1,
+        sodium: 1,
+        calcium: 1,
+        bicarbonate: 1
+      },
     },
     anticoagulants_confit: { // 抗凝剂
       1: {
@@ -2349,6 +2379,10 @@ const global_config = {
     {
       id: 2,
       name: '后稀释'
+    },
+    {
+      id:3,
+      name:"前+后稀释"
     }
     ],
 

src/xt_pages/dialysis/details/NavIgation.vue

@@ -126,6 +126,7 @@
        :dryWeightList="dryWeightList"
        :docList="docList"
        :first_monitor="first_monitor"
+       :last_record="last_assessment_after_dislysis"
     ></assessment-before-dislysis-dialog>
 
     <treatment-summary-dialog

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

@@ -39,6 +39,12 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="this.$store.getters.xt_user.template_info.org_id ==10702 || this.$store.getters.xt_user.template_info.org_id ==0">
+            <el-form-item label="上次透后体重:" :prop="isName('上次透后体重')">
+              <el-input v-model="assessmentBeforeDislysis.last_weight" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="8">
             <el-form-item label="干体重(kg)："
               :prop="isName('干体重')"
@@ -988,6 +994,7 @@
           washing_time:"",
           warsh_count:"",
           puncture_needle_direction:"",
+          last_weight:"",
         },
 
         InnerDialogProps: {
@@ -1068,6 +1075,12 @@
           return { id: 0 };
         }
       },
+      last_record: {
+        type: Object,
+        default: () => {
+          return { id: 0 }
+        }
+      },
 
     },
     methods: {
@@ -1137,6 +1150,10 @@
         }
 
         console.log("第一条监测数据23333333333333333",this.first_monitor)
+        if(this.last_record!=null){
+          this.assessmentBeforeDislysis.last_weight = (this.last_record.weight_after - this.last_record.additional_weight).toFixed(1)
+        }
+       
 
         if(this.lastPredialysisEvaluation != null) {
         // if(this.lastPredialysisEvaluation.remark == "" && this.$store.getters.xt_user.org.id == 10307){

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

@@ -952,20 +952,22 @@
                     <el-col :span="8"
                             v-if="isShows('置换液总量') && (((this.$store.getters.xt_user.template_info.template_id == 21 || this.$store.getters.xt_user.template_info.template_id == 29 || this.$store.getters.xt_user.template_info.template_id ==24 || this.$store.getters.xt_user.template_info.template_id ==53) && this.$store.getters.xt_user.template_info.org_id != 10249) && this.$store.getters.xt_user.template_info.org_id != 10441)"
                             v-show="totalShow">
-                        <el-form-item label="置换液总量(ml)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')">
-                            <el-input
-                                    v-model="dialysisPrescription.displace_liqui_value"
-                            ></el-input>
+                        <el-form-item label="置换液总量(ml)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id!=26">
+                            <el-input v-model="dialysisPrescription.displace_liqui_value"></el-input>
+                        </el-form-item>
+
+                        <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')" v-if="dialysisPrescription.mode_id ==26">
+                            <el-input v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
                     </el-col>
                     <el-col :span="8"
                             v-if="isShows('置换液总量') && (this.$store.getters.xt_user.template_info.template_id != 21 && this.$store.getters.xt_user.template_info.template_id != 29 && this.$store.getters.xt_user.template_info.template_id !=24 && this.$store.getters.xt_user.template_info.template_id !=53) || this.$store.getters.xt_user.template_info.org_id  == 10249 || this.$store.getters.xt_user.template_info.org_id == 10441 "
                             v-show="totalShow">
-                            <!-- v-show="totalShow" -->
-                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')">
-                            <el-input
-                                    v-model="dialysisPrescription.displace_liqui_value"
-                            ></el-input>
+                        <el-form-item label="置换液总量(L)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id!=26">
+                            <el-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>
+                        </el-form-item>
+                        <el-form-item label="置换液总量(L/h)" prop="displace_liqui_value" :rules="isCheckmust('置换液总量')"  v-if="dialysisPrescription.mode_id ==26">
+                            <el-input  v-model="dialysisPrescription.displace_liqui_value"></el-input>
                         </el-form-item>
                     </el-col>
 
@@ -3309,7 +3311,7 @@ mu
             //   }
 
             // }
-            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=10 && this.dialysisPrescription.mode_id!=34 && this.dialysisPrescription.mode_id!=35  && this.dialysisPrescription.mode_id!=36 && this.dialysisPrescription.mode_id!=37){
+            if(this.dialysisPrescription.mode_id!=2 && this.dialysisPrescription.mode_id!=5 && this.dialysisPrescription.mode_id!=12 && this.dialysisPrescription.mode_id!=10 && this.dialysisPrescription.mode_id!=34 && this.dialysisPrescription.mode_id!=35  && this.dialysisPrescription.mode_id!=36 && this.dialysisPrescription.mode_id!=37 && this.dialysisPrescription.mode_id!=41){
               this.dialysisPrescription.displace_liqui_part = 0
               this.dialysisPrescription.displace_liqui_value = 0
               this.dialysisPrescription.replacement_total = 0

src/xt_pages/dialysis/template/DialysisPrintOrderSeventyeight.vue

@@ -212,14 +212,14 @@
                   <div 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">
                       透析期间：
                       <div
                         style="width: 50%; text-align: center;display: inline-block;border-bottom: 1px solid #999;"
                       >
                         {{ predialysis.dialysis_interphase ? predialysis.dialysis_interphase : '/' }}
                       </div>
-                    </div>
+                    </div> -->
 
                     <div class="inline_block" style=" flex: 1">
                       透前症状：
@@ -1938,8 +1938,6 @@ export default {
         this.predialysis.diastolic_blood_pressure == 0
       ) {
         this.$message.error("透前血压未填完整");
-      } else if (this.predialysis.dialysis_interphase == "") {
-        this.$message.error("透析期间未填");
       } else if (this.predialysis.symptom_before_dialysis == "") {
         this.$message.error("透前症状未填");
       } else if (this.predialysis.internal_fistula == "") {

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -917,8 +917,8 @@
                         }}
                         </span>
 
-                        <span v-if="org_id ==10510 ">
-                          <span v-if="prescription.mode_id ==2 || prescription.mode_id ==5 || presciption.mode_id==12">{{
+                        <span v-if="org_id ==10510 || org_id == 0">
+                          <span v-if="prescription!=null &&( prescription.mode_id ==2 || prescription.mode_id ==5 || presciption.mode_id==12)">{{
                             afterdialysis.displace_liqui_value
                             ? afterdialysis.displace_liqui_value
                             : "/"
@@ -926,7 +926,7 @@
                         </span>
                         <span v-else>/</span>
                         </span>
-                        <span v-if="org_id!=10206&& org_id!=10510"> {{
+                        <span v-if="org_id!=10206&& org_id!=10510 && org_id!=0"> {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
                             : "/"
@@ -951,16 +951,22 @@
                             ? prescription.replacement_total
                             : "/"
                         }}
-                        </span>
+                       </span>
 
-                        <span v-if="org_id ==10510"> {{
-                          afterdialysis.displace_liqui_value
+                        <span v-if="org_id ==10510 || org_id == 0">
+                          <span v-if="prescription!=null && (prescription.mode_id ==2 || prescription.mode_id ==5 || prescription.mode_id==12)">{{
+                            afterdialysis.displace_liqui_value
                             ? afterdialysis.displace_liqui_value
                             : "/"
-                        }}
+                           }}
+                          </span>
+                          <span v-else>
+                            
+                          </span>
                         </span>
 
-                        <span v-if="org_id!=10206 && org_id!=10510"> {{
+                       
+                        <span v-if="org_id!=10206 && org_id!=10510&&org_id!=0"> {{
                           prescription.displace_liqui_value
                             ? prescription.displace_liqui_value
                             : "/"
@@ -2197,7 +2203,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206 || org_id== 10489"
+                      v-if="org_id == 0 || org_id ==10206 || org_id == 10644"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -2416,7 +2422,7 @@
 
 
                       <tr
-                      v-if="org_id == 0 || org_id ==10206 || org_id ==10489 || org_id ==10633 || org_id ==10644"
+                      v-if="org_id == 0 || org_id ==10206 || org_id ==10633 || org_id ==10644"
                       v-for="(advice, advice_index) in projectsOne"
                       :key="advice_index"
                     >
@@ -5639,7 +5645,7 @@ export default {
 
         console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
 
-        if(this.org_id ==10206 || this.org_id ==10489 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0){
+        if(this.org_id ==10206 || this.org_id ==10644 || this.org_id ==10633 || this.org_id == 0){
           let projectsOne = [];
           response.data.data.projects.map((item) => {
               projectsOne.push(item);
@@ -5677,7 +5683,7 @@ export default {
         }
 
         //HIS客户显示临时医嘱的地方
-        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489|| this.org_id == 10644){
+        if(this.org_id == 10510 || this.org_id ==10567 || this.org_id == 10489){
           if(response.data.data.doctorAdevieInfo!=null && response.data.data.doctorAdevieInfo.length>0){
 
             for(let i=0;i<response.data.data.doctorAdevieInfo.length;i++){
@@ -5702,7 +5708,7 @@ export default {
 
 
 
-        if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206 && this.org_id!=10478 && this.org_id!=0 && this.org_id!=10489){
+        if(this.org_id!=10510 && this.org_id!=0&&this.org_id!=10206 && this.org_id!=10478 && this.org_id!=0 && this.org_id!=10489 && this.org_id!=10644){
             if(this.projects!=null && this.projects.length >0){
              for(let i=0;i<this.projects.length;i++){
               if(this.projects[i].type== 2){

src/xt_pages/org/orginfo.vue

@@ -449,8 +449,10 @@ import Neditor from '@/components/Neditor'
                         this.fileList.push(image);
                     }
                     console.log("fileList-------------",fileList)
-
-                    var illness = res.data.orginfo.illness.split(',');
+                    var illnessList = "21,22,23,24,25,26,27,28,29,30,31,32"
+                    // var illness = res.data.orginfo.illness.split(',');
+                    var illness = illnessList.split(',')
+                    console.log("illness--------------------",illness)
                     for (const index in illness) {
                         var iid = parseInt(illness[index]);
                         if (isNaN(iid) || iid<=0) {
@@ -458,8 +460,12 @@ import Neditor from '@/components/Neditor'
                         }
                         this.form.illness_list.push(iid);
                     }
+                    console.log("this.form.illness_list---------------------",this.form.illness_list)
                     var business_week = this.form.business_week;
                     var business_week_tem = business_week.split(" — ");
+
+                    console.log("business_week",business_week)
+                    console.log("business_week_tem",business_week_tem)
                     if(business_week_tem.length==2) {
                         var fromIndex = this.weekOptions.indexOf(business_week_tem[0]);
                         var toIndex = this.weekOptions.indexOf(business_week_tem[1]);

src/xt_pages/outpatientDoctorStation/components/deskRecord.vue

@@ -582,7 +582,7 @@ export default {
             caseHistory.confirm_failure_date
           );
           this.drug_allergy_history = caseHistory.drug_allergy_history;
-          this.physical_examination = caseHistory.physical_examination;
+          this.physical_examination = caseHistory.physical_examination
           this.special_inspection = caseHistory.special_inspection;
           this.lab_apparatus = caseHistory.lab_apparatus;
           this.form.id = historyInfo.id;
@@ -827,7 +827,7 @@ export default {
         this.primary_disease = this.LastCaseHistory.primary_disease
         this.confirm_failure_date = this.LastCaseHistory.confirm_failure_date
         this.drug_allergy_history = this.LastCaseHistory.drug_allergy_history
-        this.physical_examination = this.LastCaseHistory.physical_examination
+        this.physical_examination = this.LastCaseHistory.physical_examination?this.patientInfo.remark:""
         this.special_inspection = this.LastCaseHistory.special_inspection
         this.lab_apparatus = this.LastCaseHistory.lab_apparatus
         this.case_history.sick = this.LastCaseHistory.sick
@@ -848,7 +848,7 @@ export default {
         this.primary_disease = this.case_history.primary_disease
         this.confirm_failure_date = this.case_history.confirm_failure_date
         this.drug_allergy_history = this.case_history.drug_allergy_history
-        this.physical_examination = this.case_history.physical_examination
+        this.physical_examination = this.case_history.physical_examination?this.patientInfo.remark:""
         this.special_inspection = this.case_history.special_inspection
         this.lab_apparatus = this.case_history.lab_apparatus
       }
@@ -882,19 +882,6 @@ export default {
     patientInfo: {
       handler(newval, oldval) {
 
-        this.primary_disease = this.patientInfo.primary_disease;
-        this.confirm_failure_date = this.patientInfo.confirm_failure_date;
-        this.drug_allergy_history = this.patientInfo.drug_allergy_history;
-        this.physical_examination = this.patientInfo.physical_examination;
-        this.special_inspection = this.patientInfo.special_inspection;
-        this.lab_apparatus = this.patientInfo.lab_apparatus;
-        console.log("WOWOWOWOOWOWOWWO",this.patientInfo)
-        console.log("透气那数据阿道夫阿道夫阿道夫低分安抚",this.LastCaseHistory)
-        console.log("befor------------------------",this.befor)
-        console.log("patient------------------------",this.patientInfo)
-        console.log("prescriptionInfo--------------------",this.prescriptionInfo)
-        console.log("this.diagnoses",this.diagnoses)
-        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){
@@ -919,19 +906,25 @@ export default {
           }   
         }
         if(this.patientInfo!=null){
+           console.log("owowowowowoo222222222222222",this.patientInfo)
            this.case_history.chief_conplaint = this.patientInfo.patient_complains
            this.case_history.history_of_present_illness = this.patientInfo.present_history
            this.case_history.past_history = this.patientInfo.past_history
            this.allergic_history = this.patientInfo.allergic_history
            this.case_history.diagnostic = this.patientInfo.diagnose
-         
+           this.physical_examination = this.patientInfo.remark
+           this.primary_disease = this.patientInfo.primary_disease;
+            this.confirm_failure_date = this.patientInfo.confirm_failure_date;
+            this.drug_allergy_history = this.patientInfo.drug_allergy_history;
+            this.special_inspection = this.patientInfo.special_inspection;
+            this.lab_apparatus = this.patientInfo.lab_apparatus;
            if(this.prescriptionInfo!=null){
                console.log("诊断---------------------",this.diagnoses)
               this.case_history.diagnose = this.getDiagnosis(this.prescriptionInfo.diagnosis) 
            }
          }
         }
-      
+        console.log("体格检查444444444444444444444",this.physical_examination)
       },
       deep: true,
     },
@@ -953,7 +946,11 @@ export default {
         this.primary_disease = this.case_history.primary_disease
         this.confirm_failure_date = this.case_history.confirm_failure_date
         this.drug_allergy_history = this.case_history.drug_allergy_history
-        this.physical_examination = this.case_history.physical_examination
+        if(this.case_history.physical_examination!=''){
+          this.physical_examination = this.case_history.physical_examination
+        }
+      
+        console.log("体格检查555555555555555555",this.physical_examination)
         this.special_inspection = this.case_history.special_inspection
         this.lab_apparatus = this.case_history.lab_apparatus
         this.watchSign++;

src/xt_pages/outpatientDoctorStation/recordPrint.vue

@@ -62,7 +62,7 @@
       <!-- || org_id == 0-->
       </printThree>
       <printFour
-        v-if="org_id == 10138 || org_id == 10278 || org_id == 10341 || org_id == 10342"
+        v-if="org_id == 10138 || org_id == 10278 || org_id == 10341 || org_id == 10342 || org_id == 0"
         ref="printFour"
         v-bind:childResponse="childResponse"
         :patient="patient"

src/xt_pages/outpatientDoctorStation/template/prineight.vue

@@ -40,14 +40,14 @@
                 透析号:{{ item.patient.dialysis_no }}
               </div>
               <div style="flex: 1;">
-                费别:自费
-                <!-- <span v-if="hisPatient.balance_accounts_type==1">
+                费别:
+                <!-- <span v-if="item.hisPatient.balance_accounts_type==1">
                   <span v-if="hisPatient.insutype==390">城乡医保</span>
                   <span v-if="hisPatient.insutype==310">职工医保</span>
+                </span> v-else-->
+                <span >
+                  {{ getsettlement(item.hisPatient.balance_accounts_type) }}
                 </span>
-                <span v-else>
-                  {{ getsettlement(hisPatient.balance_accounts_type) }}
-                </span> -->
               </div>
             </div>
             <div  style="display: flex;line-height: 24px;padding: 0 10px;">
@@ -91,14 +91,14 @@
             </div>
             <div style="display: flex;margin: 10px 0;">
               <div style="flex: 1;">门诊号:{{ hisPatient.number ? hisPatient.number : "" }}</div>
-              <div style="flex: 1;">费别:自费
+              <div style="flex: 1;">费别:
                 <!-- <span v-if="hisPatient.balance_accounts_type==1">
                   <span v-if="hisPatient.insutype==390">城乡医保</span>
                   <span v-if="hisPatient.insutype==310">职工医保</span>
+                </span> v-else-->
+                <span >
+                  {{ getsettlement(item.hisPatient.balance_accounts_type) }}
                 </span>
-                <span v-else>
-                  {{ getsettlement(hisPatient.balance_accounts_type) }}
-                </span> -->
               </div>
             </div>
             <div style="display: flex;">
@@ -114,8 +114,7 @@
 
           <div class="prescriptionBox" style="min-height: 300px;">
             <div class="Rp">Rp:</div>
-            <div
-              class="drugsBox"
+            <div class="drugsBox"
               v-for="(it, index) in item.advices" :key="index"
               :style="{'page-break-after':index==yi&&item.advices.length>5? 'always':'auto'}"
             >
@@ -125,7 +124,9 @@
                   v-if="prescriptions[index].med_type != '1111' && prescriptions[index].med_type != '1112'">
                   <div style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
                     <div style="flex: 1;">
-                      NO:
+                      NO:{{ item.prescription_number.substring(
+                        item.prescription_number.length - 6
+                      ) }}
                     </div>
                     <div style="flex: 1;">
                       开方时间:{{ getTime(item.ctime) ? getTime(item.ctime) : "" }}
@@ -136,7 +137,10 @@
                       透析号:{{ item.patient.dialysis_no }}
                     </div>
                     <div style="flex: 1;">
-                      费别:居民医保/职工医保/自费
+                      费别:
+                      <span >
+                        {{ getsettlement(item.hisPatient.balance_accounts_type) }}
+                      </span>
                     </div>
                   </div>
                   <div  style="display: flex;margin: 10px 0;line-height: 24px;padding: 0 10px;">
@@ -176,7 +180,11 @@
                   </div>
                   <div style="display: flex;margin: 10px 0;">
                     <div style="flex: 1;">门诊号:{{ hisPatient.number ? hisPatient.number : "" }}</div>
-                    <div style="flex: 1;">费别:居民医保/职工医保/自费</div>
+                    <div style="flex: 1;">费别:
+                      <span >
+                        {{ getsettlement(item.hisPatient.balance_accounts_type) }}
+                      </span>
+                    </div>
                   </div>
                   <div style="display: flex;">
                     <div style="flex: 1;">临床诊断:{{ getDiagnosis(item.info.diagnosis) }}</div>

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

@@ -441,7 +441,7 @@ export default {
               list[i].drugAddOne= 0
               list[i].drugOutOne =0
               
-              if(this.org_id ==10210  || this.org_id ==10402 || this.org_id ==10215){
+              if(this.org_id ==10210  || this.org_id ==10402 || this.org_id ==10215 || this.org_id == 0 || this.org_id ==10191){
                  list[i].drugIn = this.GetDrugStartFlow(list[i].DrugStatFlow.over_count,list[i].min_number,list[i].min_unit,list[i].max_unit) 
               }else{
                 list[i].drugIn = this.GetInitStartFlow(list[i].new_drug_in_flow_info,list[i].new_drug_profit_flow_info,list[i].new_drug_out_flow_info,list[i].new_drug_no_profit_flow_info,list[i].new_drug_cancel_flow_info,list[i].min_number,list[i].min_unit,list[i].max_unit)

src/xt_pages/user/doctorAdvice.vue

@@ -1859,7 +1859,7 @@
                   }}{{ advice.single_dose_unit }}</span
                 >
                 <span>{{ advice.delivery_way }}</span>
-                <span>{{ advice.execution_frequency }}</span>
+                <!-- <span>{{ advice.execution_frequency }}</span> -->
               </td>
               <td>
                 <span v-if="advice.execution_time != 0">{{