质控问题

src/api/emr-control/emr-control.ts

@@ -1,10 +1,10 @@
 import request from "./request";
 
-export function linkQualityControl(startDate, endDate, sid) {
+export function linkQualityControl(startDate, endDate, sid, timeType) {
     return request({
         url: '/emrQualityControl/linkControl',
         method: 'get',
-        params: {startDate, endDate, sid}
+        params: {startDate, endDate, sid, timeType}
     })
 }
 

src/router/modules/dashboard.js

@@ -906,11 +906,6 @@ const route = [
                 component: createNameComponent(() => import('@/views/utilities/page-editor-help/PageEditorHelp.vue')),
                 meta: {title: '页面编辑'}
             },
-            {
-                path: 'pageEditorHelpV2',
-                component: createNameComponent(() => import('@/views/data-base/page-editor-help-v2/src/PageEditorHelpV2.vue')),
-                meta: {title: '页面编辑'}
-            },
             {
                 path: 'knowledgeBase',
                 component: createNameComponent(() => import('@/views/utilities/KnowledgeBase.vue')),
@@ -1132,6 +1127,11 @@ const route = [
                 component: createNameComponent(() => import('@/views/data-base/page-editor-help-v2/src/PageEditorHelpV2.vue')),
                 meta: {title: '页面编辑'},
             },
+            {
+                path: '/dataBase/dictionaryMaintenanceEditing',
+                component: createNameComponent(() => import('@/views/data-base/dictionary-maintenance-editing/src/DictionaryMaintenanceEditing.vue')),
+                meta: {title: '基本字典维护编辑'},
+            },
         ]
     }
 ];

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

@@ -33,7 +33,7 @@ import HuanZheXinXi from "@/components/zhu-yuan-yi-sheng/HuanZheXinXi.vue";
 import {
   huanZheXinXi as patientInfo,
   jcTree,
-  jyTree, yzHeaderSize, yzMitt, yzSize,
+  jyTree, yzHeaderSize, yzSize,
 } from "@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng";
 import PatientList from "@/components/zhu-yuan-yi-sheng/public/PatientList";
 import {getJyJcZdTree} from "@/api/zhu-yuan-yi-sheng/jian-yan-jian-cha-shen-qing";

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

@@ -1,12 +1,20 @@
 <template>
   <page-layer>
     <template #header>
-      质控区间：
+      <el-switch
+          active-value="intervalPatients"
+          inactive-value="admissTimes"
+          v-model="timeType"
+          active-text="质控时间"
+          inactive-text="入院时间"
+      />
       <el-date-picker
           :shortcuts="shortcuts"
           style="width: 220px"
           type="daterange"
           v-model="intervalPatients"/>
+
+
       <el-button type="primary"
                  :loading="load"
                  @click="queryQualityControlData">查询质控数据
@@ -64,6 +72,8 @@ import XcTable from "@/components/xiao-chan/xc-table/XcTable.vue";
 import {openSocket, sid} from "@/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/emr-func/emr-socket";
 
 const intervalPatients = ref([])
+const timeType = ref('intervalPatients')
+
 const load = ref(false)
 
 const percentage = ref(0)
@@ -81,7 +91,7 @@ const queryQualityControlData = async () => {
   load.value = true
   percentage.value = 0
   siftData.value = {}
-  let res = await linkQualityControl(startTime, endTime, sid)
+  let res = await linkQualityControl(startTime, endTime, sid, timeType.value)
   ruleReturnData.value = res
   proportion.value = res.proportion
   numberToArrayFunc()

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/final-quality-control/FinalQualityControl.vue

@@ -16,6 +16,7 @@ import AdvancedSearchFunction
 
 const dateRange = ref([])
 const data = ref([])
+const timeType = ref('intervalPatients')
 const progressBar = ref({
   current: 0,
   total: 0,
@@ -107,7 +108,13 @@ onMounted(async () => {
 <template>
   <el-container>
     <el-header style="height: max-content">
-      质控时间：
+      <el-switch
+          active-value="intervalPatients"
+          inactive-value="admissTimes"
+          v-model="timeType"
+          active-text="质控时间"
+          inactive-text="入院时间"
+      />
       <el-date-picker style="width: 180px" v-model="dateRange"
                       type="daterange"
                       format="YYYY-MM-DD"

src/views/hospitalization/zhu-yuan-yi-sheng/electronic-medical-record/final-quality-control/comp/AdvancedSearchFunction.vue

@@ -35,6 +35,7 @@ const param = ref<{
   start?: string;
   end?: string;
   socketId?: string
+  timeType: string
 }>({
   blfxChkbox: [],
   isDead: '',
@@ -46,7 +47,8 @@ const param = ref<{
   disDept: '',
   disDate: null,
   referPhysician: '',
-  socketId: sid
+  socketId: sid,
+  timeType: 'intervalPatients'
 });
 
 const isOrNotOrAll = [
@@ -108,7 +110,14 @@ onMounted(() => {
   <el-dialog v-model="dialog" title="高级检索功能">
     <el-form label-width="120px" label-position="right">
 
-      <el-form-item label="质控时间：">
+      <el-form-item label="时间：">
+        <el-switch
+            active-value="intervalPatients"
+            inactive-value="admissTimes"
+            v-model="param.timeType"
+            active-text="质控时间"
+            inactive-text="入院时间"
+        />
         <el-date-picker style="width: 180px"
                         v-model="modelValue"
                         type="daterange"