同步老项目

src/api/zhu-yuan-yi-ji/men-zhen-xiang-mu.js

@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+export function getMzPatient(patientId, xiangMuZhuangTai, startTime, endTime, dept) {
+  return request({
+    url: '/menZhenXiangMu/getMzPatient',
+    method: 'get',
+    params: { patientId, xiangMuZhuangTai, startTime, endTime, dept },
+  })
+}
+
+export function getFeiYongXinXi(serialNo, patientId, times) {
+  return request({
+    url: '/menZhenXiangMu/getFeiYongXinXi',
+    method: 'get',
+    params: { serialNo, patientId, times },
+  })
+}
+
+export function getMingXi(patientId, times, reqNo) {
+  return request({
+    url: '/menZhenXiangMu/getMingXi',
+    method: 'get',
+    params: { patientId, times, reqNo },
+  })
+}
+
+export function menZhenXiangMuQueXiaoHuoQueRen(data) {
+  return request({
+    url: '/menZhenXiangMu/queRenOrQuXiao',
+    method: 'post',
+    data,
+  })
+}

src/api/zhu-yuan-yi-ji/que-ren-yi-zhu-shou-fei.js

@@ -1,6 +1,6 @@
 import request from '../../utils/request'
 
-const url = '/queRen'
+const url = '/queRenYiZhuShouFei'
 
 export function getXuQueFeiYiZhu(data) {
   return request({

src/components/inpatient/XiangMuLuRu.vue

@@ -83,7 +83,7 @@
               <el-table-column label="账单码" prop="billItemName"></el-table-column>
               <el-table-column label="是否退费" prop="tuiFeiFlag">
                 <template #default="scope">
-                  <span v-if="scope.row.tuiFeiFlag === 1" style="color: red"
+                  <span v-if="scope.row.oriDetailSn !== null && typeof scope.row.oriDetailSn !== 'undefined'" style="color: teal"
                     >已退费 <br />
                     <span v-if="scope.row.oriDetailSn !== null" style="color: teal"
                       >原流水号 <br />
@@ -430,21 +430,6 @@ export default {
         })
     }
 
-    /**
-     * 刷新费用信息
-     */
-    const shuaXinFeiYong = () => {
-      let query = {
-        inpatientNo: patient.value.inpatientNo,
-        admissTimes: patient.value.admissTimes,
-        orderNo: patient.value.orderNo,
-      }
-      getHuanZheFeiYong(query).then((res) => {
-        tableDataHuanZheFeiYong.value = res
-        cptTableDataHuanZheFeiYong.value = res
-        patient.value.total = cptTableDataHuanZheFeiYong.value.length
-      })
-    }
     /**
      * 分页
      */
@@ -607,17 +592,13 @@ export default {
     /**
      * 用来获取新增对画框中选择的项目
      */
-    const danGeLuRuXiangMu = ref()
+    const danGeLuRuXiangMu = ref([])
 
     const getDanGeXiangMu = () => {
       xiangMuData.value.filter((item) => {
         if (item.chargeCode === chargePyCode.value) {
-          if (item.deptCode === '' || item.deptCode === null) {
-            item.deptCode = patient.value.zkWard
-          }
-          let i = []
-          i.push(item)
-          danGeLuRuXiangMu.value = i
+          item.deptCode = patient.value.zkWard
+          danGeLuRuXiangMu.value.push(item)
         }
       })
     }
@@ -756,12 +737,6 @@ export default {
     )
 
     onMounted(() => {
-      if (Cookie.get('code') === '02453') {
-        ElMessage.success({
-          message: '阳哥，hello  (*^▽^*)',
-          showClose: true,
-        })
-      }
       if (!baseinfo().inpatientNo) {
         patient.value.currentPage = 1
         patient.value.pageSize = 40
@@ -850,7 +825,6 @@ export default {
       danGeXiangMuCurrentChange,
       inpatientNo,
       chaXunHuanZheXinXi,
-      shuaXinFeiYong,
       panDuanSFTongGuoBingShiJinRu,
       queryFeiYong,
       shanChuMuBanClick,

src/layout/Header/index.vue

@@ -61,7 +61,6 @@ export default defineComponent({
       showButton: true,
     })
     const isCollapse = computed(() => store.state.app.isCollapse)
-    // isCollapse change to hide/show the sidebar
     const opendStateChange = () => {
       store.commit('app/isCollapseChange', !isCollapse.value)
     }

src/layout/Logo/index.vue

@@ -1,20 +1,27 @@
 <template>
   <div class="logo-container">
-    <!-- <img src="@/assets/logo.png" alt=""> -->
+    <img src="@/assets/logo.png" :style="logoStyle" alt="" />
     <h1 v-if="!isCollapse">{{ systemTitle }}</h1>
   </div>
 </template>
 
 <script>
-import { defineComponent, computed } from 'vue'
+import { defineComponent, computed, ref, reactive } from 'vue'
 import { useStore } from 'vuex'
 import { systemTitle } from '@/config'
 export default defineComponent({
   setup() {
     const store = useStore()
     const isCollapse = computed(() => store.state.app.isCollapse)
+    const logoStyle = computed(() => {
+      return {
+        width: '60px',
+        marginLeft: isCollapse.value ? '0' : '12px',
+      }
+    })
     return {
       isCollapse,
+      logoStyle,
       systemTitle,
     }
   },
@@ -26,13 +33,16 @@ export default defineComponent({
   height: 60px;
   display: flex;
   align-items: center;
-  justify-content: center;
+  // justify-content: center;
   width: 100%;
-  background-color: var(--system-logo-background);
+  // background-color: var(--system-logo-background);
+  background-color: white;
   h1 {
     font-size: 20px;
     white-space: nowrap;
-    color: var(--system-logo-color);
+    // color: var(--system-logo-color);
+    color: black;
+    margin-left: 12px;
   }
 }
 </style>

src/views/med-tec-mod/MenZhenXiangMu.vue

@@ -0,0 +1,252 @@
+<template>
+  <el-container>
+    <el-header height="30px" style="margin-top: 10px">
+      <el-date-picker
+        type="daterange"
+        v-model="dateRange"
+        placeholder="选择日期"
+        size="mini"
+        style="width: 280px"
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+        :shortcuts="shortcuts"
+      ></el-date-picker>
+      患者ID：<el-input style="width: 120px" size="mini" @keyup.enter="getMzPatientClick" v-model="patientId" @blur="patientId = $event.target.value.trim()" clearable></el-input>
+      <el-select size="mini" v-model="xiangMuZhuangTai" style="width: 90px">
+        <el-option v-for="item in xiangMuZhuangTaiData" :key="item.code" :label="item.name" :value="item.code">
+          <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
+          <el-divider direction="vertical"></el-divider>
+          <span :style="{ color: item.color }">{{ item.name }}</span>
+        </el-option>
+      </el-select>
+      <el-button size="mini" type="primary" icon="el-icon-search" @click="getMzPatientClick"> 查询</el-button>
+      <el-button size="mini" type="success" icon="el-icon-upload" @click="baoCunClick"> 保存</el-button>
+      <el-tag effect="dark">患者姓名: {{ patient.name }}</el-tag>
+      <el-tag effect="dark" type="warning">性别:{{ cptSex(patient.sex) }} </el-tag>
+      <el-tag effect="dark">出生日期: {{ patient.birthDay }} </el-tag>
+      <el-tag effect="dark" type="warning">诊疗卡: {{ patient.icCardNo }}</el-tag>
+    </el-header>
+    <el-container>
+      <el-main>
+        <el-row>
+          <el-col :span="4">
+            <el-table :height="windowsHeight - 500" :data="shouFeiData" highlight-current-row stripe @cell-click="getFeiYongXinXiClick">
+              <el-table-column label="收费信息">
+                <el-table-column label="缴费日期" prop="chargeDate" width="80"></el-table-column>
+                <el-table-column label="流水号" prop="serialNo"></el-table-column>
+              </el-table-column>
+            </el-table>
+          </el-col>
+          <el-col :span="20">
+            <el-table :height="windowsHeight - 500" :data="keQueRenData" highlight-current-row stripe>
+              <el-table-column label="本科室">
+                <el-table-column label="待确认标志" prop="confirmFlag">
+                  <template #default="scope">
+                    <el-switch
+                      v-if="xiangMuZhuangTai === 0 && scope.row.confirmFlag === 0"
+                      v-model="scope.row.confirmFlag"
+                      active-color="#13ce66"
+                      inactive-color="#ff4949"
+                      active-text="确认"
+                      inactive-text="不确认"
+                      :active-value="1"
+                      :inactive-value="0"
+                    >
+                    </el-switch>
+                    <el-switch
+                      v-if="xiangMuZhuangTai === 0 && scope.row.confirmFlag !== 0"
+                      v-model="scope.row.confirmFlag"
+                      active-color="#13ce66"
+                      inactive-color="#ff4949"
+                      active-text="保留"
+                      inactive-text="已取消"
+                      :active-value="1"
+                      :inactive-value="3"
+                    >
+                    </el-switch>
+                    <el-switch
+                      v-else
+                      v-model="scope.row.confirmFlag"
+                      active-color="#13ce66"
+                      inactive-color="#ff4949"
+                      active-text="保留"
+                      inactive-text="取消"
+                      :active-value="1"
+                      :inactive-value="3"
+                    >
+                    </el-switch>
+                  </template>
+                </el-table-column>
+                <el-table-column label="项目编码" prop="chargeCode"></el-table-column>
+                <el-table-column label="项目" prop="chargeName"></el-table-column>
+                <el-table-column label="金额" prop="je"></el-table-column>
+                <el-table-column label="确认时间" prop="confirmTime"></el-table-column>
+                <el-table-column label="确认人" prop="confirmId"></el-table-column>
+                <el-table-column label="执行科室" prop="execDeptName"></el-table-column>
+                <el-table-column label="申请号" prop="reqNo"></el-table-column>
+              </el-table-column>
+            </el-table>
+          </el-col>
+        </el-row>
+        <br />
+        <el-row>
+          <el-col :span="16">
+            <el-table :height="windowsHeight - 500" :data="feiYongData" highlight-current-row stripe @cell-click="getMingXiClick">
+              <el-table-column label="缴费明细信息">
+                <el-table-column label="待确认标志" prop="confirmFlag">
+                  <template #default="scope">
+                    <span v-html="confirmFlag(scope.row.confirmFlag)"></span>
+                  </template>
+                </el-table-column>
+                <el-table-column label="项目编码" prop="chargeCode"></el-table-column>
+                <el-table-column label="项目" prop="chargeName"></el-table-column>
+                <el-table-column label="金额" prop="je"></el-table-column>
+                <el-table-column label="确认时间" prop="confirmTime"></el-table-column>
+                <el-table-column label="确认人" prop="confirmId"></el-table-column>
+                <el-table-column label="执行科室" prop="execDeptName"></el-table-column>
+                <el-table-column label="申请号" prop="reqNo"></el-table-column>
+              </el-table-column>
+            </el-table>
+          </el-col>
+          <el-col :span="8">
+            <el-table :data="danGeXingXi" highlight-current-row stripe>
+              <el-table-column label="明细">
+                <el-table-column label="项目编码" prop="chargeCode"></el-table-column>
+                <el-table-column label="项目" prop="chargeName"></el-table-column>
+                <el-table-column label="金额" prop="je"></el-table-column>
+              </el-table-column>
+            </el-table>
+          </el-col>
+        </el-row>
+      </el-main>
+    </el-container>
+  </el-container>
+</template>
+<script>
+import { shortcuts } from '@/data/shortcuts'
+import { ref } from 'vue'
+import { cptSex } from '@/utils/computed'
+import { getMzPatient, getFeiYongXinXi, getMingXi, menZhenXiangMuQueXiaoHuoQueRen } from '@/api/zhu-yuan-yi-ji/men-zhen-xiang-mu.js'
+import { getDateRangeFormatDate } from '@/utils/date'
+import store from '@/store'
+import jsCookie from 'js-cookie'
+import { getGreatestRole } from '@/utils/permission'
+
+export default {
+  setup() {
+    const windows = store.state.app.windowSize
+    const windowsHeight = windows.h
+    const dateRange = ref(shortcuts[0].value)
+    const patientId = ref('290509-4')
+    const xiangMuZhuangTai = ref(0)
+    const chargeDate = ref('')
+
+    const patient = ref({})
+
+    const shouFeiData = ref([])
+    const feiYongData = ref([])
+    const keQueRenData = ref([])
+    const danGeXingXi = ref([])
+    const role = getGreatestRole()
+
+    const getMzPatientClick = () => {
+      shouFeiData.value = []
+      keQueRenData.value = []
+      feiYongData.value = []
+      danGeXingXi.value = []
+      let dateR = getDateRangeFormatDate(dateRange.value)
+      getMzPatient(patientId.value, xiangMuZhuangTai.value, dateR.stratTime, dateR.endTime, jsCookie.get('dept'))
+        .then((res) => {
+          patient.value = res
+          patient.value.birthDay = patient.value.birthDay.split(' ')[0]
+          console.log(res)
+          shouFeiData.value = res.list
+        })
+        .catch(() => {
+          patient.value = {}
+        })
+    }
+
+    const getFeiYongXinXiClick = (val) => {
+      chargeDate.value = val.chargeDate
+      getFeiYongXinXi(val.serialNo, val.patientId, val.times).then((res) => {
+        keQueRenData.value = []
+        feiYongData.value = res
+        console.log(res)
+        let dept = jsCookie.get('dept')
+        if (xiangMuZhuangTai.value === 0) {
+          for (let i = 0; i < feiYongData.value.length; i++) {
+            if (feiYongData.value[i].execDept === dept && feiYongData.value[i].confirmFlag !== 1) {
+              keQueRenData.value.push(feiYongData.value[i])
+            }
+          }
+        } else {
+          for (let i = 0; i < feiYongData.value.length; i++) {
+            if (feiYongData.value[i].execDept === dept && feiYongData.value[i].confirmFlag === 1) {
+              keQueRenData.value.push(feiYongData.value[i])
+            }
+          }
+        }
+      })
+    }
+
+    const getMingXiClick = (val) => {
+      getMingXi(val.patientId, val.times, val.reqNo).then((res) => {
+        console.log(res)
+        danGeXingXi.value = res
+      })
+    }
+
+    const baoCunClick = () => {
+      let baoCun = {
+        list: keQueRenData.value,
+        xiangMuZhuangTai: xiangMuZhuangTai.value,
+        name: patient.value.name,
+        execDept: jsCookie.get('dept'),
+        chargeDateString: chargeDate.value,
+      }
+      menZhenXiangMuQueXiaoHuoQueRen(baoCun).then((res) => {
+        keQueRenData.value = []
+      })
+      console.log(baoCun)
+    }
+
+    return {
+      shortcuts,
+      patientId,
+      dateRange,
+      cptSex,
+      patient,
+      getMzPatientClick,
+      xiangMuZhuangTaiData: ref([
+        { code: 0, name: '未确认' },
+        { code: 1, name: '已确认' },
+      ]),
+      xiangMuZhuangTai,
+      windowsHeight,
+      shouFeiData,
+      getFeiYongXinXiClick,
+      feiYongData,
+      keQueRenData,
+      getMingXiClick,
+      danGeXingXi,
+      baoCunClick,
+      confirmFlag,
+    }
+  },
+}
+
+function confirmFlag(val) {
+  switch (val) {
+    case 0:
+      return '<span style="color:#E6A23C">未确认</span>'
+    case 1:
+      return '<span style="color:#67C23A">已确认</span>'
+    case 3:
+      return '<span style="color:#F56C6C">已取消</span>'
+  }
+}
+</script>
+
+<style></style>

src/views/hospitalization/med-tec-mod/QueRenYiZhuShouFei.vue → src/views/med-tec-mod/QueRenYiZhuShouFei.vue

@@ -55,22 +55,31 @@
         </span>
         <el-table :data="queFeiXiangQingData" :height="winHeight - 120" highlight-current-row stripe>
           <el-table-column label="费用详情">
-            <el-table-column label="确认">
+            <el-table-column label="确认" width="90">
               <template #default="scope">
                 <el-select size="mini" v-model="scope.row.chargeStatus">
                   <el-option v-for="item in chargeStatusData" :key="item.code" :label="item.name" :value="item.code">
                     <span style="color: #8492a6; font-size: 12px">{{ item.code }}</span>
                     <el-divider direction="vertical"></el-divider>
-                    <span>{{ item.name }}</span>
+                    <span :style="{ color: item.color }">{{ item.name }}</span>
                   </el-option>
                 </el-select>
               </template>
             </el-table-column>
-            <el-table-column prop="inpatientNo" label="住院号"></el-table-column>
+            <el-table-column prop="actOrderNo" label="医嘱号">
+              <template #default="scope">
+                <span
+                  :style="{ backgroundColor: chargeStatusData[(chargeStatusData || []).findIndex((item) => item.code === scope.row.chargeStatus)].color }"
+                  style="color: #fff; border-radius: 10px; padding: 0px 5px 5px 5px"
+                  >{{ scope.row.actOrderNo }}</span
+                >
+              </template>
+            </el-table-column>
+            <!-- <el-table-column prop="inpatientNo" label="住院号"></el-table-column>
             <el-table-column prop="bedNo" label="床号"></el-table-column>
             <el-table-column prop="name" label="姓名"></el-table-column>
+            <el-table-column prop="wardName" label="病区"></el-table-column> -->
             <el-table-column prop="occTime" label="医嘱日期" width="80"> </el-table-column>
-            <el-table-column prop="actOrderNo" label="医嘱号"></el-table-column>
             <el-table-column prop="docotrName" label="医生"></el-table-column>
             <el-table-column prop="orderName" label="医嘱名称"></el-table-column>
             <el-table-column prop="chargeCode" label="项目编码"></el-table-column>
@@ -96,7 +105,7 @@ import { getWard } from '@/api/yibao/xiang-mu-lu-ru'
 import Cookie from 'js-cookie'
 import { cptSex } from '@/utils/computed'
 import store from '@/store'
-import { getDate } from '../../utils/date'
+import { getDate } from '@/utils/date'
 import { ElMessage } from 'element-plus'
 export default {
   setup() {
@@ -124,9 +133,9 @@ export default {
     const queFeiXiangQingData = ref([])
     // 操作
     const chargeStatusData = ref([
-      { code: '0', name: '确认' },
-      { code: '1', name: '取消' },
-      { code: '3', name: '不操作' },
+      { code: '0', name: '确认', color: '#67C23A' },
+      { code: '1', name: '取消', color: '#F56C6C' },
+      { code: '3', name: '不操作', color: '#909399' },
     ])
 
     const chargeStatus = ref('0')
@@ -164,6 +173,9 @@ export default {
       })
     }
 
+    /**
+     * 这个是在点击了 下一页触发的
+     */
     const changeYiZhuQueFei = (val) => {
       queryTerm.value.currentPage = val
       getXuQueFeiYiZhu(queryTerm.value).then((res) => {
@@ -183,12 +195,18 @@ export default {
         })
     }
 
+    /**
+     * 这个是一件修改需要的操作
+     */
     const yiJianXiuGaiClick = () => {
       queFeiXiangQingData.value.forEach((item) => {
         item.chargeStatus = chargeStatus.value
       })
     }
 
+    /**
+     * 在这里保存数据
+     */
     const baoCunYiZhuQueFeiClick = () => {
       if (queFeiXiangQingData.value.length <= 0) {
         return ElMessage.error({

src/views/medical-insurance/inpatient/DiscSettlement.vue

@@ -218,7 +218,6 @@
 </template>
 
 <script>
-import Cookies from 'js-cookie'
 import { computed, onMounted, reactive, ref, watchEffect } from 'vue'
 import store from '@/store'
 import { cptSex, cptOperation, cptDisDiagStatus } from '@/utils/computed'

src/views/reports/YuanNeiTongJiCKXQ.vue

@@ -7,7 +7,7 @@
     <el-table-column label="手机号" prop="phone"></el-table-column>
     <el-table-column label="入院日期" prop="admissDate" width="80px"></el-table-column>
     <el-table-column label="出院日期" prop="disDate" width="80px"></el-table-column>
-    <el-table-column label="收费日期" prop="chargeDate" width="80px"></el-table-column>
+    <el-table-column label="收费日期" prop="chargeDateString" width="80px"></el-table-column>
     <el-table-column label="申请科室" prop="dept"></el-table-column>
     <el-table-column label="执行科室" prop="execUnit"></el-table-column>
     <el-table-column label="医保类型" prop="ybType"></el-table-column>
@@ -58,7 +58,7 @@ export default {
               phone: '手机号',
               admissDate: '入院日期',
               disDate: '出院日期',
-              chargeDate: '收费日期',
+              chargeDateString: '收费日期',
               dept: '申请科室',
               execUnit: '执行科室',
               number: '数量',
@@ -77,7 +77,7 @@ export default {
               'phone',
               'admissDate',
               'disDate',
-              'chargeDate',
+              'chargeDateString',
               'dept',
               'execUnit',
               'number',