Merge commit '0971d82c89c0f13061f0a41b9f5b0adeace42274' into 淮海科技

# Conflicts:
#	src/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng.ts
#	src/views/medical-advice/execute-item/PrintExecuteItem.vue

src/api/inpatient/patient.js

@@ -18,6 +18,7 @@ export function getPatientInfo(inpatientNo) {
 
 export function getDrgPatInfo(data) {
   return request({
+    showLoading: false,
     url: "/patient/getDrgPatInfo",
     method: "post",
     data,

src/api/triage/triage.js

@@ -4,7 +4,6 @@ export function getUnTriagedPatient(currentPage, pageSize) {
   return request({
     url: '/triage/getUnTriagedPatients',
     method: 'get',
-    params: { currentPage, pageSize },
   })
 }
 

src/components/xmlr/dialog/NewDialog.vue

@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { queryDanGeXiangMu } from "@/api/inpatient/xiang-mu-lu-ru";
-import YfGrouo from "@/components/cy/yf-group/YfGrouo.vue";
 
 const props = defineProps<{
   add: (value: any) => void;
@@ -8,7 +7,6 @@ const props = defineProps<{
 }>();
 
 const search = ref("");
-const yf = ref(null);
 
 const xiangMuHuoYaoPinFlag = ref(0);
 const xiangMuHuoYaoPinShuJu = reactive({
@@ -19,7 +17,7 @@ const xiangMuHuoYaoPinShuJu = reactive({
 
 function rmChargePyCode() {
   if (search.value.length >= 2) {
-    queryDanGeXiangMu(search.value, xiangMuHuoYaoPinFlag.value, yf.value).then(
+    queryDanGeXiangMu(search.value, xiangMuHuoYaoPinFlag.value, "73").then(
       res => {
         xiangMuHuoYaoPinShuJu.data = res;
       }
@@ -54,7 +52,6 @@ function clearXiangMuHuoYaoPinShuJu() {
         inactive-color="#13ce66"
         inactive-text="项目"
       />
-      <YfGrouo v-model="yf" v-if="xiangMuHuoYaoPinFlag === 1" />
     </template>
     <el-table
       max-height="50vh"

src/utils/cy-message-box/index.scss

@@ -16,7 +16,7 @@
   }
 
   .el-message-box__btns {
-    justify-content: right;
+    justify-content: flex-end;
   }
 }
 

src/views/clinic/triage/Untriaged.vue

@@ -1,13 +1,20 @@
 <template>
   <div class="layout_container">
     <header>
+      <el-input
+          v-model="inputContent"
+          style="width: 120px;margin-right: 12px"
+          placeholder="姓名/门诊ID"
+          clearable
+          suffix-icon="Search"
+      />
       <el-button type="primary" icon="Refresh" @click="fetchUnTriagedPatient">刷新未分诊数据</el-button>
       <el-button type="primary" icon="Refresh" @click="refreshBigScreen">刷新候诊大屏数据</el-button>
       <el-button type="primary" @click="openCardDiag" class="m-r_8px">重新绑卡</el-button>
       <ReadElectronicSiCard pat-no="triage" biztype="01101" @success="afterReadCard"/>
     </header>
     <div class="layout_main layout_el-table">
-      <el-table :data="patients" stripe highlight-current-row>
+      <el-table :data="cptPatient" stripe highlight-current-row>
         <el-table-column fixed prop="ghNo" label="队列号" sortable width="100"></el-table-column>
         <el-table-column prop="patientId" label="id号" width="100"></el-table-column>
         <el-table-column prop="name" label="姓名" width="100"></el-table-column>
@@ -29,15 +36,6 @@
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="currentPage"
-          :page-sizes="[15, 30, 45, 70, 100]"
-          :page-size="pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="totalSize"
-      ></el-pagination>
     </div>
   </div>
 
@@ -123,23 +121,18 @@ import ReadElectronicSiCard from '@/components/medical-insurance/read-electronic
 import {xcMessage} from "@/utils/xiaochan-element-plus";
 import VitalSign from "@/views/clinic/triage/components/VitalSign.vue";
 
+const inputContent = ref('')
 const patients = ref([])
-const totalSize = ref(0)
 
-const pageSize = ref(30)
-const currentPage = ref(1)
-const handleSizeChange = (val) => {
-  pageSize.value = val
-  fetchUnTriagedPatient()
-}
-const handleCurrentChange = (val) => {
-  currentPage.value = val
-  fetchUnTriagedPatient()
-}
+const cptPatient = computed(() => {
+  return patients.value.filter((item) => {
+    return item.patientId.indexOf(inputContent.value) > -1
+        || item.name.indexOf(inputContent.value) > -1
+  })
+})
 
 const fetchUnTriagedPatient = () => {
-  getUnTriagedPatient(currentPage.value, pageSize.value).then((res) => {
-    totalSize.value = res.totalSize
+  getUnTriagedPatient().then((res) => {
     patients.value = res.list
   })
 }
@@ -250,7 +243,6 @@ const showTriageDialog = ref(false)
 const fetchInteval = ref(null)
 
 onActivated(() => {
-  console.log('untriage.vue - activated')
   fetchUnTriagedPatient()
   fetchInteval.value = setInterval(() => {
     fetchUnTriagedPatient()
@@ -258,7 +250,6 @@ onActivated(() => {
 })
 
 onDeactivated(() => {
-  console.log('untriage.vue - deactivated')
   clearInterval(fetchInteval.value)
 })
 

src/views/medical-advice/execute-item/PrintExecuteItem.vue

@@ -470,12 +470,48 @@ function handleSort(value: PatientInfo[]) {
   return tmp;
 }
 
+type PatientInfo = {
+  actOrderNo: string;
+  parentNo: string | null;
+  occTime: string;
+  inpatientNo: string;
+};
+
+function handleSort(value: PatientInfo[]) {
+  const currentPatientInfo: {
+    [key: string]: {
+      info: PatientInfo;
+      list: PatientInfo[];
+    };
+  } = {};
+  XEUtils.arrayEach(value, (item, index) => {
+    item.inpatientNo = item.inpatientNo.trim();
+    if (item.actOrderNo == null) {
+      currentPatientInfo["zy" + item.inpatientNo] = {
+        info: item,
+        list: [],
+      };
+    } else {
+      currentPatientInfo["zy" + item.inpatientNo].list.push(item);
+    }
+  });
+  const tmp = [];
+
+  for (let key in currentPatientInfo) {
+    const item = currentPatientInfo[key];
+    const data = yzDataToTree(item.list, { childIcon: "┛", parentIcon: "┓" });
+    tmp.push(item.info);
+    tmp.push(...data);
+  }
+
+  return tmp;
+}
+
 const itemClassRef = ref(null);
 const resData = ref([]);
 const queryInfo = () => {
   queryExecuteItem(queryParam.value).then((res: any) => {
     resData.value = handleSort(res);
-    console.log(resData.value);
   });
 };