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

src/xt_pages/dialysis/batch_print/batch_print_order_six.vue

@@ -1492,14 +1492,14 @@
                             {{
                               monitor_record.venous_pressure
                                 ? monitor_record.venous_pressure
-                                : ""
+                                : "/"
                             }}
                           </td>
                           <td>
                             {{
                               monitor_record.transmembrane_pressure
                                 ? monitor_record.transmembrane_pressure
-                                : ""
+                                : "/"
                             }}
                           </td>
                           <td v-if="org_id != 9836">

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

@@ -1356,6 +1356,7 @@
                             <td width="50" >1:9肝素盐水剩余量<br />(ml)</td>
                             
                             <td width="60">体温(°C)</td>
+                            <td width="60">透析液温度(°C)</td>
                             <td width="60">病情变化及处理</td>
                             <td width="60">签名</td>
                             
@@ -1470,6 +1471,13 @@
                                 : ""
                             }}
                             </td>
+                            <td >
+                               {{
+                              monitor_record.dialysate_temperature
+                                ? monitor_record.dialysate_temperature
+                                : ""
+                            }}
+                            </td>
                             <td width="60">
                               {{ monitor_record.symptom }} &nbsp;{{
                                 monitor_record.dispose

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

@@ -4181,6 +4181,11 @@ mu
                 this.dialysisPrescription.remark = response.data.data.dialysisPrescription.remark
               }
             }
+            if(this.$store.getters.xt_user.template_info.org_id== 10013 || this.$store.getters.xt_user.template_info.org_id== 10014){
+              if (this.last_prescription != null && response.data.data.dialysisPrescription != null) {
+                this.dialysisPrescription.remark = response.data.data.dialysisPrescription.remark
+              }
+            }
           } else {
             if (response.data.data.prescription != null) {
               // 临时处方不为空
@@ -4237,6 +4242,12 @@ mu
                 this.dialysisPrescription.remark = this.last_prescription.remark
               }
             }
