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

src/utils/tools.js

@@ -25,12 +25,19 @@ export function jsGetAge(strBirthday, splitstr) {
   var birthYear = strBirthdayArr[0]
   var birthMonth = strBirthdayArr[1]
   var birthDay = strBirthdayArr[2]
-
+ 
+  console.log("birthYear",birthYear)
+  console.log("birthMonth",birthMonth)
+  console.log("birthDay",birthDay)
   
   var d = new Date()
   var nowYear = d.getFullYear()
   var nowMonth = d.getMonth() + 1
   var nowDay = d.getDate()
+
+  console.log("nowYear",nowYear)
+  console.log("nowMonth",nowMonth)
+  console.log("nowDay",nowDay)
   
   if (nowYear == birthYear) {
     returnAge = 0 // 同年 则为0岁

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -1111,8 +1111,9 @@
                             </tr>
 
                             <tr v-for="(item,index) in tableData" :key="index">
-                                <td>{{item.storey }}</td>
+                               
                                 <td>{{getTimes(item.record_date) }}</td>
+                                <td>{{item.storey }}</td>
                                 <td>{{getTimeTwo( item.first_start_time)}}- {{getTimeTwo(item.first_end_time)  }}</td>
                                 <td>
                                 <span v-if="setAdminUserES(item.first_creator?item.last_creator:item.first_creator) == ''">

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -3686,6 +3686,7 @@ export default {
       },
       org_id: 0,
       projectsOne: [],
+      schedule_date_one:"",
     };
   },
   methods: {
@@ -4189,6 +4190,11 @@ export default {
       if (response.data.state == 1) {
         this.adminUser = response.data.data.users;
         console.log('3333333wwwwww',response.data.data);
+       var schedule_date  =  response.data.data.schedule.schedule_date
+       this.schedule_date_one =  uParseTime(
+          schedule_date,
+          "{y}-{m}-{d}"
+        );
         this.users = response.data.data.users;
         this.patientInfo = response.data.data.patientInfo;
 
@@ -4710,9 +4716,24 @@ export default {
           birth.substr(4, 2) +
           '-' +
           birth.substr(6, 2)
+        if(this.org_id!=0){
+          var age = jsGetAge(birthtwo, '-')
+          return age
+        }
 
-        var age = jsGetAge(birthtwo, '-')
-        return age
+        if(this.org_id == 0){
+          console.log("日期搜哦",this.schedule_date_one)
+          var strBirthdayArr = this.schedule_date_one.split("-")
+          console.log("strBirthdayArr",strBirthdayArr)
+          var yeaer = strBirthdayArr[0]
+          var month = strBirthdayArr[1]
+          var day = strBirthdayArr[2]
+          var age = jsGetAge(birthtwo, '-',yeaer,month,day)
+          console.log("agesssss",age)
+          return age
+
+        }
+      
       }
     },
     newAdviceGroupObject: function () {

src/xt_pages/outpatientCharges/statementPrint.vue

@@ -122,6 +122,161 @@ export default {
   },
   data() {
     return {
+       fundsArray: [
+        { code: '310100', name: '城镇职工基本医疗保险统筹基金' },
+        { code: '310101', name: '城镇职工基本医疗保险统筹基金（预付金）' },
+        { code: '310102', name: '职工门诊统筹基金' },
+        { code: '310200', name: '城镇职工基本医疗保险个人账户基金' },
+        { code: '310400', name: '军转干部医疗补助基金' },
+        { code: '310500', name: '代缴基金（破产改制）' },
+        { code: '320100', name: '公务员医疗补助基金' },
+        { code: '320200', name: '厅级干部补助基金' },
+        { code: '330100', name: '大额医疗费用补助基金' },
+        { code: '330200', name: '职工意外伤害基金' },
+        { code: '340100', name: '离休人员医疗保障基金' },
+        { code: '340200', name: '离休老工人门慢保障基金' },
+        { code: '350100', name: '一至六级残疾军人医疗补助基金' },
+        { code: '370100', name: '企业补充医疗保险基金' },
+        { code: '370200', name: '公益补充保险基金' },
+        { code: '390100', name: '城乡居民基本医疗保险基金' },
+        { code: '390101', name: '城乡居民基本医疗保险基金（预付金）' },
+        { code: '390102', name: '居民门诊统筹基金' },
+        { code: '390200', name: '城乡居民大病医疗保险基金' },
+        { code: '390300', name: '城乡居民大病补充保险基金' },
+        { code: '390400', name: '居民意外伤害基金' },
+        { code: '390500', name: '居民家庭账户金' },
+        { code: '410100', name: '工伤保险基金' },
+        { code: '510100', name: '生育基金' },
+        { code: '610100', name: '医疗救助基金' },
+        { code: '610200', name: '优抚对象医疗补助基金' },
+        { code: '620100', name: '特惠保补偿金' },
+        { code: '630100', name: '医院减免金' },
+        { code: '640100', name: '政府兜底基金' },
+        { code: '999106', name: '预留保证金' },
+        { code: '999109', name: '农村低收入人口医疗补充保险' },
+        { code: '999110', name: '居民个人账户支出基金' },
+        { code: '999996', name: '医院垫付基金' },
+        { code: '999997', name: '其他基金' },
+        { code: '99999701', name: '再封顶线以上救助基金' },
+        { code: '99999702', name: '职工大病保险基金' },
+        { code: '99999705', name: '扶贫救助' },
+        { code: '99999706', name: '财政医疗救助' },
+        { code: '99999707', name: '新冠肺炎核酸检测财政补助' },
+        { code: '99999708', name: '贫困人口再救助' },
+        { code: '99999721', name: '居民医疗账户支出' },
+        { code: '99999722', name: '居民贫困救助' },
+        { code: '99999723', name: '居民特大病贫困救助' },
+        { code: '99999724', name: '基本起付线新增支出' },
+        { code: '99999725', name: '基本提高比例新增支出' },
+        { code: '99999726', name: '大病起付线新增支出' },
+        { code: '99999727', name: '大病提高封顶新增支出' },
+        { code: '99999728', name: '基金类别贫困救助普通慢性病提高比例新增支出' },
+        { code: '99999729', name: '基金类别贫困救助普通慢性病提高限额新增支出' },
+        { code: '99999730', name: '基金类别贫困救助重大慢性病提高比例新增支出' },
+        { code: '99999731', name: '基金类别贫困救助普通慢性病医疗救助基金支出' },
+        { code: '99999732', name: '基金类别贫困救助重大慢性病医疗救助基金支出' },
+        { code: '99999733', name: '基金类别贫困救助普通慢性病降低起付线新增支出' },
+        { code: '99999734', name: '基金类别贫困救助重大慢性病降低起付线新增支出' },
+        { code: '99999735', name: '基金类别贫困人口门诊统筹' },
+        { code: '99999737', name: '职工大病补助基金' },
+        { code: '99999747', name: '长期护理险基金' },
+        { code: '99999748', name: '离休账户支出' },
+        { code: '99999749', name: '精准扶贫补充保险基金' },
+        { code: '99999750', name: '公务员补助账户支付' },
+        { code: '99999751', name: '医疗救助基金(罕见病)' },
+        { code: '99999752', name: '职工慢性病统筹支出' },
+        { code: '99999753', name: '医疗救助基金(重特大疾病)' },
+        { code: '999702', name: '二乙基金' },
+        { code: '999703', name: '七至十级残疾军人医疗补助基金' },
+        { code: '999704', name: '城镇职工基本医疗保险单建统筹基金' },
+        { code: '999706', name: '工会互助基金' },
+        { code: '390104', name: '城乡居民大额医疗保险基金' },
+        { code: '99999757', name: '退休人员补充基金' },
+        { code: '99999758', name: '公费医疗照顾基金' },
+        { code: '360200', name: '保健基金' },
+        { code: '360300', name: '保健预支付基金' },
+        { code: '999998', name: '现金支出' },
+        { code: '310300', name: '城镇职工大病医疗保险基金' },
+        { code: '640103', name: '政府补充保障基金(特优群体人员)' },
+        { code: '640104', name: '政府补充保障基金(建国前老党员)' },
+        { code: '390103', name: '居民两病门诊统筹基金' },
+        { code: '650101', name: '大病补充保障基金(大病购药)' },
+        { code: '650102', name: '大病补充保障基金(罕见病购药)' },
+        { code: '610103', name: '医疗救助基金(再救助)' },
+        { code: '330102', name: '大额医疗费用救助基金' },
+        { code: '610102', name: '医疗救助基金（重特大疾病/再救助）' },
+        { code: '999111', name: '居民储蓄账户基金' },
+        { code: '99999765', name: '平安商业保险基金' },
+        { code: '99999766', name: '人保商业保险基金' },
+        { code: '99999767', name: '离休单位支付基金' },
+        { code: '99999768', name: '造船离休单位支付基金' },
+        { code: '99999769', name: '企业离休支付基金' },
+        { code: '99999770', name: '普惠保商业保险基金' },
+        { code: '390700', name: '城乡居民基本医疗保险二次报销基金' },
+        { code: '390801', name: '城乡低保人员团体住院医疗保险基金' },
+        { code: '310701', name: '城镇职工补充医疗保险（AB款）基金' },
+        { code: '999761', name: '128基金' },
+        { code: '999762', name: '五七工基金' },
+        { code: '999763', name: '五七工大病基金' },
+        { code: '310800', name: '地方附加医保基金' },
+        { code: '3990100', name: '劳模补助基金' },
+        { code: '99999759', name: '城镇职工长期护理保险基金' },
+        { code: '99999760', name: '城乡居民长期护理保险基金' },
+        { code: '310103', name: '职工生育基金' },
+        { code: '99999771', name: '生育产前检查支出' },
+        { code: '99999778', name: '造船离休账户支出' },
+        { code: '99999779', name: '企业离休账户支出' },
+        { code: '610104', name: '残联基金' },
+        { code: '610105', name: '慈善救助基金' },
+        { code: '99999780', name: '商业保险补充医疗基金' },
+        { code: '340300', name: '离休人员备用金' },
+        { code: '99999781', name: '卫健基金' },
+        { code: '99999782', name: '重大疾病基金' },
+        { code: '99999783', name: '医疗援助基金' },
+        { code: '370300', name: '人保健康企业补充基金' },
+        { code: '99999790', name: '其他账户支付' },
+        { code: '910101', name: '农民工大病医疗保险基金' },
+        { code: '910102', name: '农民工大病医疗互助基金' },
+        { code: '310900', name: '免缴补充基金' },
+        { code: '99999784', name: '建国前老工人补助基金' },
+        { code: '99999787', name: '财政补充基金' },
+        { code: '99999788', name: '精防医疗补助' },
+        { code: '99999785', name: '家庭医生签约公共卫生服务专项基金' },
+        { code: '320300', name: '企业事业单位补充医疗保险基金' },
+        { code: '999201', name: '一般诊疗费统筹基金' },
+        { code: '999202', name: '核酸检测统筹基金' },
+        { code: '99999772', name: '返外地退休人员支出基金' },
+        { code: '310203', name: '个人本年账户基金' },
+        { code: '310302', name: '先行支付大额基金' },
+        { code: '350102', name: '荣军账户' },
+        { code: '370201', name: '高科技人才补充基金-公益补充' },
+        { code: '390301', name: '儿童统筹基金' },
+        { code: '610107', name: '医疗救助再救助基金' },
+        { code: '640101', name: '涟康保政策范围外基金' },
+        { code: '999103', name: '地厅人员财政补助基金' },
+        { code: '999700', name: '职工大病基金' },
+        { code: '999701', name: '特殊职工大病基金' },
+        { code: '999718', name: '先行支付统筹基金' },
+        { code: '999900', name: '特殊基金' },
+        { code: '99999602', name: '医院承担基金' },
+        { code: '99999703', name: '财政补助基金' },
+        { code: '99999741', name: '领导干部额外补充基金' },
+        { code: '99999756', name: '离休账户' },
+        { code: '310600', name: '基本医疗二次报销基金' },
+        { code: '320400', name: '公务员二次报销基金' },
+        { code: '340103', name: '中央离休基金' },
+        { code: '99999704', name: '优抚补助' },
+        { code: '399100', name: '医疗照顾人员补充基金' },
+        { code: '620102', name: '补充医疗保险基金' },
+        { code: '999705', name: '优抚基金' },
+        { code: '999720', name: '工会大额互助基金' },
+        { code: '310301', name: '职工大病补助基金（预付金）' },
+        { code: '390201', name: '城乡居民大病医疗保险基金（预付金）' },
+        { code: '310601', name: '社区门诊统筹基金' },
+        { code: '310700', name: '家属统筹医疗基金' },
+        { code: '310802', name: '家属统筹地方补充医疗保险基金' },
+        { code: '320500', name: '公务员医疗补助个人账户基金' }
+      ],
       crumbs: [
         { path: false, name: '门诊医生站' },
         { path: false, name: '打印' }
@@ -1332,12 +1487,10 @@ export default {
                     }
                   }
                 }
-
                 let len = list.length / 2
                 let L_list = []
                 let R_list = []
                 len = Math.trunc(len)
-
                 for (let i = 0; i < len; i++) {
                   L_list.push(list[i])
                 }
@@ -1346,7 +1499,21 @@ export default {
                 }
                 that.info['L_list'] = L_list
                 that.info['R_list'] = R_list
-
+                var funds = []
+                for(let i = 0; i <  response.data.data.funds.length; i++){
+                  var objs = {}
+                  objs["number"] = i + 1
+                  objs["fund_pay"] = response.data.data.funds[i].fund_payamt
+                  objs["limit_pay"] = response.data.data.funds[i].inscp_scp_amt
+                  objs["insp_pay"] = response.data.data.funds[i].inscp_scp_amt
+                  for(let b = 0; b < that.fundsArray.length; b++){
+                      if(response.data.data.funds[i].fund_pay_type ==  that.fundsArray[b].code){
+                        objs["name"] =that.fundsArray[b].name
+                      }
+                  }
+                  funds.push(objs)
+                }
+                that.info['funds'] = funds
               }
             })
             .catch(function(error) {

src/xt_pages/outpatientCharges/statementTemplate/printtwelve.vue

@@ -4,16 +4,14 @@
       阜阳市医疗保险费用结算单
     </div>
     <div style="display: flex;">
-      <div style="flex: 1;">结算ID:</div>
+      <div style="flex: 1;">结算ID:{{info.new_order.setl_id}}</div>
       <div style="flex: 1;">结算日期: <span v-if="info.new_order!=null"> {{info.new_order.setl_time ? info.new_order.setl_time.split(' ')[0] : ''}}</span> </div>
-      <div style="flex: 1;" v-if="info.new_order!=null&&info.new_order.med_type == 14">医疗类别:门诊慢病</div>
+      <div style="flex: 1;" v-if="info.new_order!=null&&info.new_order.med_type == 14 || info.new_order.med_type == 140104">医疗类别:门诊慢病</div>
       <div style="flex: 1;" v-if="info.new_order!=null&&info.new_order.med_type == 11">医疗类别:普通门诊</div>
-      <div style="flex: 1;" v-else>医疗类别:门诊慢病</div>
-
-
+<!--      <div style="flex: 1;" v-else>医疗类别:门诊慢病</div>-->
     </div>
     <div style="display: flex;margin: 10px 0 5px 0;">
-      <div style="flex: 1;">医院编号:</div>
+      <div style="flex: 1;">医院编号:H34120302409</div>
       <div style="flex: 2;">医院机构名称: 阜阳经沃血液透析中心</div>
     </div>
     <div class='statementTable'>
@@ -70,15 +68,15 @@
           <td>出院日期</td>
           <td>{{info.new_order.setl_time.split(" ")[0]}}</td>
           <td>治疗方式编码</td>
-          <td></td>
+          <td>{{'M07801'}}</td>
           <td>治疗方式名称</td>
-          <td></td>
+          <td>{{'慢性肾功能衰竭（透析）'}}</td>
         </tr>
         <tr>
           <td colspan="2">出院诊断编码</td>
-          <td colspan="2">N19.x01</td>
+          <td colspan="2">{{info.dia_config[0].content_code}}</td>
           <td colspan="2">出院诊断名称</td>
-          <td colspan="2">尿毒症</td>
+          <td colspan="2">{{info.dia_config[0].class_name}}</td>
         </tr>
 
         <tr>
@@ -148,27 +146,27 @@
           <td colspan="2">本次可支付限额金额</td>
           <td colspan="1">符合政策范围金额</td>
         </tr>
-        <tr>
-          <td colspan="1"></td>
-          <td colspan="2"></td>
-          <td colspan="2"></td>
-          <td colspan="2"></td>
-          <td colspan="1"></td>
-        </tr>
-        <tr>
-          <td colspan="1"></td>
-          <td colspan="2"></td>
-          <td colspan="2"></td>
-          <td colspan="2"></td>
-          <td colspan="1"></td>
-        </tr>
-        <tr>
-          <td colspan="1"></td>
-          <td colspan="2"></td>
-          <td colspan="2"></td>
-          <td colspan="2"></td>
-          <td colspan="1"></td>
+        <tr v-for="item in info.funds">
+          <td colspan="1">{{item.number}}</td>
+          <td colspan="2">{{item.name}}</td>
+          <td colspan="2">{{item.fund_pay}}</td>
+          <td colspan="2">{{item.limit_pay}}</td>
+          <td colspan="1">{{item.insp_pay}}</td>
         </tr>
+<!--        <tr>-->
+<!--          <td colspan="1"></td>-->
+<!--          <td colspan="2"></td>-->
+<!--          <td colspan="2"></td>-->
+<!--          <td colspan="2"></td>-->
+<!--          <td colspan="1"></td>-->
+<!--        </tr>-->
+<!--        <tr>-->
+<!--          <td colspan="1"></td>-->
+<!--          <td colspan="2"></td>-->
+<!--          <td colspan="2"></td>-->
+<!--          <td colspan="2"></td>-->
+<!--          <td colspan="1"></td>-->
+<!--        </tr>-->
       </table>
     </div>
     <div style="display: flex;">

src/xt_pages/role/admin.vue

@@ -225,12 +225,12 @@
           @click="toAutoDrug">自动生成</el-button> -->
 
 
-         <!-- <el-button
+         <el-button
           type="primary"
           size="small"
           icon="el-icon-circle-plus-outline"
           style="float:left"
-          @click="toAutoDiagnose">自动脚本</el-button>  -->
+          @click="toAutoDiagnose">自动脚本</el-button> 
      </div>
 
 

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -13,7 +13,7 @@
       size="small"
       @click="exportListDetail"
       type="primary"
-      v-if="orgId !=10480 && orgId!=0"
+      v-if="orgId !=10480"
       >明细导出
      
     </el-button>
@@ -22,7 +22,7 @@
       size="small"
       @click="exportListDetailOne"
       type="primary"
-      v-if="orgId ==10480 || orgId == 0"
+      v-if="orgId ==10480"
       >明细导出
      
     </el-button>
@@ -933,7 +933,7 @@ export default {
         })
      },
      exportListDetail(){
-
+        console.log("hahhdhafhhahdf",this.tableDataList)
         var obj = {index:"合计",total_price:0}
         var total = 0
         for(let i=0;i<this.tableDataList.length;i++){

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

@@ -17,7 +17,7 @@
       >明细导出
     </el-button>
     <el-button
-      v-if="org_id == 10265"
+      v-if="org_id == 10265 || org_id == 0"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetaiOne"
@@ -25,7 +25,7 @@
       >明细导出
     </el-button>
     <el-button
-      v-if="org_id == 10480 || org_id == 0"
+      v-if="org_id == 10480"
       style="float: right;margin-right:10px"
       size="small"
       @click="exportListDetaiTwo"
@@ -782,7 +782,7 @@ export default {
             this.tableData[i].manufacturer_name = this.getManufacturerName(this.tableData[i].manufacturer)
             this.tableData[i].dealer_name = this.getDealerName(this.tableData[i].dealer)
             this.tableData[i].in_retail_price = (this.tableData[i].in_price/this.tableData[i].min_number).toFixed(2)
-       
+            this.tableData[i].in_retail_price = this.tableData[i].infor_price
             this.tableData[i].total = (this.tableData[i].count * this.tableData[i].price)
             if(this.tableData[i].count_unit == this.tableData[i].min_unit && this.tableData[i].max_unit!=this.tableData[i].min_unit){
                 this.tableData[i].total_price = (this.tableData[i].count * this.tableData[i].price)

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -363,7 +363,7 @@
             <template slot-scope="scope">
                <tr style="background: none" v-for="(item,index) in scope.row.child" :key="index">
                   <td style="border-right: none; border-inline-end: none;text-align: center">
-                    <span v-if="org_id!=0 && org_id!=10480 && org_id!=10210">
+                    <span v-if="org_id!=0 && org_id!=10480 && org_id!=10210&&org_id!=10188 && org_id!=10217">
                       <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{getTotalPrice(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}} </span>
                     <span v-if="is_sys == 0">
                       <span v-if="scope.row.child.length == 1">{{item.retail_price}}</span> 
@@ -371,7 +371,7 @@
                     </span>
                     </span>
 
-                    <span v-if="org_id==0 || org_id ==10480 || org_id==10210">
+                    <span v-if="org_id==0 || org_id ==10480 || org_id==10210 || org_id ==10188 || org_id ==10217">
                       <!-- {{(item.count * item.price).toFixed(2)}} -->
                      <span v-if="is_sys == 1 || is_sys == 5 || is_sys == 12">{{(getOutCountNightTen(item.warehousing_detail_id,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}}</span>  
                      <span v-if="is_sys==0"> {{(getOutCountNightTenOne(item.batch_number,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_id)*item.price).toFixed(2)}}</span>