添加拒绝未提交的药单，电子病历优化。

src/api/inpatient/xiang-mu-lu-ru.js

@@ -158,4 +158,12 @@ export function drugRefundForm(groupNo, patNo, times, refundTime) {
     })
 }
 
+export function rejectNotGeneratedMedicationList(patNo, times) {
+    return request({
+        url: '/xmlr/rejectNotGeneratedMedicationList',
+        method: 'get',
+        params: {patNo, times},
+    })
+}
+
 

src/components/med-tec-mod/YiJiXiangMuLuRu.vue

@@ -32,11 +32,11 @@
           >
         </el-select>
         手术编码：
-        <el-input-number :precision="0"
-                         v-model="ssCode"
-                         clearable
-                         placeholder="请输入手术编码"
-                         style="width: 120px"/>
+        <el-input
+            v-model.number="ssCode"
+            clearable
+            placeholder="请输入手术编码"
+            style="width: 120px"/>
       </span>
       <el-tag type="danger"> 项目总价：{{ xiangMuZongJia }}</el-tag>
       <el-table :data="feiYongShuJu" :height="tableHeight - 27" highlight-current-row stripe style="margin-top: 10px">

src/components/zhu-yuan-yi-sheng/emr/EmrSidebar.vue

@@ -27,9 +27,9 @@
             <Folder v-if="data.children"/>
             <Document v-else/>
           </el-icon>
-          <span :title="data.name">
-        {{ data.name }}
-        </span>
+          <span :title="fileName(data)">
+               {{ fileName(data) }}
+          </span>
         </template>
       </el-tree>
     </div>
@@ -45,6 +45,7 @@ import {
 import {BizException, ExceptionEnum} from "@/utils/BizException";
 import {emrConfig} from '@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-init'
 import {getWardsApi} from "@/api/login";
+import {stringIsBlank} from "@/utils/blank-utils";
 
 const props = defineProps({
   maxHeight: {
@@ -218,6 +219,18 @@ const queryData = () => {
   })
 }
 
+const fileName = (val) => {
+  if (templateType === 2) {
+    return val.name + nullToEmpty(val.createName) + nullToEmpty(val.createDate)
+  } else {
+    return val.name
+  }
+}
+
+const nullToEmpty = (val) => {
+  return stringIsBlank(val) ? '' : ' \\ ' + val
+}
+
 onMounted(() => {
   queryData()
   if (editor) {

src/components/zhu-yuan-yi-sheng/yi-zhu-lu-ru/EmrDualScreen.vue

@@ -1,21 +1,25 @@
 <template>
   <div ref="dualScreenRef"
        class="dual-screen">
+    <div class="close" @click="isOpenDualScreen = false">
+      X
+    </div>
+
     <iframe
         :src="dualScreenSrc"
         height="100%"
         width="100%"
-        ref="emrRef"
-    />
+        ref="emrRef"/>
   </div>
 </template>
 
 <script setup name='EmrDualScreen'>
-import {dualScreenSrc} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
+import {dualScreenSrc, isOpenDualScreen} from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
+import router from "@/router";
+import {watch} from "vue";
 
 const dualScreenRef = ref(null)
 const emrRef = ref(null)
-const zIndex = ref(0)
 let iframeWindow = null;   //iframe的window对象
 
 
@@ -33,12 +37,18 @@ onMounted(async () => {
   } else {
     body.appendChild(dualScreenRef.value);
   }
-  zIndex.value = [...document.all].reduce((r, e) => Math.max(r, +window.getComputedStyle(e).zIndex || 0), 0)
   await nextTick();
   window.addEventListener("message", handleMessage)
   iframeWindow = emrRef.value.contentWindow;
 })
 
+watch(() => router.currentRoute.value.path, () => {
+  let path = router.currentRoute.value.path
+  if (path === '/login') {
+    isOpenDualScreen.value = false
+  }
+}, {deep: true})
+
 </script>
 
 <style scoped lang="scss">
@@ -50,5 +60,19 @@ onMounted(async () => {
   height: 100%;
   background-color: white;
   z-index: 99;
+
+  .close {
+    text-align: center;
+    position: absolute;
+    border-radius: 5px;
+    height: 20px;
+    width: 20px;
+    right: 0;
+    background-color: red;
+    box-shadow: var(--el-box-shadow-light);
+    cursor: pointer;
+    color: white;
+  }
+
 }
 </style>

src/views/hospitalization/zhu-yuan-yi-sheng/Home.vue

@@ -197,7 +197,6 @@ onMounted(async () => {
   })
 })
 
-
 </script>
 
 <style lang="scss" scoped>

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/EmrMain.vue

@@ -789,7 +789,9 @@ const courseSegmentLocking = () => {
           value: values['查房时间']?.value,
           emrDocumentId: documentId,
           emrCategoryCode: categoryCode,
-          jump: true
+          jump: true,
+          createName: values['编辑者']?.value[0].name,
+          createDate: values['查房时间']?.value
         })
         if (emrConfig.value.editor) {
           let editorCode = values['编辑者']?.value[0]?.code;

src/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng.js

@@ -77,7 +77,7 @@ export const queryParam = ref({
 // 医嘱数据
 export const yiZhuData = ref({
     id: '',
-    actOrderNo: null,
+    actOrderNo: isDev ? 'tempOrderNo' : null,
     orderName: '',
     orderCode: '',
     // 频率