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:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,18 +3,6 @@
* @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'
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'
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';
@@ -33,4 +21,3 @@ export {
NursingStatus,
ReportQuery,
};
>>>>>>> v1.3