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

src/xt_pages/dialysis/batch_print/batch_print_order_seven.vue

@@ -43,7 +43,13 @@
                   <td width="50">年 龄:</td>
                   <td width="180">
                     <div class="under-line">
-                      &nbsp;{{ checkIdCardNo(record.patient.id_card_no) }}
+                      &nbsp;
+                      <span v-if="checkIdCardNo(record.patient.id_card_no)<100">
+                        {{ checkIdCardNo(record.patient.id_card_no) }}
+                      </span>
+                      <span v-else>
+                        {{ record.patient.age }}
+                      </span>
                     </div>
                   </td>
                   <td width="80">岁</td>

src/xt_pages/dialysis/template/DialysisPrintOrderFortySeven.vue

@@ -1300,7 +1300,7 @@
                             {{
                               monitor.displacement_quantity
                                 ? monitor.displacement_quantity
-                                : ""
+                                : "0"
                             }}
                           </span>
                         </td>
@@ -3040,6 +3040,7 @@ export default {
 
         this.users = response.data.data.users;
         this.patientInfo = response.data.data.patientInfo;
+        console.log('this.patientInfo11111',this.patientInfo);
 
         this.patientInfo.birth = uParseTime(
           this.patientInfo.birthday,

src/xt_pages/dialysis/template/DialysisPrintOrderSeven.vue

@@ -26,7 +26,13 @@
               <td width="50">年 龄:</td>
               <td width="150">
                 <div class="under-line">
-                  &nbsp;{{ checkIdCardNo(patientInfo.id_card_no) }}
+                  &nbsp;
+                  <span v-if="checkIdCardNo(patientInfo.id_card_no)<100">
+                    {{ checkIdCardNo(patientInfo.id_card_no) }}
+                  </span>
+                  <span v-else>
+                    {{ patientInfo.age }}
+                  </span>
                 </div>
               </td>
               <td width="60">岁</td>
@@ -914,7 +920,8 @@ export default {
       getDialysisRecord(this.queryParams).then(response => {
         if (response.data.state === 1) {
           this.total = response.data.data.total;
-
+          console.log('response.data.data',response.data.data);
+          
           this.adminUser = response.data.data.users;
           this.users = response.data.data.users;
           var patientInfo = response.data.data.patientInfo;

src/xt_pages/dialysis/template/DialysisPrintOrderSeventythree.vue

@@ -105,7 +105,7 @@
           </div>
         </div>
         <div class="row">
-          <div class="inline_block" style="margin-left: 10px">
+          <div class="inline_block" style="">
             透析日期：
             <div class="under_line"
               style="width: 120px;text-align: left;

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -472,12 +472,20 @@
                   <span v-if="monitor.venous_pressure||monitor.arterial_pressure">/</span>
                   {{ monitor.arterial_pressure ? monitor.arterial_pressure : "" }}
                 </td>
-                <td>&nbsp;{{monitor.ultrafiltration_volume==0 && monitor.id?'0':monitor.ultrafiltration_volume}}</td>
+                <td>&nbsp;
+                  <span v-if="monitor.operate_time <= dialysisOrder.end_time">
+                    {{monitor.ultrafiltration_volume==0 && monitor.id?'0':monitor.ultrafiltration_volume}}
+                  </span>
+                </td>
                 <td>&nbsp;{{monitor.transmembrane_pressure?monitor.transmembrane_pressure:''}}</td>
                 <td>&nbsp;{{monitor.conductivity?monitor.conductivity:''}}</td>
                 <td>&nbsp;{{monitor.dialysate_temperature ? monitor.dialysate_temperature : ''}}</td>
                 <!-- <td>&nbsp; <span v-if="monitor.operate_time"> {{ monitor.dialysate_flow ? monitor.dialysate_flow : "" }} </span></td> -->
-                <td>&nbsp;{{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:'0'}}</td>
+                <td>&nbsp;
+                  <span v-if="monitor.operate_time <= dialysisOrder.end_time">
+                    {{monitor.ultrafiltration_rate?monitor.ultrafiltration_rate:'0'}}
+                  </span>
+                </td>
                 <td>
                   <span v-if="monitor.symptom"> {{ monitor.symptom }} </span>
                   <span v-if="monitor.dispose"> {{ "  " + monitor.dispose }} </span>

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -83,7 +83,6 @@
             org_id != 10191 &&org_id != 10210 &&org_id != 10485  &&org_id != 10480 &&
             org_id != 10510 &&org_id != 10633 && org_id != 10721   && this.paramsObj.balance_accounts_type == 2">
       </privateChargePrint>
-
     </div>
   </div>
 </template>

src/xt_pages/outpatientDoctorStation/components/dialysishistory.vue

@@ -306,6 +306,7 @@ export default{
 
     },
     rowclick(event){
+      console.log('111111event',event.patient_id);
       this.$router.push({
         path: "/dialysis/details/indexs",
         query: { patient_id: event.patient_id, date: event.dialysis_date }
@@ -319,7 +320,6 @@ export default{
 
     },
     getPatientDialysisRecords() {
-      console.log("prams--------------------",this.queryParams)
       getPatientDialysisRecords(this.queryParams).then(response => {
         if (response.data.state == 1) {
           this.total = response.data.data.total;
@@ -370,7 +370,6 @@ export default{
       }
     },
     setAnticoagulantsConfit(prescription) {
-      console.log("透析处方----------------",prescription)
       if (typeof this.anticoagulantsConfit[prescription.anticoagulant] ==="undefined") {
         return "";
       } else {

src/xt_pages/outpatientDoctorStation/doctorDesk.vue

@@ -2745,6 +2745,8 @@ export default {
     },
 
     choosePatient(val) {
+      console.log('1234567890',val);
+      
       if (this.titleType == '电子病历') {
         if (this.$refs.child != undefined && this.$refs.child.watchSign > 2) {
           this.$confirm('是否保存当前病例', '保存', {
@@ -4734,7 +4736,7 @@ export default {
           this.$refs.child.watchSign = 0
         }
       }else if(this.titleType == '透析历史'){
-
+        this.patientid = val.id
          this.$refs.childOne.show(this.patientid)
       } else {
 

src/xt_pages/user/inspection.vue

@@ -1350,16 +1350,26 @@ export default {
               console.log("item=-----------------12",inspectionsMap[items[index].id],inspectionsMap[parseInt(items[index].item_id)])
               if (item.item_id > 0) {
                 console.log('执行0',inspectionsMap[items[index].id]);
+
                 if (typeof(inspectionsMap[parseInt(items[index].item_id)])  == "undefined") {
                   if(this.org_id == 10121 || this.org_id ==10138 || this.org_id ==10278 ){
                     item.value = inspectionsMap[items[index].id].inspect_value
                     item.item_name = inspectionsMap[items[index].id].item_name
                   }else{
                     console.log('执行3',inspectionsMap,item);
-                    if(item.project_name == '血常规'){
-                      item.value = inspectionsMap[items[index].id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
-                      item.item_name = inspectionsMap[items[index].id].item_name
-                    }else{
+                    if(this.org_id == 10702 || this.org_id == 0){
+                      if(item.project_name == '血常规'|| item.project_name == '透后肾功能' || 
+                          item.project_name == '肝功能' || item.project_name == '电解质' || item.project_name == '透前肾功能'
+                        ){
+                        console.log('11111',inspectionsMap[items[index].id].inspect_value);
+                        item.value = inspectionsMap[items[index].id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
+                        item.item_name = inspectionsMap[items[index].id].item_name
+                      }else{
+                        
+                        item.value = ''
+                        item.item_name = ''
+                      }
+                    } else{
                       item.value = ''
                       item.item_name = ''
                     }
@@ -1369,6 +1379,7 @@ export default {
                   item.value = inspectionsMap[items[index].item_id].inspect_value.replace(/&lt;/g, "<").replace(/&gt;/g, ">")
                   item.item_name = inspectionsMap[items[index].item_id].item_name
                 }
+               
 
                 if(this.org_id ==10191){
                   if(item.project_name == "乙肝定性（五项)"){