wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

提交merge1.3

Browse Source
This commit is contained in:
chenqi
2025-12-27 15:30:25 +08:00
parent 8c607c8749
commit 088861f66e
1245 changed files with 220442 additions and 77616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
openhis-ui-vue3/src/views/inpatientDoctor/home/index.js
View File

@@ -3,6 +3,7 @@
* @Date: 2025-04-07 12:58:22
* @Description:
*/
<<<<<<< HEAD
import PatientList from './components/patientList.vue'
import PatientCard from './components/patientCard/index.vue'
import Advice from './components/order/index.vue'
@@ -13,3 +14,23 @@ import SurgeryApplication from './components/applicationShow/surgeryApplication.
import TestApplication from './components/applicationShow/testApplication.vue'
import NursingStatus from './components/applicationShow/nursingStatus.vue'
export { PatientList, PatientCard, Advice,Diagnose, BloodTtransfusionAapplication, ExamineApplication, SurgeryApplication, TestApplication, NursingStatus }
=======
import Advice from './components/order/index.vue';
import Diagnose from './components/diagnosis/diagnosis.vue';
import BloodTtransfusionAapplication from './components/applicationShow/bloodTtransfusionAapplication.vue';
import ExamineApplication from './components/applicationShow/examineApplication.vue';
import SurgeryApplication from './components/applicationShow/surgeryApplication.vue';
import TestApplication from './components/applicationShow/testApplication.vue';
import NursingStatus from './components/applicationShow/nursingStatus.vue';
import ReportQuery from './components/applicationShow/reportQuery.vue';
export {
Advice,
Diagnose,
BloodTtransfusionAapplication,
ExamineApplication,
SurgeryApplication,
TestApplication,
NursingStatus,
ReportQuery,
};
>>>>>>> v1.3