Merge branch 'master' into test-ca

.env.tz

@@ -0,0 +1,14 @@
+ENV = 'tz'
+
+VITE_BASE_URL = 'http://172.16.20.115:8077'
+VITE_SOCKET_URL = 'ws://172.16.20.115:8707/websocket/'
+VITE_EMR_CONTROL_URL = '172.16.20.115:9227'
+VITE_DATA_BASE = 'http://172.16.20.115:9205'
+VITE_EMR_SOCKET = 'http://172.16.20.115:8707/socketApi'
+VITE_MAGIC_API_IFRAME = 'http://172.16.20.115:9206'
+
+VITE_HOSPITAL_NAME = '天资'
+VITE_SYSTEM_NAME = '工作集成平台'
+VITE_HOSPITAL_CODE = 'H00000000001'
+
+VITE_UPLOAD_TEMPLATE_THUMB = ''

package.json

@@ -5,7 +5,8 @@
     "dev": "vite",
     "update:element": "npm install element-plus ./deps/element-plus.2.7.1.1.tar.gz",
     "build": "vite build --mode=production",
-    "build:show": "vite build --mode=show"
+    "build:show": "vite build --mode=show",
+    "build:tianzi": "vite build --mode=tz"
   },
   "dependencies": {
     "@babel/standalone": "7.24.5",

src/components/si-sheet-upload/jie-suan-dan-xiu-gai/JieSuanDanXiangQing.vue

@@ -852,6 +852,16 @@ const bingAnShouYeXiaoYan = (flag) => {
       forceVerifies.value = res.force
       adviceVerifies.value = res.advice
       showMessageDrawer.value = true
+      ElMessageBox.confirm('病案首页质控不通过,请先完善病案首页,是否强制继续操作', '提示', {
+        type: 'warning',
+        confirmButtonText: '确认继续',
+        cancelButtonText: '取消',
+      }).then(() => {
+        showMessageDrawer.value = false
+        qualityTest(flag)
+          })
+          .catch(() => {
+          })
     } else {
       qualityTest(flag)
     }

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

@@ -49,9 +49,12 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template #label> 登记日期</template>
-          <el-date-picker v-model="patient.ybRegisterDate" placeholder="选择日期时间" style="width: 180px"
-                          type="datetime"
-                          @change="formatYbRegisterDate"></el-date-picker>
+          <el-date-picker
+              v-model="patient.ybRegisterDate" placeholder="选择日期时间"
+              style="width: 180px"
+              type="datetime"
+              @change="formatYbRegisterDate"
+          ></el-date-picker>
         </el-descriptions-item>
         <el-descriptions-item>
           <template #label> 证件类型</template>