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

src/api/zhu-yuan-yi-sheng/yi-zhu-lu-ru.ts

@@ -330,3 +330,11 @@ export function analyzeSiChargeLimit(data: SiLimitRequest) {
     data,
   });
 }
+
+export function confirmYzCheck(patNo, times, ledgerSn) {
+  return requestV2({
+    url: url + "/confirmYzCheck",
+    method: "get",
+    params: { patNo, times, ledgerSn },
+  });
+}

src/components/xmlr/components/projectInput/FeeInput.vue

@@ -258,13 +258,12 @@ onMounted(() => {
         />
       </template>
     </header>
-    <div class="layout_main">
+    <div class="layout_main layout_el-table">
       <el-table
         :data="saveData"
         border
         show-summary
         :summary-method="getSummaries"
-        max-height="100%"
       >
         <el-table-column label="是否自费" width="130">
           <template #default="{ row }">

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/yz-edit/YzEditor.vue

@@ -534,20 +534,6 @@ const drugDefaultValue = async (
         "请注意已使用【默认给药方式】，药剂科维护默认给药方式。"
       );
     }
-
-    await analyzeSiChargeLimit({
-      patNo: props.patientInfo.inpatientNo,
-      times: props.patientInfo.admissTimes,
-      ledgerSn: props.patientInfo.ledgerSn,
-      chargeList: [data.orderCode],
-    })
-      .then(res => {
-        if (res === "OK") {
-          return;
-        }
-        yzInfoPrompt.value.push(res);
-      })
-      .catch(XEUtils.noop);
   }
 
   if (stringIsBlank(yiZhuData.value.frequCode)) {

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/components/GenerateSignature.vue

@@ -5,10 +5,7 @@
       <SystemStaffSelect style="width: 100%" v-model="code" />
     </el-form-item>
     <el-form-item label="密码:">
-      <el-input
-        v-model="password"
-        @keyup.enter.stop.prevent="emits('cyDialogConfirm', null, false)"
-      />
+      <el-input v-model="password" @keyup.enter.stop.prevent="handelEnter" />
     </el-form-item>
     <el-alert type="warning">
       电子病历签名令牌在 企业微信 > 工具台 > 工作集成平台移动端 > 我的 <br />
@@ -16,10 +13,7 @@
       如果你不想把密码告诉别人又想别人可以生成你的签名可以使用这个功能
     </el-alert>
     <el-form-item label="电子病历签名令牌:">
-      <el-input
-        v-model="signCode"
-        @keyup.enter.stop.prevent="emits('cyDialogConfirm', null, false)"
-      />
+      <el-input v-model="signCode" @keyup.enter.stop.prevent="handelEnter" />
     </el-form-item>
     <el-form-item>
       <div style="text-align: right" class="layout_h-w_max">
@@ -50,6 +44,11 @@ function signUser() {
   });
 }
 
+async function handelEnter() {
+  const data = await confirmClick();
+  emits("cyDialogConfirm", data);
+}
+
 async function confirmClick() {
   return await magicApi({
     url: "/dataEmr/DoctorAuthSignature",

src/views/hospitalization/zhu-yuan-yi-sheng/yi-zhu-lu-ru/YiZhuLuRu.vue

@@ -37,6 +37,7 @@
 
 <script setup lang="ts">
 import {
+  confirmYzCheck,
   deleteMultipleOrders,
   insertTemplateOrder,
 } from "@/api/zhu-yuan-yi-sheng/yi-zhu-lu-ru";
@@ -94,6 +95,23 @@ const reasonableRef = useCompRef(RationalDrugUseWindow);
  * 确认医嘱 , 已经做过无患者的判断了
  */
 const confirmOrdersClick = async () => {
+  const confirmYzCheckData = await confirmYzCheck(
+    huanZheXinXi.value.inpatientNo,
+    huanZheXinXi.value.admissTimes,
+    huanZheXinXi.value.ledgerSn
+  ).catch(err => {
+    console.log("校验医保规则", err);
+    return "OK";
+  });
+
+  if (confirmYzCheckData !== "OK") {
+    await CyMessageBox.confirm({
+      message: confirmYzCheckData,
+      title: "医保限制，是否继续保存医嘱",
+      confirmButtonText: "继续",
+    });
+  }
+
   if (isDev) {
     await confirmOrder();
     return;
@@ -181,7 +199,7 @@ const orderQuash = async val => {
     inputMaxLength: 50,
   })
     .then(async ({ value }) => {
-      let res = await applicationForRevocation({
+      const res = await applicationForRevocation({
         actOrderNo: val.actOrderNo,
         reqRemark: value,
         patNo: val.inpatientNo,