费用结算添加护士退药单的判断

src/components/MyClock.vue

@@ -1,7 +1,7 @@
 <template>
   <div style="display: flex" :style="boxSize">
     <div v-if="showLogo">
-      <img src="../assets/thyylogo.png" alt="" :style="boxSize" />
+      <img src="../assets/thyylogo.png" alt="" :style="logoSize" />
     </div>
     <div style="width: 30px"></div>
     <div class="clock" :style="[fontSize, boxSize]">{{ date }}&nbsp;&nbsp;&nbsp;&nbsp;{{ time }}</div>
@@ -44,9 +44,14 @@ export default {
       return (zero + num).slice(-digit)
     }
 
+    const logoSize = {
+      height: '40px',
+      marginTop: '0'
+    }
+
     const boxSize = {
-      height: props.size === 'large' ? '60px' : '',
-      lineHeight: props.size === 'large' ? '60px' : '',
+      height: props.size === 'large' ? '60px' : '40px',
+      lineHeight: props.size === 'large' ? '60px' : '40px',
     }
 
     const fontSize = {
@@ -70,6 +75,7 @@ export default {
       date,
       time,
       boxSize,
+      logoSize,
       fontSize,
     }
   },

src/views/clinic/triage/FloorScreen.vue

@@ -148,8 +148,8 @@ export default {
     }
     const socketCallback = (data) => {
       if (data.action === 1) {
-        // audio.src = 'http://172.16.32.160:8888/voices/' + data.serialNo + '.mp3' // 生产
-        audio.src = 'http://172.16.30.26:8888/voices/' + data.serialNo + '.mp3' // 测试
+        // audio.src = 'http://172.16.32.160:8080/resource/voice/' + data.serialNo + '.mp3' // 生产
+        audio.src = 'http://172.16.30.26:8080/reource/voice/' + data.serialNo + '.mp3' // 测试
         playCount.value = 0
         audioPlay()
         notifyMsg.value = data

src/views/clinic/triage/RoomScreen.vue

@@ -2,7 +2,7 @@
   <div id="roomScreen" :style="windowSize">
     <el-container>
       <el-main>
-        <my-clock size="small"></my-clock>
+        <my-clock size="small" show-logo></my-clock>
         <el-row :gutter="5" class="room-name">
           <el-col :span="11" class="text-right">诊室{{ room.code }}</el-col>
           <el-col :span="2" class="text-center">
@@ -65,7 +65,7 @@
   </div>
 </template>
 
-<script>
+<script setup>
 import { ref } from '@vue/reactivity'
 import MyClock from '@/components/MyClock.vue'
 import { onMounted } from 'vue'
@@ -73,208 +73,184 @@ import { getNextJzList, getRoomNoAndDept, getVideoList, getDoctorInfo, notifyCom
 import { initWebSocket, setCallback } from '@/utils/websocket'
 import $ from 'jquery'
 import Cookies from 'js-cookie'
-export default {
-  components: {
-    MyClock,
-  },
-  setup() {
-    const windowSize = getWindowSize()
-    const mainInfoRow = {
-      display: 'flex',
-      width: windowSize.w - 20 + 'px',
-      height: windowSize.h / 2 + 'px',
-      padding: '15px 0',
-    }
-    const doctorCard = {
-      width: windowSize.w / 2 + 'px',
-      height: mainInfoRow.height,
-    }
-    const avatarStyle = {
-      width: windowSize.w / 5 + 'px',
-    }
 
-    const nowJzBox = {
-      width: windowSize.w / 2 - 5 + 'px',
-      height: windowSize.h / 7 + 'px',
-    }
+const windowSize = getWindowSize()
+const mainInfoRow = {
+  display: 'flex',
+  width: windowSize.w - 20 + 'px',
+  height: windowSize.h / 2 + 'px',
+  padding: '15px 0',
+}
+const doctorCard = {
+  width: windowSize.w / 2 + 'px',
+  height: mainInfoRow.height,
+}
+const avatarStyle = {
+  width: windowSize.w / 5 + 'px',
+}
 
-    const nextJzBox = {
-      width: nowJzBox.width,
-      height: windowSize.h / 2 - windowSize.h / 7 - 10 + 'px',
-    }
+const nowJzBox = {
+  width: windowSize.w / 2 - 5 + 'px',
+  height: windowSize.h / 7 + 'px',
+}
 
-    const scrollStyle = {
-      width: nextJzBox.width,
-      height: windowSize.h / 2 - windowSize.h / 7 - 70 + 'px',
-      overflowY: 'scroll',
-    }
+const nextJzBox = {
+  width: nowJzBox.width,
+  height: windowSize.h / 2 - windowSize.h / 7 - 10 + 'px',
+}
+
+const scrollStyle = {
+  width: nextJzBox.width,
+  height: windowSize.h / 2 - windowSize.h / 7 - 70 + 'px',
+  overflowY: 'scroll',
+}
 
-    const doctorPortraitUrl = ref(null)
-    const roomCode = ref('')
-    const room = ref({})
-    const doctor = ref({})
-    const nowJz = ref({})
-    const nextJz = ref({})
-    const nextJzList = ref([])
-    const occupyMsg = ref('-')
-    const offset = ref(600)
-    const duration = ref(5000)
+const doctorPortraitUrl = ref(null)
+const roomCode = ref('')
+const room = ref({})
+const doctor = ref({})
+const nowJz = ref({})
+const nextJz = ref({})
+const nextJzList = ref([])
+const occupyMsg = ref('-')
+const offset = ref(600)
+const duration = ref(5000)
 
-    const fetchDoctorInfo = () => {
-      getDoctorInfo(roomCode.value)
-        .then((res) => {
-          doctor.value = res || {}
-          doctorPortraitUrl.value = 'data:image/png;base64,' + doctor.value.portrait
-        })
-        .catch(() => {
-          doctor.value = {}
-        })
-      getRoomNoAndDept(roomCode.value)
-        .then((res) => {
-          room.value = res || {}
-        })
-        .catch(() => {
-          room.value = {}
-        })
-    }
+const fetchDoctorInfo = () => {
+  getDoctorInfo(roomCode.value)
+      .then((res) => {
+        doctor.value = res || {}
+        doctorPortraitUrl.value = 'data:image/png;base64,' + doctor.value.portrait
+      })
+      .catch(() => {
+        doctor.value = {}
+      })
+  getRoomNoAndDept(roomCode.value)
+      .then((res) => {
+        room.value = res || {}
+      })
+      .catch(() => {
+        room.value = {}
+      })
+}
 
-    const myScrollRef = ref(null)
-    const scrollPage = () => {
-      const target = $('#myScroll')
-      target.animate(
-        {
-          scrollTop: offset.value,
-        },
-        duration.value,
-        null,
-        () => {
-          target.animate(
+const myScrollRef = ref(null)
+const scrollPage = () => {
+  const target = $('#myScroll')
+  target.animate(
+      {
+        scrollTop: offset.value,
+      },
+      duration.value,
+      null,
+      () => {
+        target.animate(
             {
               scrollTop: 0,
             },
             0,
             null,
             scrollPage()
-          )
-        }
-      )
-    }
-
-    const setJzList = (data) => {
-      nextJzList.value = data
-      const size = nextJzList.value.length
-      if (size > 6) {
-        offset.value = 32 * (size - 6)
-        duration.value = 2000 * (size - 6)
-        scrollPage()
+        )
       }
-    }
+  )
+}
 
-    const updateNowJzAndSoOn = (param) => {
-      nowJz.value = { no: param.fzNo, name: param.name }
-      getNextJzList(param).then((res) => {
-        setJzList(res)
-      })
-    }
+const setJzList = (data) => {
+  nextJzList.value = data
+  const size = nextJzList.value.length
+  if (size > 6) {
+    offset.value = 32 * (size - 6)
+    duration.value = 2000 * (size - 6)
+    scrollPage()
+  }
+}
 
-    const audio = new Audio()
-    const playCount = ref(0)
-    const audioPlay = () => {
-      for (let i = 0; i < 2; i++) {
-        if (i === playCount.value) {
-          audio.play()
-        }
-      }
-      playCount.value++
-    }
-    audio.onended = () => {
-      audioPlay()
+const updateNowJzAndSoOn = (param) => {
+  nowJz.value = { no: param.fzNo, name: param.name }
+  getNextJzList(param).then((res) => {
+    setJzList(res)
+  })
+}
+
+const audio = new Audio()
+const playCount = ref(0)
+const audioPlay = () => {
+  for (let i = 0; i < 2; i++) {
+    if (i === playCount.value) {
+      audio.play()
     }
+  }
+  playCount.value++
+}
+audio.onended = () => {
+  audioPlay()
+}
 
-    const socketCallback = (data) => {
-      if (data.action === 1) {
-        audio.src = 'http://172.16.32.160:8888/voices/' + data.serialNo + '.mp3' // 生产
-        playCount.value = 0
-        audioPlay()
-        occupyMsg.value = '请' + data.fzNo + '号 ' + data.name + ' 到' + data.deptName + data.roomNo + '号诊室就诊'
-        setTimeout(() => {
-          occupyMsg.value = ''
-        }, 30 * 1000)
-        updateNowJzAndSoOn(data)
-        notifyComplete(data.serialNo).then(() => {})
-      } else if (data.action === 2) {
-        updateNowJzAndSoOn(data)
-      } else if (data.action === 3) {
-        location.reload()
-      }
+const socketCallback = (data) => {
+  if (data.action === 1) {
+    audio.src = 'http://172.16.32.160:8080/resource/voice/' + data.serialNo + '.mp3' // 生产
+    playCount.value = 0
+    audioPlay()
+    occupyMsg.value = '请' + data.fzNo + '号 ' + data.name + ' 到' + data.deptName + data.roomNo + '号诊室就诊'
+    setTimeout(() => {
+      occupyMsg.value = ''
+    }, 30 * 1000)
+    updateNowJzAndSoOn(data)
+    notifyComplete(data.serialNo).then(() => {})
+  } else if (data.action === 2) {
+    updateNowJzAndSoOn(data)
+  } else if (data.action === 3) {
+    location.reload()
+  }
+}
+
+const getQueryVariable = (variable) => {
+  let query = window.location.search.substring(1)
+  let vars = query.split('&')
+  for (let i = 0; i < vars.length; i++) {
+    let pair = vars[i].split('=')
+    if (pair[0] === variable) {
+      return pair[1]
     }
+  }
+  return false
+}
 
-    const getQueryVariable = (variable) => {
-      let query = window.location.search.substring(1)
-      let vars = query.split('&')
-      for (let i = 0; i < vars.length; i++) {
-        let pair = vars[i].split('=')
-        if (pair[0] === variable) {
-          return pair[1]
+onMounted(() => {
+  roomCode.value = getQueryVariable('roomCode')
+  const sid = roomCode.value + '-triageRoomScreen'
+  Cookies.set('room-screen-sid', sid)
+  initWebSocket(sid)
+  setCallback(socketCallback)
+  fetchDoctorInfo()
+  getVideoList().then((res) => {
+    const videoList = res
+    const video = document.getElementById('video')
+    let vLen = videoList.length
+    let curr = 0
+    video.onended = () => {
+      videoPlay()
+    }
+    videoPlay()
+    function videoPlay() {
+      for (let i = 0; i < vLen; i++) {
+        let url = videoList[i]
+        if (i === curr) {
+          video.src = url
         }
       }
-      return false
+      curr++
+      if (curr >= vLen) {
+        curr = 0
+      }
     }
+  })
 
-    onMounted(() => {
-      roomCode.value = getQueryVariable('roomCode')
-      const sid = roomCode.value + '-triageRoomScreen'
-      Cookies.set('room-screen-sid', sid)
-      initWebSocket(sid)
-      setCallback(socketCallback)
-      fetchDoctorInfo()
-      getVideoList().then((res) => {
-        const videoList = res
-        const video = document.getElementById('video')
-        let vLen = videoList.length
-        let curr = 0
-        video.onended = () => {
-          videoPlay()
-        }
-        videoPlay()
-        function videoPlay() {
-          for (let i = 0; i < vLen; i++) {
-            let url = videoList[i]
-            if (i === curr) {
-              video.src = url
-            }
-          }
-          curr++
-          if (curr >= vLen) {
-            curr = 0
-          }
-        }
-      })
-
-      getNextJzList({ roomCode: roomCode.value }).then((res) => {
-        setJzList(res)
-      })
-    })
-
-    return {
-      room,
-      doctor,
-      nowJz,
-      nextJz,
-      nextJzList,
-      occupyMsg,
-      windowSize,
-      mainInfoRow,
-      doctorCard,
-      avatarStyle,
-      nowJzBox,
-      nextJzBox,
-      scrollStyle,
-      myScrollRef,
-      doctorPortraitUrl,
-    }
-  },
-}
+  getNextJzList({ roomCode: roomCode.value }).then((res) => {
+    setJzList(res)
+  })
+})
 
 function getWindowSize() {
   const w = window.innerWidth

src/views/hospitalization/case-front-sheet/FillCaseFrontSheet.vue

@@ -655,6 +655,9 @@
               新生儿Apgar评分: <input style="margin-right: 0; width: 50px" v-model="patient.xxeApgar" />分
             </div>
           </div>
+<!--          <div style="margin-top: 20px">-->
+<!--             todo 额外填写的内容用组件的方式写在这里-->
+<!--          </div>-->
         </div>
 
         <span class="m-drawer">

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

@@ -193,6 +193,12 @@
         <el-table-column property="pageNoTy" label="退药单号" width="120"></el-table-column>
       </el-table>
     </el-dialog>
+    <el-dialog title="此患者有未处理的护士退药单" v-model="showUnhandledRefundDrugOrder" width="400px">
+      <el-table :data="negativeFees" empty-text=" " height="300">
+        <el-table-column property="pageNoTy" label="退药单号" width="120"></el-table-column>
+        <el-table-column property="remark" label="说明" width="180"></el-table-column>
+      </el-table>
+    </el-dialog>
     <el-dialog title="撤销检验项目" v-model="conventionsVisible" fullscreen @close="closeThreeConventions">
       <el-table :data="roughConventions" @row-click="clickConvention" highlight-current-row :height="actOrderHeight"
                 @selection-change="handleSelectConvention">
@@ -416,6 +422,10 @@ const executeDismissCalculate = (midSetl, disdate, sortNo) => {
       negativeFees.value = res2.data
       dismissCalMsg.value = res2.message
       showUnhandledDrugOrder.value = true
+    } else if (res2.code && res2.code === 1105) {
+      negativeFees.value = res2.data
+      dismissCalMsg.value = res2.message
+      showUnhandledRefundDrugOrder.value = true
     } else {
       dismissCalMsg.value = res2.toString()
     }
@@ -546,6 +556,7 @@ const switchActOrder = (row) => {
 
 const showNegativeFee = ref(false)
 const showUnhandledDrugOrder = ref(false)
+const showUnhandledRefundDrugOrder = ref(false)
 const negativeFees = ref([])
 
 const doCalFee = () => {
@@ -564,6 +575,10 @@ const doCalFee = () => {
       negativeFees.value = res.data
       dismissCalMsg.value = res.message
       showUnhandledDrugOrder.value = true
+    } else if (res.code && res.code === 1105) {
+      negativeFees.value = res.data
+      dismissCalMsg.value = res.message
+      showUnhandledRefundDrugOrder.value = true
     } else {
       dismissCalMsg.value = res.toString()
     }