+            if(this.$store.getters.xt_user.template_info.org_id== 10013 || this.$store.getters.xt_user.template_info.org_id== 10014){
+              if (this.last_prescription != null) {
+                this.dialysisPrescription.remark = this.last_prescription.remark
+              }
+            }
+
           }
         if (
           this.dialysisPrescription.dialysis_duration_hour === '' ||

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -92,7 +92,7 @@
           <div class="inline_block" v-if="org_id!=10460">
             床号：
             <div class="under_line" style="width: 50px; text-align: center">
-              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460">{{
+              <span v-if="org_id == 10121||org_id == 10414 || org_id == 10447 || org_id == 9675 || org_id == 0 || org_id ==10460 || org_id ==10515">{{
                 dialysisOrder &&
                 dialysisOrder.DeviceNumber &&
                 dialysisOrder.DeviceNumber.number.length > 0
@@ -1501,7 +1501,7 @@
                           {{
                             monitor.venous_pressure
                               ? monitor.venous_pressure
-                              : ""
+                              : "/"
                           }}
                         </td>
                         <td>
@@ -1517,7 +1517,7 @@
                             {{
                               monitor.transmembrane_pressure
                                 ? monitor.transmembrane_pressure
-                                : ""
+                                : "/"
                             }}
                           </span>
                           <span

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

@@ -1433,7 +1433,8 @@
                         <td width="50">超滤率<br />(ml/h)</td>
                         <td width="50">超滤量<br />(ml/h)</td>
                         <td width="50">1:9肝素盐水剩余量<br />(ml/h)</td>
-                        <td width="50">体温<br />(ml/h)</td>
+                        <td width="50">体温<br />(℃)</td>
+                        <td width="50">透析液温度<br />(℃)</td>
                         <td width="50">病情变化及处理</td>
                         <td width="50">签名<br /></td>
                      
@@ -1456,6 +1457,7 @@
                         <td width="50">{{monitor.ultrafiltration_volume }}<br /></td>
                         <td width="50">{{monitor.heparin }}<br /></td>
                         <td width="50">{{monitor.temperature }}<br /></td>
+                        <td width="50">{{monitor.dialysate_temperature }}<br /></td>
                         <td width="50">{{ monitor.symptom }} &nbsp;{{
                                 monitor.dispose
                               }}</td>
@@ -3815,6 +3817,13 @@ export default {
         return "0.0";
       }
     },
+    compare (property) {
+      return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
+      }
+    },
   },
   watch: {
     "patientInfo.gender": function () {

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyfour.vue

@@ -1001,6 +1001,7 @@ export default {
         let projects = [];
         response.data.data.projects.map((item) => {
           if (item.type == 2 && item.project.is_print == 1) {
+          
             projects.push(item);
           }
         });
@@ -1025,9 +1026,11 @@ export default {
         console.log("this.projects", this.projects);
 
         // var objProject = {advice_name:"",start_time:"",single_dose:"",single_dose_unit:"",}
-      
+        
+        
         if(this.projects!=null && this.projects.length >0){
            for(let i=0;i<this.projects.length;i++){
+             this.projects.sort(this.compare('execution_time'))
              if(this.projects[i].type== 2){
             
               this.projects[i].project_team_name = ""
@@ -1384,6 +1387,13 @@ export default {
       // 通过Blob将Uint8Array数组转换成pdf类型的文件对象
       return new Blob([uInt8Array], { type: 'application/pdf' });
     },
+    compare (property) {
+      return function (a, b) {
+          var value1 = a[property]
+          var value2 = b[property]
+          return value1 - value2
+      }
+    },
   },
   created() {
     var bloodAccessParOpera = getDataConfig(

src/xt_pages/management/index.vue

@@ -37,7 +37,7 @@
           icon="el-icon-search"
           size="small"
           @click="Auto()"
-          >自动生成</el-button
+          >脚本</el-button
         > -->
       </div>
 

src/xt_pages/outpatientCharges/invoiceTemplate/printtwelve.vue

@@ -81,7 +81,7 @@
           {{paramsObj.name}}
         </div>
         <div :style="{position: 'absolute',top:(80 + (index * 450))  + 'px',left:'200px'}">
-
+          {{list.order.fa_piao_number}}
         </div>
       </div>
 
@@ -321,7 +321,7 @@ export default {
           }
           this.pageArr.push(obj)
         }
-       
+
           // var num=''
           // if(this.pageArr.length<=3){
           //   num=1

src/xt_pages/outpatientCharges/summary.vue

@@ -66,6 +66,16 @@
             </el-option>
           </el-select>
 
+
+          <el-select v-model="medTypeVal" placeholder="请选择医疗类别" style="margin-right:20px;" @change="handleMedChange">
+            <el-option
+              v-for="item in med_options"
+              :key="item.id"
+              :label="item.text"
+              :value="item.id">
+            </el-option>
+          </el-select>
+
           <!-- <el-date-picker
               size="small"
               v-model="start_time"
@@ -496,6 +506,11 @@ export default {
     return {
       orderObj: {},
       batchOrderObj:{},
+      med_options:[
+        { id: 0, text: '全部' },
+        { id: 11, text: '普通门诊' },
+        { id: 14, text: '门诊特殊病' },
+      ],
       zone_options: [
         { id: 0, text: '全部分区' }
       ],
@@ -515,6 +530,7 @@ export default {
       keywords: "",
       sch_type:"0",//班次
       zoneVal:0,//分区
+      medTypeVal:0,
       start_time: moment(new Date()).add('year',0).format("YYYY-MM-DD"),
       end_time: moment(new Date()).add('year',0).format("YYYY-MM-DD"),
       total: "",
@@ -583,6 +599,8 @@ export default {
     handleSchType(val){
       this.sch_type = val
       this.getHisOrderList()
+    },handleMedChange(){
+      this.getHisOrderList()
     },
     handleZoneChange(val){
       this.zoneVal = val
@@ -3577,7 +3595,8 @@ export default {
         p_type: 2,
         sort_type: this.sort_type,
         sch_type: this.sch_type,
-        zone_type: this.zoneVal
+        zone_type: this.zoneVal,
+        med_type: this.medTypeVal
       };
       getHisOrderList(params).then((response) => {
         if (response.data.state == 0) {

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -961,7 +961,7 @@ export default {
       this.getExportOutOrderDrugList();
     },
     batchDelete() {
-      console.log("232322323", this.selectedTableData);
+     
 
       if (this.selectedTableData.length <= 0) {
         this.$message.error("请选择要删除的记录");
@@ -1215,32 +1215,44 @@ export default {
         if (response.data.state == 1) {
           this.tableShow = true;
           this.tableList = [];
+          //流水详情
           var list = response.data.data.list;
-          console.log("listwowowowoow",list)
+      
           this.warehouseOutList = list
           this.manufacturerList = response.data.data.manufacturerList;
           this.dealerList = response.data.data.dealerList;
+          //详情（xt_drug_automatic_reduce_detail）
           var drugFlowList = response.data.data.drugFlowList;
+          //流水详情
           var drugList = response.data.data.drugList
          
           this.tabList = drugList
+          //按批号分组
           var drugListOne = response.data.data.drugListFlow
-          console.log("drugListOne----------",drugListOne)
+        
           //按批号分组
           var drugListTwo=  response.data.data.drugListOne
-          console.log("drugListTwo9922wo",drugListTwo)
+       
+
+          //出库详情
           var drugoutlist = response.data.data.drugoutlist
+       
           this.outList = drugoutlist
           this.drugOutInfo = drugoutlist
           if (is_sys == 1) {
+             console.log("数据1",drugFlowList)
+             console.log("数据2",drugListOne)
             if (drugFlowList.length > 0) {
               for (let i = 0; i < drugFlowList.length; i++) {
                  drugFlowList[i].childOne = []
                  drugFlowList[i].child = []
-                if (drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.max_unit) {
+                if ((drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.max_unit) && (drugFlowList[i].XtBaseDrug.max_unit!=drugFlowList[i].XtBaseDrug.min_unit)) {
                    drugFlowList[i].count =drugFlowList[i].count * drugFlowList[i].XtBaseDrug.min_number;
                 }
-                if (drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.min_unit) {
+                if ((drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.min_unit)&& (drugFlowList[i].XtBaseDrug.max_unit!=drugFlowList[i].XtBaseDrug.min_unit) ) {
+                    drugFlowList[i].count = drugFlowList[i].count;
+                }
+                if ((drugFlowList[i].count_unit ==drugFlowList[i].XtBaseDrug.min_unit)&& (drugFlowList[i].XtBaseDrug.max_unit==drugFlowList[i].XtBaseDrug.min_unit) ) {
                     drugFlowList[i].count = drugFlowList[i].count;
                 }
                 for(let j=0;j<drugListOne.length;j++){
@@ -1248,16 +1260,15 @@ export default {
                        drugFlowList[i].childOne.push(drugListOne[j])
                    }
                 }
-                if(drugFlowList[i].drug_id == 1154){
-                    console.log("drugflowlist------",drugFlowList[i].count)
-                }
+               
               }
             }
-          
+            console.log("以色列",drugFlowList)
             this.drugFlowList = drugFlowList;
           }
 
           if (is_sys == 0 || is_sys == 12 || is_sys == 5) {
+            //出库详情
             var flowlist = response.data.data.flowlist;
             this.drugFlowList = [];
             for (let i = 0; i < flowlist.length; i++) {
@@ -1291,6 +1302,8 @@ export default {
                 }
              }
             }
+
+
             if(list[i].is_sys == 0 || list[i].is_sys == 5  || list[i].is_sys == 12){
               for(let j=0;j<drugListTwo.length;j++){
                 if(list[i].drug_id == drugListTwo[j].drug_id){
@@ -1300,13 +1313,16 @@ export default {
             }
           }
 
-     
+        
+        console.log("中故宫人我奶奶万年万年",list)
         if(is_sys == 1 || is_sys == 5){
           for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
                list[i].childOne[j].over_count_total = this.getOutCountSix(list[i].childOne[j].warehousing_detail_id,list[i].max_unit,list[i].min_unit,list[i].min_number,list[i].drug_id)
             }
           }
+         
+          console.log("中部listowowowoowowow",list)
 
          for(let i=0;i<list.length;i++){
             for(let j=0;j<list[i].childOne.length;j++){
@@ -1334,17 +1350,7 @@ export default {
             }
           }
          
-          // for(let i=0;i<list.length;i++){
-          //  for(let j=0;j<list[i].child.length;j++){
-          //   list[i].child[j].outInfo = []
-          //    for(let z=0;z<this.drugOutInfo.length;z++){
-          //      if(list[i].child[j].warehousing_detail_id == this.drugOutInfo[z].warehouse_info_id&&list[i].child[j].drug_id == this.drugOutInfo[z].drug_id){
-          //        list[i].child[j].outInfo.push(this.drugOutInfo[z])
-          //      }
-          //    }
-          //  }
-          // }
-          // console.log("list23322332233wo",list)
+          console.log("listowowowowo",list)
           this.tableList = list;
         }
 
@@ -1379,11 +1385,11 @@ export default {
         drug_id: val.drug_id,
         record_time: val.sys_record_time,
       };
-      //  console.log("使用明细",params)
+
       getAutoDrugDetail(params).then((response) => {
         if (response.data.state == 1) {
           this.userList = response.data.data.list;
-          // console.log("自动出库数据", this.userList);
+         
           if (val.is_sys == 1) {
             this.drugDialogVisible = true;
           }
@@ -1391,10 +1397,10 @@ export default {
             this.drugDialogVisibleTwo = true;
           }
           var userListOne = response.data.data.outList;
-          //  console.log("手动出库2232332",userListOne)
+        
           this.userListOne = userListOne;
           var batchNumber = response.data.data.batchNumber;
-          //  console.log("出库详情",batchNumber)
+        
           this.batchNumberList = batchNumber;
         }
       });
@@ -1419,16 +1425,16 @@ export default {
       getDrugCountList(params).then((response) => {
         if (response.data.state == 1) {
           var countlist = response.data.data.countList;
-          // console.log("入库数据",countlist)
+        
           this.countList = countlist;
           var outcountlist = response.data.data.outCountList;
-          // console.log("出库数据",outcountlist)
+        
           this.outCountList = outcountlist;
           var aucountlist = response.data.data.auCountList;
-          // console.log("自动数据",aucountlist)
+         
           this.autoCountList = aucountlist;
           var minCount = response.data.data.minCount;
-          // console.log("minCount",minCount)
+          
           this.minCount = minCount;
           var info = response.data.data.info;
           for (let i = 0; i < info.length; i++) {
@@ -1436,7 +1442,7 @@ export default {
               info[i].count = info[i].count * info[i].min_number;
             }
           }
-          // console.log("info2222222",info)
+          
           this.drugOutList = info;
         }
       });
@@ -1664,7 +1670,7 @@ export default {
           "remark",
         ];
 
-        // console.log("table",this.exportList)
+      
 
         const data = this.formatJson(filterVal, this.exportList);
         excel.export_json_to_excel({
@@ -1731,6 +1737,7 @@ export default {
       var total = 0
       var max_str = ""
       var min_str = ""
+
       for(let j=0;j<this.outList.length;j++){
         if(warehouse_info_id == this.outList[j].warehouse_info_id && drug_id == this.outList[j].drug_id){
            arr.push(this.outList[j])
@@ -1830,12 +1837,12 @@ export default {
       return max_str + min_str;
     },
     getOutCountOne(batch_number,max_unit,min_unit,min_number,drug_id){
-      console.log("drug_id-----",drug_id)
+    
       var arr = []
       var total = 0
       var max_str = ""
       var min_str = ""
-      console.log("tablelost----",this.tabList)
+    
       for(let j=0;j<this.tabList.length;j++){
       
         if(batch_number == this.tabList[j].batch_number && drug_id == this.tabList[j].drug_id){
@@ -1962,7 +1969,7 @@ export default {
       if(max_unit == min_unit){
          all_price = max_str * price + min_str * price
       }
-      console.log("all_pricewowo",all_price)
+     
       if(all_price > 0){
         return all_price.toFixed(2)
       }else{
@@ -2213,7 +2220,7 @@ export default {
       var max_str = ""
       var min_str = ""
   
-     console.log("total",total)
+  
       if (total < min_number) {
         min_str = total + min_unit;
       }

src/xt_pages/user/components/PatientDetail.vue

@@ -959,7 +959,8 @@
     <div style="display: none">
       <div id="print-info-box">
         <div class="print_main_content" >
-          <div class="order_title">{{ orgname }} 血液透析门诊病历</div>
+          <div class="order_title" v-if="org_id!=10210">{{ orgname }} 血液透析门诊病历</div>
+          <div class="order_title" v-if="org_id==10210">{{ orgname }} 血液透析住院病历</div>
           <div >
             <table >
               <!-- 用 thead 规定好宽度 -->