Merge remote-tracking branch 'origin/master'

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

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

src/components/cy/CyDialog/index.vue

@@ -110,11 +110,14 @@ const style = (item: DialogState) => {
     </template>
     <ConfigProvider :item="item">
       <component
-        :style="{
-          height: item.dialogProps.height
-            ? XEUtils.addUnit(item.dialogProps.height)
-            : '',
-        }"
+        :style="
+          () => {
+            if (item.dialogProps.height) {
+              return { height: XEUtils.addUnit(item.dialogProps.height) };
+            }
+            return {};
+          }
+        "
         :is="item.component"
         :ref="el => setRef(el, item)"
         v-bind="item.params"

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/case-front-sheet/FillCaseFrontSheet.vue

@@ -271,6 +271,7 @@
             <input
               id="birthPlaceName"
               v-model="patient.birthPlaceName"
+              readonly
               style="width: 230px"
               @click="showSearchData('birth')"
             />
@@ -278,6 +279,7 @@
             <input
               id="nativePlaceName"
               v-model="patient.nativePlaceName"
+              readonly
               style="width: 170px"
               @click="showSearchData('native')"
             />
@@ -820,6 +822,7 @@
             <input
               id="hurtReasonName"
               v-model="patient.hurtReasonName"
+              readonly
               style="width: 360px"
               @click="showSearchData('hurt')"
             />
@@ -842,6 +845,7 @@
             <input
               id="pathologicDiagStr"
               v-model="patient.pathologicDiagStr"
+              readonly
               style="width: 300px"
               @click="showSearchData('pathologic')"
             />
@@ -965,6 +969,7 @@
             科室主任:
             <input
               id="deptLeaderName"
+              readonly
               style="width: 70px"
               v-model="patient.deptLeaderName"
               @click="showSearchData('deptleader')"
@@ -972,6 +977,7 @@
             主任(副主任)医师:
             <input
               id="leaderDoctorName"
+              readonly
               style="width: 70px"
               v-model="patient.leaderDoctorName"
               @click="showSearchData('leaderdoctor')"
@@ -979,6 +985,7 @@
             主治医师:
             <input
               id="mainDoctorName"
+              readonly
               style="width: 70px"
               v-model="patient.mainDoctorName"
               @click="showSearchData('maindoctor')"
@@ -986,6 +993,7 @@
             住院医师:
             <input
               id="admissDoctorName"
+              readonly
               style="width: 70px"
               v-model="patient.admissDoctorName"
               @click="showSearchData('admissdoctor')"
@@ -995,6 +1003,7 @@
             责任护士:
             <input
               id="dutyNurseName"
+              readonly
               style="width: 70px"
               v-model="patient.dutyNurseName"
               @click="showSearchData('dutynurse')"
@@ -1002,6 +1011,7 @@
             进修医师:
             <input
               id="studyDoctorName"
+              readonly
               style="width: 70px"
               v-model="patient.studyDoctorName"
               @click="showSearchData('studydoctor')"
@@ -1009,6 +1019,7 @@
             实习医师:
             <input
               id="internshipDoctorName"
+              readonly
               style="width: 70px"
               v-model="patient.internshipDoctorName"
               @click="showSearchData('internshipdoctor')"
@@ -1016,6 +1027,7 @@
             编码员:
             <input
               id="coderName"
+              readonly
               style="width: 70px"
               v-model="patient.coderName"
               @click="showSearchData('coder')"
@@ -1038,6 +1050,7 @@
             质控医师:
             <input
               id="qualityControlDoctorName"
+              readonly
               style="width: 70px"
               v-model="patient.qualityControlDoctorName"
               @click="showSearchData('qualitycontroldoctor')"
@@ -1045,6 +1058,7 @@
             质控护士:
             <input
               style="width: 70px"
+              readonly
               v-model="patient.qualityControlNurseName"
               @click="showSearchData('qualitycontrolnurse')"
             />
@@ -2124,9 +2138,10 @@
     <el-tag style="margin-left: 8px">险种类型：{{ patient.insutype }}</el-tag>
     <div style="height: 5px"></div>
     <el-input
+      v-model="ybDiag.name"
       placeholder="在此搜索诊断"
+      readonly
       style="width: 160px"
-      v-model="ybDiag.name"
       @click="showSearchData('ybDiag')"
     ></el-input>
     <el-input

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

@@ -57,7 +57,7 @@
           <el-button type="danger" @click="rejectAudit">审核不通过</el-button>
         </span>
         <span
-          v-if="auditInquiryRequest.state === 'APPROVED'"
+          v-if="auditInquiryRequest.state !== 'INITIAL'"
           style="margin: 0 12px"
         >
           <el-button icon="Refresh" type="danger" @click="beforeRevokeApprove"

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/electronic-medical-record/emr-editor/plugins/opinion/AuditRecord.vue

@@ -8,9 +8,7 @@ import {
 import { useUserStore } from "@/pinia/user-store";
 import { formatDateToStr } from "@/utils/moment-utils";
 import AuditDisplayComponent from "@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/plugins/opinion/AuditDisplayComponent.vue";
-import { ElMessageBox } from "element-plus";
 import { needRule } from "@/utils/public";
-import XEUtils from "xe-utils";
 import XcElOption from "@/components/xiao-chan/xc-el-option/XcElOption.vue";
 import { CyMessageBox } from "@/utils/cy-message-box";
 
@@ -32,8 +30,10 @@ async function delById(row: EmrAuditDetail, index: number) {
     message: "是否删除该意见",
     type: "delete",
   });
-  await deleteEmrAuditByEmrId(row.id);
-  root!.state.currentAudit.splice(index, 1);
+  await deleteEmrAuditByEmrId(row.id).then(() => {
+    const findIndex = root.state.currentAudit.findIndex(i => (i.id = row.id));
+    findIndex > -1 && root!.state.currentAudit.splice(findIndex, 1);
+  });
 }
 
 function showDel(item: EmrAuditDetail) {
@@ -44,7 +44,7 @@ const tmpData = computed(() => {
   if (remediationStatus.value === 0) {
     return root.state.currentAudit;
   }
-  return XEUtils.filter(root.state.currentAudit, (audit: EmrAuditDetail) => {
+  return root.state.currentAudit.filter((audit: EmrAuditDetail) => {
     return remediationStatus.value === 1
       ? audit.remediationStatus === null
       : audit.remediationStatus !== null;

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-editor/plugins/opinion/SendAudit.vue

@@ -69,7 +69,6 @@ function handleSendAudit() {
     xcMessage.error("请先选中需要审核的数据");
     return;
   }
-
   CyMessageBox.confirm({
     title: "发送审核",
     message: `请确认是否发送给【${sendDoctor.value.name}】医生`,

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,