Merge branch 'master' of https://172.16.32.165/lighter/vue-intergration-platform

# Conflicts:
#	src/components/medical-insurance/charge-list/Index.vue

.env.show

@@ -1,5 +1,5 @@
 ENV = 'show'
 
-VITE_BASE_URL = 'http://172.16.32.217:8706'
-VITE_SOCKET_URL = 'ws://172.16.32.217:8707/websocket/'
-VITE_EMR_CONTROL_URL = '172.16.32.217:9227'
+VITE_BASE_URL = 'http://demo.hnthyy.cn:8706'
+VITE_SOCKET_URL = 'ws://demo.hnthyy.cn:8707/websocket/'
+VITE_EMR_CONTROL_URL = 'demo.hnthyy.cn:9227'

Dockerfile

@@ -0,0 +1,7 @@
+FROM nginx:1.24.0
+USER root
+RUN mkdir -p /home/intergration-platform
+COPY dist /home/intergration-platform/dist
+WORKDIR /home/intergration-platform
+COPY nginx.conf /etc/nginx/nginx.conf
+RUN mkdir -p /home/nginx-logs

nginx.conf

@@ -0,0 +1,55 @@
+worker_processes  1;
+
+events {
+    worker_connections  1024;
+}
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+	#获取真实ip
+    proxy_set_header Host $host;
+    proxy_set_header X-Real-IP $remote_addr;
+    proxy_set_header X-Real-Port $remote_port;
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+
+    client_max_body_size 20m;
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                     '$status $body_bytes_sent "$http_referer" '
+                     '"$http_user_agent" "$http_x_forwarded_for"';
+
+    sendfile        on;
+
+    keepalive_timeout  65;
+
+	map $http_upgrade $connection_upgrade {
+    default upgrade;
+    '' close;
+    }
+
+    server {
+        listen	    8080;
+        server_name localhost;
+        root        /home/intergration-platform/dist;
+
+		location / {
+		    try_files $uri $uri/ @router;
+		    index  index.html index.htm;
+		}
+
+		location @router {
+		    rewrite ^.*$ /index.html last;
+		}
+
+		location ^~ /emr {
+			proxy_pass http://172.16.32.125:8001/emr;
+		}
+
+		location ^~ /bdp/dataservice/api {
+			proxy_pass http://172.16.32.183:8888/bdp/dataservice/api;
+		}
+
+    }
+
+}

src/components/medical-insurance/charge-list/Index.vue

@@ -3,8 +3,7 @@
     <div style="display: flex; width: 100%; height: 100%;">
       <div style="width: 330px;height: 100%; padding: 0 12px; border-right: 1px solid lightgray">
         <div class="flex-header">
-          <el-input :model-value="patNo" placeholder="住院号" @input="inputPatNo" clearable
-                    style="width: 160px"></el-input>
+          <el-input v-model="currentPatNo" placeholder="住院号" clearable style="width: 160px"></el-input>
           <el-button type="primary" icon="Search" style="margin-left: 20px" @click="fetchOverview">查询</el-button>
         </div>
         <div style="width: 336px">
@@ -137,7 +136,7 @@ export default {
       default: true
     }
   },
-  emits: ['close', 'update:patNo'],
+  emits: ['close'],
   setup(props, ctx) {
     const tableHeight = window.innerHeight - 72
     const patList = ref([])
@@ -145,18 +144,16 @@ export default {
     const chargeListMap = ref({})
     const sumsMap = ref({})
 
+    const currentPatNo = ref('')
+
     const chargeListBoxStyle = {
       height: window.innerHeight - 180 + 'px',
       width: '100%',
       overflowY: 'scroll'
     }
 
-    const inputPatNo = (val) => {
-      ctx.emits('update:patNo', val)
-    }
-
     const fetchOverview = () => {
-      if (!props.patNo) {
+      if (!currentPatNo.value) {
         ElMessage({
           message: '住院号不能为空！',
           type: 'warning',
@@ -165,7 +162,7 @@ export default {
         })
         return
       }
-      selectPatOverviews(props.patNo).then(res => {
+      selectPatOverviews(currentPatNo.value).then(res => {
         patList.value = res
       })
     }
@@ -227,6 +224,7 @@ export default {
     onMounted(() => {
       initLodop()
       if (props.patNo && props.times) {
+        currentPatNo.value = props.patNo
         selectPatOverviews(props.patNo).then(res => {
           patList.value = res
         })
@@ -237,6 +235,7 @@ export default {
       ctx.emit('close')
     }
     return {
+      currentPatNo,
       tableHeight,
       patList,
       briefPatInfo,
@@ -250,7 +249,6 @@ export default {
       selfpayUpload,
       execPrint,
       props,
-      inputPatNo
     }
   },
 }

src/views/hospitalization/nurse-module/PrintInfusionCard.vue

@@ -112,17 +112,6 @@ const handleWardChange = (wardCode) => {
       queryParams.bedNoEnd = null
       queryParams.sortNoEnd = null
     }
-
-    // todo 下面是测试语句
-   setTimeout(() => {
-     queryParams.executeDate = '2023-09-20'
-     queryParams.sortNoStart = 4
-     queryParams.sortNoEnd = 4
-     queryParams.frequency = 'ALL'
-     queryParams.printRange = 'ALL'
-     queryParams.cardType = 'BOTTLE_CARD'
-     executeQuery()
-   }, 100)
   })
 }
 
@@ -193,13 +182,17 @@ const execPrint = () => {
   LODOP.PREVIEW()
 }
 
+// -- 小输液卡
+// -- 已打印：print_comment like '%S%'
+// -- 未打印：isnull(print_comment,'')not like '%S%'
+//
+// -- 瓶贴卡
+// -- 已打印：print_comment like '%J%'
+// -- 未打印：isnull(print_comment,'')not like '%J%'
 onMounted(() => {
   initLodop()
   if (!queryParams.wardCode) {
-    // queryParams.wardCode = userWards.value[0].value
-
-    // todo 下面是测试语句
-    queryParams.wardCode = '8000006'
+    queryParams.wardCode = userWards.value[0].value
   }
   handleWardChange(queryParams.wardCode)
 })