From d32510d4940aa723e10e2e2581d30e76f6fe8f3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AF=92=E5=8C=A0?= Date: Tue, 1 Sep 2020 17:19:06 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/annotation/TraceId.java | 13 + .../com/ruoyi/common/func/ExceptionUtil.java | 90 ++ .../main/java/com/ruoyi/common/func/Func.java | 842 ++++++++++++++++++ .../java/com/ruoyi/common/func/IConstant.java | 26 + .../com/ruoyi/common/func/IdCardUtil.java | 262 ++++++ .../com/ruoyi/common/func/ObjectUtil.java | 22 + .../com/ruoyi/common/func/RandomType.java | 13 + .../com/ruoyi/common/func/StringPool.java | 74 ++ .../common/func/support/BaseBeanCopier.java | 196 ++++ .../common/func/support/BeanProperty.java | 16 + .../func/support/ConcurrentDateFormat.java | 86 ++ .../common/func/support/FastStringWriter.java | 103 +++ .../com/ruoyi/common/func/support/Kv.java | 190 ++++ .../com/ruoyi/framework/config/HisConfig.java | 15 + ruoyi-his/pom.xml | 7 +- .../bend/controller/AgreementController.java | 6 + .../bend/controller/ArticleController.java | 35 +- .../controller/PatientListController.java | 2 +- .../ScrcuOfflineOrdersController.java | 126 +++ .../ScrcuOfflineRefundOrdersController.java | 126 +++ .../ScrcuOnlineOrdersController.java | 166 ++++ .../ScrcuOnlineRefundOrdersController.java | 126 +++ .../com/ruoyi/bend/domain/PatientList.java | 2 +- .../ruoyi/bend/domain/ScrcuOfflineOrders.java | 130 +++ .../bend/domain/ScrcuOfflineRefundOrders.java | 89 ++ .../bend/domain/ScrcuOnlineOrderDetails.java | 82 ++ .../ruoyi/bend/domain/ScrcuOnlineOrders.java | 157 ++++ .../bend/domain/ScrcuOnlineRefundOrders.java | 78 ++ .../ruoyi/bend/mapper/PatientListMapper.java | 2 +- .../bend/mapper/ScrcuOfflineOrdersMapper.java | 62 ++ .../ScrcuOfflineRefundOrdersMapper.java | 62 ++ .../mapper/ScrcuOnlineOrderDetailsMapper.java | 62 ++ .../bend/mapper/ScrcuOnlineOrdersMapper.java | 88 ++ .../mapper/ScrcuOnlineRefundOrdersMapper.java | 62 ++ .../bend/service/IPatientListService.java | 2 +- .../service/IScrcuOfflineOrdersService.java | 61 ++ .../IScrcuOfflineRefundOrdersService.java | 61 ++ .../IScrcuOnlineOrderDetailsService.java | 61 ++ .../service/IScrcuOnlineOrdersService.java | 69 ++ .../IScrcuOnlineRefundOrdersService.java | 61 ++ .../service/impl/PatientListServiceImpl.java | 2 +- .../impl/ScrcuOfflineOrdersServiceImpl.java | 97 ++ .../ScrcuOfflineRefundOrdersServiceImpl.java | 96 ++ .../ScrcuOnlineOrderDetailsServiceImpl.java | 96 ++ .../impl/ScrcuOnlineOrdersServiceImpl.java | 146 +++ .../ScrcuOnlineRefundOrdersServiceImpl.java | 96 ++ .../ruoyi/his/controller/HisController.java | 409 +++++++++ .../controller/HisDepartmentController.java | 138 +++ .../his/controller/HisDoctorController.java | 172 ++++ .../HisDoctorDepartmentController.java | 126 +++ .../HisDoctorScheduleController.java | 126 +++ .../HisEhealthClientController.java | 126 +++ .../his/controller/HisFeeItemController.java | 140 +++ .../controller/HisHospitalInfoController.java | 237 +++++ .../controller/HisInpatientController.java | 126 +++ .../HisInpatientPrepaymentController.java | 126 +++ .../HisInspectionApplyController.java | 126 +++ .../HisInspectionReportController.java | 149 ++++ .../HisMerchantScrcuController.java | 126 +++ .../HisMerchantWechatController.java | 126 +++ .../controller/HisOutpatientController.java | 126 +++ .../HisOutpatientExpensesBillController.java | 147 +++ .../HisOutpatientPaymentController.java | 126 +++ .../HisPatientExpensesController.java | 152 ++++ .../HisPatientExpensesDetailController.java | 69 ++ .../controller/HisPayAccountController.java | 140 +++ .../HisRegistrationRecordController.java | 126 +++ .../HisRegistrationTemplateController.java | 138 +++ .../HisWechatProviderController.java | 126 +++ .../com/ruoyi/his/domain/HisDepartment.java | 162 ++++ .../java/com/ruoyi/his/domain/HisDoctor.java | 351 ++++++++ .../ruoyi/his/domain/HisDoctorDepartment.java | 116 +++ .../ruoyi/his/domain/HisDoctorSchedule.java | 245 +++++ .../ruoyi/his/domain/HisEhealthClient.java | 59 ++ .../java/com/ruoyi/his/domain/HisFeeItem.java | 44 + .../com/ruoyi/his/domain/HisHospitalInfo.java | 362 ++++++++ .../com/ruoyi/his/domain/HisInpatient.java | 218 +++++ .../his/domain/HisInpatientPrepayment.java | 122 +++ .../ruoyi/his/domain/HisInspectionApply.java | 78 ++ .../ruoyi/his/domain/HisInspectionReport.java | 168 ++++ .../his/domain/HisInspectionReportItem.java | 83 ++ .../ruoyi/his/domain/HisMerchantScrcu.java | 104 +++ .../ruoyi/his/domain/HisMerchantWechat.java | 48 + .../com/ruoyi/his/domain/HisOutpatient.java | 127 +++ .../his/domain/HisOutpatientExpensesBill.java | 133 +++ .../HisOutpatientExpensesBillDetail.java | 115 +++ .../his/domain/HisOutpatientPayment.java | 79 ++ .../ruoyi/his/domain/HisPatientExpenses.java | 95 ++ .../his/domain/HisPatientExpensesDetail.java | 241 +++++ .../com/ruoyi/his/domain/HisPayAccount.java | 69 ++ .../his/domain/HisRegistrationRecord.java | 492 ++++++++++ .../his/domain/HisRegistrationTemplate.java | 136 +++ .../ruoyi/his/domain/HisWechatProvider.java | 86 ++ .../ruoyi/his/mapper/HisDepartmentMapper.java | 71 ++ .../his/mapper/HisDoctorDepartmentMapper.java | 65 ++ .../com/ruoyi/his/mapper/HisDoctorMapper.java | 85 ++ .../his/mapper/HisDoctorScheduleMapper.java | 79 ++ .../his/mapper/HisEhealthClientMapper.java | 34 + .../ruoyi/his/mapper/HisFeeItemMapper.java | 34 + .../his/mapper/HisHospitalInfoMapper.java | 70 ++ .../ruoyi/his/mapper/HisInpatientMapper.java | 25 + .../mapper/HisInpatientPrepaymentMapper.java | 34 + .../his/mapper/HisInspectionApplyMapper.java | 34 + .../mapper/HisInspectionReportItemMapper.java | 34 + .../his/mapper/HisInspectionReportMapper.java | 60 ++ .../his/mapper/HisMerchantScrcuMapper.java | 34 + .../his/mapper/HisMerchantWechatMapper.java | 34 + ...HisOutpatientExpensesBillDetailMapper.java | 33 + .../HisOutpatientExpensesBillMapper.java | 60 ++ .../ruoyi/his/mapper/HisOutpatientMapper.java | 25 + .../mapper/HisOutpatientPaymentMapper.java | 34 + .../HisPatientExpensesDetailMapper.java | 25 + .../his/mapper/HisPatientExpensesMapper.java | 60 ++ .../ruoyi/his/mapper/HisPayAccountMapper.java | 34 + .../mapper/HisRegistrationRecordMapper.java | 71 ++ .../mapper/HisRegistrationTemplateMapper.java | 65 ++ .../his/mapper/HisWechatProviderMapper.java | 60 ++ .../his/service/IHisDepartmentService.java | 69 ++ .../service/IHisDoctorDepartmentService.java | 68 ++ .../service/IHisDoctorScheduleService.java | 81 ++ .../ruoyi/his/service/IHisDoctorService.java | 77 ++ .../his/service/IHisEhealthClientService.java | 78 ++ .../ruoyi/his/service/IHisFeeItemService.java | 80 ++ .../his/service/IHisHospitalInfoService.java | 68 ++ .../IHisInpatientPrepaymentService.java | 78 ++ .../his/service/IHisInpatientService.java | 84 ++ .../service/IHisInspectionApplyService.java | 78 ++ .../IHisInspectionReportItemService.java | 78 ++ .../service/IHisInspectionReportService.java | 86 ++ .../his/service/IHisMerchantScrcuService.java | 78 ++ .../service/IHisMerchantWechatService.java | 78 ++ .../IHisOutpatientExpensesBillService.java | 107 +++ .../service/IHisOutpatientPaymentService.java | 78 ++ .../his/service/IHisOutpatientService.java | 84 ++ .../IHisPatientExpensesDetailService.java | 24 + .../service/IHisPatientExpensesService.java | 97 ++ .../his/service/IHisPayAccountService.java | 80 ++ .../IHisRegistrationRecordService.java | 84 ++ .../IHisRegistrationTemplateService.java | 77 ++ .../com/ruoyi/his/service/IHisService.java | 64 ++ .../service/IHisWechatProviderService.java | 78 ++ .../impl/HisDepartmentServiceImpl.java | 107 +++ .../impl/HisDoctorDepartmentServiceImpl.java | 107 +++ .../impl/HisDoctorScheduleServiceImpl.java | 121 +++ .../service/impl/HisDoctorServiceImpl.java | 117 +++ .../impl/HisEhealthClientServiceImpl.java | 123 +++ .../service/impl/HisFeeItemServiceImpl.java | 128 +++ .../impl/HisHospitalInfoServiceImpl.java | 126 +++ .../HisInpatientPrepaymentServiceImpl.java | 122 +++ .../service/impl/HisInpatientServiceImpl.java | 134 +++ .../impl/HisInspectionApplyServiceImpl.java | 122 +++ .../HisInspectionReportItemServiceImpl.java | 122 +++ .../impl/HisInspectionReportServiceImpl.java | 184 ++++ .../impl/HisMerchantScrcuServiceImpl.java | 122 +++ .../impl/HisMerchantWechatServiceImpl.java | 122 +++ .../HisOutpatientExpensesBillServiceImpl.java | 200 +++++ .../impl/HisOutpatientPaymentServiceImpl.java | 122 +++ .../impl/HisOutpatientServiceImpl.java | 133 +++ .../HisPatientExpensesDetailServiceImpl.java | 40 + .../impl/HisPatientExpensesServiceImpl.java | 216 +++++ .../impl/HisPayAccountServiceImpl.java | 128 +++ .../HisRegistrationRecordServiceImpl.java | 123 +++ .../HisRegistrationTemplateServiceImpl.java | 110 +++ .../his/service/impl/HisServiceImpl.java | 639 +++++++++++++ .../impl/HisWechatProviderServiceImpl.java | 162 ++++ .../com/ruoyi/quartz/task/SyncHisTask.java | 573 ++++++++++++ .../java/com/ruoyi/quartz/task/TaskParam.java | 20 + .../mapper/bend/PatientListMapper.xml | 1 - .../mapper/bend/ScrcuOfflineOrdersMapper.xml | 159 ++++ .../bend/ScrcuOfflineRefundOrdersMapper.xml | 114 +++ .../bend/ScrcuOnlineOrderDetailsMapper.xml | 110 +++ .../mapper/bend/ScrcuOnlineOrdersMapper.xml | 216 +++++ .../bend/ScrcuOnlineRefundOrdersMapper.xml | 108 +++ .../mapper/his/HisDepartmentMapper.xml | 100 +++ .../mapper/his/HisDoctorDepartmentMapper.xml | 96 ++ .../resources/mapper/his/HisDoctorMapper.xml | 173 ++++ .../mapper/his/HisDoctorScheduleMapper.xml | 164 ++++ .../mapper/his/HisEhealthClientMapper.xml | 36 + .../resources/mapper/his/HisFeeItemMapper.xml | 32 + .../mapper/his/HisHospitalInfoMapper.xml | 161 ++++ .../mapper/his/HisInpatientMapper.xml | 88 ++ .../his/HisInpatientPrepaymentMapper.xml | 57 ++ .../mapper/his/HisInspectionApplyMapper.xml | 41 + .../his/HisInspectionReportItemMapper.xml | 42 + .../mapper/his/HisInspectionReportMapper.xml | 117 +++ .../mapper/his/HisMerchantScrcuMapper.xml | 48 + .../mapper/his/HisMerchantWechatMapper.xml | 33 + .../HisOutpatientExpensesBillDetailMapper.xml | 47 + .../his/HisOutpatientExpensesBillMapper.xml | 115 +++ .../mapper/his/HisOutpatientMapper.xml | 61 ++ .../mapper/his/HisOutpatientPaymentMapper.xml | 43 + .../his/HisPatientExpensesDetailMapper.xml | 71 ++ .../mapper/his/HisPatientExpensesMapper.xml | 121 +++ .../mapper/his/HisPayAccountMapper.xml | 38 + .../his/HisRegistrationRecordMapper.xml | 219 +++++ .../his/HisRegistrationTemplateMapper.xml | 95 ++ .../mapper/his/HisWechatProviderMapper.xml | 75 ++ .../templates/bend/article/edit.html | 6 +- .../templates/bend/offlineOrders/add.html | 25 + .../templates/bend/offlineOrders/edit.html | 26 + .../bend/offlineOrders/offlineOrders.html | 272 ++++++ .../templates/bend/offlineRefund/add.html | 25 + .../templates/bend/offlineRefund/edit.html | 26 + .../bend/offlineRefund/offlineRefund.html | 209 +++++ .../bend/onlineOrderDetails/add.html | 25 + .../bend/onlineOrderDetails/edit.html | 26 + .../onlineOrderDetails.html | 144 +++ .../bend/onlineOrders/onlineOrderDetails.html | 177 ++++ .../bend/onlineOrders/onlineOrders.html | 343 +++++++ .../bend/onlineRefund/onlineRefund.html | 213 +++++ .../bend/patientList/patientList.html | 7 - .../templates/his/department/add.html | 58 ++ .../templates/his/department/department.html | 121 +++ .../templates/his/department/edit.html | 60 ++ .../resources/templates/his/doctor/add.html | 121 +++ .../templates/his/doctor/doctor.html | 169 ++++ .../resources/templates/his/doctor/edit.html | 125 +++ .../templates/his/doctorDepartment/add.html | 25 + .../doctorDepartment/doctorDepartment.html | 78 ++ .../templates/his/doctorDepartment/edit.html | 26 + .../templates/his/doctorSchedule/add.html | 34 + .../his/doctorSchedule/doctorSchedule.html | 181 ++++ .../templates/his/doctorSchedule/edit.html | 35 + .../templates/his/ehealthClient/add.html | 61 ++ .../templates/his/ehealthClient/edit.html | 62 ++ .../his/ehealthClient/ehealthClient.html | 126 +++ .../templates/his/expensesBill/add.html | 25 + .../templates/his/expensesBill/edit.html | 26 + .../his/expensesBill/expensesBill.html | 240 +++++ .../his/expensesBill/expensesBillDetail.html | 188 ++++ .../resources/templates/his/feeItem/add.html | 25 + .../resources/templates/his/feeItem/edit.html | 26 + .../templates/his/feeItem/feeItem.html | 131 +++ .../resources/templates/his/hospital/add.html | 210 +++++ .../templates/his/hospital/edit.html | 258 ++++++ .../templates/his/hospital/hospital.html | 183 ++++ .../templates/his/inpatient/add.html | 25 + .../templates/his/inpatient/edit.html | 26 + .../templates/his/inpatient/inpatient.html | 273 ++++++ .../his/inpatientPrepayment/add.html | 25 + .../his/inpatientPrepayment/edit.html | 26 + .../inpatientPrepayment.html | 211 +++++ .../templates/his/inspectionApply/add.html | 25 + .../templates/his/inspectionApply/edit.html | 26 + .../his/inspectionApply/inspectionApply.html | 126 +++ .../templates/his/inspectionReport/add.html | 202 +++++ .../templates/his/inspectionReport/edit.html | 204 +++++ .../inspectionReport/inspectionReport.html | 254 ++++++ .../inspectionReportItem.html | 156 ++++ .../templates/his/merchantScrcu/add.html | 115 +++ .../templates/his/merchantScrcu/edit.html | 117 +++ .../his/merchantScrcu/merchantScrcu.html | 188 ++++ .../templates/his/merchantWechat/add.html | 49 + .../templates/his/merchantWechat/edit.html | 50 ++ .../his/merchantWechat/merchantWechat.html | 108 +++ .../templates/his/outpatient/add.html | 25 + .../templates/his/outpatient/edit.html | 26 + .../templates/his/outpatient/outpatient.html | 209 +++++ .../templates/his/patientExpenses/add.html | 513 +++++++++++ .../templates/his/patientExpenses/edit.html | 515 +++++++++++ .../his/patientExpenses/patientExpenses.html | 182 ++++ .../patientExpensesDetail.html | 245 +++++ .../templates/his/payAccount/add.html | 25 + .../templates/his/payAccount/edit.html | 26 + .../templates/his/payAccount/payAccount.html | 157 ++++ .../templates/his/registration/add.html | 25 + .../templates/his/registration/edit.html | 26 + .../his/registration/registration.html | 291 ++++++ .../his/registrationTemplate/add.html | 25 + .../his/registrationTemplate/edit.html | 26 + .../registrationTemplate.html | 149 ++++ .../templates/his/wechatProvider/add.html | 186 ++++ .../templates/his/wechatProvider/edit.html | 175 ++++ .../his/wechatProvider/wechatProvider.html | 144 +++ .../java/com/ruoyi/quartz/domain/SysJob.java | 12 + .../com/ruoyi/quartz/domain/SysJobLog.java | 12 + .../mapper/quartz/SysJobLogMapper.xml | 5 +- .../resources/mapper/quartz/SysJobMapper.xml | 6 +- .../resources/templates/monitor/job/add.html | 6 + .../templates/monitor/job/detail.html | 5 + .../resources/templates/monitor/job/edit.html | 6 + .../resources/templates/monitor/job/job.html | 7 + .../templates/monitor/job/jobLog.html | 13 +- 283 files changed, 30754 insertions(+), 32 deletions(-) create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/annotation/TraceId.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/func/ExceptionUtil.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/func/Func.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/func/IConstant.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/func/IdCardUtil.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/func/ObjectUtil.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/func/RandomType.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/func/StringPool.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/func/support/BaseBeanCopier.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/func/support/BeanProperty.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/func/support/ConcurrentDateFormat.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/func/support/FastStringWriter.java create mode 100644 ruoyi-common/src/main/java/com/ruoyi/common/func/support/Kv.java create mode 100644 ruoyi-framework/src/main/java/com/ruoyi/framework/config/HisConfig.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOfflineOrdersController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOfflineRefundOrdersController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOnlineOrdersController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOnlineRefundOrdersController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOfflineOrders.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOfflineRefundOrders.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOnlineOrderDetails.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOnlineOrders.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOnlineRefundOrders.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOfflineOrdersMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOfflineRefundOrdersMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOnlineOrderDetailsMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOnlineOrdersMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOnlineRefundOrdersMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOfflineOrdersService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOfflineRefundOrdersService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOnlineOrderDetailsService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOnlineOrdersService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOnlineRefundOrdersService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOfflineOrdersServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOfflineRefundOrdersServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOnlineOrderDetailsServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOnlineOrdersServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOnlineRefundOrdersServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDepartmentController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDoctorController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDoctorDepartmentController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDoctorScheduleController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisEhealthClientController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisFeeItemController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisHospitalInfoController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInpatientController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInpatientPrepaymentController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInspectionApplyController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInspectionReportController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisMerchantScrcuController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisMerchantWechatController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisOutpatientController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisOutpatientExpensesBillController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisOutpatientPaymentController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisPatientExpensesController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisPatientExpensesDetailController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisPayAccountController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisRegistrationRecordController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisRegistrationTemplateController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/controller/HisWechatProviderController.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDepartment.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDoctor.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDoctorDepartment.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDoctorSchedule.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisEhealthClient.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisFeeItem.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisHospitalInfo.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInpatient.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInpatientPrepayment.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInspectionApply.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInspectionReport.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInspectionReportItem.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisMerchantScrcu.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisMerchantWechat.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatient.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatientExpensesBill.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatientExpensesBillDetail.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatientPayment.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisPatientExpenses.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisPatientExpensesDetail.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisPayAccount.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisRegistrationRecord.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisRegistrationTemplate.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/domain/HisWechatProvider.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDepartmentMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDoctorDepartmentMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDoctorMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDoctorScheduleMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisEhealthClientMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisFeeItemMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisHospitalInfoMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInpatientMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInpatientPrepaymentMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInspectionApplyMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInspectionReportItemMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInspectionReportMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisMerchantScrcuMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisMerchantWechatMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientExpensesBillDetailMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientExpensesBillMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientPaymentMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisPatientExpensesDetailMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisPatientExpensesMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisPayAccountMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisRegistrationRecordMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisRegistrationTemplateMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisWechatProviderMapper.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDepartmentService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDoctorDepartmentService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDoctorScheduleService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDoctorService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisEhealthClientService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisFeeItemService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisHospitalInfoService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInpatientPrepaymentService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInpatientService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInspectionApplyService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInspectionReportItemService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInspectionReportService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisMerchantScrcuService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisMerchantWechatService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisOutpatientExpensesBillService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisOutpatientPaymentService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisOutpatientService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisPatientExpensesDetailService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisPatientExpensesService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisPayAccountService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisRegistrationRecordService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisRegistrationTemplateService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/IHisWechatProviderService.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDepartmentServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDoctorDepartmentServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDoctorScheduleServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDoctorServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisEhealthClientServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisFeeItemServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisHospitalInfoServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInpatientPrepaymentServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInpatientServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInspectionApplyServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInspectionReportItemServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInspectionReportServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisMerchantScrcuServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisMerchantWechatServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisOutpatientExpensesBillServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisOutpatientPaymentServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisOutpatientServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisPatientExpensesDetailServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisPatientExpensesServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisPayAccountServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisRegistrationRecordServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisRegistrationTemplateServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisWechatProviderServiceImpl.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/quartz/task/SyncHisTask.java create mode 100644 ruoyi-his/src/main/java/com/ruoyi/quartz/task/TaskParam.java create mode 100644 ruoyi-his/src/main/resources/mapper/bend/ScrcuOfflineOrdersMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/bend/ScrcuOfflineRefundOrdersMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/bend/ScrcuOnlineOrderDetailsMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/bend/ScrcuOnlineOrdersMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/bend/ScrcuOnlineRefundOrdersMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisDepartmentMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisDoctorDepartmentMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisDoctorMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisDoctorScheduleMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisEhealthClientMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisFeeItemMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisHospitalInfoMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisInpatientMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisInpatientPrepaymentMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisInspectionApplyMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisInspectionReportItemMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisInspectionReportMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisMerchantScrcuMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisMerchantWechatMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisOutpatientExpensesBillDetailMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisOutpatientExpensesBillMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisOutpatientMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisOutpatientPaymentMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisPatientExpensesDetailMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisPatientExpensesMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisPayAccountMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisRegistrationRecordMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisRegistrationTemplateMapper.xml create mode 100644 ruoyi-his/src/main/resources/mapper/his/HisWechatProviderMapper.xml create mode 100644 ruoyi-his/src/main/resources/templates/bend/offlineOrders/add.html create mode 100644 ruoyi-his/src/main/resources/templates/bend/offlineOrders/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/bend/offlineOrders/offlineOrders.html create mode 100644 ruoyi-his/src/main/resources/templates/bend/offlineRefund/add.html create mode 100644 ruoyi-his/src/main/resources/templates/bend/offlineRefund/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/bend/offlineRefund/offlineRefund.html create mode 100644 ruoyi-his/src/main/resources/templates/bend/onlineOrderDetails/add.html create mode 100644 ruoyi-his/src/main/resources/templates/bend/onlineOrderDetails/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/bend/onlineOrderDetails/onlineOrderDetails.html create mode 100644 ruoyi-his/src/main/resources/templates/bend/onlineOrders/onlineOrderDetails.html create mode 100644 ruoyi-his/src/main/resources/templates/bend/onlineOrders/onlineOrders.html create mode 100644 ruoyi-his/src/main/resources/templates/bend/onlineRefund/onlineRefund.html create mode 100644 ruoyi-his/src/main/resources/templates/his/department/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/department/department.html create mode 100644 ruoyi-his/src/main/resources/templates/his/department/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/doctor/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/doctor/doctor.html create mode 100644 ruoyi-his/src/main/resources/templates/his/doctor/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/doctorDepartment/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/doctorDepartment/doctorDepartment.html create mode 100644 ruoyi-his/src/main/resources/templates/his/doctorDepartment/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/doctorSchedule/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/doctorSchedule/doctorSchedule.html create mode 100644 ruoyi-his/src/main/resources/templates/his/doctorSchedule/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/ehealthClient/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/ehealthClient/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/ehealthClient/ehealthClient.html create mode 100644 ruoyi-his/src/main/resources/templates/his/expensesBill/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/expensesBill/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/expensesBill/expensesBill.html create mode 100644 ruoyi-his/src/main/resources/templates/his/expensesBill/expensesBillDetail.html create mode 100644 ruoyi-his/src/main/resources/templates/his/feeItem/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/feeItem/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/feeItem/feeItem.html create mode 100644 ruoyi-his/src/main/resources/templates/his/hospital/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/hospital/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/hospital/hospital.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inpatient/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inpatient/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inpatient/inpatient.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inpatientPrepayment/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inpatientPrepayment/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inpatientPrepayment/inpatientPrepayment.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inspectionApply/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inspectionApply/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inspectionApply/inspectionApply.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inspectionReport/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inspectionReport/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inspectionReport/inspectionReport.html create mode 100644 ruoyi-his/src/main/resources/templates/his/inspectionReport/inspectionReportItem.html create mode 100644 ruoyi-his/src/main/resources/templates/his/merchantScrcu/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/merchantScrcu/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/merchantScrcu/merchantScrcu.html create mode 100644 ruoyi-his/src/main/resources/templates/his/merchantWechat/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/merchantWechat/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/merchantWechat/merchantWechat.html create mode 100644 ruoyi-his/src/main/resources/templates/his/outpatient/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/outpatient/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/outpatient/outpatient.html create mode 100644 ruoyi-his/src/main/resources/templates/his/patientExpenses/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/patientExpenses/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/patientExpenses/patientExpenses.html create mode 100644 ruoyi-his/src/main/resources/templates/his/patientExpenses/patientExpensesDetail.html create mode 100644 ruoyi-his/src/main/resources/templates/his/payAccount/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/payAccount/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/payAccount/payAccount.html create mode 100644 ruoyi-his/src/main/resources/templates/his/registration/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/registration/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/registration/registration.html create mode 100644 ruoyi-his/src/main/resources/templates/his/registrationTemplate/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/registrationTemplate/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/registrationTemplate/registrationTemplate.html create mode 100644 ruoyi-his/src/main/resources/templates/his/wechatProvider/add.html create mode 100644 ruoyi-his/src/main/resources/templates/his/wechatProvider/edit.html create mode 100644 ruoyi-his/src/main/resources/templates/his/wechatProvider/wechatProvider.html diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/annotation/TraceId.java b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/TraceId.java new file mode 100644 index 000000000..a77f061b2 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/annotation/TraceId.java @@ -0,0 +1,13 @@ +package com.ruoyi.common.annotation; + +import java.lang.annotation.*; + +/** + * 自定义 @TraceId + */ +@Documented +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface TraceId { + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/func/ExceptionUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/func/ExceptionUtil.java new file mode 100644 index 000000000..553b5eb17 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/func/ExceptionUtil.java @@ -0,0 +1,90 @@ +package com.ruoyi.common.func; + +import com.ruoyi.common.func.support.FastStringWriter; +import com.ruoyi.common.utils.StringUtils; +import org.apache.commons.lang3.exception.ExceptionUtils; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.UndeclaredThrowableException; + +/** + * 错误信息处理类。 + * + * @author ruoyi + */ +public class ExceptionUtil { + /** + * 获取exception的详细错误信息。 + */ + public static String getExceptionMessage(Throwable e) { + StringWriter sw = new StringWriter(); + e.printStackTrace(new PrintWriter(sw, true)); + String str = sw.toString(); + return str; + } + + public static String getRootErrorMseeage(Exception e) { + Throwable root = ExceptionUtils.getRootCause(e); + root = (root == null ? e : root); + if (root == null) { + return ""; + } + String msg = root.getMessage(); + if (msg == null) { + return "null"; + } + return StringUtils.defaultString(msg); + } + + /** + * 将CheckedException转换为UncheckedException. + * + * @param e Throwable + * @return {RuntimeException} + */ + public static RuntimeException unchecked(Throwable e) { + if (e instanceof IllegalAccessException || e instanceof IllegalArgumentException + || e instanceof NoSuchMethodException) { + return new IllegalArgumentException(e); + } else if (e instanceof InvocationTargetException) { + return new RuntimeException(((InvocationTargetException) e).getTargetException()); + } else if (e instanceof RuntimeException) { + return (RuntimeException) e; + } else { + return new RuntimeException(e); + } + } + + /** + * 代理异常解包 + * + * @param wrapped 包装过得异常 + * @return 解包后的异常 + */ + public static Throwable unwrap(Throwable wrapped) { + Throwable unwrapped = wrapped; + while (true) { + if (unwrapped instanceof InvocationTargetException) { + unwrapped = ((InvocationTargetException) unwrapped).getTargetException(); + } else if (unwrapped instanceof UndeclaredThrowableException) { + unwrapped = ((UndeclaredThrowableException) unwrapped).getUndeclaredThrowable(); + } else { + return unwrapped; + } + } + } + + /** + * 将ErrorStack转化为String. + * + * @param ex Throwable + * @return {String} + */ + public static String getStackTraceAsString(Throwable ex) { + FastStringWriter stringWriter = new FastStringWriter(); + ex.printStackTrace(new PrintWriter(stringWriter)); + return stringWriter.toString(); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/func/Func.java b/ruoyi-common/src/main/java/com/ruoyi/common/func/Func.java new file mode 100644 index 000000000..b67f50032 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/func/Func.java @@ -0,0 +1,842 @@ +package com.ruoyi.common.func; + +import com.ruoyi.common.func.support.BaseBeanCopier; +import com.ruoyi.common.func.support.ConcurrentDateFormat; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import org.apache.commons.lang3.math.NumberUtils; +import org.springframework.beans.BeansException; +import org.springframework.cglib.core.CodeGenerationException; +import org.springframework.lang.Nullable; +import org.springframework.util.Assert; + +import java.beans.PropertyDescriptor; +import java.text.ParseException; +import java.time.Duration; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoField; +import java.time.temporal.TemporalAmount; +import java.util.*; +import java.util.concurrent.ThreadLocalRandom; + +/** + * 工具包集合，只做简单的调用，不删除原有工具类 + * + * @author L.cm + */ +public class Func { + /** + * Check whether the given {@code CharSequence} contains actual text. + *

More specifically, this method returns {@code true} if the + * {@code CharSequence} is not {@code null}, its length is greater than + * 0, and it contains at least one non-whitespace character. + * 

+     * $.isBlank(null)		= true
+     * $.isBlank("")		= true
+     * $.isBlank(" ")		= true
+     * $.isBlank("12345")	= false
+     * $.isBlank(" 12345 ")	= false
+     *
+ * + * @param cs the {@code CharSequence} to check (may be {@code null}) + * @return {@code true} if the {@code CharSequence} is not {@code null}, + * its length is greater than 0, and it does not contain whitespace only + * @see Character#isWhitespace + */ + public static boolean isBlank(@Nullable final CharSequence cs) { + return StringUtils.isBlank(cs); + } + + /** + *

Checks if a CharSequence is not empty (""), not null and not whitespace only.

+ * 
+     * $.isNotBlank(null)	= false
+     * $.isNotBlank("")		= false
+     * $.isNotBlank(" ")	= false
+     * $.isNotBlank("bob")	= true
+     * $.isNotBlank("  bob  ") = true
+     *
+ * + * @param cs the CharSequence to check, may be null + * @return {@code true} if the CharSequence is + * not empty and not null and not whitespace + * @see Character#isWhitespace + */ + public static boolean isNotBlank(@Nullable final CharSequence cs) { + return StringUtils.isNotBlank(cs); + } + + /** + * Determine whether the given object is not empty: + * i.e. {@code null} or of zero length. + * + * @param obj the object to check + * @return 是否不为空 + */ + public static boolean isNotEmpty(@Nullable Object obj) { + return !ObjectUtil.isEmpty(obj); + } + + /** + * Determine whether the given array is empty: + * i.e. {@code null} or of zero length. + * + * @param array the array to check + * @return 数组是否为空 + */ + public static boolean isEmpty(@Nullable Object[] array) { + return ObjectUtil.isEmpty(array); + } + + /** + * 转换为String数组
+ * + * @param str 被转换的值 + * @return 结果 + */ + public static String[] toStrArray(String str) { + return toStrArray(",", str); + } + + /** + * 转换为String数组
+ * + * @param split 分隔符 + * @param str 被转换的值 + * @return 结果 + */ + public static String[] toStrArray(String split, String str) { + if (isBlank(str)) { + return new String[]{}; + } + return str.split(split); + } + + /** + * 转换为String集合
+ * + * @param str 结果被转换的值 + * @return 结果 + */ + public static List toStrList(String str) { + return Arrays.asList(toStrArray(str)); + } + + /** + * 转换为String集合
+ * + * @param split 分隔符 + * @param str 被转换的值 + * @return 结果 + */ + public static List toStrList(String split, String str) { + return Arrays.asList(toStrArray(split, str)); + } + + /** + * 清理字符串，清理出某些不可见字符 + * + * @param txt 字符串 + * @return {String} + */ + public static String cleanChars(String txt) { + return txt.replaceAll("[ 　`·•�\\f\\t\\v\\s]", ""); + } + + /** + * Convert a {@code Collection} into a delimited {@code String} (e.g., CSV). + *

Useful for {@code toString()} implementations. + * + * @param coll the {@code Collection} to convert + * @return the delimited {@code String} + */ + public static String join(Collection coll) { + return StringUtils.join(coll); + } + + /** + * Convert a {@code Collection} into a delimited {@code String} (e.g. CSV). + *

Useful for {@code toString()} implementations. + * + * @param coll the {@code Collection} to convert + * @param delim the delimiter to use (typically a ",") + * @return the delimited {@code String} + */ + public static String join(Collection coll, String delim) { + return StringUtils.join(coll, delim); + } + + /** + * Convert a {@code String} array into a comma delimited {@code String} + * (i.e., CSV). + *

Useful for {@code toString()} implementations. + * + * @param arr the array to display + * @return the delimited {@code String} + */ + public static String join(Object[] arr) { + return StringUtils.join(arr); + } + + /** + * Convert a {@code String} array into a delimited {@code String} (e.g. CSV). + *

Useful for {@code toString()} implementations. + * + * @param arr the array to display + * @param delim the delimiter to use (typically a ",") + * @return the delimited {@code String} + */ + public static String join(Object[] arr, String delim) { + return StringUtils.join(arr, delim); + } + + /** + * Trim leading and trailing whitespace from the given {@code String}. + * + * @param str the {@code String} to check + * @return the trimmed {@code String} + * @see java.lang.Character#isWhitespace + */ + public static String trimWhitespace(String str) { + if (!hasLength(str)) { + return str; + } + + int beginIndex = 0; + int endIndex = str.length() - 1; + + while (beginIndex <= endIndex && Character.isWhitespace(str.charAt(beginIndex))) { + beginIndex++; + } + + while (endIndex > beginIndex && Character.isWhitespace(str.charAt(endIndex))) { + endIndex--; + } + + return str.substring(beginIndex, endIndex + 1); + } + + /** + * Check that the given {@code String} is neither {@code null} nor of length 0. + *

Note: this method returns {@code true} for a {@code String} that + * purely consists of whitespace. + * + * @param str the {@code String} to check (may be {@code null}) + * @return {@code true} if the {@code String} is not {@code null} and has length + */ + public static boolean hasLength(@Nullable String str) { + return (str != null && !str.isEmpty()); + } + + /** + * copy 对象属性到另一个对象，默认不使用Convert + *

+ * 注意：不支持链式Bean，链式用 copyProperties + * + * @param source 源对象 + * @param clazz 类名 + * @param 泛型标记 + * @return T + */ + public static T copy(Object source, Class clazz) { + BaseBeanCopier copier = BaseBeanCopier.create(source.getClass(), clazz, false); + T to = org.springframework.beans.BeanUtils.instantiateClass(clazz); + copier.copy(source, to, null); + return to; + } + + /** + * 拷贝对象 + *

+ * 注意：不支持链式Bean，链式用 copyProperties + * + * @param source 源对象 + * @param targetBean 需要赋值的对象 + */ + public static void copy(Object source, Object targetBean) { + BaseBeanCopier copier = BaseBeanCopier.create(source.getClass(), targetBean.getClass(), false); + copier.copy(source, targetBean, null); + } + + /** + * 判断一个字符串是否是数字 + * + * @param cs the CharSequence to check, may be null + * @return {boolean} + */ + public static boolean isNumeric(final CharSequence cs) { + return StringUtils.isNumeric(cs); + } + + /** + *

Convert a String to an int, returning + * zero if the conversion fails.

+ * + *

If the string is null, zero is returned.

+ * + * 
+     *   $.toInt(null) = 0
+     *   $.toInt("")   = 0
+     *   $.toInt("1")  = 1
+     *
+ * + * @param value the string to convert, may be null + * @return the int represented by the string, or zero if + * conversion fails + */ + public static int toInt(final Object value) { + return NumberUtils.toInt(String.valueOf(value)); + } + + /** + *

Convert a String to an int, returning a + * default value if the conversion fails.

+ * + *

If the string is null, the default value is returned.

+ * + * 
+     *   $.toInt(null, 1) = 1
+     *   $.toInt("", 1)   = 1
+     *   $.toInt("1", 0)  = 1
+     *
+ * + * @param value the string to convert, may be null + * @param defaultValue the default value + * @return the int represented by the string, or the default if conversion fails + */ + public static int toInt(final Object value, final int defaultValue) { + return NumberUtils.toInt(String.valueOf(value), defaultValue); + } + + /** + *

Convert a String to a long, returning + * zero if the conversion fails.

+ * + *

If the string is null, zero is returned.

+ * + * 
+     *   $.toLong(null) = 0L
+     *   $.toLong("")   = 0L
+     *   $.toLong("1")  = 1L
+     *
+ * + * @param value the string to convert, may be null + * @return the long represented by the string, or 0 if + * conversion fails + */ + public static long toLong(final Object value) { + return NumberUtils.toLong(String.valueOf(value)); + } + + /** + *

Convert a String to a long, returning a + * default value if the conversion fails.

+ * + *

If the string is null, the default value is returned.

+ * + * 
+     *   $.toLong(null, 1L) = 1L
+     *   $.toLong("", 1L)   = 1L
+     *   $.toLong("1", 0L)  = 1L
+     *
+ * + * @param value the string to convert, may be null + * @param defaultValue the default value + * @return the long represented by the string, or the default if conversion fails + */ + public static long toLong(final Object value, final long defaultValue) { + return NumberUtils.toLong(String.valueOf(value), defaultValue); + } + + /** + *

Convert a String to an Double, returning a + * default value if the conversion fails.

+ * + *

If the string is null, the default value is returned.

+ * + * 
+     *   $.toDouble(null, 1) = 1.0
+     *   $.toDouble("", 1)   = 1.0
+     *   $.toDouble("1", 0)  = 1.0
+     *
+ * + * @param value the string to convert, may be null + * @return the int represented by the string, or the default if conversion fails + */ + public static Double toDouble(Object value) { + return toDouble(String.valueOf(value), -1.00); + } + + /** + *

Convert a String to an Double, returning a + * default value if the conversion fails.

+ * + *

If the string is null, the default value is returned.

+ * + * 
+     *   $.toDouble(null, 1) = 1.0
+     *   $.toDouble("", 1)   = 1.0
+     *   $.toDouble("1", 0)  = 1.0
+     *
+ * + * @param value the string to convert, may be null + * @param defaultValue the default value + * @return the int represented by the string, or the default if conversion fails + */ + public static Double toDouble(Object value, Double defaultValue) { + return NumberUtils.toDouble(String.valueOf(value), defaultValue); + } + + /** + *

Convert a String to an Float, returning a + * default value if the conversion fails.

+ * + *

If the string is null, the default value is returned.

+ * + * 
+     *   $.toFloat(null, 1) = 1.00f
+     *   $.toFloat("", 1)   = 1.00f
+     *   $.toFloat("1", 0)  = 1.00f
+     *
+ * + * @param value the string to convert, may be null + * @return the int represented by the string, or the default if conversion fails + */ + public static Float toFloat(Object value) { + return toFloat(String.valueOf(value), -1.0f); + } + + /** + *

Convert a String to an Float, returning a + * default value if the conversion fails.

+ * + *

If the string is null, the default value is returned.

+ * + * 
+     *   $.toFloat(null, 1) = 1.00f
+     *   $.toFloat("", 1)   = 1.00f
+     *   $.toFloat("1", 0)  = 1.00f
+     *
+ * + * @param value the string to convert, may be null + * @param defaultValue the default value + * @return the int represented by the string, or the default if conversion fails + */ + public static Float toFloat(Object value, Float defaultValue) { + return NumberUtils.toFloat(String.valueOf(value), defaultValue); + } + + /** + *

Convert a String to an Boolean, returning a + * default value if the conversion fails.

+ * + *

If the string is null, the default value is returned.

+ * + * 
+     *   $.toBoolean("true", true)  = true
+     *   $.toBoolean("false")   	= false
+     *   $.toBoolean("", false)  	= false
+     *
+ * + * @param value the string to convert, may be null + * @return the int represented by the string, or the default if conversion fails + */ + public static Boolean toBoolean(Object value) { + return toBoolean(value, null); + } + + /** + *

Convert a String to an Boolean, returning a + * default value if the conversion fails.

+ * + *

If the string is null, the default value is returned.

+ * + * 
+     *   $.toBoolean("true", true)  = true
+     *   $.toBoolean("false")   	= false
+     *   $.toBoolean("", false)  	= false
+     *
+ * + * @param value the string to convert, may be null + * @param defaultValue the default value + * @return the int represented by the string, or the default if conversion fails + */ + public static Boolean toBoolean(Object value, Boolean defaultValue) { + if (value != null) { + String val = String.valueOf(value); + val = val.toLowerCase().trim(); + return Boolean.parseBoolean(val); + } + return defaultValue; + } + + /** + * 转换为Integer数组
+ * + * @param str 被转换的值 + * @return 结果 + */ + public static Integer[] toIntArray(String str) { + return toIntArray(",", str); + } + + /** + * 转换为Integer数组
+ * + * @param split 分隔符 + * @param str 被转换的值 + * @return 结果 + */ + public static Integer[] toIntArray(String split, String str) { + if (StringUtils.isEmpty(str)) { + return new Integer[]{}; + } + String[] arr = str.split(split); + final Integer[] ints = new Integer[arr.length]; + for (int i = 0; i < arr.length; i++) { + final int v = toInt(arr[i], 0); + ints[i] = v; + } + return ints; + } + + /** + * 转换为Integer集合
+ * + * @param str 结果被转换的值 + * @return 结果 + */ + public static List toIntList(String str) { + return Arrays.asList(toIntArray(str)); + } + + /** + * 转换为Integer集合
+ * + * @param split 分隔符 + * @param str 被转换的值 + * @return 结果 + */ + public static List toIntList(String split, String str) { + return Arrays.asList(toIntArray(split, str)); + } + + /** + * 转换为Long数组
+ * + * @param str 被转换的值 + * @return 结果 + */ + public static Long[] toLongArray(String str) { + return toLongArray(",", str); + } + + /** + * 转换为Long数组
+ * + * @param split 分隔符 + * @param str 被转换的值 + * @return 结果 + */ + public static Long[] toLongArray(String split, String str) { + if (StringUtils.isEmpty(str)) { + return new Long[]{}; + } + String[] arr = str.split(split); + final Long[] longs = new Long[arr.length]; + for (int i = 0; i < arr.length; i++) { + final Long v = toLong(arr[i], 0); + longs[i] = v; + } + return longs; + } + + /** + * 转换为Long集合
+ * + * @param str 结果被转换的值 + * @return 结果 + */ + public static List toLongList(String str) { + return Arrays.asList(toLongArray(str)); + } + + /** + * 转换为Long集合
+ * + * @param split 分隔符 + * @param str 被转换的值 + * @return 结果 + */ + public static List toLongList(String split, String str) { + return Arrays.asList(toLongArray(split, str)); + } + + /** + * 强转string,并去掉多余空格 + * + * @param str 字符串 + * @return String + */ + public static String toStr(Object str) { + return toStr(str, ""); + } + + /** + * 强转string,并去掉多余空格 + * + * @param str 字符串 + * @param defaultValue 默认值 + * @return String + */ + public static String toStr(Object str, String defaultValue) { + if (null == str) { + return defaultValue; + } + return String.valueOf(str); + } + + /** + * 获取 Bean 的所有 get方法 + * + * @param type 类 + * @return PropertyDescriptor数组 + */ + public static PropertyDescriptor[] getBeanGetters(Class type) { + return getPropertiesHelper(type, true, false); + } + + /** + * 获取 Bean 的所有 set方法 + * + * @param type 类 + * @return PropertyDescriptor数组 + */ + public static PropertyDescriptor[] getBeanSetters(Class type) { + return getPropertiesHelper(type, false, true); + } + + private static PropertyDescriptor[] getPropertiesHelper(Class type, boolean read, boolean write) { + try { + PropertyDescriptor[] all = BeanUtils.getPropertyDescriptors(type); + if (read && write) { + return all; + } else { + List properties = new ArrayList<>(all.length); + for (PropertyDescriptor pd : all) { + if (read && pd.getReadMethod() != null) { + properties.add(pd); + } else if (write && pd.getWriteMethod() != null) { + properties.add(pd); + } + } + return properties.toArray(new PropertyDescriptor[0]); + } + } catch (BeansException ex) { + throw new CodeGenerationException(ex); + } + } + + /** + * 日期减少时间量 + * + * @param date 时间 + * @param amount 时间量 + * @return 设置后的时间 + */ + public static Date minus(Date date, TemporalAmount amount) { + Instant instant = date.toInstant(); + return Date.from(instant.minus(amount)); + } + + /** + * 日期添加时间量 + * + * @param date 时间 + * @param amount 时间量 + * @return 设置后的时间 + */ + public static Date plus(Date date, TemporalAmount amount) { + Instant instant = date.toInstant(); + return Date.from(instant.plus(amount)); + } + + /** + * 添加天 + * + * @param date 时间 + * @param daysToAdd 添加的天数 + * @return 设置后的时间 + */ + public static Date plusDays(Date date, long daysToAdd) { + return plus(date, Duration.ofDays(daysToAdd)); + } + + + /** + * 减少天 + * + * @param date 时间 + * @param days 减少的天数 + * @return 设置后的时间 + */ + public static Date minusDays(Date date, long days) { + return minus(date, Duration.ofDays(days)); + } + + /** + * 根据小时判断是否为上午、中午、下午 + */ + public static String getDuringDay(LocalDateTime localDateTime) { + int i = localDateTime.get(ChronoField.AMPM_OF_DAY); + return i == 0 ? "上午" : "下午"; + } + + /** + * 根据小时判断是否为上午、中午、下午 + */ + public static String getDuringDay(Date date) { + LocalDateTime localDateTime = fromDate(date); + return getDuringDay(localDateTime); + } + + /** + * 转换成java8 时间 + * + * @param date Date + * @return LocalDateTime + */ + public static LocalDateTime fromDate(final Date date) { + return LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()); + } + + /** + * 日期格式化:yyyy-MM-dd HH:mm:ss + * + * @param date 时间, + * @return 格式化后的时间 ,yyyy-MM-dd HH:mm:ss + */ + public static String formatDate(Date date) { + return ConcurrentDateFormat.of(DateUtils.YYYY_MM_DD_HH_MM_SS).format(date); + } + + /** + * 日期格式化:yyyy-MM-dd HH:mm:ss + * + * @param date 时间 + * @return 格式化后的时间, yyyy-MM-dd HH:mm:ss + */ + public static String formatDate(LocalDateTime date) { + return DateTimeFormatter.ofPattern(DateUtils.YYYY_MM_DD_HH_MM_SS).format(date); + } + + /** + * 日期格式化 + * + * @param date 时间 + * @param pattern 格式 + * @return 格式化后的时间 + */ + public static String formatDate(Date date, String pattern) { + return ConcurrentDateFormat.of(pattern).format(date); + } + + /** + * 日期格式化 + * + * @param date 时间 + * @param pattern 格式 + * @return 格式化后的时间 + */ + public static String formatDate(LocalDateTime date, String pattern) { + return DateTimeFormatter.ofPattern(pattern).format(date); + } + + /** + * 日期时间格式化 + * + * @param date 时间 + * @return 格式化后的时间 + */ + public static String formatDateTime(Date date) { + return ConcurrentDateFormat.of(DateUtils.YYYY_MM_DD_HH_MM_SS).format(date); + } + + /** + * 日期时间格式化 + * + * @param date 时间 + * @return 格式化后的时间 + */ + public static String formatDateTime(LocalDateTime date) { + return DateTimeFormatter.ofPattern(DateUtils.YYYY_MM_DD_HH_MM_SS).format(date); + } + + /** + * 将字符串转换为时间 + * + * @param dateStr 时间字符串 + * @param pattern 表达式 + * @return 时间 + */ + public static Date parse(String dateStr, String pattern) { + ConcurrentDateFormat format = ConcurrentDateFormat.of(pattern); + try { + return format.parse(dateStr); + } catch (ParseException e) { + throw ExceptionUtil.unchecked(e); + } + } + + /** + * 将字符串转换为时间 + * + * @param dateStr 时间字符串 + * @param format ConcurrentDateFormat + * @return 时间 + */ + public static Date parse(String dateStr, ConcurrentDateFormat format) { + try { + return format.parse(dateStr); + } catch (ParseException e) { + throw ExceptionUtil.unchecked(e); + } + } + + private static final String S_INT = "0123456789"; + private static final String S_STR = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; + private static final String S_ALL = S_INT + S_STR; + + /** + * 随机数生成 + * + * @param count 字符长度 + * @param randomType 随机数类别 + * @return 随机数 + */ + public static String random(int count, RandomType randomType) { + if (count == 0) { + return ""; + } + Assert.isTrue(count > 0, "Requested random string length " + count + " is less than 0."); + final ThreadLocalRandom random = ThreadLocalRandom.current(); + char[] buffer = new char[count]; + for (int i = 0; i < count; i++) { + if (RandomType.INT == randomType) { + buffer[i] = S_INT.charAt(random.nextInt(S_INT.length())); + } else if (RandomType.STRING == randomType) { + buffer[i] = S_STR.charAt(random.nextInt(S_STR.length())); + } else { + buffer[i] = S_ALL.charAt(random.nextInt(S_ALL.length())); + } + } + return new String(buffer); + } + + + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/func/IConstant.java b/ruoyi-common/src/main/java/com/ruoyi/common/func/IConstant.java new file mode 100644 index 000000000..60a020f75 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/func/IConstant.java @@ -0,0 +1,26 @@ +package com.ruoyi.common.func; + +public enum IConstant { + MINUS_ONE(-1), + ZERO(0), + ONE(1), + TWO(2), + THREE(3), + FOURTH(4), + FIFTH(5), + SIXTH(6), + SEVENTH(7), + EIGHTH(8), + NINTH(9), + TENTH(10); + + private int value; + + private IConstant(int value) { + this.value = value; + } + + public int getValue() { + return this.value; + } + } \ No newline at end of file diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/func/IdCardUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/func/IdCardUtil.java new file mode 100644 index 000000000..0dcdba7bb --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/func/IdCardUtil.java @@ -0,0 +1,262 @@ +package com.ruoyi.common.func; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Calendar; +import java.util.GregorianCalendar; +import java.util.Hashtable; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * 身份证号码的格式：610821-20061222-612-X 由18位数字组成：前6位为地址码，第7至14位为出生日期码，第15至17位为顺序码， + * 第18位为校验码。检验码分别是0-10共11个数字，当检验码为“10”时，为了保证公民身份证号码18位，所以用“X”表示。虽然校验码为“X”不能更换，但若需全用数字表示，只需将18位公民身份号码转换成15位居民身份证号码，去掉第7至8位和最后1位3个数码。 + * 当今的身份证号码有15位和18位之分。1985年我国实行居民身份证制度，当时签发的身份证号码是15位的，1999年签发的身份证由于年份的扩展（由两位变为四位）和末尾加了效验码，就成了18位。 + * （1）前1、2位数字表示：所在省份的代码； + * （2）第3、4位数字表示：所在城市的代码； + * （3）第5、6位数字表示：所在区县的代码； + * （4）第7~14位数字表示：出生年、月、日； + * （5）第15、16位数字表示：所在地的派出所的代码； + * （6）第17位数字表示性别：奇数表示男性，偶数表示女性 + * （7）第18位数字是校检码：根据一定算法生成 + *

+ * ———————————————— + * 版权声明：本文为CSDN博主「mazaiting」的原创文章，遵循 CC 4.0 BY-SA 版权协议，转载请附上原文出处链接及本声明。 + * 原文链接：https://blog.csdn.net/mazaiting/article/details/79707923= + */ +public class IdCardUtil { + + private static final Logger logger = LoggerFactory.getLogger(IdCardUtil.class); + /** + * 身份证有效 + */ + private static final String VALIDITY = "该身份证有效！"; + /** + * 位数不足 + */ + private static final String LACKDIGITS = "身份证号码长度应该为15位或18位。"; + /** + * 最后一位应为数字 + */ + private static final String LASTOFNUMBER = "身份证15位号码都应为数字 ; 18位号码除最后一位外，都应为数字。"; + /** + * 出生日期无效 + */ + private static final String INVALIDBIRTH = "身份证出生日期无效。"; + /** + * 生日不在有效范围 + */ + private static final String INVALIDSCOPE = "身份证生日不在有效范围。"; + /** + * 月份无效 + */ + private static final String INVALIDMONTH = "身份证月份无效"; + /** + * 日期无效 + */ + private static final String INVALIDDAY = "身份证日期无效"; + /** + * 身份证地区编码错误 + */ + private static final String CODINGERROR = "身份证地区编码错误。"; + /** + * 身份证校验码无效 + */ + private static final String INVALIDCALIBRATION = "身份证校验码无效，不是合法的身份证号码"; + + /** + * 检验身份证号码是否符合规范 + * + * @param IDStr 身份证号码 + * @return 错误信息或成功信息 + */ + public static boolean validate(String IDStr) { + String tipMsg = VALIDITY;// 记录错误信息 + String Ai = ""; + // 判断号码的长度 15位或18位 + if (IDStr.length() != 15 && IDStr.length() != 18) { + tipMsg = LACKDIGITS; + logger.error("{}：{}", IDStr, tipMsg); + return false; + } + + // 18位身份证前17位位数字，如果是15位的身份证则所有号码都为数字 + if (IDStr.length() == 18) Ai = IDStr.substring(0, 17); + if (IDStr.length() == 15) Ai = IDStr.substring(0, 6) + "19" + IDStr.substring(6, 15); + if (!isNumeric(Ai)) { + tipMsg = LASTOFNUMBER; + logger.error("{}：{}", IDStr, tipMsg); + return false; + } + + // 判断出生年月是否有效 + String strYear = Ai.substring(6, 10);// 年份 + String strMonth = Ai.substring(10, 12);// 月份 + String strDay = Ai.substring(12, 14);// 日期 + if (!isDate(strYear + "-" + strMonth + "-" + strDay)) { + tipMsg = INVALIDBIRTH; + logger.error("{}：{}", IDStr, tipMsg); + return false; + } + GregorianCalendar gc = new GregorianCalendar(); + SimpleDateFormat s = new SimpleDateFormat("yyyy-MM-dd"); + try { + if ((gc.get(Calendar.YEAR) - Integer.parseInt(strYear)) > 150 + || (gc.getTime().getTime() - s.parse(strYear + "-" + strMonth + "-" + strDay).getTime()) < 0) { + tipMsg = INVALIDSCOPE; + logger.error("{}：{}", IDStr, tipMsg); + return false; + } + } catch (NumberFormatException | ParseException e) { + e.printStackTrace(); + } + if (Integer.parseInt(strMonth) > 12 || Integer.parseInt(strMonth) == 0) { + tipMsg = INVALIDMONTH; + logger.error("{}：{}", IDStr, tipMsg); + return false; + } + if (Integer.parseInt(strDay) > 31 || Integer.parseInt(strDay) == 0) { + tipMsg = INVALIDDAY; + logger.error("{}：{}", IDStr, tipMsg); + return false; + } + // 判断地区码是否有效 + Hashtable areaCode = getAreaCode(); + // 如果身份证前两位的地区码不在Hashtable，则地区码有误 + if (areaCode.get(Ai.substring(0, 2)) == null) { + tipMsg = CODINGERROR; + logger.error("{}：{}", IDStr, tipMsg); + return false; + } + if (!isVerifyCode(Ai, IDStr)) { + tipMsg = INVALIDCALIBRATION; + logger.error("{}：{}", IDStr, tipMsg); + return false; + } + //logger.debug("{}：{}", IDStr, tipMsg); + return true; + } + + /* + * 判断第18位校验码是否正确 第18位校验码的计算方式： + * 1. 对前17位数字本体码加权求和 公式为：S = Sum(Ai * Wi), i = + * 0, ... , 16 其中Ai表示第i个位置上的身份证号码数字值，Wi表示第i位置上的加权因子，其各位对应的值依次为： 7 9 10 5 8 4 + * 2 1 6 3 7 9 10 5 8 4 2 + * 2. 用11对计算结果取模 Y = mod(S, 11) + * 3. 根据模的值得到对应的校验码 + * 对应关系为： Y值： 0 1 2 3 4 5 6 7 8 9 10 校验码： 1 0 X 9 8 7 6 5 4 3 2 + */ + private static boolean isVerifyCode(String Ai, String IDStr) { + String[] verifyCode = {"1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2"}; + String[] Wi = {"7", "9", "10", "5", "8", "4", "2", "1", "6", "3", "7", "9", "10", "5", "8", "4", "2"}; + int sum = 0; + for (int i = 0; i < 17; i++) { + sum = sum + Integer.parseInt(String.valueOf(Ai.charAt(i))) * Integer.parseInt(Wi[i]); + } + int modValue = sum % 11; + String strVerifyCode = verifyCode[modValue]; + Ai = Ai + strVerifyCode; + if (IDStr.length() == 18) { + return Ai.equals(IDStr); + } + return true; + } + + /** + * 将所有地址编码保存在一个Hashtable中 + * + * @return Hashtable 对象 + */ + + private static Hashtable getAreaCode() { + Hashtable hashtable = new Hashtable(); + hashtable.put("11", "北京"); + hashtable.put("12", "天津"); + hashtable.put("13", "河北"); + hashtable.put("14", "山西"); + hashtable.put("15", "内蒙古"); + hashtable.put("21", "辽宁"); + hashtable.put("22", "吉林"); + hashtable.put("23", "黑龙江"); + hashtable.put("31", "上海"); + hashtable.put("32", "江苏"); + hashtable.put("33", "浙江"); + hashtable.put("34", "安徽"); + hashtable.put("35", "福建"); + hashtable.put("36", "江西"); + hashtable.put("37", "山东"); + hashtable.put("41", "河南"); + hashtable.put("42", "湖北"); + hashtable.put("43", "湖南"); + hashtable.put("44", "广东"); + hashtable.put("45", "广西"); + hashtable.put("46", "海南"); + hashtable.put("50", "重庆"); + hashtable.put("51", "四川"); + hashtable.put("52", "贵州"); + hashtable.put("53", "云南"); + hashtable.put("54", "西藏"); + hashtable.put("61", "陕西"); + hashtable.put("62", "甘肃"); + hashtable.put("63", "青海"); + hashtable.put("64", "宁夏"); + hashtable.put("65", "新疆"); + hashtable.put("71", "台湾"); + hashtable.put("81", "香港"); + hashtable.put("82", "澳门"); + hashtable.put("91", "国外"); + return hashtable; + } + + /** + * 判断字符串是否为数字,0-9重复0次或者多次 + * + * @param strNum + * @return true, 符合; false, 不符合。 + */ + private static boolean isNumeric(String strNum) { + Pattern pattern = Pattern.compile("[0-9]*"); + Matcher isNum = pattern.matcher(strNum); + return isNum.matches(); + } + + /** + * 功能：判断字符串出生日期是否符合正则表达式：包括年月日，闰年、平年和每月31天、30天和闰月的28天或者29天 + * + * @param strDate + * @return true, 符合; false, 不符合。 + */ + public static boolean isDate(String strDate) { + Pattern pattern = Pattern.compile( + "^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))?$"); + Matcher m = pattern.matcher(strDate); + return m.matches(); + } + + /*** + * 性别判断 可以根据身份证号码的第十七位判断性别，如果为奇数则为男性，偶数则为女性。 + * @param IDStr 身份证 + * @return 0:未知,1:男,2:女 + */ + public static Integer verifyGender(String IDStr) { + IDStr = IDStr.trim(); + if (IDStr.length() == 15) { + if (Integer.parseInt(IDStr.substring(14, 15)) % 2 == 0) { + return 2; + } else { + return 1; + } + } else if (IDStr.length() == 18) { + if (Integer.parseInt(IDStr.substring(16).substring(0, 1)) % 2 == 0) { + return 2; + } else { + return 1; + } + } else { + return 0; + } + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/func/ObjectUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/func/ObjectUtil.java new file mode 100644 index 000000000..4b8f6659c --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/func/ObjectUtil.java @@ -0,0 +1,22 @@ +package com.ruoyi.common.func; + +import org.springframework.lang.Nullable; + +/** + * 对象工具类 + * + * @author L.cm + */ +public class ObjectUtil extends org.springframework.util.ObjectUtils { + + /** + * 判断元素不为空 + * + * @param obj object + * @return boolean + */ + public static boolean isNotEmpty(@Nullable Object obj) { + return !ObjectUtil.isEmpty(obj); + } + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/func/RandomType.java b/ruoyi-common/src/main/java/com/ruoyi/common/func/RandomType.java new file mode 100644 index 000000000..744a28251 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/func/RandomType.java @@ -0,0 +1,13 @@ +package com.ruoyi.common.func; + +/** + * 生成的随机数类型 + * + * @author L.cm + */ +public enum RandomType { + /** + * INT STRING ALL + */ + INT, STRING, ALL +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/func/StringPool.java b/ruoyi-common/src/main/java/com/ruoyi/common/func/StringPool.java new file mode 100644 index 000000000..937ed9be8 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/func/StringPool.java @@ -0,0 +1,74 @@ +package com.ruoyi.common.func; + +/** + * 静态 String 池 + * + * @author L.cm + */ +public interface StringPool { + + String AMPERSAND = "&"; + String AND = "and"; + String AT = "@"; + String ASTERISK = "*"; + String STAR = ASTERISK; + String SLASH = "/"; + char BACK_SLASH = '\\'; + String DOUBLE_SLASH = "#//"; + String COLON = ":"; + String COMMA = ","; + String DASH = "-"; + String DOLLAR = "$"; + String DOT = "."; + String EMPTY = ""; + String EMPTY_JSON = "{}"; + String EQUALS = "="; + String FALSE = "false"; + String HASH = "#"; + String HAT = "^"; + String LEFT_BRACE = "{"; + String LEFT_BRACKET = "("; + String LEFT_CHEV = "<"; + String NEWLINE = "\n"; + String N = "n"; + String NO = "no"; + String NULL = "null"; + String OFF = "off"; + String ON = "on"; + String PERCENT = "%"; + String PIPE = "|"; + String PLUS = "+"; + String QUESTION_MARK = "?"; + String EXCLAMATION_MARK = "!"; + String QUOTE = "\""; + String RETURN = "\r"; + String TAB = "\t"; + String RIGHT_BRACE = "}"; + String RIGHT_BRACKET = ")"; + String RIGHT_CHEV = ">"; + String SEMICOLON = ";"; + String SINGLE_QUOTE = "'"; + String BACKTICK = "`"; + String SPACE = " "; + String TILDA = "~"; + String LEFT_SQ_BRACKET = "["; + String RIGHT_SQ_BRACKET = "]"; + String TRUE = "true"; + String UNDERSCORE = "_"; + String UTF_8 = "UTF-8"; + String GBK = "GBK"; + String ISO_8859_1 = "ISO-8859-1"; + String Y = "y"; + String YES = "yes"; + String ONE = "1"; + String ZERO = "0"; + String DOLLAR_LEFT_BRACE= "${"; + char U_A = 'A'; + char L_A = 'a'; + char U_Z = 'Z'; + char L_Z = 'z'; + String UNKNOWN = "unknown"; + String GET = "GET"; + String POST = "POST"; + +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/func/support/BaseBeanCopier.java b/ruoyi-common/src/main/java/com/ruoyi/common/func/support/BaseBeanCopier.java new file mode 100644 index 000000000..3aa41bcf1 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/func/support/BaseBeanCopier.java @@ -0,0 +1,196 @@ +package com.ruoyi.common.func.support; + +import com.ruoyi.common.func.Func; +import org.springframework.asm.ClassVisitor; +import org.springframework.asm.Type; +import org.springframework.cglib.core.*; + +import java.beans.PropertyDescriptor; +import java.lang.reflect.Modifier; +import java.security.ProtectionDomain; +import java.util.HashMap; +import java.util.Map; + +/** + * spring cglib 魔改 + * + *

+ * 1. 支持链式 bean + * 2. 自定义的 BeanCopier 解决 spring boot 和 cglib ClassLoader classLoader 不一致的问题 + *

+ * + * @author L.cm + */ +public abstract class BaseBeanCopier { + private static final BeanCopierKey KEY_FACTORY = (BeanCopierKey) KeyFactory.create(BeanCopierKey.class); + private static final Type CONVERTER = TypeUtils.parseType("org.springframework.cglib.core.Converter"); + private static final Type BEAN_COPIER = TypeUtils.parseType(BaseBeanCopier.class.getName()); + private static final Signature COPY = new Signature("copy", Type.VOID_TYPE, new Type[]{Constants.TYPE_OBJECT, Constants.TYPE_OBJECT, CONVERTER}); + private static final Signature CONVERT = TypeUtils.parseSignature("Object convert(Object, Class, Object)"); + + interface BeanCopierKey { + /** + * 实例化 + * @param source 源 + * @param target 目标 + * @param useConverter 是否使用转换 + * @return + */ + Object newInstance(String source, String target, boolean useConverter); + } + + public static BaseBeanCopier create(Class source, Class target, boolean useConverter) { + return BaseBeanCopier.create(source, target, null, useConverter); + } + + public static BaseBeanCopier create(Class source, Class target, ClassLoader classLoader, boolean useConverter) { + Generator gen; + if (classLoader == null) { + gen = new Generator(); + } else { + gen = new Generator(classLoader); + } + gen.setSource(source); + gen.setTarget(target); + gen.setUseConverter(useConverter); + return gen.create(); + } + + /** + * 拷贝 + * @param from 源 + * @param to 目标 + * @param converter 转换器 + */ + abstract public void copy(Object from, Object to, Converter converter); + + public static class Generator extends AbstractClassGenerator { + private static final Source SOURCE = new Source(BaseBeanCopier.class.getName()); + private final ClassLoader classLoader; + private Class source; + private Class target; + private boolean useConverter; + + Generator() { + super(SOURCE); + this.classLoader = null; + } + + Generator(ClassLoader classLoader) { + super(SOURCE); + this.classLoader = classLoader; + } + + public void setSource(Class source) { + if (!Modifier.isPublic(source.getModifiers())) { + setNamePrefix(source.getName()); + } + this.source = source; + } + + public void setTarget(Class target) { + if (!Modifier.isPublic(target.getModifiers())) { + setNamePrefix(target.getName()); + } + + this.target = target; + } + + public void setUseConverter(boolean useConverter) { + this.useConverter = useConverter; + } + + @Override + protected ClassLoader getDefaultClassLoader() { + return target.getClassLoader(); + } + + @Override + protected ProtectionDomain getProtectionDomain() { + return ReflectUtils.getProtectionDomain(source); + } + + public BaseBeanCopier create() { + Object key = KEY_FACTORY.newInstance(source.getName(), target.getName(), useConverter); + return (BaseBeanCopier) super.create(key); + } + + @Override + public void generateClass(ClassVisitor v) { + Type sourceType = Type.getType(source); + Type targetType = Type.getType(target); + ClassEmitter ce = new ClassEmitter(v); + ce.begin_class(Constants.V1_2, + Constants.ACC_PUBLIC, + getClassName(), + BEAN_COPIER, + null, + Constants.SOURCE_FILE); + + EmitUtils.null_constructor(ce); + CodeEmitter e = ce.begin_method(Constants.ACC_PUBLIC, COPY, null); + + // 2018.12.27 by L.cm 支持链式 bean + PropertyDescriptor[] getters = Func.getBeanGetters(source); + PropertyDescriptor[] setters = Func.getBeanSetters(target); + Map names = new HashMap<>(16); + for (PropertyDescriptor getter : getters) { + names.put(getter.getName(), getter); + } + + Local targetLocal = e.make_local(); + Local sourceLocal = e.make_local(); + e.load_arg(1); + e.checkcast(targetType); + e.store_local(targetLocal); + e.load_arg(0); + e.checkcast(sourceType); + e.store_local(sourceLocal); + + for (int i = 0; i < setters.length; i++) { + PropertyDescriptor setter = setters[i]; + PropertyDescriptor getter = (PropertyDescriptor) names.get(setter.getName()); + if (getter != null) { + MethodInfo read = ReflectUtils.getMethodInfo(getter.getReadMethod()); + MethodInfo write = ReflectUtils.getMethodInfo(setter.getWriteMethod()); + if (useConverter) { + Type setterType = write.getSignature().getArgumentTypes()[0]; + e.load_local(targetLocal); + e.load_arg(2); + e.load_local(sourceLocal); + e.invoke(read); + e.box(read.getSignature().getReturnType()); + EmitUtils.load_class(e, setterType); + e.push(write.getSignature().getName()); + e.invoke_interface(CONVERTER, CONVERT); + e.unbox_or_zero(setterType); + e.invoke(write); + } else if (compatible(getter, setter)) { + // 2018.12.27 by L.cm 支持链式 bean + e.load_local(targetLocal); + e.load_local(sourceLocal); + e.invoke(read); + e.invoke(write); + } + } + } + e.return_value(); + e.end_method(); + ce.end_class(); + } + + private static boolean compatible(PropertyDescriptor getter, PropertyDescriptor setter) { + return setter.getPropertyType().isAssignableFrom(getter.getPropertyType()); + } + + @Override + protected Object firstInstance(Class type) { + return ReflectUtils.newInstance(type); + } + + @Override + protected Object nextInstance(Object instance) { + return instance; + } + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/func/support/BeanProperty.java b/ruoyi-common/src/main/java/com/ruoyi/common/func/support/BeanProperty.java new file mode 100644 index 000000000..d1457b69d --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/func/support/BeanProperty.java @@ -0,0 +1,16 @@ +package com.ruoyi.common.func.support; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +/** + * Bean属性 + * + * @author Chill + */ +@Getter +@AllArgsConstructor +public class BeanProperty { + private final String name; + private final Class type; +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/func/support/ConcurrentDateFormat.java b/ruoyi-common/src/main/java/com/ruoyi/common/func/support/ConcurrentDateFormat.java new file mode 100644 index 000000000..ff40d8af6 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/func/support/ConcurrentDateFormat.java @@ -0,0 +1,86 @@ +/** + * Copyright (c) 2018-2028, DreamLu 卢春梦 (qq596392912@gmail.com). + *

+ * Licensed under the GNU LESSER GENERAL PUBLIC LICENSE 3.0; + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + *

+ * http://www.gnu.org/licenses/lgpl.html + *

+ * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.ruoyi.common.func.support; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.Locale; +import java.util.Queue; +import java.util.TimeZone; +import java.util.concurrent.ConcurrentLinkedQueue; + +/** + * 参考tomcat8中的并发DateFormat + *

+ * {@link SimpleDateFormat}的线程安全包装器。 + * 不使用ThreadLocal，创建足够的SimpleDateFormat对象来满足并发性要求。 + *

+ * + * @author L.cm + */ +public class ConcurrentDateFormat { + private final String format; + private final Locale locale; + private final TimeZone timezone; + private final Queue queue = new ConcurrentLinkedQueue<>(); + + private ConcurrentDateFormat(String format, Locale locale, TimeZone timezone) { + this.format = format; + this.locale = locale; + this.timezone = timezone; + SimpleDateFormat initial = createInstance(); + queue.add(initial); + } + + public static ConcurrentDateFormat of(String format) { + return new ConcurrentDateFormat(format, Locale.getDefault(), TimeZone.getDefault()); + } + + public static ConcurrentDateFormat of(String format, TimeZone timezone) { + return new ConcurrentDateFormat(format, Locale.getDefault(), timezone); + } + + public static ConcurrentDateFormat of(String format, Locale locale, TimeZone timezone) { + return new ConcurrentDateFormat(format, locale, timezone); + } + + public String format(Date date) { + SimpleDateFormat sdf = queue.poll(); + if (sdf == null) { + sdf = createInstance(); + } + String result = sdf.format(date); + queue.add(sdf); + return result; + } + + public Date parse(String source) throws ParseException { + SimpleDateFormat sdf = queue.poll(); + if (sdf == null) { + sdf = createInstance(); + } + Date result = sdf.parse(source); + queue.add(sdf); + return result; + } + + private SimpleDateFormat createInstance() { + SimpleDateFormat sdf = new SimpleDateFormat(format, locale); + sdf.setTimeZone(timezone); + return sdf; + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/func/support/FastStringWriter.java b/ruoyi-common/src/main/java/com/ruoyi/common/func/support/FastStringWriter.java new file mode 100644 index 000000000..86b95f225 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/func/support/FastStringWriter.java @@ -0,0 +1,103 @@ +package com.ruoyi.common.func.support; + +import com.ruoyi.common.func.StringPool; +import org.springframework.lang.Nullable; + +import java.io.Writer; + +/** + * FastStringWriter + * + * @author L.cm + */ +public class FastStringWriter extends Writer { + private final StringBuilder builder; + + public FastStringWriter() { + builder = new StringBuilder(64); + } + + public FastStringWriter(final int capacity) { + if (capacity < 0) { + throw new IllegalArgumentException("Negative builderfer size"); + } + builder = new StringBuilder(capacity); + } + + public FastStringWriter(@Nullable final StringBuilder builder) { + this.builder = builder != null ? builder : new StringBuilder(64); + } + + /** + * Gets the underlying StringBuilder. + * + * @return StringBuilder + */ + public StringBuilder getBuilder() { + return builder; + } + + @Override + public void write(int c) { + builder.append((char) c); + } + + @Override + public void write(char[] cbuilder, int off, int len) { + if ((off < 0) || (off > cbuilder.length) || (len < 0) || + ((off + len) > cbuilder.length) || ((off + len) < 0)) { + throw new IndexOutOfBoundsException(); + } else if (len == 0) { + return; + } + builder.append(cbuilder, off, len); + } + + @Override + public void write(String str) { + builder.append(str); + } + + @Override + public void write(String str, int off, int len) { + builder.append(str.substring(off, off + len)); + } + + @Override + public FastStringWriter append(CharSequence csq) { + if (csq == null) { + write(StringPool.NULL); + } else { + write(csq.toString()); + } + return this; + } + + @Override + public FastStringWriter append(CharSequence csq, int start, int end) { + CharSequence cs = (csq == null ? StringPool.NULL : csq); + write(cs.subSequence(start, end).toString()); + return this; + } + + @Override + public FastStringWriter append(char c) { + write(c); + return this; + } + + @Override + public String toString() { + return builder.toString(); + } + + @Override + public void flush() { + } + + @Override + public void close() { + builder.setLength(0); + builder.trimToSize(); + } +} diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/func/support/Kv.java b/ruoyi-common/src/main/java/com/ruoyi/common/func/support/Kv.java new file mode 100644 index 000000000..d52815886 --- /dev/null +++ b/ruoyi-common/src/main/java/com/ruoyi/common/func/support/Kv.java @@ -0,0 +1,190 @@ +package com.ruoyi.common.func.support; + +import com.ruoyi.common.func.Func; +import org.springframework.util.LinkedCaseInsensitiveMap; + +import java.sql.Time; +import java.sql.Timestamp; +import java.util.Date; +import java.util.HashMap; + +/** + * 链式map + * + * @author Chill + */ +public class Kv extends LinkedCaseInsensitiveMap { + + + private Kv() { + + } + + /** + * 创建Kv + * + * @return Kv + */ + public static Kv init() { + return new Kv(); + } + + public static HashMap newMap() { + return new HashMap(16); + } + + /** + * 设置列 + * + * @param attr 属性 + * @param value 值 + * @return 本身 + */ + public Kv set(String attr, Object value) { + this.put(attr, value); + return this; + } + + /** + * 设置列，当键或值为null时忽略 + * + * @param attr 属性 + * @param value 值 + * @return 本身 + */ + public Kv setIgnoreNull(String attr, Object value) { + if (null != attr && null != value) { + set(attr, value); + } + return this; + } + + public Object getObj(String key) { + return super.get(key); + } + + /** + * 获得特定类型值 + * + * @param 值类型 + * @param attr 字段名 + * @param defaultValue 默认值 + * @return 字段值 + */ + @SuppressWarnings("unchecked") + public T get(String attr, T defaultValue) { + final Object result = get(attr); + return (T) (result != null ? result : defaultValue); + } + + /** + * 获得特定类型值 + * + * @param attr 字段名 + * @return 字段值 + */ + public String getStr(String attr) { + return Func.toStr(get(attr), null); + } + + /** + * 获得特定类型值 + * + * @param attr 字段名 + * @return 字段值 + */ + public Integer getInt(String attr) { + return Func.toInt(get(attr), -1); + } + + /** + * 获得特定类型值 + * + * @param attr 字段名 + * @return 字段值 + */ + public Long getLong(String attr) { + return Func.toLong(get(attr), -1L); + } + + /** + * 获得特定类型值 + * + * @param attr 字段名 + * @return 字段值 + */ + public Float getFloat(String attr) { + return Func.toFloat(get(attr), null); + } + + public Double getDouble(String attr) { + return Func.toDouble(get(attr), null); + } + + + /** + * 获得特定类型值 + * + * @param attr 字段名 + * @return 字段值 + */ + public Boolean getBool(String attr) { + return Func.toBoolean(get(attr), null); + } + + /** + * 获得特定类型值 + * + * @param attr 字段名 + * @return 字段值 + */ + public byte[] getBytes(String attr) { + return get(attr, null); + } + + /** + * 获得特定类型值 + * + * @param attr 字段名 + * @return 字段值 + */ + public Date getDate(String attr) { + return get(attr, null); + } + + /** + * 获得特定类型值 + * + * @param attr 字段名 + * @return 字段值 + */ + public Time getTime(String attr) { + return get(attr, null); + } + + /** + * 获得特定类型值 + * + * @param attr 字段名 + * @return 字段值 + */ + public Timestamp getTimestamp(String attr) { + return get(attr, null); + } + + /** + * 获得特定类型值 + * + * @param attr 字段名 + * @return 字段值 + */ + public Number getNumber(String attr) { + return get(attr, null); + } + + @Override + public Kv clone() { + return (Kv) super.clone(); + } + +} diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/HisConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/HisConfig.java new file mode 100644 index 000000000..ed392e2c8 --- /dev/null +++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/HisConfig.java @@ -0,0 +1,15 @@ +package com.ruoyi.framework.config; + +import com.bending.core.props.HisClientProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +/** + * HIS客户端配置 + */ +@Configuration +@EnableConfigurationProperties({HisClientProperties.class}) +@ComponentScan(basePackages = "com.bending.core") +public class HisConfig { +} diff --git a/ruoyi-his/pom.xml b/ruoyi-his/pom.xml index 22d7c62c0..4d5507966 100644 --- a/ruoyi-his/pom.xml +++ b/ruoyi-his/pom.xml @@ -21,7 +21,12 @@ com.ruoyi ruoyi-common - + + + com.ruoyi + ruoyi-framework + + com.bending.core bending-his-core diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/controller/AgreementController.java b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/AgreementController.java index a0814e2ac..fbdd74442 100644 --- a/ruoyi-his/src/main/java/com/ruoyi/bend/controller/AgreementController.java +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/AgreementController.java @@ -1,6 +1,8 @@ package com.ruoyi.bend.controller; import java.util.List; + +import com.ruoyi.framework.util.ShiroUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -86,6 +88,8 @@ public class AgreementController extends BaseController @ResponseBody public AjaxResult addSave(Agreement agreement) { + String operName = ShiroUtils.getSysUser().getLoginName(); + agreement.setCreateBy(operName); return toAjax(agreementService.insertAgreement(agreement)); } @@ -109,6 +113,8 @@ public class AgreementController extends BaseController @ResponseBody public AjaxResult editSave(Agreement agreement) { + String operName = ShiroUtils.getSysUser().getLoginName(); + agreement.setCreateBy(operName); return toAjax(agreementService.updateAgreement(agreement)); } diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ArticleController.java b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ArticleController.java index 6375afd0d..bde5b7e29 100644 --- a/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ArticleController.java +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ArticleController.java @@ -1,23 +1,26 @@ package com.ruoyi.bend.controller; -import java.util.List; +import com.ruoyi.bend.domain.Article; +import com.ruoyi.bend.service.IArticleService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.framework.util.ShiroUtils; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; -import com.ruoyi.common.annotation.Log; -import com.ruoyi.common.enums.BusinessType; -import com.ruoyi.bend.domain.Article; -import com.ruoyi.bend.service.IArticleService; -import com.ruoyi.common.core.controller.BaseController; -import com.ruoyi.common.core.domain.AjaxResult; -import com.ruoyi.common.utils.poi.ExcelUtil; -import com.ruoyi.common.core.page.TableDataInfo; + +import java.util.List; /** * 内容管理Controller - * + * * @author bend * @date 2020-08-30 */ @@ -109,6 +112,12 @@ public class ArticleController extends BaseController @ResponseBody public AjaxResult addSave(Article article) { + //根据文章发布状态(文章状态（0草稿 1正常 2删除）)，添加额外数据 + if(article.getArticleStatus().equals(1)){ + article.setReleaseTime(DateUtils.getNowDate()); + } + String operName = ShiroUtils.getSysUser().getLoginName(); + article.setCreateBy(operName); return toAjax(articleService.insertArticle(article)); } @@ -132,6 +141,12 @@ public class ArticleController extends BaseController @ResponseBody public AjaxResult editSave(Article article) { + //根据文章发布状态(文章状态（0草稿 1正常 2删除）)，添加额外数据 + if(article.getArticleStatus().equals(1)){ + article.setReleaseTime(DateUtils.getNowDate()); + } + String operName = ShiroUtils.getSysUser().getLoginName(); + article.setCreateBy(operName); return toAjax(articleService.updateArticle(article)); } diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/controller/PatientListController.java b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/PatientListController.java index bd1c4cfcc..9cf4d9834 100644 --- a/ruoyi-his/src/main/java/com/ruoyi/bend/controller/PatientListController.java +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/PatientListController.java @@ -23,7 +23,7 @@ import com.ruoyi.common.core.page.TableDataInfo; * 就诊人列表Controller * * @author bend - * @date 2020-08-30 + * @date 2020-09-01 */ @Controller @RequestMapping("/bend/patientList") diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOfflineOrdersController.java b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOfflineOrdersController.java new file mode 100644 index 000000000..ec1e39e0e --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOfflineOrdersController.java @@ -0,0 +1,126 @@ +package com.ruoyi.bend.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.bend.domain.ScrcuOfflineOrders; +import com.ruoyi.bend.service.IScrcuOfflineOrdersService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 线下订单Controller + * + * @author bend + * @date 2020-09-01 + */ +@Controller +@RequestMapping("/bend/offlineOrders") +public class ScrcuOfflineOrdersController extends BaseController +{ + private String prefix = "bend/offlineOrders"; + + @Autowired + private IScrcuOfflineOrdersService scrcuOfflineOrdersService; + + @RequiresPermissions("bend:offlineOrders:view") + @GetMapping() + public String offlineOrders() + { + return prefix + "/offlineOrders"; + } + + /** + * 查询线下订单列表 + */ + @RequiresPermissions("bend:offlineOrders:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(ScrcuOfflineOrders scrcuOfflineOrders) + { + startPage(); + List list = scrcuOfflineOrdersService.selectScrcuOfflineOrdersList(scrcuOfflineOrders); + return getDataTable(list); + } + + /** + * 导出线下订单列表 + */ + @RequiresPermissions("bend:offlineOrders:export") + @Log(title = "线下订单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(ScrcuOfflineOrders scrcuOfflineOrders) + { + List list = scrcuOfflineOrdersService.selectScrcuOfflineOrdersList(scrcuOfflineOrders); + ExcelUtil util = new ExcelUtil(ScrcuOfflineOrders.class); + return util.exportExcel(list, "offlineOrders"); + } + + /** + * 新增线下订单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存线下订单 + */ + @RequiresPermissions("bend:offlineOrders:add") + @Log(title = "线下订单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(ScrcuOfflineOrders scrcuOfflineOrders) + { + return toAjax(scrcuOfflineOrdersService.insertScrcuOfflineOrders(scrcuOfflineOrders)); + } + + /** + * 修改线下订单 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + ScrcuOfflineOrders scrcuOfflineOrders = scrcuOfflineOrdersService.selectScrcuOfflineOrdersById(id); + mmap.put("scrcuOfflineOrders", scrcuOfflineOrders); + return prefix + "/edit"; + } + + /** + * 修改保存线下订单 + */ + @RequiresPermissions("bend:offlineOrders:edit") + @Log(title = "线下订单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(ScrcuOfflineOrders scrcuOfflineOrders) + { + return toAjax(scrcuOfflineOrdersService.updateScrcuOfflineOrders(scrcuOfflineOrders)); + } + + /** + * 删除线下订单 + */ + @RequiresPermissions("bend:offlineOrders:remove") + @Log(title = "线下订单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(scrcuOfflineOrdersService.deleteScrcuOfflineOrdersByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOfflineRefundOrdersController.java b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOfflineRefundOrdersController.java new file mode 100644 index 000000000..ea6f7f232 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOfflineRefundOrdersController.java @@ -0,0 +1,126 @@ +package com.ruoyi.bend.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.bend.domain.ScrcuOfflineRefundOrders; +import com.ruoyi.bend.service.IScrcuOfflineRefundOrdersService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 扫码退款Controller + * + * @author bend + * @date 2020-09-01 + */ +@Controller +@RequestMapping("/bend/offlineRefund") +public class ScrcuOfflineRefundOrdersController extends BaseController +{ + private String prefix = "bend/offlineRefund"; + + @Autowired + private IScrcuOfflineRefundOrdersService scrcuOfflineRefundOrdersService; + + @RequiresPermissions("bend:offlineRefund:view") + @GetMapping() + public String offlineRefund() + { + return prefix + "/offlineRefund"; + } + + /** + * 查询扫码退款列表 + */ + @RequiresPermissions("bend:offlineRefund:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders) + { + startPage(); + List list = scrcuOfflineRefundOrdersService.selectScrcuOfflineRefundOrdersList(scrcuOfflineRefundOrders); + return getDataTable(list); + } + + /** + * 导出扫码退款列表 + */ + @RequiresPermissions("bend:offlineRefund:export") + @Log(title = "扫码退款", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders) + { + List list = scrcuOfflineRefundOrdersService.selectScrcuOfflineRefundOrdersList(scrcuOfflineRefundOrders); + ExcelUtil util = new ExcelUtil(ScrcuOfflineRefundOrders.class); + return util.exportExcel(list, "offlineRefund"); + } + + /** + * 新增扫码退款 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存扫码退款 + */ + @RequiresPermissions("bend:offlineRefund:add") + @Log(title = "扫码退款", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders) + { + return toAjax(scrcuOfflineRefundOrdersService.insertScrcuOfflineRefundOrders(scrcuOfflineRefundOrders)); + } + + /** + * 修改扫码退款 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + ScrcuOfflineRefundOrders scrcuOfflineRefundOrders = scrcuOfflineRefundOrdersService.selectScrcuOfflineRefundOrdersById(id); + mmap.put("scrcuOfflineRefundOrders", scrcuOfflineRefundOrders); + return prefix + "/edit"; + } + + /** + * 修改保存扫码退款 + */ + @RequiresPermissions("bend:offlineRefund:edit") + @Log(title = "扫码退款", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders) + { + return toAjax(scrcuOfflineRefundOrdersService.updateScrcuOfflineRefundOrders(scrcuOfflineRefundOrders)); + } + + /** + * 删除扫码退款 + */ + @RequiresPermissions("bend:offlineRefund:remove") + @Log(title = "扫码退款", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(scrcuOfflineRefundOrdersService.deleteScrcuOfflineRefundOrdersByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOnlineOrdersController.java b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOnlineOrdersController.java new file mode 100644 index 000000000..23188abc1 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOnlineOrdersController.java @@ -0,0 +1,166 @@ +package com.ruoyi.bend.controller; + +import com.ruoyi.bend.domain.ScrcuOnlineOrderDetails; +import com.ruoyi.bend.domain.ScrcuOnlineOrders; +import com.ruoyi.bend.service.IScrcuOnlineOrderDetailsService; +import com.ruoyi.bend.service.IScrcuOnlineOrdersService; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.utils.poi.ExcelUtil; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 收单列表Controller + * + * @author bend + * @date 2020-09-01 + */ +@Controller +@RequestMapping("/bend/onlineOrders") +public class ScrcuOnlineOrdersController extends BaseController +{ + private String prefix = "bend/onlineOrders"; + + @Autowired + private IScrcuOnlineOrdersService scrcuOnlineOrdersService; + + @Resource + private IScrcuOnlineOrderDetailsService orderDetailsService; + + + @RequiresPermissions("bend:onlineOrders:view") + @GetMapping() + public String onlineOrders() + { + return prefix + "/onlineOrders"; + } + + /** + * 查询收单列表列表 + */ + @RequiresPermissions("bend:onlineOrders:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(ScrcuOnlineOrders scrcuOnlineOrders) + { + startPage(); + List list = scrcuOnlineOrdersService.selectScrcuOnlineOrdersList(scrcuOnlineOrders); + return getDataTable(list); + } + + /** + * 导出收单列表列表 + */ + @RequiresPermissions("bend:onlineOrders:export") + @Log(title = "收单列表", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(ScrcuOnlineOrders scrcuOnlineOrders) + { + List list = scrcuOnlineOrdersService.selectScrcuOnlineOrdersList(scrcuOnlineOrders); + ExcelUtil util = new ExcelUtil(ScrcuOnlineOrders.class); + return util.exportExcel(list, "onlineOrders"); + } + + /** + * 新增收单列表 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存收单列表 + */ + @RequiresPermissions("bend:onlineOrders:add") + @Log(title = "收单列表", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(ScrcuOnlineOrders scrcuOnlineOrders) + { + return toAjax(scrcuOnlineOrdersService.insertScrcuOnlineOrders(scrcuOnlineOrders)); + } + + /** + * 修改收单列表 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + ScrcuOnlineOrders scrcuOnlineOrders = scrcuOnlineOrdersService.selectScrcuOnlineOrdersById(id); + mmap.put("scrcuOnlineOrders", scrcuOnlineOrders); + return prefix + "/edit"; + } + + /** + * 修改保存收单列表 + */ + @RequiresPermissions("bend:onlineOrders:edit") + @Log(title = "收单列表", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(ScrcuOnlineOrders scrcuOnlineOrders) + { + return toAjax(scrcuOnlineOrdersService.updateScrcuOnlineOrders(scrcuOnlineOrders)); + } + + /** + * 删除收单列表 + */ + @RequiresPermissions("bend:onlineOrders:remove") + @Log(title = "收单列表", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(scrcuOnlineOrdersService.deleteScrcuOnlineOrdersByIds(ids)); + } + + /** + * 收单详情页面 + * @param orderNumber 收单单号 + */ + @RequiresPermissions("bend:onlineOrders:detail") + @GetMapping("/detail/{orderNumber}") + public String onlineOrdersDetail(@PathVariable("orderNumber") String orderNumber, ModelMap mmap) + { + if (StringUtils.isNotEmpty(orderNumber)) + { + ScrcuOnlineOrders scrcuOnlineOrders = new ScrcuOnlineOrders(); + scrcuOnlineOrders.setOrderNumber(orderNumber); + ScrcuOnlineOrders onlineOrders = scrcuOnlineOrdersService.selectScrcuOnlineOrders(scrcuOnlineOrders); + mmap.put("onlineOrders",onlineOrders); + } + return prefix + "/onlineOrderDetails"; + } + + + /** + * 收单详情列表 + * @param detail 收单详情 + * @return 列表 + */ + @RequiresPermissions("bend:onlineOrders:list") + @PostMapping("/detail/list") + @ResponseBody + public TableDataInfo onlineOrdersDetailList(ScrcuOnlineOrderDetails detail) + { + startPage(); + List list = orderDetailsService.selectScrcuOnlineOrderDetailsList(detail); + return getDataTable(list); + } + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOnlineRefundOrdersController.java b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOnlineRefundOrdersController.java new file mode 100644 index 000000000..b118fa183 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/controller/ScrcuOnlineRefundOrdersController.java @@ -0,0 +1,126 @@ +package com.ruoyi.bend.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.bend.domain.ScrcuOnlineRefundOrders; +import com.ruoyi.bend.service.IScrcuOnlineRefundOrdersService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 退款订单Controller + * + * @author bend + * @date 2020-09-01 + */ +@Controller +@RequestMapping("/bend/onlineRefund") +public class ScrcuOnlineRefundOrdersController extends BaseController +{ + private String prefix = "bend/onlineRefund"; + + @Autowired + private IScrcuOnlineRefundOrdersService scrcuOnlineRefundOrdersService; + + @RequiresPermissions("bend:onlineRefund:view") + @GetMapping() + public String onlineRefund() + { + return prefix + "/onlineRefund"; + } + + /** + * 查询退款订单列表 + */ + @RequiresPermissions("bend:onlineRefund:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders) + { + startPage(); + List list = scrcuOnlineRefundOrdersService.selectScrcuOnlineRefundOrdersList(scrcuOnlineRefundOrders); + return getDataTable(list); + } + + /** + * 导出退款订单列表 + */ + @RequiresPermissions("bend:onlineRefund:export") + @Log(title = "退款订单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders) + { + List list = scrcuOnlineRefundOrdersService.selectScrcuOnlineRefundOrdersList(scrcuOnlineRefundOrders); + ExcelUtil util = new ExcelUtil(ScrcuOnlineRefundOrders.class); + return util.exportExcel(list, "onlineRefund"); + } + + /** + * 新增退款订单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存退款订单 + */ + @RequiresPermissions("bend:onlineRefund:add") + @Log(title = "退款订单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders) + { + return toAjax(scrcuOnlineRefundOrdersService.insertScrcuOnlineRefundOrders(scrcuOnlineRefundOrders)); + } + + /** + * 修改退款订单 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + ScrcuOnlineRefundOrders scrcuOnlineRefundOrders = scrcuOnlineRefundOrdersService.selectScrcuOnlineRefundOrdersById(id); + mmap.put("scrcuOnlineRefundOrders", scrcuOnlineRefundOrders); + return prefix + "/edit"; + } + + /** + * 修改保存退款订单 + */ + @RequiresPermissions("bend:onlineRefund:edit") + @Log(title = "退款订单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders) + { + return toAjax(scrcuOnlineRefundOrdersService.updateScrcuOnlineRefundOrders(scrcuOnlineRefundOrders)); + } + + /** + * 删除退款订单 + */ + @RequiresPermissions("bend:onlineRefund:remove") + @Log(title = "退款订单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(scrcuOnlineRefundOrdersService.deleteScrcuOnlineRefundOrdersByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/domain/PatientList.java b/ruoyi-his/src/main/java/com/ruoyi/bend/domain/PatientList.java index a2e9402e8..69311546b 100644 --- a/ruoyi-his/src/main/java/com/ruoyi/bend/domain/PatientList.java +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/domain/PatientList.java @@ -12,7 +12,7 @@ import javax.persistence.Table; * 就诊人列表对象 bend_patient_list * * @author bend - * @date 2020-08-30 + * @date 2020-09-01 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOfflineOrders.java b/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOfflineOrders.java new file mode 100644 index 000000000..583bb4fcd --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOfflineOrders.java @@ -0,0 +1,130 @@ +package com.ruoyi.bend.domain; + +import java.util.Date; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 线下订单对象 scrcu_offline_orders + * + * @author bend + * @date 2020-09-01 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "线下订单") +@Table(name = "scrcu_offline_orders") +public class ScrcuOfflineOrders extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + + /** 用户ID */ + @ApiModelProperty(notes = "用户ID") + private Long memberId; + + /** 订单号 */ + @ApiModelProperty(notes = "订单号") + @Excel(name = "订单号") + private String reqSsn; + + /** 请求时间 */ + @ApiModelProperty(notes = "请求时间") + @Excel(name = "请求时间") + private String reqTime; + + /** 商户编号 */ + @ApiModelProperty(notes = "商户编号") + @Excel(name = "商户编号") + private String mchtNo; + + /** 行政区划 */ + @ApiModelProperty(notes = "行政区划") + private String txnAreaInfo; + + /** 交易结果通知地址 */ + @ApiModelProperty(notes = "交易结果通知地址") + private String notifyUrl; + + /** 订单金额 */ + @ApiModelProperty(notes = "订单金额") + @Excel(name = "订单金额") + private String orderAmt; + + /** 有效时间,单位为秒；超过该时间订单自动关闭； */ + @ApiModelProperty(notes = "有效时间,单位为秒；超过该时间订单自动关闭；") + private String validTime; + + /** 订单描述 */ + @ApiModelProperty(notes = "订单描述") + @Excel(name = "订单描述") + private String orderDesc; + + /** 商户二维码 */ + @ApiModelProperty(notes = "商户二维码") + private String mchToken; + + /** 用户付款码 */ + @ApiModelProperty(notes = "用户付款码") + private String userToken; + + /** 扫码类别（1用户主扫 2用户被扫） */ + @ApiModelProperty(notes = "扫码类别（1用户主扫 2用户被扫）") + @Excel(name = "扫码类别", readConverterExp = "1=用户主扫,2=用户被扫") + private String sacnType; + + /** 交易类型（01支付 02退款） */ + @ApiModelProperty(notes = "交易类型（01支付 02退款）") + @Excel(name = "交易类型", readConverterExp = "0=1支付,0=2退款") + private String txnType; + + /** 系统流水号 */ + @ApiModelProperty(notes = "系统流水号") + @Excel(name = "系统流水号") + private String payNo; + + /** 机构编码 */ + @ApiModelProperty(notes = "机构编码") + @Excel(name = "机构编码") + private String orgCode; + + /** HIS交易号 */ + @ApiModelProperty(notes = "HIS交易号") + @Excel(name = "HIS交易号") + private String hisTradeNo; + + /** 响应流水号 */ + @ApiModelProperty(notes = "响应流水号") + @Excel(name = "响应流水号") + private String respSsn; + + /** 响应时间 */ + @ApiModelProperty(notes = "响应时间") + @Excel(name = "响应时间") + private String respTime; + + /** 订单状态（00订单成功 01已撤销 02已发生退款 03已关闭 09订单失败 10订单已受理 11订单处理中 12用户输密中 13订单处理超时）] */ + @ApiModelProperty(notes = "订单状态（00订单成功 01已撤销 02已发生退款 03已关闭 09订单失败 10订单已受理 11订单处理中 12用户输密中 13订单处理超时）]") + @Excel(name = "订单状态", readConverterExp = "0=0订单成功,0=1已撤销,0=2已发生退款,0=3已关闭,0=9订单失败,1=0订单已受理,1=1订单处理中,1=2用户输密中,1=3订单处理超时") + private String orderState; + + /** 订单种类（0免费支付 1收单支付 2扫码支付 3微信支付） */ + @ApiModelProperty(notes = "订单种类（0免费支付 1收单支付 2扫码支付 3微信支付）") + @Excel(name = "订单种类", readConverterExp = "0=免费支付,1=收单支付,2=扫码支付,3=微信支付") + private Integer orderSpecies; + + /** 费用来源（0微信挂号 1微信门诊缴费 2微信住院预交 3分诊挂号 4分诊门诊缴费 5线下扫码支付 6诊间支付） */ + @ApiModelProperty(notes = "费用来源（0微信挂号 1微信门诊缴费 2微信住院预交 3分诊挂号 4分诊门诊缴费 5线下扫码支付 6诊间支付）") + @Excel(name = "费用来源", readConverterExp = "0=微信挂号,1=微信门诊缴费,2=微信住院预交,3=分诊挂号,4=分诊门诊缴费,5=线下扫码支付,6=诊间支付") + private Integer expenseType; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOfflineRefundOrders.java b/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOfflineRefundOrders.java new file mode 100644 index 000000000..f3f80c58b --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOfflineRefundOrders.java @@ -0,0 +1,89 @@ +package com.ruoyi.bend.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 扫码退款对象 scrcu_offline_refund_orders + * + * @author bend + * @date 2020-09-01 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "扫码退款") +@Table(name = "scrcu_offline_refund_orders") +public class ScrcuOfflineRefundOrders extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 商户编号 */ + @ApiModelProperty(notes = "商户编号") + @Excel(name = "商户编号") + private String mchtNo; + + /** 退款订单 */ + @ApiModelProperty(notes = "退款订单") + @Excel(name = "退款订单") + private String reqSsn; + + /** 请求时间 */ + @ApiModelProperty(notes = "请求时间") + @Excel(name = "请求时间") + private String reqTime; + + /** 原订单号 */ + @ApiModelProperty(notes = "原订单号") + @Excel(name = "原订单号") + private String origReqSsn; + + /** 原请求时间 */ + @ApiModelProperty(notes = "原请求时间") + @Excel(name = "原请求时间") + private String origReqTime; + + /** 原响应流水 */ + @ApiModelProperty(notes = "原响应流水") + @Excel(name = "原响应流水") + private String origRespSsn; + + /** 原响应时间 */ + @ApiModelProperty(notes = "原响应时间") + @Excel(name = "原响应时间") + private String origRespTime; + + /** 退款金额 */ + @ApiModelProperty(notes = "退款金额") + @Excel(name = "退款金额") + private String orderAmt; + + /** 退款描述 */ + @ApiModelProperty(notes = "退款描述") + @Excel(name = "退款描述") + private String orderDesc; + + /** 退款响应流水号 */ + @ApiModelProperty(notes = "退款响应流水号") + @Excel(name = "退款响应流水号") + private String respSsn; + + /** 退款响应时间 */ + @ApiModelProperty(notes = "退款响应时间") + @Excel(name = "退款响应时间") + private String respTime; + + /** 订单状态（00订单成功 01已撤销 02已发生退款 03已关闭 09订单失败 10订单已受理 11订单处理中 12用户输密中 13订单处理超时）] */ + @ApiModelProperty(notes = "订单状态（00订单成功 01已撤销 02已发生退款 03已关闭 09订单失败 10订单已受理 11订单处理中 12用户输密中 13订单处理超时）]") + @Excel(name = "订单状态", readConverterExp = "0=0订单成功,0=1已撤销,0=2已发生退款,0=3已关闭,0=9订单失败,1=0订单已受理,1=1订单处理中,1=2用户输密中,1=3订单处理超时") + private String orderState; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOnlineOrderDetails.java b/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOnlineOrderDetails.java new file mode 100644 index 000000000..0a858339d --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOnlineOrderDetails.java @@ -0,0 +1,82 @@ +package com.ruoyi.bend.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 收单详情对象 scrcu_online_order_details + * + * @author bend + * @date 2020-09-01 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "收单列表") +@Table(name = "scrcu_online_order_details") +public class ScrcuOnlineOrderDetails extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 商户号 */ + @ApiModelProperty(notes = "商户号") + @Excel(name = "商户号") + private String merId; + + /** 父商户号 */ + @ApiModelProperty(notes = "父商户号") + @Excel(name = "父商户号") + private String parentMerId; + + /** 机构编码 */ + @ApiModelProperty(notes = "机构编码") + @Excel(name = "机构编码") + private String orgCode; + + /** 主订单号 */ + @ApiModelProperty(notes = "主订单号") + @Excel(name = "主订单号") + private String orderNumber; + + /** 子订单号 */ + @ApiModelProperty(notes = "子订单号") + @Excel(name = "子订单号") + private String subOrderNumber; + + /** 交易金额 */ + @ApiModelProperty(notes = "交易金额") + @Excel(name = "交易金额") + private String subOrderAmt; + + /** 支付金额 */ + @ApiModelProperty(notes = "支付金额") + @Excel(name = "支付金额") + private String subPayAmt; + + /** 物流码 */ + @ApiModelProperty(notes = "物流码") + private String logisCode; + + /** 机构红包 */ + @ApiModelProperty(notes = "机构红包") + private String redPacketOrgNo; + + /** 结算标记（0不自动结算 1自动结算） */ + @ApiModelProperty(notes = "结算标记（0不自动结算 1自动结算）") + @Excel(name = "结算标记", readConverterExp = "0=不自动结算,1=自动结算") + private String autoSettleFlag; + + /** 商品信息 */ + @ApiModelProperty(notes = "商品信息") + @Excel(name = "商品信息") + private String goodsInfo; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOnlineOrders.java b/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOnlineOrders.java new file mode 100644 index 000000000..e59e57d68 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOnlineOrders.java @@ -0,0 +1,157 @@ +package com.ruoyi.bend.domain; + +import java.util.List; +import java.util.Date; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 收单列表对象 scrcu_online_orders + * + * @author bend + * @date 2020-09-01 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "收单列表") +@Table(name = "scrcu_online_orders") +public class ScrcuOnlineOrders extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 用户ID */ + @ApiModelProperty(notes = "用户ID") + @Excel(name = "用户ID") + private Long memberId; + + /** 商户代码 */ + @ApiModelProperty(notes = "商户代码") + @Excel(name = "商户代码") + private String merId; + + /** 订单类型(01实物消费订单,固定值) */ + @ApiModelProperty(notes = "订单类型(01实物消费订单,固定值)") + private String orderType; + + /** 订单号 */ + @ApiModelProperty(notes = "订单号") + @Excel(name = "订单号") + private String orderNumber; + + /** 订单发送时间,格式: yyyyMMddHHmmss */ + @ApiModelProperty(notes = "订单发送时间,格式: yyyyMMddHHmmss") + @Excel(name = "订单发送时间,格式: yyyyMMddHHmmss") + private String orderSendTime; + + /** 订单总金额,单位为分 */ + @ApiModelProperty(notes = "订单总金额,单位为分") + @Excel(name = "订单总金额,单位为分") + private String orderAmt; + + /** 支付总金额,单位为分(包含物流,不包含红包) */ + @ApiModelProperty(notes = "支付总金额,单位为分(包含物流,不包含红包)") + @Excel(name = "支付总金额,单位为分(包含物流,不包含红包)") + private String payAmt; + + /** 商品名称 */ + @ApiModelProperty(notes = "商品名称") + @Excel(name = "商品名称") + private String goodsSubject; + + /** 交易币种（01人民币） */ + @ApiModelProperty(notes = "交易币种（01人民币）") + @Excel(name = "交易币种", readConverterExp = "0=1人民币") + private String orderCurrency; + + /** 接入渠道（01PC 02手机） */ + @ApiModelProperty(notes = "接入渠道（01PC 02手机）") + @Excel(name = "接入渠道", readConverterExp = "0=1PC,0=2手机") + private String channel; + + /** 接入方式（01H5商城 02APP商城 03微信公众号商城 04小程序商城 05其它(当channel为02时必填)） */ + @ApiModelProperty(notes = "接入方式（01H5商城 02APP商城 03微信公众号商城 04小程序商城 05其它(当channel为02时必填)）") + @Excel(name = "接入方式", readConverterExp = "0=1H5商城,0=2APP商城,0=3微信公众号商城,0=4小程序商城,0=5其它(当channel为02时必填)") + private String mobileWay; + + /** 手机接入类型（01安卓 02IOS系统(当mobileWay为02时必填)） */ + @ApiModelProperty(notes = "手机接入类型（01安卓 02IOS系统(当mobileWay为02时必填)）") + @Excel(name = "手机接入类型", readConverterExp = "0=1安卓,0=2IOS系统(当mobileWay为02时必填)") + private String mobileType; + + /** 前端通知地址 */ + @ApiModelProperty(notes = "前端通知地址") + private String frontEndUrl; + + /** 后台通知地址 */ + @ApiModelProperty(notes = "后台通知地址") + private String backEndUrl; + + /** 收单主订单号 */ + @ApiModelProperty(notes = "收单主订单号") + @Excel(name = "收单主订单号") + private String orderSeqId; + + /** 支付类型（00蜀信e支付 01蜀信卡快捷支付 02银联支付 03微信支付 04支付宝支付 05授信支付 10积分支付） */ + @ApiModelProperty(notes = "支付类型（00蜀信e支付 01蜀信卡快捷支付 02银联支付 03微信支付 04支付宝支付 05授信支付 10积分支付）") + @Excel(name = "支付类型", readConverterExp = "0=0蜀信e支付,0=1蜀信卡快捷支付,0=2银联支付,0=3微信支付,0=4支付宝支付,0=5授信支付,1=0积分支付") + private String payType; + + /** 交易类型（01消费 02退货 03撤销 04查询） */ + @ApiModelProperty(notes = "交易类型（01消费 02退货 03撤销 04查询）") + @Excel(name = "交易类型", readConverterExp = "0=1消费,0=2退货,0=3撤销,0=4查询") + private String transType; + + /** 交易状态（02成功） */ + @ApiModelProperty(notes = "交易状态（02成功）") + @Excel(name = "交易状态", readConverterExp = "0=2成功") + private String payStatus; + + /** 订单种类（1收单支付 2扫码支付） */ + @ApiModelProperty(notes = "订单种类（1收单支付 2扫码支付）") + @Excel(name = "订单种类", readConverterExp = "1=收单支付,2=扫码支付") + private Integer orderSpecies; + + /** 订单状态（01交易中 02交易成功 03交易失败） */ + @ApiModelProperty(notes = "订单状态（01交易中 02交易成功 03交易失败）") + @Excel(name = "订单状态", readConverterExp = "0=1交易中,0=2交易成功,0=3交易失败") + private String orderState; + + /** 支付完成时间,格式: yyyyMMddHHmmss */ + @ApiModelProperty(notes = "支付完成时间,格式: yyyyMMddHHmmss") + @Excel(name = "支付完成时间,格式: yyyyMMddHHmmss", width = 30, dateFormat = "yyyy-MM-dd") + private Date orderTranTime; + + /** 订单创建时间,格式: yyyyMMddHHmmss */ + @ApiModelProperty(notes = "订单创建时间,格式: yyyyMMddHHmmss") + @Excel(name = "订单创建时间,格式: yyyyMMddHHmmss", width = 30, dateFormat = "yyyy-MM-dd") + private Date orderCreateTime; + + /** 费用来源（0微信挂号 1微信门诊缴费 2微信住院预交 3分诊挂号 4分诊门诊缴费 5线下扫码支付 6诊间支付） */ + @ApiModelProperty(notes = "费用来源（0微信挂号 1微信门诊缴费 2微信住院预交 3分诊挂号 4分诊门诊缴费 5线下扫码支付 6诊间支付）") + @Excel(name = "费用来源", readConverterExp = "0=微信挂号,1=微信门诊缴费,2=微信住院预交,3=分诊挂号,4=分诊门诊缴费,5=线下扫码支付,6=诊间支付") + private Integer expenseType; + + /** 支付方式类别（1微信支付 2支付宝 3农信支付） */ + @ApiModelProperty(notes = "支付方式类别（1微信支付 2支付宝 3农信支付）") + @Excel(name = "支付方式类别", readConverterExp = "1=微信支付,2=支付宝,3=农信支付") + private Integer payWayType; + + /** 流水号 */ + @ApiModelProperty(notes = "流水号") + @Excel(name = "流水号") + private String payNo; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + + /** 收单详情信息 */ + @ApiModelProperty(notes = "收单详情信息") + private List scrcuOnlineOrderDetailsList; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOnlineRefundOrders.java b/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOnlineRefundOrders.java new file mode 100644 index 000000000..17ad6505f --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/domain/ScrcuOnlineRefundOrders.java @@ -0,0 +1,78 @@ +package com.ruoyi.bend.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 退款订单对象 scrcu_online_refund_orders + * + * @author bend + * @date 2020-09-01 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "退款订单") +@Table(name = "scrcu_online_refund_orders") +public class ScrcuOnlineRefundOrders extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 商户代码 */ + @ApiModelProperty(notes = "商户代码") + @Excel(name = "商户代码") + private String merId; + + /** 退货商户号 */ + @ApiModelProperty(notes = "退货商户号") + @Excel(name = "退货商户号") + private String merNo; + + /** 退款订单号 */ + @ApiModelProperty(notes = "退款订单号") + @Excel(name = "退款订单号") + private String orderNumber; + + /** 发送时间 */ + @ApiModelProperty(notes = "发送时间") + @Excel(name = "发送时间") + private String orderSendTime; + + /** 后台通知地址 */ + @ApiModelProperty(notes = "后台通知地址") + private String backEndUrl; + + /** 原支付主订单号 */ + @ApiModelProperty(notes = "原支付主订单号") + @Excel(name = "原支付主订单号") + private String oriOrderNumber; + + /** 原支付子订单号 */ + @ApiModelProperty(notes = "原支付子订单号") + @Excel(name = "原支付子订单号") + private String oriSubOrderNumber; + + /** 退款金额 */ + @ApiModelProperty(notes = "退款金额") + @Excel(name = "退款金额") + private String orderAmt; + + /** 接入渠道（01PC 02手机wap） */ + @ApiModelProperty(notes = "接入渠道（01PC 02手机wap）") + @Excel(name = "接入渠道", readConverterExp = "0=1PC,0=2手机wap") + private String channel; + + /** 订单状态（01交易中 02交易成功 03交易失败） */ + @ApiModelProperty(notes = "订单状态（01交易中 02交易成功 03交易失败）") + @Excel(name = "订单状态", readConverterExp = "0=1交易中,0=2交易成功,0=3交易失败") + private String orderState; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/PatientListMapper.java b/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/PatientListMapper.java index 38f02247a..bd1e8f000 100644 --- a/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/PatientListMapper.java +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/PatientListMapper.java @@ -8,7 +8,7 @@ import java.util.List; * 就诊人列表Mapper接口 * * @author bend - * @date 2020-08-30 + * @date 2020-09-01 */ public interface PatientListMapper extends RuoYiBaseMapper { diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOfflineOrdersMapper.java b/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOfflineOrdersMapper.java new file mode 100644 index 000000000..415c4aec9 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOfflineOrdersMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.bend.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.bend.domain.ScrcuOfflineOrders; +import java.util.List; + +/** + * 线下订单Mapper接口 + * + * @author bend + * @date 2020-09-01 + */ +public interface ScrcuOfflineOrdersMapper extends RuoYiBaseMapper +{ + /** + * 查询线下订单 + * + * @param id 线下订单ID + * @return 线下订单 + */ + public ScrcuOfflineOrders selectScrcuOfflineOrdersById(Long id); + + /** + * 查询线下订单列表 + * + * @param scrcuOfflineOrders 线下订单 + * @return 线下订单集合 + */ + public List selectScrcuOfflineOrdersList(ScrcuOfflineOrders scrcuOfflineOrders); + + /** + * 新增线下订单 + * + * @param scrcuOfflineOrders 线下订单 + * @return 结果 + */ + public int insertScrcuOfflineOrders(ScrcuOfflineOrders scrcuOfflineOrders); + + /** + * 修改线下订单 + * + * @param scrcuOfflineOrders 线下订单 + * @return 结果 + */ + public int updateScrcuOfflineOrders(ScrcuOfflineOrders scrcuOfflineOrders); + + /** + * 删除线下订单 + * + * @param id 线下订单ID + * @return 结果 + */ + public int deleteScrcuOfflineOrdersById(Long id); + + /** + * 批量删除线下订单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteScrcuOfflineOrdersByIds(String[] ids); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOfflineRefundOrdersMapper.java b/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOfflineRefundOrdersMapper.java new file mode 100644 index 000000000..925226626 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOfflineRefundOrdersMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.bend.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.bend.domain.ScrcuOfflineRefundOrders; +import java.util.List; + +/** + * 扫码退款Mapper接口 + * + * @author bend + * @date 2020-09-01 + */ +public interface ScrcuOfflineRefundOrdersMapper extends RuoYiBaseMapper +{ + /** + * 查询扫码退款 + * + * @param id 扫码退款ID + * @return 扫码退款 + */ + public ScrcuOfflineRefundOrders selectScrcuOfflineRefundOrdersById(Long id); + + /** + * 查询扫码退款列表 + * + * @param scrcuOfflineRefundOrders 扫码退款 + * @return 扫码退款集合 + */ + public List selectScrcuOfflineRefundOrdersList(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders); + + /** + * 新增扫码退款 + * + * @param scrcuOfflineRefundOrders 扫码退款 + * @return 结果 + */ + public int insertScrcuOfflineRefundOrders(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders); + + /** + * 修改扫码退款 + * + * @param scrcuOfflineRefundOrders 扫码退款 + * @return 结果 + */ + public int updateScrcuOfflineRefundOrders(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders); + + /** + * 删除扫码退款 + * + * @param id 扫码退款ID + * @return 结果 + */ + public int deleteScrcuOfflineRefundOrdersById(Long id); + + /** + * 批量删除扫码退款 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteScrcuOfflineRefundOrdersByIds(String[] ids); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOnlineOrderDetailsMapper.java b/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOnlineOrderDetailsMapper.java new file mode 100644 index 000000000..a0411acea --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOnlineOrderDetailsMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.bend.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.bend.domain.ScrcuOnlineOrderDetails; +import java.util.List; + +/** + * 收单详情Mapper接口 + * + * @author bend + * @date 2020-09-01 + */ +public interface ScrcuOnlineOrderDetailsMapper extends RuoYiBaseMapper +{ + /** + * 查询收单详情 + * + * @param id 收单详情ID + * @return 收单详情 + */ + public ScrcuOnlineOrderDetails selectScrcuOnlineOrderDetailsById(Long id); + + /** + * 查询收单详情列表 + * + * @param scrcuOnlineOrderDetails 收单详情 + * @return 收单详情集合 + */ + public List selectScrcuOnlineOrderDetailsList(ScrcuOnlineOrderDetails scrcuOnlineOrderDetails); + + /** + * 新增收单详情 + * + * @param scrcuOnlineOrderDetails 收单详情 + * @return 结果 + */ + public int insertScrcuOnlineOrderDetails(ScrcuOnlineOrderDetails scrcuOnlineOrderDetails); + + /** + * 修改收单详情 + * + * @param scrcuOnlineOrderDetails 收单详情 + * @return 结果 + */ + public int updateScrcuOnlineOrderDetails(ScrcuOnlineOrderDetails scrcuOnlineOrderDetails); + + /** + * 删除收单详情 + * + * @param id 收单详情ID + * @return 结果 + */ + public int deleteScrcuOnlineOrderDetailsById(Long id); + + /** + * 批量删除收单详情 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteScrcuOnlineOrderDetailsByIds(String[] ids); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOnlineOrdersMapper.java b/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOnlineOrdersMapper.java new file mode 100644 index 000000000..30f0dd187 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOnlineOrdersMapper.java @@ -0,0 +1,88 @@ +package com.ruoyi.bend.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.bend.domain.ScrcuOnlineOrders; +import com.ruoyi.bend.domain.ScrcuOnlineOrderDetails; +import java.util.List; + +/** + * 收单列表Mapper接口 + * + * @author bend + * @date 2020-09-01 + */ +public interface ScrcuOnlineOrdersMapper extends RuoYiBaseMapper +{ + /** + * 查询收单列表 + * + * @param id 收单列表ID + * @return 收单列表 + */ + public ScrcuOnlineOrders selectScrcuOnlineOrdersById(Long id); + + /** + * 查询收单列表列表 + * + * @param scrcuOnlineOrders 收单列表 + * @return 收单列表集合 + */ + public List selectScrcuOnlineOrdersList(ScrcuOnlineOrders scrcuOnlineOrders); + + /** + * 新增收单列表 + * + * @param scrcuOnlineOrders 收单列表 + * @return 结果 + */ + public int insertScrcuOnlineOrders(ScrcuOnlineOrders scrcuOnlineOrders); + + /** + * 修改收单列表 + * + * @param scrcuOnlineOrders 收单列表 + * @return 结果 + */ + public int updateScrcuOnlineOrders(ScrcuOnlineOrders scrcuOnlineOrders); + + /** + * 删除收单列表 + * + * @param id 收单列表ID + * @return 结果 + */ + public int deleteScrcuOnlineOrdersById(Long id); + + /** + * 批量删除收单列表 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteScrcuOnlineOrdersByIds(String[] ids); + + /** + * 批量删除收单详情 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteScrcuOnlineOrderDetailsByOrderNumbers(String[] ids); + + /** + * 批量新增收单详情 + * + * @param scrcuOnlineOrderDetailsList 收单详情列表 + * @return 结果 + */ + public int batchScrcuOnlineOrderDetails(List scrcuOnlineOrderDetailsList); + + + /** + * 通过收单列表ID删除收单详情信息 + * + * @param id 收单列表ID + * @return 结果 + */ + public int deleteScrcuOnlineOrderDetailsByOrderNumber(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOnlineRefundOrdersMapper.java b/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOnlineRefundOrdersMapper.java new file mode 100644 index 000000000..d1f2528f6 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/mapper/ScrcuOnlineRefundOrdersMapper.java @@ -0,0 +1,62 @@ +package com.ruoyi.bend.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.bend.domain.ScrcuOnlineRefundOrders; +import java.util.List; + +/** + * 退款订单Mapper接口 + * + * @author bend + * @date 2020-09-01 + */ +public interface ScrcuOnlineRefundOrdersMapper extends RuoYiBaseMapper +{ + /** + * 查询退款订单 + * + * @param id 退款订单ID + * @return 退款订单 + */ + public ScrcuOnlineRefundOrders selectScrcuOnlineRefundOrdersById(Long id); + + /** + * 查询退款订单列表 + * + * @param scrcuOnlineRefundOrders 退款订单 + * @return 退款订单集合 + */ + public List selectScrcuOnlineRefundOrdersList(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders); + + /** + * 新增退款订单 + * + * @param scrcuOnlineRefundOrders 退款订单 + * @return 结果 + */ + public int insertScrcuOnlineRefundOrders(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders); + + /** + * 修改退款订单 + * + * @param scrcuOnlineRefundOrders 退款订单 + * @return 结果 + */ + public int updateScrcuOnlineRefundOrders(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders); + + /** + * 删除退款订单 + * + * @param id 退款订单ID + * @return 结果 + */ + public int deleteScrcuOnlineRefundOrdersById(Long id); + + /** + * 批量删除退款订单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteScrcuOnlineRefundOrdersByIds(String[] ids); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/service/IPatientListService.java b/ruoyi-his/src/main/java/com/ruoyi/bend/service/IPatientListService.java index f5b417bef..17df92b38 100644 --- a/ruoyi-his/src/main/java/com/ruoyi/bend/service/IPatientListService.java +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/service/IPatientListService.java @@ -7,7 +7,7 @@ import com.ruoyi.bend.domain.PatientList; * 就诊人列表Service接口 * * @author bend - * @date 2020-08-30 + * @date 2020-09-01 */ public interface IPatientListService { diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOfflineOrdersService.java b/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOfflineOrdersService.java new file mode 100644 index 000000000..652e81320 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOfflineOrdersService.java @@ -0,0 +1,61 @@ +package com.ruoyi.bend.service; + +import java.util.List; +import com.ruoyi.bend.domain.ScrcuOfflineOrders; + +/** + * 线下订单Service接口 + * + * @author bend + * @date 2020-09-01 + */ +public interface IScrcuOfflineOrdersService +{ + /** + * 查询线下订单 + * + * @param id 线下订单ID + * @return 线下订单 + */ + public ScrcuOfflineOrders selectScrcuOfflineOrdersById(Long id); + + /** + * 查询线下订单列表 + * + * @param scrcuOfflineOrders 线下订单 + * @return 线下订单集合 + */ + public List selectScrcuOfflineOrdersList(ScrcuOfflineOrders scrcuOfflineOrders); + + /** + * 新增线下订单 + * + * @param scrcuOfflineOrders 线下订单 + * @return 结果 + */ + public int insertScrcuOfflineOrders(ScrcuOfflineOrders scrcuOfflineOrders); + + /** + * 修改线下订单 + * + * @param scrcuOfflineOrders 线下订单 + * @return 结果 + */ + public int updateScrcuOfflineOrders(ScrcuOfflineOrders scrcuOfflineOrders); + + /** + * 批量删除线下订单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteScrcuOfflineOrdersByIds(String ids); + + /** + * 删除线下订单信息 + * + * @param id 线下订单ID + * @return 结果 + */ + public int deleteScrcuOfflineOrdersById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOfflineRefundOrdersService.java b/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOfflineRefundOrdersService.java new file mode 100644 index 000000000..f46019ecf --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOfflineRefundOrdersService.java @@ -0,0 +1,61 @@ +package com.ruoyi.bend.service; + +import java.util.List; +import com.ruoyi.bend.domain.ScrcuOfflineRefundOrders; + +/** + * 扫码退款Service接口 + * + * @author bend + * @date 2020-09-01 + */ +public interface IScrcuOfflineRefundOrdersService +{ + /** + * 查询扫码退款 + * + * @param id 扫码退款ID + * @return 扫码退款 + */ + public ScrcuOfflineRefundOrders selectScrcuOfflineRefundOrdersById(Long id); + + /** + * 查询扫码退款列表 + * + * @param scrcuOfflineRefundOrders 扫码退款 + * @return 扫码退款集合 + */ + public List selectScrcuOfflineRefundOrdersList(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders); + + /** + * 新增扫码退款 + * + * @param scrcuOfflineRefundOrders 扫码退款 + * @return 结果 + */ + public int insertScrcuOfflineRefundOrders(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders); + + /** + * 修改扫码退款 + * + * @param scrcuOfflineRefundOrders 扫码退款 + * @return 结果 + */ + public int updateScrcuOfflineRefundOrders(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders); + + /** + * 批量删除扫码退款 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteScrcuOfflineRefundOrdersByIds(String ids); + + /** + * 删除扫码退款信息 + * + * @param id 扫码退款ID + * @return 结果 + */ + public int deleteScrcuOfflineRefundOrdersById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOnlineOrderDetailsService.java b/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOnlineOrderDetailsService.java new file mode 100644 index 000000000..1cfec8462 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOnlineOrderDetailsService.java @@ -0,0 +1,61 @@ +package com.ruoyi.bend.service; + +import java.util.List; +import com.ruoyi.bend.domain.ScrcuOnlineOrderDetails; + +/** + * 收单详情Service接口 + * + * @author bend + * @date 2020-09-01 + */ +public interface IScrcuOnlineOrderDetailsService +{ + /** + * 查询收单详情 + * + * @param id 收单详情ID + * @return 收单详情 + */ + public ScrcuOnlineOrderDetails selectScrcuOnlineOrderDetailsById(Long id); + + /** + * 查询收单详情列表 + * + * @param scrcuOnlineOrderDetails 收单详情 + * @return 收单详情集合 + */ + public List selectScrcuOnlineOrderDetailsList(ScrcuOnlineOrderDetails scrcuOnlineOrderDetails); + + /** + * 新增收单详情 + * + * @param scrcuOnlineOrderDetails 收单详情 + * @return 结果 + */ + public int insertScrcuOnlineOrderDetails(ScrcuOnlineOrderDetails scrcuOnlineOrderDetails); + + /** + * 修改收单详情 + * + * @param scrcuOnlineOrderDetails 收单详情 + * @return 结果 + */ + public int updateScrcuOnlineOrderDetails(ScrcuOnlineOrderDetails scrcuOnlineOrderDetails); + + /** + * 批量删除收单详情 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteScrcuOnlineOrderDetailsByIds(String ids); + + /** + * 删除收单详情信息 + * + * @param id 收单详情ID + * @return 结果 + */ + public int deleteScrcuOnlineOrderDetailsById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOnlineOrdersService.java b/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOnlineOrdersService.java new file mode 100644 index 000000000..347af5646 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOnlineOrdersService.java @@ -0,0 +1,69 @@ +package com.ruoyi.bend.service; + +import java.util.List; +import com.ruoyi.bend.domain.ScrcuOnlineOrders; + +/** + * 收单列表Service接口 + * + * @author bend + * @date 2020-09-01 + */ +public interface IScrcuOnlineOrdersService +{ + /** + * 查询收单列表 + * + * @param id 收单列表ID + * @return 收单列表 + */ + public ScrcuOnlineOrders selectScrcuOnlineOrdersById(Long id); + + /** + * 查询收单列表列表 + * + * @param scrcuOnlineOrders 收单列表 + * @return 收单列表集合 + */ + public List selectScrcuOnlineOrdersList(ScrcuOnlineOrders scrcuOnlineOrders); + + /** + * 新增收单列表 + * + * @param scrcuOnlineOrders 收单列表 + * @return 结果 + */ + public int insertScrcuOnlineOrders(ScrcuOnlineOrders scrcuOnlineOrders); + + /** + * 修改收单列表 + * + * @param scrcuOnlineOrders 收单列表 + * @return 结果 + */ + public int updateScrcuOnlineOrders(ScrcuOnlineOrders scrcuOnlineOrders); + + /** + * 批量删除收单列表 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteScrcuOnlineOrdersByIds(String ids); + + /** + * 删除收单列表信息 + * + * @param id 收单列表ID + * @return 结果 + */ + public int deleteScrcuOnlineOrdersById(Long id); + + /** + * 查询在线收单 + * + * @param scrcuOnlineOrders 在线收单 + * @return 在线收单 + */ + public ScrcuOnlineOrders selectScrcuOnlineOrders(ScrcuOnlineOrders scrcuOnlineOrders); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOnlineRefundOrdersService.java b/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOnlineRefundOrdersService.java new file mode 100644 index 000000000..fa5a481e4 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/service/IScrcuOnlineRefundOrdersService.java @@ -0,0 +1,61 @@ +package com.ruoyi.bend.service; + +import java.util.List; +import com.ruoyi.bend.domain.ScrcuOnlineRefundOrders; + +/** + * 退款订单Service接口 + * + * @author bend + * @date 2020-09-01 + */ +public interface IScrcuOnlineRefundOrdersService +{ + /** + * 查询退款订单 + * + * @param id 退款订单ID + * @return 退款订单 + */ + public ScrcuOnlineRefundOrders selectScrcuOnlineRefundOrdersById(Long id); + + /** + * 查询退款订单列表 + * + * @param scrcuOnlineRefundOrders 退款订单 + * @return 退款订单集合 + */ + public List selectScrcuOnlineRefundOrdersList(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders); + + /** + * 新增退款订单 + * + * @param scrcuOnlineRefundOrders 退款订单 + * @return 结果 + */ + public int insertScrcuOnlineRefundOrders(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders); + + /** + * 修改退款订单 + * + * @param scrcuOnlineRefundOrders 退款订单 + * @return 结果 + */ + public int updateScrcuOnlineRefundOrders(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders); + + /** + * 批量删除退款订单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteScrcuOnlineRefundOrdersByIds(String ids); + + /** + * 删除退款订单信息 + * + * @param id 退款订单ID + * @return 结果 + */ + public int deleteScrcuOnlineRefundOrdersById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/PatientListServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/PatientListServiceImpl.java index d7bf9d012..47dd214b4 100644 --- a/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/PatientListServiceImpl.java +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/PatientListServiceImpl.java @@ -13,7 +13,7 @@ import com.ruoyi.common.core.text.Convert; * 就诊人列表Service业务层处理 * * @author bend - * @date 2020-08-30 + * @date 2020-09-01 */ @Service public class PatientListServiceImpl implements IPatientListService diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOfflineOrdersServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOfflineOrdersServiceImpl.java new file mode 100644 index 000000000..a4e950407 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOfflineOrdersServiceImpl.java @@ -0,0 +1,97 @@ +package com.ruoyi.bend.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.bend.mapper.ScrcuOfflineOrdersMapper; +import com.ruoyi.bend.domain.ScrcuOfflineOrders; +import com.ruoyi.bend.service.IScrcuOfflineOrdersService; +import com.ruoyi.common.core.text.Convert; + +/** + * 线下订单Service业务层处理 + * + * @author bend + * @date 2020-09-01 + */ +@Service +public class ScrcuOfflineOrdersServiceImpl implements IScrcuOfflineOrdersService +{ + @Autowired + private ScrcuOfflineOrdersMapper scrcuOfflineOrdersMapper; + + /** + * 查询线下订单 + * + * @param id 线下订单ID + * @return 线下订单 + */ + @Override + public ScrcuOfflineOrders selectScrcuOfflineOrdersById(Long id) + { + return scrcuOfflineOrdersMapper.selectScrcuOfflineOrdersById(id); + } + + /** + * 查询线下订单列表 + * + * @param scrcuOfflineOrders 线下订单 + * @return 线下订单 + */ + @Override + public List selectScrcuOfflineOrdersList(ScrcuOfflineOrders scrcuOfflineOrders) + { + return scrcuOfflineOrdersMapper.selectScrcuOfflineOrdersList(scrcuOfflineOrders); + } + + /** + * 新增线下订单 + * + * @param scrcuOfflineOrders 线下订单 + * @return 结果 + */ + @Override + public int insertScrcuOfflineOrders(ScrcuOfflineOrders scrcuOfflineOrders) + { + scrcuOfflineOrders.setCreateTime(DateUtils.getNowDate()); + return scrcuOfflineOrdersMapper.insertScrcuOfflineOrders(scrcuOfflineOrders); + } + + /** + * 修改线下订单 + * + * @param scrcuOfflineOrders 线下订单 + * @return 结果 + */ + @Override + public int updateScrcuOfflineOrders(ScrcuOfflineOrders scrcuOfflineOrders) + { + scrcuOfflineOrders.setUpdateTime(DateUtils.getNowDate()); + return scrcuOfflineOrdersMapper.updateScrcuOfflineOrders(scrcuOfflineOrders); + } + + /** + * 删除线下订单对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteScrcuOfflineOrdersByIds(String ids) + { + return scrcuOfflineOrdersMapper.deleteScrcuOfflineOrdersByIds(Convert.toStrArray(ids)); + } + + /** + * 删除线下订单信息 + * + * @param id 线下订单ID + * @return 结果 + */ + @Override + public int deleteScrcuOfflineOrdersById(Long id) + { + return scrcuOfflineOrdersMapper.deleteScrcuOfflineOrdersById(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOfflineRefundOrdersServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOfflineRefundOrdersServiceImpl.java new file mode 100644 index 000000000..61e30e226 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOfflineRefundOrdersServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.bend.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.bend.mapper.ScrcuOfflineRefundOrdersMapper; +import com.ruoyi.bend.domain.ScrcuOfflineRefundOrders; +import com.ruoyi.bend.service.IScrcuOfflineRefundOrdersService; +import com.ruoyi.common.core.text.Convert; + +/** + * 扫码退款Service业务层处理 + * + * @author bend + * @date 2020-09-01 + */ +@Service +public class ScrcuOfflineRefundOrdersServiceImpl implements IScrcuOfflineRefundOrdersService +{ + @Autowired + private ScrcuOfflineRefundOrdersMapper scrcuOfflineRefundOrdersMapper; + + /** + * 查询扫码退款 + * + * @param id 扫码退款ID + * @return 扫码退款 + */ + @Override + public ScrcuOfflineRefundOrders selectScrcuOfflineRefundOrdersById(Long id) + { + return scrcuOfflineRefundOrdersMapper.selectScrcuOfflineRefundOrdersById(id); + } + + /** + * 查询扫码退款列表 + * + * @param scrcuOfflineRefundOrders 扫码退款 + * @return 扫码退款 + */ + @Override + public List selectScrcuOfflineRefundOrdersList(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders) + { + return scrcuOfflineRefundOrdersMapper.selectScrcuOfflineRefundOrdersList(scrcuOfflineRefundOrders); + } + + /** + * 新增扫码退款 + * + * @param scrcuOfflineRefundOrders 扫码退款 + * @return 结果 + */ + @Override + public int insertScrcuOfflineRefundOrders(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders) + { + scrcuOfflineRefundOrders.setCreateTime(DateUtils.getNowDate()); + return scrcuOfflineRefundOrdersMapper.insertScrcuOfflineRefundOrders(scrcuOfflineRefundOrders); + } + + /** + * 修改扫码退款 + * + * @param scrcuOfflineRefundOrders 扫码退款 + * @return 结果 + */ + @Override + public int updateScrcuOfflineRefundOrders(ScrcuOfflineRefundOrders scrcuOfflineRefundOrders) + { + return scrcuOfflineRefundOrdersMapper.updateScrcuOfflineRefundOrders(scrcuOfflineRefundOrders); + } + + /** + * 删除扫码退款对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteScrcuOfflineRefundOrdersByIds(String ids) + { + return scrcuOfflineRefundOrdersMapper.deleteScrcuOfflineRefundOrdersByIds(Convert.toStrArray(ids)); + } + + /** + * 删除扫码退款信息 + * + * @param id 扫码退款ID + * @return 结果 + */ + @Override + public int deleteScrcuOfflineRefundOrdersById(Long id) + { + return scrcuOfflineRefundOrdersMapper.deleteScrcuOfflineRefundOrdersById(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOnlineOrderDetailsServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOnlineOrderDetailsServiceImpl.java new file mode 100644 index 000000000..d921fd582 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOnlineOrderDetailsServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.bend.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.bend.mapper.ScrcuOnlineOrderDetailsMapper; +import com.ruoyi.bend.domain.ScrcuOnlineOrderDetails; +import com.ruoyi.bend.service.IScrcuOnlineOrderDetailsService; +import com.ruoyi.common.core.text.Convert; + +/** + * 收单详情Service业务层处理 + * + * @author bend + * @date 2020-09-01 + */ +@Service +public class ScrcuOnlineOrderDetailsServiceImpl implements IScrcuOnlineOrderDetailsService +{ + @Autowired + private ScrcuOnlineOrderDetailsMapper scrcuOnlineOrderDetailsMapper; + + /** + * 查询收单详情 + * + * @param id 收单详情ID + * @return 收单详情 + */ + @Override + public ScrcuOnlineOrderDetails selectScrcuOnlineOrderDetailsById(Long id) + { + return scrcuOnlineOrderDetailsMapper.selectScrcuOnlineOrderDetailsById(id); + } + + /** + * 查询收单详情列表 + * + * @param scrcuOnlineOrderDetails 收单详情 + * @return 收单详情 + */ + @Override + public List selectScrcuOnlineOrderDetailsList(ScrcuOnlineOrderDetails scrcuOnlineOrderDetails) + { + return scrcuOnlineOrderDetailsMapper.selectScrcuOnlineOrderDetailsList(scrcuOnlineOrderDetails); + } + + /** + * 新增收单详情 + * + * @param scrcuOnlineOrderDetails 收单详情 + * @return 结果 + */ + @Override + public int insertScrcuOnlineOrderDetails(ScrcuOnlineOrderDetails scrcuOnlineOrderDetails) + { + scrcuOnlineOrderDetails.setCreateTime(DateUtils.getNowDate()); + return scrcuOnlineOrderDetailsMapper.insertScrcuOnlineOrderDetails(scrcuOnlineOrderDetails); + } + + /** + * 修改收单详情 + * + * @param scrcuOnlineOrderDetails 收单详情 + * @return 结果 + */ + @Override + public int updateScrcuOnlineOrderDetails(ScrcuOnlineOrderDetails scrcuOnlineOrderDetails) + { + return scrcuOnlineOrderDetailsMapper.updateScrcuOnlineOrderDetails(scrcuOnlineOrderDetails); + } + + /** + * 删除收单详情对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteScrcuOnlineOrderDetailsByIds(String ids) + { + return scrcuOnlineOrderDetailsMapper.deleteScrcuOnlineOrderDetailsByIds(Convert.toStrArray(ids)); + } + + /** + * 删除收单详情信息 + * + * @param id 收单详情ID + * @return 结果 + */ + @Override + public int deleteScrcuOnlineOrderDetailsById(Long id) + { + return scrcuOnlineOrderDetailsMapper.deleteScrcuOnlineOrderDetailsById(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOnlineOrdersServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOnlineOrdersServiceImpl.java new file mode 100644 index 000000000..524d3b277 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOnlineOrdersServiceImpl.java @@ -0,0 +1,146 @@ +package com.ruoyi.bend.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import com.ruoyi.common.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import com.ruoyi.bend.domain.ScrcuOnlineOrderDetails; +import com.ruoyi.bend.mapper.ScrcuOnlineOrdersMapper; +import com.ruoyi.bend.domain.ScrcuOnlineOrders; +import com.ruoyi.bend.service.IScrcuOnlineOrdersService; +import com.ruoyi.common.core.text.Convert; + +/** + * 收单列表Service业务层处理 + * + * @author bend + * @date 2020-09-01 + */ +@Service +public class ScrcuOnlineOrdersServiceImpl implements IScrcuOnlineOrdersService +{ + @Autowired + private ScrcuOnlineOrdersMapper scrcuOnlineOrdersMapper; + + /** + * 查询收单列表 + * + * @param id 收单列表ID + * @return 收单列表 + */ + @Override + public ScrcuOnlineOrders selectScrcuOnlineOrdersById(Long id) + { + return scrcuOnlineOrdersMapper.selectScrcuOnlineOrdersById(id); + } + + /** + * 查询收单列表列表 + * + * @param scrcuOnlineOrders 收单列表 + * @return 收单列表 + */ + @Override + public List selectScrcuOnlineOrdersList(ScrcuOnlineOrders scrcuOnlineOrders) + { + return scrcuOnlineOrdersMapper.selectScrcuOnlineOrdersList(scrcuOnlineOrders); + } + + /** + * 新增收单列表 + * + * @param scrcuOnlineOrders 收单列表 + * @return 结果 + */ + @Transactional + @Override + public int insertScrcuOnlineOrders(ScrcuOnlineOrders scrcuOnlineOrders) + { + scrcuOnlineOrders.setCreateTime(DateUtils.getNowDate()); + int rows = scrcuOnlineOrdersMapper.insertScrcuOnlineOrders(scrcuOnlineOrders); + insertScrcuOnlineOrderDetails(scrcuOnlineOrders); + return rows; + } + + /** + * 修改收单列表 + * + * @param scrcuOnlineOrders 收单列表 + * @return 结果 + */ + @Transactional + @Override + public int updateScrcuOnlineOrders(ScrcuOnlineOrders scrcuOnlineOrders) + { + scrcuOnlineOrders.setUpdateTime(DateUtils.getNowDate()); + scrcuOnlineOrdersMapper.deleteScrcuOnlineOrderDetailsByOrderNumber(scrcuOnlineOrders.getId()); + insertScrcuOnlineOrderDetails(scrcuOnlineOrders); + return scrcuOnlineOrdersMapper.updateScrcuOnlineOrders(scrcuOnlineOrders); + } + + /** + * 删除收单列表对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Transactional + @Override + public int deleteScrcuOnlineOrdersByIds(String ids) + { + scrcuOnlineOrdersMapper.deleteScrcuOnlineOrderDetailsByOrderNumbers(Convert.toStrArray(ids)); + return scrcuOnlineOrdersMapper.deleteScrcuOnlineOrdersByIds(Convert.toStrArray(ids)); + } + + /** + * 删除收单列表信息 + * + * @param id 收单列表ID + * @return 结果 + */ + @Override + public int deleteScrcuOnlineOrdersById(Long id) + { + scrcuOnlineOrdersMapper.deleteScrcuOnlineOrderDetailsByOrderNumber(id); + return scrcuOnlineOrdersMapper.deleteScrcuOnlineOrdersById(id); + } + + /** + * 新增收单详情信息 + * + * @param scrcuOnlineOrders 收单列表对象 + */ + public void insertScrcuOnlineOrderDetails(ScrcuOnlineOrders scrcuOnlineOrders) + { + List scrcuOnlineOrderDetailsList = scrcuOnlineOrders.getScrcuOnlineOrderDetailsList(); + Long id = scrcuOnlineOrders.getId(); + if (StringUtils.isNotNull(scrcuOnlineOrderDetailsList)) + { + List list = new ArrayList(); + for (ScrcuOnlineOrderDetails scrcuOnlineOrderDetails : scrcuOnlineOrderDetailsList) + { + scrcuOnlineOrderDetails.setId(id); + list.add(scrcuOnlineOrderDetails); + } + if (list.size() > 0) + { + scrcuOnlineOrdersMapper.batchScrcuOnlineOrderDetails(list); + } + } + } + + /** + * 查询在线收单 + * + * @param scrcuOnlineOrders 在线收单ID + * @return 在线收单 + */ + @Override + public ScrcuOnlineOrders selectScrcuOnlineOrders(ScrcuOnlineOrders scrcuOnlineOrders) + { + return scrcuOnlineOrdersMapper.selectOne(scrcuOnlineOrders); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOnlineRefundOrdersServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOnlineRefundOrdersServiceImpl.java new file mode 100644 index 000000000..4b7b03b5a --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/bend/service/impl/ScrcuOnlineRefundOrdersServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.bend.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.bend.mapper.ScrcuOnlineRefundOrdersMapper; +import com.ruoyi.bend.domain.ScrcuOnlineRefundOrders; +import com.ruoyi.bend.service.IScrcuOnlineRefundOrdersService; +import com.ruoyi.common.core.text.Convert; + +/** + * 退款订单Service业务层处理 + * + * @author bend + * @date 2020-09-01 + */ +@Service +public class ScrcuOnlineRefundOrdersServiceImpl implements IScrcuOnlineRefundOrdersService +{ + @Autowired + private ScrcuOnlineRefundOrdersMapper scrcuOnlineRefundOrdersMapper; + + /** + * 查询退款订单 + * + * @param id 退款订单ID + * @return 退款订单 + */ + @Override + public ScrcuOnlineRefundOrders selectScrcuOnlineRefundOrdersById(Long id) + { + return scrcuOnlineRefundOrdersMapper.selectScrcuOnlineRefundOrdersById(id); + } + + /** + * 查询退款订单列表 + * + * @param scrcuOnlineRefundOrders 退款订单 + * @return 退款订单 + */ + @Override + public List selectScrcuOnlineRefundOrdersList(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders) + { + return scrcuOnlineRefundOrdersMapper.selectScrcuOnlineRefundOrdersList(scrcuOnlineRefundOrders); + } + + /** + * 新增退款订单 + * + * @param scrcuOnlineRefundOrders 退款订单 + * @return 结果 + */ + @Override + public int insertScrcuOnlineRefundOrders(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders) + { + scrcuOnlineRefundOrders.setCreateTime(DateUtils.getNowDate()); + return scrcuOnlineRefundOrdersMapper.insertScrcuOnlineRefundOrders(scrcuOnlineRefundOrders); + } + + /** + * 修改退款订单 + * + * @param scrcuOnlineRefundOrders 退款订单 + * @return 结果 + */ + @Override + public int updateScrcuOnlineRefundOrders(ScrcuOnlineRefundOrders scrcuOnlineRefundOrders) + { + return scrcuOnlineRefundOrdersMapper.updateScrcuOnlineRefundOrders(scrcuOnlineRefundOrders); + } + + /** + * 删除退款订单对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteScrcuOnlineRefundOrdersByIds(String ids) + { + return scrcuOnlineRefundOrdersMapper.deleteScrcuOnlineRefundOrdersByIds(Convert.toStrArray(ids)); + } + + /** + * 删除退款订单信息 + * + * @param id 退款订单ID + * @return 结果 + */ + @Override + public int deleteScrcuOnlineRefundOrdersById(Long id) + { + return scrcuOnlineRefundOrdersMapper.deleteScrcuOnlineRefundOrdersById(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisController.java new file mode 100644 index 000000000..86bdb5ddd --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisController.java @@ -0,0 +1,409 @@ +package com.ruoyi.his.controller; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; +import com.bending.core.his.bo.PayAccountBO; +import com.bending.core.his.common.HISResult; +import com.bending.core.his.constant.HisConstant; +import com.bending.core.his.entity.*; +import com.bending.core.his.vo.*; +import com.bending.core.utils.HISClientUtil; +import com.ruoyi.common.func.IConstant; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.func.Func; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.bean.BeanUtils; +import com.ruoyi.his.domain.*; +import com.ruoyi.his.service.*; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Function; +import java.util.function.Predicate; +import java.util.stream.Collectors; + +import static java.util.stream.Collectors.toList; + +@RestController +@RequestMapping("his/v1/sync") +@Api(value = "HIS同步数据接口", tags = "HIS同步数据接口") +public class HisController { + @Resource + private HISClientUtil hisClientUtil; + @Resource + private IHisHospitalInfoService iHisHospitalInfoService; + @Resource + private IHisDepartmentService iHisDepartmentService; + @Resource + private IHisDoctorDepartmentService iHisDoctorDepartmentService; + @Resource + private IHisDoctorService iHisDoctorService; + @Resource + private IHisRegistrationTemplateService iHisRegistrationTemplateService; + @Resource + private IHisPayAccountService iHisPayAccountService; + @Resource + private IHisFeeItemService hisFeeItemService; + @Resource + private IHisDoctorScheduleService iHisDoctorScheduleService; + + @ApiOperation("获取挂号模板") + @GetMapping("/template/list") + public AjaxResult templateList(String orgCode) { + HisHospitalInfo hisHospitalInfo = iHisHospitalInfoService.selectHisHospitalInfoByOrgCode(orgCode); + if (null == hisHospitalInfo) { + return AjaxResult.error("指定机构不存在！"); + } + RegistrationTemplate registrationTemplate = new RegistrationTemplate(); + registrationTemplate.setOrgCode(orgCode); + registrationTemplate.setTemplateId(""); + HISResult hisResult = hisClientUtil.getRegistrationTemplateList(registrationTemplate); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + //保存数据到本地数据库 + for (RegistrationTemplateVO vo : list) { + //每次更新时,查询是否已经存在 + String s = vo.getTemplateName().replaceAll("\\s*", ""); + vo.setTemplateName(Func.cleanChars(s)); + HisRegistrationTemplate hisRegistrationTemplate = Func.copy(vo, HisRegistrationTemplate.class); + hisRegistrationTemplate.setIsShow(0); + hisRegistrationTemplate.setFee(vo.getRegistrationAmount()); + hisRegistrationTemplate.setOrgCode(orgCode); + hisRegistrationTemplate.setOrgName(hisHospitalInfo.getOrgName()); + iHisRegistrationTemplateService.insertHisRegistrationTemplate(hisRegistrationTemplate); + } + return AjaxResult.success(list); + } + return AjaxResult.error(hisResult.getMsg()); + } + + @ApiOperation("获取机构列表") + @GetMapping("/hospital/list") + public AjaxResult hospitalList(String orgName) { + HospitalInfo hospitalInfo = new HospitalInfo(); + hospitalInfo.setOrgName(orgName); + HISResult hisResult = hisClientUtil.getHospitalInfoByList(hospitalInfo); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + if (CollectionUtils.isNotEmpty(list)) { + for (HospitalInfoVO hospitalInfoVO : list) { + HisHospitalInfo hisHospitalInfo = iHisHospitalInfoService.selectHisHospitalInfoByOrgCode(hospitalInfoVO.getOrgCode()); + if (null == hisHospitalInfo) { + hisHospitalInfo = new HisHospitalInfo(); + BeanUtils.copyProperties(hospitalInfoVO, hisHospitalInfo); + iHisHospitalInfoService.insertHisHospitalInfo(hisHospitalInfo); + } else { + iHisHospitalInfoService.updateHisHospitalInfo(hisHospitalInfo); + } + } + } + return AjaxResult.success(list); + } + return AjaxResult.error(hisResult.getMsg()); + } + + @ApiOperation("获取科室列表") + @GetMapping("/dept/list") + public AjaxResult deptList(String orgCode) { + //查询本地数据库 + HisHospitalInfo hisHospitalInfo = iHisHospitalInfoService.selectHisHospitalInfoByOrgCode(orgCode); + if (null == hisHospitalInfo) { + return AjaxResult.error("指定机构不存在！"); + } + //HIS医院综合目录 + ComprehensiveCatalogue comprehensiveCatalogue = new ComprehensiveCatalogue(); + comprehensiveCatalogue.setDirectoryType(HisConstant.CATALOG_TYPE_1); + comprehensiveCatalogue.setOrgCode(orgCode); + HISResult hisResult = hisClientUtil.getComprehensiveCatalogueList(comprehensiveCatalogue); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + for (ComprehensiveCatalogueVO vo : list) { + String deptId = vo.getDirectoryCode(); + HisDepartment hisDepartment = new HisDepartment(); + hisDepartment.setDeptId(deptId); + hisDepartment.setDeptName(vo.getDirectoryName()); + hisDepartment.setOrgCode(orgCode); + hisDepartment.setOrgName(hisHospitalInfo.getOrgName()); + hisDepartment.setIsShow(0); + hisDepartment.setCreateTime(DateUtils.getNowDate()); + int res = iHisDepartmentService.insertHisDepartment(hisDepartment); + //每次更新时,查询是否已经存在 + } + return AjaxResult.success(list); + } + return AjaxResult.error(hisResult.getMsg()); + } + + @ApiOperation("获取医生列表") + @GetMapping("/doctor/list") + public AjaxResult doctorList(String orgCode) { + //查询本地数据库 + HisHospitalInfo hisHospitalInfo = iHisHospitalInfoService.selectHisHospitalInfoByOrgCode(orgCode); + if (null == hisHospitalInfo) { + return AjaxResult.error("指定机构不存在！"); + } + //HIS医院综合目录 + ComprehensiveCatalogue comprehensiveCatalogue = new ComprehensiveCatalogue(); + comprehensiveCatalogue.setDirectoryType(HisConstant.CATALOG_TYPE_2); + comprehensiveCatalogue.setOrgCode(orgCode); + HISResult hisResult = hisClientUtil.getComprehensiveCatalogueList(comprehensiveCatalogue); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + + //医生分组,但是数据没有去重。 + Map> map = list.stream().collect(Collectors.groupingBy(ComprehensiveCatalogueVO::getDirectoryCode)); + // 医生与科室对应关系 + // Map --> Map> + Map> doctorMapR = new HashMap<>(); + map.forEach((doctorId, voList) -> { + //拿到科室ID,就是科室去重 + List tempList = voList.stream().filter(distinctByKey(ComprehensiveCatalogueVO::getRemark)).collect(Collectors.toList()); + List deptIds = tempList.stream().map(ComprehensiveCatalogueVO::getRemark).collect(Collectors.toList()); + doctorMapR.put(doctorId, deptIds); + }); + //保存医生与科室的对应关系 + doctorMapR.forEach((doctorId, deptIds) -> { + deptIds.forEach(deptId -> { + //每次更新时,查询是否已经存在对应关系 + HisDoctorDepartment doctorDepartment = new HisDoctorDepartment(); + //一个医生理论上对应一个科室，实际上是对应多个科室的. + doctorDepartment.setDeptId(deptId); + HisDepartment hisDepartment = iHisDepartmentService.selectHisDepartmentByDeptId(deptId); + doctorDepartment.setDeptName(null != hisDepartment ? hisDepartment.getDeptName() : ""); + doctorDepartment.setDoctorId(doctorId); + doctorDepartment.setOrgCode(orgCode); + doctorDepartment.setIsShow(0); + iHisDoctorDepartmentService.insertHisDoctorDepartment(doctorDepartment); + }); + }); + + //根据医生ID去重 + List voList = list.stream().filter(distinctByKey(ComprehensiveCatalogueVO::getDirectoryCode)).collect(Collectors.toList()); + for (ComprehensiveCatalogueVO v : voList) { + HisDoctor hisDoctor = new HisDoctor(); + hisDoctor.setDoctorId(v.getDirectoryCode()); + hisDoctor.setDoctorName(v.getDirectoryName()); + //备注[目录类型1： 返回医生所在科室的编码;目录类型3： 返回床位所在的病区编码.] + hisDoctor.setDeptId(v.getRemark()); //随机设置一个默认科室 + HisDepartment hisDepartment = iHisDepartmentService.selectHisDepartmentByDeptId(v.getRemark()); + hisDoctor.setDeptName(null != hisDepartment ? hisDepartment.getDeptName() : ""); + hisDoctor.setOrgCode(orgCode); + hisDoctor.setOrgName(hisHospitalInfo.getOrgName()); + hisDoctor.setIsShow(0); + iHisDoctorService.insertHisDoctor(hisDoctor); + } + //每次更新时,查询是否已经存在 + return AjaxResult.success(list); + } + return AjaxResult.error(hisResult.getMsg()); + } + + private static Predicate distinctByKey(Function keyExtractor) { + Map seen = new ConcurrentHashMap<>(); + return t -> seen.putIfAbsent(keyExtractor.apply(t), Boolean.TRUE) == null; + } + + + @GetMapping("/payment/list") + @ApiOperation(value = "HIS同步数据接口:机构支付方式列表", notes = "传入查询参数") + public AjaxResult queryHospitalPayment(@ApiParam(name = "orgCode", value = "机构ID", required = true) @RequestParam String orgCode) { + HisHospitalInfo hisHospitalInfo = iHisHospitalInfoService.selectHisHospitalInfoByOrgCode(orgCode); + if (null == hisHospitalInfo) { + return AjaxResult.error("指定机构不存在！"); + } + HospitalPayment hospitalPayment = new HospitalPayment(); + hospitalPayment.setOrgCode(orgCode); + HISResult hisResult = hisClientUtil.getHospitalPaymentList(hospitalPayment); + + List hisPayAccountList = new ArrayList<>(); + + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + //保存数据到本地数据库 + for (HospitalPaymentVO vo : list) { + List payAccountBOList = vo.getOrgAcc(); + payAccountBOList.forEach(bo -> { + HisPayAccount payAccount = new HisPayAccount(); + Func.copy(bo, payAccount); + payAccount.setAccId(bo.getId()); + hisPayAccountList.add(payAccount); + }); + } + if (Func.isNotEmpty(hisPayAccountList)) { + iHisPayAccountService.insertHisPayAccountBatch(hisPayAccountList); + } + return AjaxResult.success(hisPayAccountList); + } + return AjaxResult.error(hisResult.getMsg()); + } + + + @GetMapping("/fee/item/list") + @ApiOperation(value = "HIS同步数据接口:挂号费用类型") + public AjaxResult queryHisFeeItem() { + List hisFeeItemList = new ArrayList<>(); + RegistrationFeeType registrationFeeType = new RegistrationFeeType(); + HISResult hisResult = hisClientUtil.getFeeItemList(registrationFeeType); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + if (Func.isNotEmpty(list)) { + for (RegistrationFeeTypeVO vo : list) { + HisFeeItem hisFeeItem = new HisFeeItem(); + Func.copy(vo, hisFeeItem); + hisFeeItem.setIsShow(IConstant.ZERO.getValue()); + hisFeeItem.setCreateTime(DateUtils.getNowDate()); + hisFeeItemList.add(hisFeeItem); + } + } + if (Func.isNotEmpty(hisFeeItemList)) { + hisFeeItemService.insertHisFeeItemBatch(hisFeeItemList); + } + return AjaxResult.success(hisFeeItemList); + } else { + return AjaxResult.error(hisResult.getMsg()); + } + } + + /** + * /his/v1/sync/doctor/schedule + * 同步医生排班信息 + * + * @param orgCode 机构ID + * @return + */ + @GetMapping("/doctor/schedule") + @ApiOperation(value = "HIS同步数据接口:医生排班信息", notes = "传入查询参数") + public AjaxResult queryDoctorSchedule(@ApiParam(name = "orgCode", value = "机构ID") @RequestParam(required = false) String orgCode) { + Date nowDate = DateUtils.getNowDate(); + Date beginTime = Func.minusDays(nowDate, 1);//-days天 + Date endTime = Func.plusDays(nowDate, 1);//+days天 + if (Func.isNotEmpty(orgCode)) { + HisHospitalInfo hospitalInfo = iHisHospitalInfoService.selectHisHospitalInfoByOrgCode(orgCode); //机构信息 + if (null == hospitalInfo) return AjaxResult.error("指定机构不存在！"); + syncDoctorSchedule(hospitalInfo, beginTime, endTime); + } else { + HisHospitalInfo hospitalInfoQuery = new HisHospitalInfo(); + hospitalInfoQuery.setIsShow(IConstant.ONE.getValue()); + List hospitalInfoList = iHisHospitalInfoService.selectHisHospitalInfoList(hospitalInfoQuery); + if (Func.isNotEmpty(hospitalInfoList)) { + hospitalInfoList.forEach(hospitalInfo -> { + syncDoctorSchedule(hospitalInfo, beginTime, endTime); + }); + } + } + return AjaxResult.success("医生排班同步完成!"); + } + + private void syncDoctorSchedule(HisHospitalInfo hospitalInfo, Date beginTime, Date endTime) { + if (null == hospitalInfo) return; + String orgName = Func.isNotEmpty(hospitalInfo) ? hospitalInfo.getOrgName() : ""; + String orgCode = hospitalInfo.getOrgCode(); + //班次判断是否存在 + HisDoctorSchedule doctorScheduleQuery = new HisDoctorSchedule(); + doctorScheduleQuery.setOrgCode(orgCode); + Map paramsQuery = new HashMap<>(); + //删除过期排班老数据 + Date beginScheduleDate = Func.minusDays(beginTime, 7); //当前日期过去的days + Date endScheduleDate = Func.minusDays(beginTime, 1); //昨天 + paramsQuery.put("beginScheduleDate", Func.formatDate(beginScheduleDate, DateUtils.YYYY_MM_DD)); + paramsQuery.put("endScheduleDate", Func.formatDate(endScheduleDate, DateUtils.YYYY_MM_DD)); + doctorScheduleQuery.setParams(paramsQuery); + List oldScheduleList = iHisDoctorScheduleService.selectHisDoctorScheduleList(doctorScheduleQuery); + if (Func.isNotEmpty(oldScheduleList)) { + List idsList = oldScheduleList.stream().map(HisDoctorSchedule::getId).collect(toList()); + String ids = Func.join(idsList, ","); + iHisDoctorScheduleService.deleteHisDoctorScheduleByIds(ids); + } + //医生列表(正常在线) + HisDoctor hisDoctor = new HisDoctor(); + hisDoctor.setOrgCode(orgCode); + hisDoctor.setIsShow(IConstant.ONE.getValue()); + List doctorList = iHisDoctorService.selectHisDoctorList(hisDoctor); + if (Func.isNotEmpty(doctorList)) { + // 新数据 + List newDoctorScheduleList = new ArrayList<>(); + List oldDoctorScheduleList = new ArrayList<>(); + + doctorList.forEach(doctor -> { + DoctorSchedule doctorSchedule = new DoctorSchedule(); + doctorSchedule.setOrgCode(orgCode); + doctorSchedule.setDoctorId(doctor.getDoctorId()); + //查询日期限制在7天内，yyyy-MM-dd + doctorSchedule.setBeginTime(Func.formatDate(beginTime)); + doctorSchedule.setEndTime(Func.formatDate(endTime)); + HISResult hisResult = hisClientUtil.getDoctorScheduleList(doctorSchedule); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + if (Func.isNotEmpty(list)) { + for (DoctorScheduleVO vo : list) { + String shift = Func.trimWhitespace(vo.getScheduleShift()); + Date scheduleDate = Func.parse(vo.getScheduleDate(), "yyyy-MM-dd"); + //班次判断是否存在 --老数据 + HisDoctorSchedule hisDoctorScheduleQuery = new HisDoctorSchedule(); + hisDoctorScheduleQuery.setOrgCode(orgCode); + hisDoctorScheduleQuery.setDoctorId(vo.getDoctorId()); + hisDoctorScheduleQuery.setScheduleDate(scheduleDate); + hisDoctorScheduleQuery.setScheduleShift(shift); + HisDoctorSchedule hisDoctorSchedule = iHisDoctorScheduleService.selectHisDoctorSchedule(hisDoctorScheduleQuery); + if (null == hisDoctorSchedule) { + hisDoctorSchedule = new HisDoctorSchedule(); + hisDoctorSchedule.setScheduleDate(scheduleDate); + hisDoctorSchedule.setOrgCode(orgCode); + hisDoctorSchedule.setOrgName(orgName); + hisDoctorSchedule.setCreateTime(DateUtils.getNowDate()); + hisDoctorSchedule.setIsShow(IConstant.ONE.getValue()); + Func.copy(vo, hisDoctorSchedule); + if (HisConstant.MORNING.equals(shift)) { + hisDoctorSchedule.setScheduleTag(IConstant.ONE.getValue()); + } + if (HisConstant.AFTERNOON.equals(shift)) { + hisDoctorSchedule.setScheduleTag(IConstant.TWO.getValue()); + } + newDoctorScheduleList.add(hisDoctorSchedule); + } else { + Func.copy(vo, hisDoctorSchedule); + if (HisConstant.MORNING.equals(shift)) { + hisDoctorSchedule.setScheduleTag(IConstant.ONE.getValue()); + } + if (HisConstant.AFTERNOON.equals(shift)) { + hisDoctorSchedule.setScheduleTag(IConstant.TWO.getValue()); + } + oldDoctorScheduleList.add(hisDoctorSchedule); + } + } + } + } + }); + + if (Func.isNotEmpty(newDoctorScheduleList)) { + iHisDoctorScheduleService.insertHisDoctorScheduleBatch(newDoctorScheduleList); + } + if (Func.isNotEmpty(oldDoctorScheduleList)) { + iHisDoctorScheduleService.updateHisDoctorScheduleBatch(oldDoctorScheduleList); + } + } + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDepartmentController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDepartmentController.java new file mode 100644 index 000000000..e9c863feb --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDepartmentController.java @@ -0,0 +1,138 @@ +package com.ruoyi.his.controller; + +import java.util.List; + +import com.ruoyi.his.domain.HisDoctorDepartment; +import com.ruoyi.his.service.IHisDoctorDepartmentService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisDepartment; +import com.ruoyi.his.service.IHisDepartmentService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 科室Controller + * + * @author bend + * @date 2020-07-01 + */ +@Controller +@RequestMapping("/his/department") +public class HisDepartmentController extends BaseController +{ + private String prefix = "his/department"; + + @Autowired + private IHisDepartmentService hisDepartmentService; + @Autowired + private IHisDoctorDepartmentService iHisDoctorDepartmentService; + + @RequiresPermissions("his:department:view") + @GetMapping() + public String department() + { + return prefix + "/department"; + } + + /** + * 查询科室列表 + */ + @RequiresPermissions("his:department:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisDepartment hisDepartment) + { + startPage(); + List list = hisDepartmentService.selectHisDepartmentList(hisDepartment); + return getDataTable(list); + } + + /** + * 导出科室列表 + */ + @RequiresPermissions("his:department:export") + @Log(title = "科室", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisDepartment hisDepartment) + { + List list = hisDepartmentService.selectHisDepartmentList(hisDepartment); + ExcelUtil util = new ExcelUtil(HisDepartment.class); + return util.exportExcel(list, "department"); + } + + /** + * 新增科室 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存科室 + */ + @RequiresPermissions("his:department:add") + @Log(title = "科室", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisDepartment hisDepartment) + { + return toAjax(hisDepartmentService.insertHisDepartment(hisDepartment)); + } + + /** + * 修改科室 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisDepartment hisDepartment = hisDepartmentService.selectHisDepartmentById(id); + mmap.put("hisDepartment", hisDepartment); + return prefix + "/edit"; + } + + /** + * 修改保存科室 + */ + @RequiresPermissions("his:department:edit") + @Log(title = "科室", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisDepartment hisDepartment) + { + //科室更新时 同步更新对应关系 + String deptId = hisDepartment.getDeptId(); + HisDoctorDepartment hisDoctorDepartment = new HisDoctorDepartment(); + hisDoctorDepartment.setDeptId(deptId); + hisDoctorDepartment.setIsShow(hisDepartment.getIsShow()); + iHisDoctorDepartmentService.updateHisDoctorDepartmentByDeptId(hisDoctorDepartment); + + return toAjax(hisDepartmentService.updateHisDepartment(hisDepartment)); + } + + /** + * 删除科室 + */ + @RequiresPermissions("his:department:remove") + @Log(title = "科室", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisDepartmentService.deleteHisDepartmentByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDoctorController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDoctorController.java new file mode 100644 index 000000000..9a80b847c --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDoctorController.java @@ -0,0 +1,172 @@ +package com.ruoyi.his.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.func.Func; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.his.domain.HisDepartment; +import com.ruoyi.his.domain.HisDoctor; +import com.ruoyi.his.domain.HisDoctorDepartment; +import com.ruoyi.his.domain.HisRegistrationTemplate; +import com.ruoyi.his.service.IHisDepartmentService; +import com.ruoyi.his.service.IHisDoctorDepartmentService; +import com.ruoyi.his.service.IHisDoctorService; +import com.ruoyi.his.service.IHisRegistrationTemplateService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 医生Controller + * + * @author bend + * @date 2020-07-01 + */ +@Controller +@RequestMapping("/his/doctor") +public class HisDoctorController extends BaseController +{ + private String prefix = "his/doctor"; + + @Autowired + private IHisDoctorService hisDoctorService; + @Autowired + private IHisRegistrationTemplateService iHisRegistrationTemplateService; + @Autowired + private IHisDoctorDepartmentService iHisDoctorDepartmentService; + @Autowired + private IHisDepartmentService iHisDepartmentService; + + + @RequiresPermissions("his:doctor:view") + @GetMapping() + public String doctor() + { + return prefix + "/doctor"; + } + + /** + * 查询医生列表 + */ + @RequiresPermissions("his:doctor:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisDoctor hisDoctor) + { + startPage(); + List list = hisDoctorService.selectHisDoctorList(hisDoctor); + return getDataTable(list); + } + + /** + * 导出医生列表 + */ + @RequiresPermissions("his:doctor:export") + @Log(title = "医生", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisDoctor hisDoctor) + { + List list = hisDoctorService.selectHisDoctorList(hisDoctor); + ExcelUtil util = new ExcelUtil(HisDoctor.class); + return util.exportExcel(list, "doctor"); + } + + /** + * 新增医生 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存医生 + */ + @RequiresPermissions("his:doctor:add") + @Log(title = "医生", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisDoctor hisDoctor) + { + return toAjax(hisDoctorService.insertHisDoctor(hisDoctor)); + } + + /** + * 修改医生 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisDoctor hisDoctor = hisDoctorService.selectHisDoctorById(id); + mmap.put("hisDoctor", hisDoctor); + if(Func.isNotEmpty(hisDoctor)){ + //编辑时可设置挂号模板 + HisRegistrationTemplate template = new HisRegistrationTemplate(); + template.setOrgCode(hisDoctor.getOrgCode()); + template.setIsShow(1); + List hisRegistrationTemplateList = iHisRegistrationTemplateService.selectHisRegistrationTemplateList(template); + if (Func.isNotEmpty(hisRegistrationTemplateList)){ + mmap.put("hisRegistrationTemplateList", hisRegistrationTemplateList); + } + //修改默认科室 + HisDoctorDepartment hisDoctorDepartment= new HisDoctorDepartment(); + hisDoctorDepartment.setDoctorId(hisDoctor.getDoctorId()); + List hisDoctorDepartmentList = iHisDoctorDepartmentService.selectHisDoctorDepartmentList(hisDoctorDepartment); + if (Func.isNotEmpty(hisDoctorDepartmentList)){ + mmap.put("hisDoctorDepartmentList", hisDoctorDepartmentList); + } + } + return prefix + "/edit"; + } + + /** + * 修改保存医生 + */ + @RequiresPermissions("his:doctor:edit") + @Log(title = "医生", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisDoctor hisDoctor) + { + //根据挂号模板ID获取模板名称 + String templateId = hisDoctor.getTemplateId(); + if (Func.isNotEmpty(templateId)){ + HisRegistrationTemplate template = new HisRegistrationTemplate(); + template.setTemplateId(templateId); + HisRegistrationTemplate hisRegistrationTemplate = iHisRegistrationTemplateService.selectHisRegistrationTemplate(template); + if (Func.isNotEmpty(hisRegistrationTemplate)){ + hisDoctor.setTemplateName(hisRegistrationTemplate.getTemplateName()); + } + } + //设置默认科室 + String deptId = hisDoctor.getDeptId(); + if (Func.isNotEmpty(deptId)){ + HisDepartment hisDepartment = iHisDepartmentService.selectHisDepartmentByDeptId(deptId); + if (Func.isNotEmpty(hisDepartment)){ + hisDoctor.setDeptName(hisDepartment.getDeptName()); + } + } + return toAjax(hisDoctorService.updateHisDoctor(hisDoctor)); + } + + /** + * 删除医生 + */ + @RequiresPermissions("his:doctor:remove") + @Log(title = "医生", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisDoctorService.deleteHisDoctorByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDoctorDepartmentController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDoctorDepartmentController.java new file mode 100644 index 000000000..2517129bb --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDoctorDepartmentController.java @@ -0,0 +1,126 @@ +package com.ruoyi.his.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisDoctorDepartment; +import com.ruoyi.his.service.IHisDoctorDepartmentService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 医生科室关系Controller + * + * @author bend + * @date 2020-07-01 + */ +@Controller +@RequestMapping("/his/doctorDepartment") +public class HisDoctorDepartmentController extends BaseController +{ + private String prefix = "his/doctorDepartment"; + + @Autowired + private IHisDoctorDepartmentService hisDoctorDepartmentService; + + @RequiresPermissions("his:doctorDepartment:view") + @GetMapping() + public String doctorDepartment() + { + return prefix + "/doctorDepartment"; + } + + /** + * 查询医生科室关系列表 + */ + @RequiresPermissions("his:doctorDepartment:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisDoctorDepartment hisDoctorDepartment) + { + startPage(); + List list = hisDoctorDepartmentService.selectHisDoctorDepartmentList(hisDoctorDepartment); + return getDataTable(list); + } + + /** + * 导出医生科室关系列表 + */ + @RequiresPermissions("his:doctorDepartment:export") + @Log(title = "医生科室关系", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisDoctorDepartment hisDoctorDepartment) + { + List list = hisDoctorDepartmentService.selectHisDoctorDepartmentList(hisDoctorDepartment); + ExcelUtil util = new ExcelUtil(HisDoctorDepartment.class); + return util.exportExcel(list, "doctorDepartment"); + } + + /** + * 新增医生科室关系 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存医生科室关系 + */ + @RequiresPermissions("his:doctorDepartment:add") + @Log(title = "医生科室关系", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisDoctorDepartment hisDoctorDepartment) + { + return toAjax(hisDoctorDepartmentService.insertHisDoctorDepartment(hisDoctorDepartment)); + } + + /** + * 修改医生科室关系 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisDoctorDepartment hisDoctorDepartment = hisDoctorDepartmentService.selectHisDoctorDepartmentById(id); + mmap.put("hisDoctorDepartment", hisDoctorDepartment); + return prefix + "/edit"; + } + + /** + * 修改保存医生科室关系 + */ + @RequiresPermissions("his:doctorDepartment:edit") + @Log(title = "医生科室关系", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisDoctorDepartment hisDoctorDepartment) + { + return toAjax(hisDoctorDepartmentService.updateHisDoctorDepartment(hisDoctorDepartment)); + } + + /** + * 删除医生科室关系 + */ + @RequiresPermissions("his:doctorDepartment:remove") + @Log(title = "医生科室关系", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisDoctorDepartmentService.deleteHisDoctorDepartmentByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDoctorScheduleController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDoctorScheduleController.java new file mode 100644 index 000000000..7e7e19beb --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisDoctorScheduleController.java @@ -0,0 +1,126 @@ +package com.ruoyi.his.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisDoctorSchedule; +import com.ruoyi.his.service.IHisDoctorScheduleService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 医生排班Controller + * + * @author bend + * @date 2020-07-03 + */ +@Controller +@RequestMapping("/his/doctorSchedule") +public class HisDoctorScheduleController extends BaseController +{ + private String prefix = "his/doctorSchedule"; + + @Autowired + private IHisDoctorScheduleService hisDoctorScheduleService; + + @RequiresPermissions("his:doctorSchedule:view") + @GetMapping() + public String doctorSchedule() + { + return prefix + "/doctorSchedule"; + } + + /** + * 查询医生排班列表 + */ + @RequiresPermissions("his:doctorSchedule:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisDoctorSchedule hisDoctorSchedule) + { + startPage(); + List list = hisDoctorScheduleService.selectHisDoctorScheduleList(hisDoctorSchedule); + return getDataTable(list); + } + + /** + * 导出医生排班列表 + */ + @RequiresPermissions("his:doctorSchedule:export") + @Log(title = "医生排班", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisDoctorSchedule hisDoctorSchedule) + { + List list = hisDoctorScheduleService.selectHisDoctorScheduleList(hisDoctorSchedule); + ExcelUtil util = new ExcelUtil(HisDoctorSchedule.class); + return util.exportExcel(list, "doctorSchedule"); + } + + /** + * 新增医生排班 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存医生排班 + */ + @RequiresPermissions("his:doctorSchedule:add") + @Log(title = "医生排班", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisDoctorSchedule hisDoctorSchedule) + { + return toAjax(hisDoctorScheduleService.insertHisDoctorSchedule(hisDoctorSchedule)); + } + + /** + * 修改医生排班 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisDoctorSchedule hisDoctorSchedule = hisDoctorScheduleService.selectHisDoctorScheduleById(id); + mmap.put("hisDoctorSchedule", hisDoctorSchedule); + return prefix + "/edit"; + } + + /** + * 修改保存医生排班 + */ + @RequiresPermissions("his:doctorSchedule:edit") + @Log(title = "医生排班", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisDoctorSchedule hisDoctorSchedule) + { + return toAjax(hisDoctorScheduleService.updateHisDoctorSchedule(hisDoctorSchedule)); + } + + /** + * 删除医生排班 + */ + @RequiresPermissions("his:doctorSchedule:remove") + @Log(title = "医生排班", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisDoctorScheduleService.deleteHisDoctorScheduleByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisEhealthClientController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisEhealthClientController.java new file mode 100644 index 000000000..8b085fbaa --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisEhealthClientController.java @@ -0,0 +1,126 @@ +package com.ruoyi.his.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisEhealthClient; +import com.ruoyi.his.service.IHisEhealthClientService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 健康卡Controller + * + * @author bend + * @date 2020-07-27 + */ +@Controller +@RequestMapping("/his/ehealthClient") +public class HisEhealthClientController extends BaseController +{ + private String prefix = "his/ehealthClient"; + + @Autowired + private IHisEhealthClientService hisEhealthClientService; + + @RequiresPermissions("his:ehealthClient:view") + @GetMapping() + public String ehealthClient() + { + return prefix + "/ehealthClient"; + } + + /** + * 查询健康卡列表 + */ + @RequiresPermissions("his:ehealthClient:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisEhealthClient hisEhealthClient) + { + startPage(); + List list = hisEhealthClientService.selectHisEhealthClientList(hisEhealthClient); + return getDataTable(list); + } + + /** + * 导出健康卡列表 + */ + @RequiresPermissions("his:ehealthClient:export") + @Log(title = "健康卡", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisEhealthClient hisEhealthClient) + { + List list = hisEhealthClientService.selectHisEhealthClientList(hisEhealthClient); + ExcelUtil util = new ExcelUtil(HisEhealthClient.class); + return util.exportExcel(list, "ehealthClient"); + } + + /** + * 新增健康卡 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存健康卡 + */ + @RequiresPermissions("his:ehealthClient:add") + @Log(title = "健康卡", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisEhealthClient hisEhealthClient) + { + return toAjax(hisEhealthClientService.insertHisEhealthClient(hisEhealthClient)); + } + + /** + * 修改健康卡 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisEhealthClient hisEhealthClient = hisEhealthClientService.selectHisEhealthClientById(id); + mmap.put("hisEhealthClient", hisEhealthClient); + return prefix + "/edit"; + } + + /** + * 修改保存健康卡 + */ + @RequiresPermissions("his:ehealthClient:edit") + @Log(title = "健康卡", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisEhealthClient hisEhealthClient) + { + return toAjax(hisEhealthClientService.updateHisEhealthClient(hisEhealthClient)); + } + + /** + * 删除健康卡 + */ + @RequiresPermissions("his:ehealthClient:remove") + @Log(title = "健康卡", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisEhealthClientService.deleteHisEhealthClientByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisFeeItemController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisFeeItemController.java new file mode 100644 index 000000000..02055cdc7 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisFeeItemController.java @@ -0,0 +1,140 @@ +package com.ruoyi.his.controller; + +import java.util.List; + +import com.ruoyi.his.domain.HisRegistrationTemplate; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisFeeItem; +import com.ruoyi.his.service.IHisFeeItemService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 费用类型Controller + * + * @author bend + * @date 2020-07-14 + */ +@Controller +@RequestMapping("/his/feeItem") +public class HisFeeItemController extends BaseController +{ + private String prefix = "his/feeItem"; + + @Autowired + private IHisFeeItemService hisFeeItemService; + + @RequiresPermissions("his:feeItem:view") + @GetMapping() + public String feeItem() + { + return prefix + "/feeItem"; + } + + /** + * 查询费用类型列表 + */ + @RequiresPermissions("his:feeItem:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisFeeItem hisFeeItem) + { + startPage(); + List list = hisFeeItemService.selectHisFeeItemList(hisFeeItem); + return getDataTable(list); + } + + /** + * 导出费用类型列表 + */ + @RequiresPermissions("his:feeItem:export") + @Log(title = "费用类型", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisFeeItem hisFeeItem) + { + List list = hisFeeItemService.selectHisFeeItemList(hisFeeItem); + ExcelUtil util = new ExcelUtil(HisFeeItem.class); + return util.exportExcel(list, "feeItem"); + } + + /** + * 新增费用类型 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存费用类型 + */ + @RequiresPermissions("his:feeItem:add") + @Log(title = "费用类型", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisFeeItem hisFeeItem) + { + return toAjax(hisFeeItemService.insertHisFeeItem(hisFeeItem)); + } + + /** + * 修改费用类型 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisFeeItem hisFeeItem = hisFeeItemService.selectHisFeeItemById(id); + mmap.put("hisFeeItem", hisFeeItem); + return prefix + "/edit"; + } + + /** + * 修改保存费用类型 + */ + @RequiresPermissions("his:feeItem:edit") + @Log(title = "费用类型", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisFeeItem hisFeeItem) + { + return toAjax(hisFeeItemService.updateHisFeeItem(hisFeeItem)); + } + + /** + * 删除费用类型 + */ + @RequiresPermissions("his:feeItem:remove") + @Log(title = "费用类型", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisFeeItemService.deleteHisFeeItemByIds(ids)); + } + + /** + * 状态修改 + */ + @Log(title = "费用类型管理", businessType = BusinessType.UPDATE) + @RequiresPermissions("his:feeItem:edit") + @PostMapping("/changeStatus") + @ResponseBody + public AjaxResult changeStatus(HisFeeItem hisFeeItem) + { + return toAjax(hisFeeItemService.changeStatus(hisFeeItem)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisHospitalInfoController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisHospitalInfoController.java new file mode 100644 index 000000000..79c59fbff --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisHospitalInfoController.java @@ -0,0 +1,237 @@ +package com.ruoyi.his.controller; + +import java.util.List; + +import com.ruoyi.common.config.Global; +import com.ruoyi.common.config.ServerConfig; +import com.ruoyi.common.func.Func; +import com.ruoyi.common.utils.file.FileUploadUtils; +import com.ruoyi.his.domain.HisDepartment; +import com.ruoyi.his.domain.HisDoctor; +import com.ruoyi.his.service.IHisDepartmentService; +import com.ruoyi.his.service.IHisDoctorService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisHospitalInfo; +import com.ruoyi.his.service.IHisHospitalInfoService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; +import org.springframework.web.multipart.MultipartFile; + +/** + * 医疗机构Controller + * + * @author bend + * @date 2020-06-28 + */ +@Controller +@RequestMapping("/his/hospital") +public class HisHospitalInfoController extends BaseController +{ + private String prefix = "his/hospital"; + + @Autowired + private IHisHospitalInfoService hisHospitalInfoService; + @Autowired + private IHisDoctorService hisDoctorService; + @Autowired + private IHisDepartmentService iHisDepartmentService; + + @RequiresPermissions("his:hospital:view") + @GetMapping() + public String hospital() + { + return prefix + "/hospital"; + } + + /** + * 查询医疗机构列表 + */ + @RequiresPermissions("his:hospital:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisHospitalInfo hisHospitalInfo) + { + startPage(); + List list = hisHospitalInfoService.selectHisHospitalInfoList(hisHospitalInfo); + return getDataTable(list); + } + + /** + * 导出医疗机构列表 + */ + @RequiresPermissions("his:hospital:export") + @Log(title = "医疗机构", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisHospitalInfo hisHospitalInfo) + { + List list = hisHospitalInfoService.selectHisHospitalInfoList(hisHospitalInfo); + ExcelUtil util = new ExcelUtil(HisHospitalInfo.class); + return util.exportExcel(list, "hospital"); + } + + /** + * 新增医疗机构 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存医疗机构 + */ + @RequiresPermissions("his:hospital:add") + @Log(title = "医疗机构", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisHospitalInfo hisHospitalInfo) + { + return toAjax(hisHospitalInfoService.insertHisHospitalInfo(hisHospitalInfo)); + } + + /** + * 修改医疗机构 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisHospitalInfo hisHospitalInfo = hisHospitalInfoService.selectHisHospitalInfoById(id); + mmap.put("hisHospitalInfo", hisHospitalInfo); + if (Func.isNotEmpty(hisHospitalInfo)){ + HisDoctor hisDoctor = new HisDoctor(); + hisDoctor.setOrgCode(hisHospitalInfo.getOrgCode()); + hisDoctor.setIsShow(1); + //选择优秀医生 + List hisDoctorList = hisDoctorService.selectHisDoctorList(hisDoctor); + if (Func.isNotEmpty(hisDoctorList)){ + //已经选中的优秀医生 + String excellentDoctorIds = hisHospitalInfo.getExcellentDoctorIds(); + if (Func.isNotEmpty(excellentDoctorIds)){ + String[] doctorIds = Func.toStrArray(",", excellentDoctorIds); + if (Func.isNotEmpty(doctorIds)){ + for (String doctorId : doctorIds) { + for (HisDoctor doctor : hisDoctorList) { + if (doctorId.equals(doctor.getDoctorId())) { + doctor.setFlag(true); + break; + } + } + } + } + } + //设置选中标签 + mmap.put("hisDoctorList", hisDoctorList); + } + + //选择机构虚拟操作员列表 + HisDoctor vmDoctor = new HisDoctor(); + vmDoctor.setOrgCode(hisHospitalInfo.getOrgCode()); + vmDoctor.setIsVirtualAccount(1); + List vmUserList = hisDoctorService.selectHisDoctorList(vmDoctor); + if (Func.isNotEmpty(vmUserList)){ + String vmUserId = hisHospitalInfo.getVmUserId(); + //已经选中的虚拟操作员 + if (Func.isNotEmpty(vmUserId)){ + for (HisDoctor vm : vmUserList) { + if (vmUserId.equals(vm.getDoctorId())) { + vm.setFlag(true);//设置选中标签 + break; + } + } + } + mmap.put("vmUserList", vmUserList); + } + + //选择优秀科室 + HisDepartment hisDepartment = new HisDepartment(); + hisDepartment.setOrgCode(hisHospitalInfo.getOrgCode()); + hisDepartment.setIsShow(1); + List hisDepartmentList = iHisDepartmentService.selectHisDepartmentList(hisDepartment); + if (Func.isNotEmpty(hisDepartmentList)){ + //已经选中的优秀科室 + String excellentDeptIds = hisHospitalInfo.getExcellentDeptIds(); + if (Func.isNotEmpty(excellentDeptIds)){ + String[] deptIds= Func.toStrArray(",", excellentDeptIds); + if (Func.isNotEmpty(deptIds)){ + for (String deptId : deptIds) { + for (HisDepartment department : hisDepartmentList) { + if (deptId.equals(department.getDeptId())) { + department.setFlag(true); + break; + } + } + } + } + } + //设置选中标签 + mmap.put("hisDepartmentList", hisDepartmentList); + } + } + + return prefix + "/edit"; + } + + /** + * 修改保存医疗机构 + */ + @RequiresPermissions("his:hospital:edit") + @Log(title = "医疗机构", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisHospitalInfo hisHospitalInfo) + { + return toAjax(hisHospitalInfoService.updateHisHospitalInfo(hisHospitalInfo)); + } + + /** + * 删除医疗机构 + */ + @RequiresPermissions("his:hospital:remove") + @Log(title = "医疗机构", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisHospitalInfoService.deleteHisHospitalInfoByIds(ids)); + } + + @Autowired + private ServerConfig serverConfig; + + /** + * 机构图标 + */ + @Log(title = "上传机构图标", businessType = BusinessType.UPDATE) + @PostMapping("/update/logo") + @ResponseBody + public AjaxResult updateLogo(@RequestParam("logoFile") MultipartFile file) + { + try + { + if (!file.isEmpty()) + { + String fileName = FileUploadUtils.upload(Global.getUploadPath(), file); + String url = serverConfig.getUrl() + fileName; + AjaxResult ajax = AjaxResult.success(); + ajax.put("data", fileName); + ajax.put("url", url); + return ajax; + } + return error(); + } + catch (Exception e) + { + return error(e.getMessage()); + } + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInpatientController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInpatientController.java new file mode 100644 index 000000000..79d67b7e6 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInpatientController.java @@ -0,0 +1,126 @@ +package com.ruoyi.web.controller.his; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisInpatient; +import com.ruoyi.his.service.IHisInpatientService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 住院病人Controller + * + * @author bend + * @date 2020-07-08 + */ +@Controller +@RequestMapping("/his/inpatient") +public class HisInpatientController extends BaseController +{ + private String prefix = "his/inpatient"; + + @Autowired + private IHisInpatientService hisInpatientService; + + @RequiresPermissions("his:inpatient:view") + @GetMapping() + public String inpatient() + { + return prefix + "/inpatient"; + } + + /** + * 查询住院病人列表 + */ + @RequiresPermissions("his:inpatient:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisInpatient hisInpatient) + { + startPage(); + List list = hisInpatientService.selectHisInpatientList(hisInpatient); + return getDataTable(list); + } + + /** + * 导出住院病人列表 + */ + @RequiresPermissions("his:inpatient:export") + @Log(title = "住院病人", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisInpatient hisInpatient) + { + List list = hisInpatientService.selectHisInpatientList(hisInpatient); + ExcelUtil util = new ExcelUtil(HisInpatient.class); + return util.exportExcel(list, "inpatient"); + } + + /** + * 新增住院病人 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存住院病人 + */ + @RequiresPermissions("his:inpatient:add") + @Log(title = "住院病人", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisInpatient hisInpatient) + { + return toAjax(hisInpatientService.insertHisInpatient(hisInpatient)); + } + + /** + * 修改住院病人 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisInpatient hisInpatient = hisInpatientService.selectHisInpatientById(id); + mmap.put("hisInpatient", hisInpatient); + return prefix + "/edit"; + } + + /** + * 修改保存住院病人 + */ + @RequiresPermissions("his:inpatient:edit") + @Log(title = "住院病人", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisInpatient hisInpatient) + { + return toAjax(hisInpatientService.updateHisInpatient(hisInpatient)); + } + + /** + * 删除住院病人 + */ + @RequiresPermissions("his:inpatient:remove") + @Log(title = "住院病人", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisInpatientService.deleteHisInpatientByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInpatientPrepaymentController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInpatientPrepaymentController.java new file mode 100644 index 000000000..b3d34d526 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInpatientPrepaymentController.java @@ -0,0 +1,126 @@ +package com.ruoyi.his.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisInpatientPrepayment; +import com.ruoyi.his.service.IHisInpatientPrepaymentService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 住院预交Controller + * + * @author bend + * @date 2020-07-14 + */ +@Controller +@RequestMapping("/his/inpatientPrepayment") +public class HisInpatientPrepaymentController extends BaseController +{ + private String prefix = "his/inpatientPrepayment"; + + @Autowired + private IHisInpatientPrepaymentService hisInpatientPrepaymentService; + + @RequiresPermissions("his:inpatientPrepayment:view") + @GetMapping() + public String inpatientPrepayment() + { + return prefix + "/inpatientPrepayment"; + } + + /** + * 查询住院预交列表 + */ + @RequiresPermissions("his:inpatientPrepayment:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisInpatientPrepayment hisInpatientPrepayment) + { + startPage(); + List list = hisInpatientPrepaymentService.selectHisInpatientPrepaymentList(hisInpatientPrepayment); + return getDataTable(list); + } + + /** + * 导出住院预交列表 + */ + @RequiresPermissions("his:inpatientPrepayment:export") + @Log(title = "住院预交", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisInpatientPrepayment hisInpatientPrepayment) + { + List list = hisInpatientPrepaymentService.selectHisInpatientPrepaymentList(hisInpatientPrepayment); + ExcelUtil util = new ExcelUtil(HisInpatientPrepayment.class); + return util.exportExcel(list, "inpatientPrepayment"); + } + + /** + * 新增住院预交 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存住院预交 + */ + @RequiresPermissions("his:inpatientPrepayment:add") + @Log(title = "住院预交", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisInpatientPrepayment hisInpatientPrepayment) + { + return toAjax(hisInpatientPrepaymentService.insertHisInpatientPrepayment(hisInpatientPrepayment)); + } + + /** + * 修改住院预交 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisInpatientPrepayment hisInpatientPrepayment = hisInpatientPrepaymentService.selectHisInpatientPrepaymentById(id); + mmap.put("hisInpatientPrepayment", hisInpatientPrepayment); + return prefix + "/edit"; + } + + /** + * 修改保存住院预交 + */ + @RequiresPermissions("his:inpatientPrepayment:edit") + @Log(title = "住院预交", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisInpatientPrepayment hisInpatientPrepayment) + { + return toAjax(hisInpatientPrepaymentService.updateHisInpatientPrepayment(hisInpatientPrepayment)); + } + + /** + * 删除住院预交 + */ + @RequiresPermissions("his:inpatientPrepayment:remove") + @Log(title = "住院预交", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisInpatientPrepaymentService.deleteHisInpatientPrepaymentByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInspectionApplyController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInspectionApplyController.java new file mode 100644 index 000000000..1d1d4b196 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInspectionApplyController.java @@ -0,0 +1,126 @@ +package com.ruoyi.his.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisInspectionApply; +import com.ruoyi.his.service.IHisInspectionApplyService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 申请单Controller + * + * @author bend + * @date 2020-07-10 + */ +@Controller +@RequestMapping("/his/inspectionApply") +public class HisInspectionApplyController extends BaseController +{ + private String prefix = "his/inspectionApply"; + + @Autowired + private IHisInspectionApplyService hisInspectionApplyService; + + @RequiresPermissions("his:inspectionApply:view") + @GetMapping() + public String inspectionApply() + { + return prefix + "/inspectionApply"; + } + + /** + * 查询申请单列表 + */ + @RequiresPermissions("his:inspectionApply:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisInspectionApply hisInspectionApply) + { + startPage(); + List list = hisInspectionApplyService.selectHisInspectionApplyList(hisInspectionApply); + return getDataTable(list); + } + + /** + * 导出申请单列表 + */ + @RequiresPermissions("his:inspectionApply:export") + @Log(title = "申请单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisInspectionApply hisInspectionApply) + { + List list = hisInspectionApplyService.selectHisInspectionApplyList(hisInspectionApply); + ExcelUtil util = new ExcelUtil(HisInspectionApply.class); + return util.exportExcel(list, "inspectionApply"); + } + + /** + * 新增申请单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存申请单 + */ + @RequiresPermissions("his:inspectionApply:add") + @Log(title = "申请单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisInspectionApply hisInspectionApply) + { + return toAjax(hisInspectionApplyService.insertHisInspectionApply(hisInspectionApply)); + } + + /** + * 修改申请单 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisInspectionApply hisInspectionApply = hisInspectionApplyService.selectHisInspectionApplyById(id); + mmap.put("hisInspectionApply", hisInspectionApply); + return prefix + "/edit"; + } + + /** + * 修改保存申请单 + */ + @RequiresPermissions("his:inspectionApply:edit") + @Log(title = "申请单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisInspectionApply hisInspectionApply) + { + return toAjax(hisInspectionApplyService.updateHisInspectionApply(hisInspectionApply)); + } + + /** + * 删除申请单 + */ + @RequiresPermissions("his:inspectionApply:remove") + @Log(title = "申请单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisInspectionApplyService.deleteHisInspectionApplyByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInspectionReportController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInspectionReportController.java new file mode 100644 index 000000000..a8e764076 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisInspectionReportController.java @@ -0,0 +1,149 @@ +package com.ruoyi.his.controller; + +import java.util.List; + +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.his.domain.HisInspectionReportItem; +import com.ruoyi.his.domain.HisOutpatientExpensesBill; +import com.ruoyi.his.domain.HisOutpatientExpensesBillDetail; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisInspectionReport; +import com.ruoyi.his.service.IHisInspectionReportService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 检查检验Controller + * + * @author bend + * @date 2020-07-10 + */ +@Controller +@RequestMapping("/his/inspectionReport") +public class HisInspectionReportController extends BaseController +{ + private String prefix = "his/inspectionReport"; + + @Autowired + private IHisInspectionReportService hisInspectionReportService; + + @RequiresPermissions("his:inspectionReport:view") + @GetMapping() + public String inspectionReport() + { + return prefix + "/inspectionReport"; + } + + /** + * 查询检查检验列表 + */ + @RequiresPermissions("his:inspectionReport:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisInspectionReport hisInspectionReport) + { + startPage(); + List list = hisInspectionReportService.selectHisInspectionReportList(hisInspectionReport); + return getDataTable(list); + } + + /** + * 导出检查检验列表 + */ + @RequiresPermissions("his:inspectionReport:export") + @Log(title = "检查检验", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisInspectionReport hisInspectionReport) + { + List list = hisInspectionReportService.selectHisInspectionReportList(hisInspectionReport); + ExcelUtil util = new ExcelUtil(HisInspectionReport.class); + return util.exportExcel(list, "inspectionReport"); + } + + /** + * 新增检查检验 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存检查检验 + */ + @RequiresPermissions("his:inspectionReport:add") + @Log(title = "检查检验", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisInspectionReport hisInspectionReport) + { + return toAjax(hisInspectionReportService.insertHisInspectionReport(hisInspectionReport)); + } + + /** + * 修改检查检验 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisInspectionReport hisInspectionReport = hisInspectionReportService.selectHisInspectionReportById(id); + mmap.put("hisInspectionReport", hisInspectionReport); + return prefix + "/edit"; + } + + /** + * 修改保存检查检验 + */ + @RequiresPermissions("his:inspectionReport:edit") + @Log(title = "检查检验", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisInspectionReport hisInspectionReport) + { + return toAjax(hisInspectionReportService.updateHisInspectionReport(hisInspectionReport)); + } + + /** + * 删除检查检验 + */ + @RequiresPermissions("his:inspectionReport:remove") + @Log(title = "检查检验", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisInspectionReportService.deleteHisInspectionReportByIds(ids)); + } + + @RequiresPermissions("his:inspectionReport:detail") + @GetMapping("/detail") + public String expensesBillDetail(@RequestParam(value = "id") Long id, ModelMap mmap) + { + if (StringUtils.isNotNull(id)) + { + HisInspectionReport report = hisInspectionReportService.selectHisInspectionReportById(id); + mmap.put("report", report); + } + return prefix + "/inspectionReportItem"; + } + + @RequiresPermissions("his:inspectionReport:list") + @PostMapping("/detail/list") + @ResponseBody + public TableDataInfo list(HisInspectionReportItem item) + { + startPage(); + List list = hisInspectionReportService.selectHisInspectionReportItemList(item); + return getDataTable(list); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisMerchantScrcuController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisMerchantScrcuController.java new file mode 100644 index 000000000..d384cf465 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisMerchantScrcuController.java @@ -0,0 +1,126 @@ +package com.ruoyi.his.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisMerchantScrcu; +import com.ruoyi.his.service.IHisMerchantScrcuService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 农信商户Controller + * + * @author bend + * @date 2020-07-27 + */ +@Controller +@RequestMapping("/his/merchantScrcu") +public class HisMerchantScrcuController extends BaseController +{ + private String prefix = "his/merchantScrcu"; + + @Autowired + private IHisMerchantScrcuService hisMerchantScrcuService; + + @RequiresPermissions("his:merchantScrcu:view") + @GetMapping() + public String merchantScrcu() + { + return prefix + "/merchantScrcu"; + } + + /** + * 查询农信商户列表 + */ + @RequiresPermissions("his:merchantScrcu:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisMerchantScrcu hisMerchantScrcu) + { + startPage(); + List list = hisMerchantScrcuService.selectHisMerchantScrcuList(hisMerchantScrcu); + return getDataTable(list); + } + + /** + * 导出农信商户列表 + */ + @RequiresPermissions("his:merchantScrcu:export") + @Log(title = "农信商户", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisMerchantScrcu hisMerchantScrcu) + { + List list = hisMerchantScrcuService.selectHisMerchantScrcuList(hisMerchantScrcu); + ExcelUtil util = new ExcelUtil(HisMerchantScrcu.class); + return util.exportExcel(list, "merchantScrcu"); + } + + /** + * 新增农信商户 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存农信商户 + */ + @RequiresPermissions("his:merchantScrcu:add") + @Log(title = "农信商户", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisMerchantScrcu hisMerchantScrcu) + { + return toAjax(hisMerchantScrcuService.insertHisMerchantScrcu(hisMerchantScrcu)); + } + + /** + * 修改农信商户 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisMerchantScrcu hisMerchantScrcu = hisMerchantScrcuService.selectHisMerchantScrcuById(id); + mmap.put("hisMerchantScrcu", hisMerchantScrcu); + return prefix + "/edit"; + } + + /** + * 修改保存农信商户 + */ + @RequiresPermissions("his:merchantScrcu:edit") + @Log(title = "农信商户", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisMerchantScrcu hisMerchantScrcu) + { + return toAjax(hisMerchantScrcuService.updateHisMerchantScrcu(hisMerchantScrcu)); + } + + /** + * 删除农信商户 + */ + @RequiresPermissions("his:merchantScrcu:remove") + @Log(title = "农信商户", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisMerchantScrcuService.deleteHisMerchantScrcuByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisMerchantWechatController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisMerchantWechatController.java new file mode 100644 index 000000000..bb18d57fe --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisMerchantWechatController.java @@ -0,0 +1,126 @@ +package com.ruoyi.his.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisMerchantWechat; +import com.ruoyi.his.service.IHisMerchantWechatService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 特约商户Controller + * + * @author bend + * @date 2020-07-27 + */ +@Controller +@RequestMapping("/his/merchantWechat") +public class HisMerchantWechatController extends BaseController +{ + private String prefix = "his/merchantWechat"; + + @Autowired + private IHisMerchantWechatService hisMerchantWechatService; + + @RequiresPermissions("his:merchantWechat:view") + @GetMapping() + public String merchantWechat() + { + return prefix + "/merchantWechat"; + } + + /** + * 查询特约商户列表 + */ + @RequiresPermissions("his:merchantWechat:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisMerchantWechat hisMerchantWechat) + { + startPage(); + List list = hisMerchantWechatService.selectHisMerchantWechatList(hisMerchantWechat); + return getDataTable(list); + } + + /** + * 导出特约商户列表 + */ + @RequiresPermissions("his:merchantWechat:export") + @Log(title = "特约商户", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisMerchantWechat hisMerchantWechat) + { + List list = hisMerchantWechatService.selectHisMerchantWechatList(hisMerchantWechat); + ExcelUtil util = new ExcelUtil(HisMerchantWechat.class); + return util.exportExcel(list, "merchantWechat"); + } + + /** + * 新增特约商户 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存特约商户 + */ + @RequiresPermissions("his:merchantWechat:add") + @Log(title = "特约商户", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisMerchantWechat hisMerchantWechat) + { + return toAjax(hisMerchantWechatService.insertHisMerchantWechat(hisMerchantWechat)); + } + + /** + * 修改特约商户 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisMerchantWechat hisMerchantWechat = hisMerchantWechatService.selectHisMerchantWechatById(id); + mmap.put("hisMerchantWechat", hisMerchantWechat); + return prefix + "/edit"; + } + + /** + * 修改保存特约商户 + */ + @RequiresPermissions("his:merchantWechat:edit") + @Log(title = "特约商户", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisMerchantWechat hisMerchantWechat) + { + return toAjax(hisMerchantWechatService.updateHisMerchantWechat(hisMerchantWechat)); + } + + /** + * 删除特约商户 + */ + @RequiresPermissions("his:merchantWechat:remove") + @Log(title = "特约商户", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisMerchantWechatService.deleteHisMerchantWechatByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisOutpatientController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisOutpatientController.java new file mode 100644 index 000000000..a562f0f2d --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisOutpatientController.java @@ -0,0 +1,126 @@ +package com.ruoyi.web.controller.his; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisOutpatient; +import com.ruoyi.his.service.IHisOutpatientService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 门诊病人Controller + * + * @author bend + * @date 2020-07-07 + */ +@Controller +@RequestMapping("/his/outpatient") +public class HisOutpatientController extends BaseController +{ + private String prefix = "his/outpatient"; + + @Autowired + private IHisOutpatientService hisOutpatientService; + + @RequiresPermissions("his:outpatient:view") + @GetMapping() + public String outpatient() + { + return prefix + "/outpatient"; + } + + /** + * 查询门诊病人列表 + */ + @RequiresPermissions("his:outpatient:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisOutpatient hisOutpatient) + { + startPage(); + List list = hisOutpatientService.selectHisOutpatientList(hisOutpatient); + return getDataTable(list); + } + + /** + * 导出门诊病人列表 + */ + @RequiresPermissions("his:outpatient:export") + @Log(title = "门诊病人", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisOutpatient hisOutpatient) + { + List list = hisOutpatientService.selectHisOutpatientList(hisOutpatient); + ExcelUtil util = new ExcelUtil(HisOutpatient.class); + return util.exportExcel(list, "outpatient"); + } + + /** + * 新增门诊病人 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存门诊病人 + */ + @RequiresPermissions("his:outpatient:add") + @Log(title = "门诊病人", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisOutpatient hisOutpatient) + { + return toAjax(hisOutpatientService.insertHisOutpatient(hisOutpatient)); + } + + /** + * 修改门诊病人 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisOutpatient hisOutpatient = hisOutpatientService.selectHisOutpatientById(id); + mmap.put("hisOutpatient", hisOutpatient); + return prefix + "/edit"; + } + + /** + * 修改保存门诊病人 + */ + @RequiresPermissions("his:outpatient:edit") + @Log(title = "门诊病人", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisOutpatient hisOutpatient) + { + return toAjax(hisOutpatientService.updateHisOutpatient(hisOutpatient)); + } + + /** + * 删除门诊病人 + */ + @RequiresPermissions("his:outpatient:remove") + @Log(title = "门诊病人", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisOutpatientService.deleteHisOutpatientByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisOutpatientExpensesBillController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisOutpatientExpensesBillController.java new file mode 100644 index 000000000..84aa12296 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisOutpatientExpensesBillController.java @@ -0,0 +1,147 @@ +package com.ruoyi.his.controller; + +import java.util.List; + +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.his.domain.HisOutpatientExpensesBillDetail; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisOutpatientExpensesBill; +import com.ruoyi.his.service.IHisOutpatientExpensesBillService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 待缴费单Controller + * + * @author bend + * @date 2020-07-09 + */ +@Controller +@RequestMapping("/his/expensesBill") +public class HisOutpatientExpensesBillController extends BaseController +{ + private String prefix = "his/expensesBill"; + + @Autowired + private IHisOutpatientExpensesBillService hisOutpatientExpensesBillService; + + @RequiresPermissions("his:expensesBill:view") + @GetMapping() + public String expensesBill() + { + return prefix + "/expensesBill"; + } + + /** + * 查询待缴费单列表 + */ + @RequiresPermissions("his:expensesBill:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisOutpatientExpensesBill hisOutpatientExpensesBill) + { + startPage(); + List list = hisOutpatientExpensesBillService.selectHisOutpatientExpensesBillList(hisOutpatientExpensesBill); + return getDataTable(list); + } + + /** + * 导出待缴费单列表 + */ + @RequiresPermissions("his:expensesBill:export") + @Log(title = "待缴费单", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisOutpatientExpensesBill hisOutpatientExpensesBill) + { + List list = hisOutpatientExpensesBillService.selectHisOutpatientExpensesBillList(hisOutpatientExpensesBill); + ExcelUtil util = new ExcelUtil(HisOutpatientExpensesBill.class); + return util.exportExcel(list, "expensesBill"); + } + + /** + * 新增待缴费单 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存待缴费单 + */ + @RequiresPermissions("his:expensesBill:add") + @Log(title = "待缴费单", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisOutpatientExpensesBill hisOutpatientExpensesBill) + { + return toAjax(hisOutpatientExpensesBillService.insertHisOutpatientExpensesBill(hisOutpatientExpensesBill)); + } + + /** + * 修改待缴费单 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisOutpatientExpensesBill hisOutpatientExpensesBill = hisOutpatientExpensesBillService.selectHisOutpatientExpensesBillById(id); + mmap.put("hisOutpatientExpensesBill", hisOutpatientExpensesBill); + return prefix + "/edit"; + } + + /** + * 修改保存待缴费单 + */ + @RequiresPermissions("his:expensesBill:edit") + @Log(title = "待缴费单", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisOutpatientExpensesBill hisOutpatientExpensesBill) + { + return toAjax(hisOutpatientExpensesBillService.updateHisOutpatientExpensesBill(hisOutpatientExpensesBill)); + } + + /** + * 删除待缴费单 + */ + @RequiresPermissions("his:expensesBill:remove") + @Log(title = "待缴费单", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisOutpatientExpensesBillService.deleteHisOutpatientExpensesBillByIds(ids)); + } + + @RequiresPermissions("his:expensesBill:detail") + @GetMapping("/detail") + public String expensesBillDetail(@RequestParam(value = "billId") Long billId, ModelMap mmap) + { + if (StringUtils.isNotNull(billId)) + { + HisOutpatientExpensesBill bill = hisOutpatientExpensesBillService.selectHisOutpatientExpensesBillById(billId); + mmap.put("bill", bill); + } + return prefix + "/expensesBillDetail"; + } + + @RequiresPermissions("his:expensesBill:list") + @PostMapping("/detail/list") + @ResponseBody + public TableDataInfo list(HisOutpatientExpensesBillDetail detail) + { + startPage(); + List list = hisOutpatientExpensesBillService.selectHisOutpatientExpensesBillDetailList(detail); + return getDataTable(list); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisOutpatientPaymentController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisOutpatientPaymentController.java new file mode 100644 index 000000000..f964b83ec --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisOutpatientPaymentController.java @@ -0,0 +1,126 @@ +package com.ruoyi.his.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisOutpatientPayment; +import com.ruoyi.his.service.IHisOutpatientPaymentService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 门诊预交Controller + * + * @author bend + * @date 2020-07-14 + */ +@Controller +@RequestMapping("/his/outpatientPayment") +public class HisOutpatientPaymentController extends BaseController +{ + private String prefix = "his/outpatientPayment"; + + @Autowired + private IHisOutpatientPaymentService hisOutpatientPaymentService; + + @RequiresPermissions("his:outpatientPayment:view") + @GetMapping() + public String outpatientPayment() + { + return prefix + "/outpatientPayment"; + } + + /** + * 查询门诊预交列表 + */ + @RequiresPermissions("his:outpatientPayment:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisOutpatientPayment hisOutpatientPayment) + { + startPage(); + List list = hisOutpatientPaymentService.selectHisOutpatientPaymentList(hisOutpatientPayment); + return getDataTable(list); + } + + /** + * 导出门诊预交列表 + */ + @RequiresPermissions("his:outpatientPayment:export") + @Log(title = "门诊预交", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisOutpatientPayment hisOutpatientPayment) + { + List list = hisOutpatientPaymentService.selectHisOutpatientPaymentList(hisOutpatientPayment); + ExcelUtil util = new ExcelUtil(HisOutpatientPayment.class); + return util.exportExcel(list, "outpatientPayment"); + } + + /** + * 新增门诊预交 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存门诊预交 + */ + @RequiresPermissions("his:outpatientPayment:add") + @Log(title = "门诊预交", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisOutpatientPayment hisOutpatientPayment) + { + return toAjax(hisOutpatientPaymentService.insertHisOutpatientPayment(hisOutpatientPayment)); + } + + /** + * 修改门诊预交 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisOutpatientPayment hisOutpatientPayment = hisOutpatientPaymentService.selectHisOutpatientPaymentById(id); + mmap.put("hisOutpatientPayment", hisOutpatientPayment); + return prefix + "/edit"; + } + + /** + * 修改保存门诊预交 + */ + @RequiresPermissions("his:outpatientPayment:edit") + @Log(title = "门诊预交", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisOutpatientPayment hisOutpatientPayment) + { + return toAjax(hisOutpatientPaymentService.updateHisOutpatientPayment(hisOutpatientPayment)); + } + + /** + * 删除门诊预交 + */ + @RequiresPermissions("his:outpatientPayment:remove") + @Log(title = "门诊预交", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisOutpatientPaymentService.deleteHisOutpatientPaymentByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisPatientExpensesController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisPatientExpensesController.java new file mode 100644 index 000000000..800f1b297 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisPatientExpensesController.java @@ -0,0 +1,152 @@ +package com.ruoyi.his.controller; + +import java.util.List; + +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.his.domain.HisOutpatientExpensesBill; +import com.ruoyi.his.domain.HisOutpatientExpensesBillDetail; +import com.ruoyi.his.domain.HisPatientExpensesDetail; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisPatientExpenses; +import com.ruoyi.his.service.IHisPatientExpensesService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 费用记录Controller + * + * @author bend + * @date 2020-07-09 + */ +@Controller +@RequestMapping("/his/patientExpenses") +public class HisPatientExpensesController extends BaseController +{ + private String prefix = "his/patientExpenses"; + + @Autowired + private IHisPatientExpensesService hisPatientExpensesService; + + @RequiresPermissions("his:patientExpenses:view") + @GetMapping() + public String patientExpenses() + { + return prefix + "/patientExpenses"; + } + + /** + * 查询费用记录列表 + */ + @RequiresPermissions("his:patientExpenses:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisPatientExpenses hisPatientExpenses) + { + startPage(); + List list = hisPatientExpensesService.selectHisPatientExpensesList(hisPatientExpenses); + return getDataTable(list); + } + + /** + * 导出费用记录列表 + */ + @RequiresPermissions("his:patientExpenses:export") + @Log(title = "费用记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisPatientExpenses hisPatientExpenses) + { + List list = hisPatientExpensesService.selectHisPatientExpensesList(hisPatientExpenses); + ExcelUtil util = new ExcelUtil(HisPatientExpenses.class); + return util.exportExcel(list, "patientExpenses"); + } + + /** + * 新增费用记录 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存费用记录 + */ + @RequiresPermissions("his:patientExpenses:add") + @Log(title = "费用记录", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisPatientExpenses hisPatientExpenses) + { + return toAjax(hisPatientExpensesService.insertHisPatientExpenses(hisPatientExpenses)); + } + + /** + * 修改费用记录 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisPatientExpenses hisPatientExpenses = hisPatientExpensesService.selectHisPatientExpensesById(id); + mmap.put("hisPatientExpenses", hisPatientExpenses); + return prefix + "/edit"; + } + + /** + * 修改保存费用记录 + */ + @RequiresPermissions("his:patientExpenses:edit") + @Log(title = "费用记录", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisPatientExpenses hisPatientExpenses) + { + return toAjax(hisPatientExpensesService.updateHisPatientExpenses(hisPatientExpenses)); + } + + /** + * 删除费用记录 + */ + @RequiresPermissions("his:patientExpenses:remove") + @Log(title = "费用记录", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisPatientExpensesService.deleteHisPatientExpensesByIds(ids)); + } + + /** + * 费用记录详情 + */ + @RequiresPermissions("his:patientExpenses:detail") + @GetMapping("/detail") + public String patientExpensesDetail(@RequestParam(value = "expensesId") Long expensesId, ModelMap mmap) + { + if (StringUtils.isNotNull(expensesId)) + { + HisPatientExpenses patientExpenses = hisPatientExpensesService.selectHisPatientExpensesById(expensesId); + mmap.put("patientExpenses", patientExpenses); + } + return prefix + "/patientExpensesDetail"; + } + + @RequiresPermissions("his:patientExpenses:list") + @PostMapping("/detail/list") + @ResponseBody + public TableDataInfo list(HisPatientExpensesDetail detail) + { + startPage(); + List list = hisPatientExpensesService.selectHisPatientExpensesDetailList(detail); + return getDataTable(list); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisPatientExpensesDetailController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisPatientExpensesDetailController.java new file mode 100644 index 000000000..4769c54d1 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisPatientExpensesDetailController.java @@ -0,0 +1,69 @@ +package com.ruoyi.his.controller; + +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.his.domain.HisPatientExpensesDetail; +import com.ruoyi.his.service.IHisPatientExpensesDetailService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.List; + +/** + * 费用详情Controller + * + * @author bend + * @date 2020-07-09 + */ +@Controller +@RequestMapping("/his/patientExpensesDetail") +public class HisPatientExpensesDetailController extends BaseController +{ + private String prefix = "his/patientExpensesDetail"; + + @Autowired + private IHisPatientExpensesDetailService hisPatientExpensesDetailService; + + @RequiresPermissions("his:patientExpensesDetail:view") + @GetMapping() + public String patientExpensesDetail() + { + return prefix + "/patientExpensesDetail"; + } + + /** + * 查询费用详情列表 + */ + @RequiresPermissions("his:patientExpensesDetail:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisPatientExpensesDetail hisPatientExpensesDetail) + { + startPage(); + List list = hisPatientExpensesDetailService.selectHisPatientExpensesDetailList(hisPatientExpensesDetail); + return getDataTable(list); + } + + /** + * 导出费用详情列表 + */ + @RequiresPermissions("his:patientExpensesDetail:export") + @Log(title = "费用详情", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisPatientExpensesDetail hisPatientExpensesDetail) + { + List list = hisPatientExpensesDetailService.selectHisPatientExpensesDetailList(hisPatientExpensesDetail); + ExcelUtil util = new ExcelUtil(HisPatientExpensesDetail.class); + return util.exportExcel(list, "patientExpensesDetail"); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisPayAccountController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisPayAccountController.java new file mode 100644 index 000000000..0a14772b7 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisPayAccountController.java @@ -0,0 +1,140 @@ +package com.ruoyi.his.controller; + +import java.util.List; + +import com.ruoyi.his.domain.HisRegistrationTemplate; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisPayAccount; +import com.ruoyi.his.service.IHisPayAccountService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 支付账户Controller + * + * @author bend + * @date 2020-07-14 + */ +@Controller +@RequestMapping("/his/payAccount") +public class HisPayAccountController extends BaseController +{ + private String prefix = "his/payAccount"; + + @Autowired + private IHisPayAccountService hisPayAccountService; + + @RequiresPermissions("his:payAccount:view") + @GetMapping() + public String payAccount() + { + return prefix + "/payAccount"; + } + + /** + * 查询支付账户列表 + */ + @RequiresPermissions("his:payAccount:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisPayAccount hisPayAccount) + { + startPage(); + List list = hisPayAccountService.selectHisPayAccountList(hisPayAccount); + return getDataTable(list); + } + + /** + * 导出支付账户列表 + */ + @RequiresPermissions("his:payAccount:export") + @Log(title = "支付账户", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisPayAccount hisPayAccount) + { + List list = hisPayAccountService.selectHisPayAccountList(hisPayAccount); + ExcelUtil util = new ExcelUtil(HisPayAccount.class); + return util.exportExcel(list, "payAccount"); + } + + /** + * 新增支付账户 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存支付账户 + */ + @RequiresPermissions("his:payAccount:add") + @Log(title = "支付账户", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisPayAccount hisPayAccount) + { + return toAjax(hisPayAccountService.insertHisPayAccount(hisPayAccount)); + } + + /** + * 修改支付账户 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisPayAccount hisPayAccount = hisPayAccountService.selectHisPayAccountById(id); + mmap.put("hisPayAccount", hisPayAccount); + return prefix + "/edit"; + } + + /** + * 修改保存支付账户 + */ + @RequiresPermissions("his:payAccount:edit") + @Log(title = "支付账户", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisPayAccount hisPayAccount) + { + return toAjax(hisPayAccountService.updateHisPayAccount(hisPayAccount)); + } + + /** + * 删除支付账户 + */ + @RequiresPermissions("his:payAccount:remove") + @Log(title = "支付账户", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisPayAccountService.deleteHisPayAccountByIds(ids)); + } + + /** + * 账户状态修改 + */ + @Log(title = "支付账户管理", businessType = BusinessType.UPDATE) + @RequiresPermissions("his:payAccount:edit") + @PostMapping("/changeStatus") + @ResponseBody + public AjaxResult changeStatus(HisPayAccount hisPayAccount) + { + return toAjax(hisPayAccountService.changeStatus(hisPayAccount)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisRegistrationRecordController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisRegistrationRecordController.java new file mode 100644 index 000000000..9e4765fdf --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisRegistrationRecordController.java @@ -0,0 +1,126 @@ +package com.ruoyi.his.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisRegistrationRecord; +import com.ruoyi.his.service.IHisRegistrationRecordService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 挂号记录Controller + * + * @author bend + * @date 2020-06-28 + */ +@Controller +@RequestMapping("/his/registration") +public class HisRegistrationRecordController extends BaseController +{ + private String prefix = "his/registration"; + + @Autowired + private IHisRegistrationRecordService hisRegistrationRecordService; + + @RequiresPermissions("his:registration:view") + @GetMapping() + public String registration() + { + return prefix + "/registration"; + } + + /** + * 查询挂号记录列表 + */ + @RequiresPermissions("his:registration:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisRegistrationRecord hisRegistrationRecord) + { + startPage(); + List list = hisRegistrationRecordService.selectHisRegistrationRecordList(hisRegistrationRecord); + return getDataTable(list); + } + + /** + * 导出挂号记录列表 + */ + @RequiresPermissions("his:registration:export") + @Log(title = "挂号记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisRegistrationRecord hisRegistrationRecord) + { + List list = hisRegistrationRecordService.selectHisRegistrationRecordList(hisRegistrationRecord); + ExcelUtil util = new ExcelUtil(HisRegistrationRecord.class); + return util.exportExcel(list, "registration"); + } + + /** + * 新增挂号记录 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存挂号记录 + */ + @RequiresPermissions("his:registration:add") + @Log(title = "挂号记录", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisRegistrationRecord hisRegistrationRecord) + { + return toAjax(hisRegistrationRecordService.insertHisRegistrationRecord(hisRegistrationRecord)); + } + + /** + * 修改挂号记录 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisRegistrationRecord hisRegistrationRecord = hisRegistrationRecordService.selectHisRegistrationRecordById(id); + mmap.put("hisRegistrationRecord", hisRegistrationRecord); + return prefix + "/edit"; + } + + /** + * 修改保存挂号记录 + */ + @RequiresPermissions("his:registration:edit") + @Log(title = "挂号记录", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisRegistrationRecord hisRegistrationRecord) + { + return toAjax(hisRegistrationRecordService.updateHisRegistrationRecord(hisRegistrationRecord)); + } + + /** + * 删除挂号记录 + */ + @RequiresPermissions("his:registration:remove") + @Log(title = "挂号记录", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisRegistrationRecordService.deleteHisRegistrationRecordByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisRegistrationTemplateController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisRegistrationTemplateController.java new file mode 100644 index 000000000..5879d7b2a --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisRegistrationTemplateController.java @@ -0,0 +1,138 @@ +package com.ruoyi.his.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisRegistrationTemplate; +import com.ruoyi.his.service.IHisRegistrationTemplateService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 挂号模板Controller + * + * @author bend + * @date 2020-07-01 + */ +@Controller +@RequestMapping("/his/registrationTemplate") +public class HisRegistrationTemplateController extends BaseController +{ + private String prefix = "his/registrationTemplate"; + + @Autowired + private IHisRegistrationTemplateService hisRegistrationTemplateService; + + @RequiresPermissions("his:registrationTemplate:view") + @GetMapping() + public String registrationTemplate() + { + return prefix + "/registrationTemplate"; + } + + /** + * 查询挂号模板列表 + */ + @RequiresPermissions("his:registrationTemplate:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisRegistrationTemplate hisRegistrationTemplate) + { + startPage(); + List list = hisRegistrationTemplateService.selectHisRegistrationTemplateList(hisRegistrationTemplate); + return getDataTable(list); + } + + /** + * 导出挂号模板列表 + */ + @RequiresPermissions("his:registrationTemplate:export") + @Log(title = "挂号模板", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisRegistrationTemplate hisRegistrationTemplate) + { + List list = hisRegistrationTemplateService.selectHisRegistrationTemplateList(hisRegistrationTemplate); + ExcelUtil util = new ExcelUtil(HisRegistrationTemplate.class); + return util.exportExcel(list, "registrationTemplate"); + } + + /** + * 新增挂号模板 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存挂号模板 + */ + @RequiresPermissions("his:registrationTemplate:add") + @Log(title = "挂号模板", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisRegistrationTemplate hisRegistrationTemplate) + { + return toAjax(hisRegistrationTemplateService.insertHisRegistrationTemplate(hisRegistrationTemplate)); + } + + /** + * 修改挂号模板 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisRegistrationTemplate hisRegistrationTemplate = hisRegistrationTemplateService.selectHisRegistrationTemplateById(id); + mmap.put("hisRegistrationTemplate", hisRegistrationTemplate); + return prefix + "/edit"; + } + + /** + * 修改保存挂号模板 + */ + @RequiresPermissions("his:registrationTemplate:edit") + @Log(title = "挂号模板", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisRegistrationTemplate hisRegistrationTemplate) + { + return toAjax(hisRegistrationTemplateService.updateHisRegistrationTemplate(hisRegistrationTemplate)); + } + + /** + * 删除挂号模板 + */ + @RequiresPermissions("his:registrationTemplate:remove") + @Log(title = "挂号模板", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisRegistrationTemplateService.deleteHisRegistrationTemplateByIds(ids)); + } + + /** + * 用户状态修改 + */ + @Log(title = "用户管理", businessType = BusinessType.UPDATE) + @RequiresPermissions("his:registrationTemplate:edit") + @PostMapping("/changeStatus") + @ResponseBody + public AjaxResult changeStatus(HisRegistrationTemplate hisRegistrationTemplate) + { + return toAjax(hisRegistrationTemplateService.changeStatus(hisRegistrationTemplate)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisWechatProviderController.java b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisWechatProviderController.java new file mode 100644 index 000000000..b736216b8 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/controller/HisWechatProviderController.java @@ -0,0 +1,126 @@ +package com.ruoyi.his.controller; + +import java.util.List; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import com.ruoyi.common.annotation.Log; +import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.his.domain.HisWechatProvider; +import com.ruoyi.his.service.IHisWechatProviderService; +import com.ruoyi.common.core.controller.BaseController; +import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.utils.poi.ExcelUtil; +import com.ruoyi.common.core.page.TableDataInfo; + +/** + * 微信服务商Controller + * + * @author bend + * @date 2020-07-27 + */ +@Controller +@RequestMapping("/his/wechatProvider") +public class HisWechatProviderController extends BaseController +{ + private String prefix = "his/wechatProvider"; + + @Autowired + private IHisWechatProviderService hisWechatProviderService; + + @RequiresPermissions("his:wechatProvider:view") + @GetMapping() + public String wechatProvider() + { + return prefix + "/wechatProvider"; + } + + /** + * 查询微信服务商列表 + */ + @RequiresPermissions("his:wechatProvider:list") + @PostMapping("/list") + @ResponseBody + public TableDataInfo list(HisWechatProvider hisWechatProvider) + { + startPage(); + List list = hisWechatProviderService.selectHisWechatProviderList(hisWechatProvider); + return getDataTable(list); + } + + /** + * 导出微信服务商列表 + */ + @RequiresPermissions("his:wechatProvider:export") + @Log(title = "微信服务商", businessType = BusinessType.EXPORT) + @PostMapping("/export") + @ResponseBody + public AjaxResult export(HisWechatProvider hisWechatProvider) + { + List list = hisWechatProviderService.selectHisWechatProviderList(hisWechatProvider); + ExcelUtil util = new ExcelUtil(HisWechatProvider.class); + return util.exportExcel(list, "wechatProvider"); + } + + /** + * 新增微信服务商 + */ + @GetMapping("/add") + public String add() + { + return prefix + "/add"; + } + + /** + * 新增保存微信服务商 + */ + @RequiresPermissions("his:wechatProvider:add") + @Log(title = "微信服务商", businessType = BusinessType.INSERT) + @PostMapping("/add") + @ResponseBody + public AjaxResult addSave(HisWechatProvider hisWechatProvider) + { + return toAjax(hisWechatProviderService.insertHisWechatProvider(hisWechatProvider)); + } + + /** + * 修改微信服务商 + */ + @GetMapping("/edit/{id}") + public String edit(@PathVariable("id") Long id, ModelMap mmap) + { + HisWechatProvider hisWechatProvider = hisWechatProviderService.selectHisWechatProviderById(id); + mmap.put("hisWechatProvider", hisWechatProvider); + return prefix + "/edit"; + } + + /** + * 修改保存微信服务商 + */ + @RequiresPermissions("his:wechatProvider:edit") + @Log(title = "微信服务商", businessType = BusinessType.UPDATE) + @PostMapping("/edit") + @ResponseBody + public AjaxResult editSave(HisWechatProvider hisWechatProvider) + { + return toAjax(hisWechatProviderService.updateHisWechatProvider(hisWechatProvider)); + } + + /** + * 删除微信服务商 + */ + @RequiresPermissions("his:wechatProvider:remove") + @Log(title = "微信服务商", businessType = BusinessType.DELETE) + @PostMapping( "/remove") + @ResponseBody + public AjaxResult remove(String ids) + { + return toAjax(hisWechatProviderService.deleteHisWechatProviderByIds(ids)); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDepartment.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDepartment.java new file mode 100644 index 000000000..11ec55033 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDepartment.java @@ -0,0 +1,162 @@ +package com.ruoyi.his.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 科室对象 his_department + * + * @author bend + * @date 2020-07-01 + */ +public class HisDepartment extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 科室ID */ + @Excel(name = "科室ID") + private String deptId; + + /** 科室名称 */ + @Excel(name = "科室名称") + private String deptName; + + /** 机构ID */ + private String orgCode; + + /** 机构名称 */ + @Excel(name = "机构名称") + private String orgName; + + /** 科室简介 */ + @Excel(name = "科室简介") + private String deptProfile; + + /** 显示状态（0否 1是） */ + @Excel(name = "显示状态", readConverterExp = "0=否,1=是") + private Integer isShow; + + /** 序号 */ + @Excel(name = "序号") + private Integer sortNo; + + /** 删除标记（0否 1是） */ + private Integer deleted; + + /** 优秀医生标识 默认不存在 */ + private boolean flag = false; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setDeptId(String deptId) + { + this.deptId = deptId; + } + + public String getDeptId() + { + return deptId; + } + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + public void setOrgCode(String orgCode) + { + this.orgCode = orgCode; + } + + public String getOrgCode() + { + return orgCode; + } + public void setOrgName(String orgName) + { + this.orgName = orgName; + } + + public String getOrgName() + { + return orgName; + } + public void setDeptProfile(String deptProfile) + { + this.deptProfile = deptProfile; + } + + public String getDeptProfile() + { + return deptProfile; + } + public void setIsShow(Integer isShow) + { + this.isShow = isShow; + } + + public Integer getIsShow() + { + return isShow; + } + public void setSortNo(Integer sortNo) + { + this.sortNo = sortNo; + } + + public Integer getSortNo() + { + return sortNo; + } + public void setDeleted(Integer deleted) + { + this.deleted = deleted; + } + + public Integer getDeleted() + { + return deleted; + } + + public boolean isFlag() + { + return flag; + } + + public void setFlag(boolean flag) + { + this.flag = flag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("orgCode", getOrgCode()) + .append("orgName", getOrgName()) + .append("deptProfile", getDeptProfile()) + .append("isShow", getIsShow()) + .append("sortNo", getSortNo()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("deleted", getDeleted()) + .toString(); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDoctor.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDoctor.java new file mode 100644 index 000000000..2739a9e38 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDoctor.java @@ -0,0 +1,351 @@ +package com.ruoyi.his.domain; + +import java.math.BigDecimal; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 医生对象 his_doctor + * + * @author bend + * @date 2020-07-01 + */ +public class HisDoctor extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 用户ID */ + private Long memberId; + + /** 医生ID */ + private String doctorId; + + /** 医生名称 */ + @Excel(name = "医生名称") + private String doctorName; + + /** 机构ID */ + private String orgCode; + + /** 机构名称 */ + @Excel(name = "机构名称") + private String orgName; + + /** 科室ID */ + private String deptId; + + /** 科室名称 */ + @Excel(name = "科室名称") + private String deptName; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String mobilePhone; + + /** 医生头像 */ + private String avatar; + + /** 职称头衔 */ + @Excel(name = "职称头衔") + private String jobTitle; + + /** 工作年限 */ + @Excel(name = "工作年限") + private Long workingYears; + + /** 擅长领域 */ + @Excel(name = "擅长领域") + private String expertiseAreas; + + /** 医生简介 */ + @Excel(name = "医生简介") + private String doctorProfile; + + /** 粉丝量 */ + private Long fans; + + /** 星级评分 */ + private BigDecimal starRating; + + /** 显示状态（0否 1是） */ + @Excel(name = "显示状态", readConverterExp = "0=否,1=是") + private Integer isShow; + + /** 虚拟账户（0否 1是） */ + @Excel(name = "虚拟账户", readConverterExp = "0=否,1=是") + private Integer isVirtualAccount; + + /** 挂号模板 */ + private String templateId; + + /** 模板名称 */ + @Excel(name = "模板名称") + private String templateName; + + /** 日挂号量 */ + private Long dailyRegisteredNum; + + /** 排序号 */ + @Excel(name = "排序号") + private Integer sortNo; + + /** 删除标记（0否 1是） */ + private Integer deleted; + + /** 优秀医生标识 默认不存在 */ + private boolean flag = false; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setMemberId(Long memberId) + { + this.memberId = memberId; + } + + public Long getMemberId() + { + return memberId; + } + public void setDoctorId(String doctorId) + { + this.doctorId = doctorId; + } + + public String getDoctorId() + { + return doctorId; + } + public void setDoctorName(String doctorName) + { + this.doctorName = doctorName; + } + + public String getDoctorName() + { + return doctorName; + } + public void setOrgCode(String orgCode) + { + this.orgCode = orgCode; + } + + public String getOrgCode() + { + return orgCode; + } + public void setOrgName(String orgName) + { + this.orgName = orgName; + } + + public String getOrgName() + { + return orgName; + } + public void setDeptId(String deptId) + { + this.deptId = deptId; + } + + public String getDeptId() + { + return deptId; + } + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + public void setMobilePhone(String mobilePhone) + { + this.mobilePhone = mobilePhone; + } + + public String getMobilePhone() + { + return mobilePhone; + } + public void setAvatar(String avatar) + { + this.avatar = avatar; + } + + public String getAvatar() + { + return avatar; + } + public void setJobTitle(String jobTitle) + { + this.jobTitle = jobTitle; + } + + public String getJobTitle() + { + return jobTitle; + } + public void setWorkingYears(Long workingYears) + { + this.workingYears = workingYears; + } + + public Long getWorkingYears() + { + return workingYears; + } + public void setExpertiseAreas(String expertiseAreas) + { + this.expertiseAreas = expertiseAreas; + } + + public String getExpertiseAreas() + { + return expertiseAreas; + } + public void setDoctorProfile(String doctorProfile) + { + this.doctorProfile = doctorProfile; + } + + public String getDoctorProfile() + { + return doctorProfile; + } + public void setFans(Long fans) + { + this.fans = fans; + } + + public Long getFans() + { + return fans; + } + public void setStarRating(BigDecimal starRating) + { + this.starRating = starRating; + } + + public BigDecimal getStarRating() + { + return starRating; + } + public void setIsShow(Integer isShow) + { + this.isShow = isShow; + } + + public Integer getIsShow() + { + return isShow; + } + public void setIsVirtualAccount(Integer isVirtualAccount) + { + this.isVirtualAccount = isVirtualAccount; + } + + public Integer getIsVirtualAccount() + { + return isVirtualAccount; + } + public void setTemplateId(String templateId) + { + this.templateId = templateId; + } + + public String getTemplateId() + { + return templateId; + } + public void setTemplateName(String templateName) + { + this.templateName = templateName; + } + + public String getTemplateName() + { + return templateName; + } + public void setDailyRegisteredNum(Long dailyRegisteredNum) + { + this.dailyRegisteredNum = dailyRegisteredNum; + } + + public Long getDailyRegisteredNum() + { + return dailyRegisteredNum; + } + public void setSortNo(Integer sortNo) + { + this.sortNo = sortNo; + } + + public Integer getSortNo() + { + return sortNo; + } + public void setDeleted(Integer deleted) + { + this.deleted = deleted; + } + + public Integer getDeleted() + { + return deleted; + } + + public boolean isFlag() + { + return flag; + } + + public void setFlag(boolean flag) + { + this.flag = flag; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("memberId", getMemberId()) + .append("doctorId", getDoctorId()) + .append("doctorName", getDoctorName()) + .append("orgCode", getOrgCode()) + .append("orgName", getOrgName()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("mobilePhone", getMobilePhone()) + .append("avatar", getAvatar()) + .append("jobTitle", getJobTitle()) + .append("workingYears", getWorkingYears()) + .append("expertiseAreas", getExpertiseAreas()) + .append("doctorProfile", getDoctorProfile()) + .append("fans", getFans()) + .append("starRating", getStarRating()) + .append("isShow", getIsShow()) + .append("isVirtualAccount", getIsVirtualAccount()) + .append("templateId", getTemplateId()) + .append("templateName", getTemplateName()) + .append("dailyRegisteredNum", getDailyRegisteredNum()) + .append("sortNo", getSortNo()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("deleted", getDeleted()) + .toString(); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDoctorDepartment.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDoctorDepartment.java new file mode 100644 index 000000000..94f2e999b --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDoctorDepartment.java @@ -0,0 +1,116 @@ +package com.ruoyi.his.domain; + +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 医生科室关系对象 his_doctor_department + * + * @author bend + * @date 2020-07-01 + */ +public class HisDoctorDepartment extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 科室ID */ + private String deptId; + + /** 科室名称 */ + private String deptName; + + /** 医生ID */ + private String doctorId; + + /** 机构ID */ + private String orgCode; + + /** 显示状态（0否 1是） */ + private Integer isShow; + + /** 删除标记（0否 1是） */ + private Integer deleted; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setDeptId(String deptId) + { + this.deptId = deptId; + } + + public String getDeptId() + { + return deptId; + } + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + public void setDoctorId(String doctorId) + { + this.doctorId = doctorId; + } + + public String getDoctorId() + { + return doctorId; + } + public void setOrgCode(String orgCode) + { + this.orgCode = orgCode; + } + + public String getOrgCode() + { + return orgCode; + } + public void setIsShow(Integer isShow) + { + this.isShow = isShow; + } + + public Integer getIsShow() + { + return isShow; + } + public void setDeleted(Integer deleted) + { + this.deleted = deleted; + } + + public Integer getDeleted() + { + return deleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("doctorId", getDoctorId()) + .append("orgCode", getOrgCode()) + .append("isShow", getIsShow()) + .append("createTime", getCreateTime()) + .append("deleted", getDeleted()) + .toString(); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDoctorSchedule.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDoctorSchedule.java new file mode 100644 index 000000000..8254d300e --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisDoctorSchedule.java @@ -0,0 +1,245 @@ +package com.ruoyi.his.domain; + +import java.util.Date; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 医生排班对象 his_doctor_schedule + * + * @author bend + * @date 2020-07-03 + */ +public class HisDoctorSchedule extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 机构ID */ + private String orgCode; + + /** 机构名称 */ + @Excel(name = "机构名称") + private String orgName; + + /** 科室ID */ + private String deptId; + + /** 科室名称 */ + @Excel(name = "科室名称") + private String deptName; + + /** 医生ID */ + private String doctorId; + + /** 医生名称 */ + @Excel(name = "医生名称") + private String doctorName; + + /** 排班日期 */ + @Excel(name = "排班日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date scheduleDate; + + /** 班次标签（1上午 2下午） */ + private Integer scheduleTag; + + /** 班次 */ + @Excel(name = "班次") + private String scheduleShift; + + /** 线上限制量 */ + @Excel(name = "线上限制量") + private Integer onLimitNum; + + /** 线上已挂量 */ + @Excel(name = "线上已挂量") + private Integer onNum; + + /** 线下限制量 */ + @Excel(name = "线下限制量") + private Integer offLimitNum; + + /** 线下已挂量 */ + @Excel(name = "线下已挂量") + private Integer offNum; + + /** 显示状态（0否 1是） */ + @Excel(name = "显示状态", readConverterExp = "0=否,1=是") + private Integer isShow; + + /** 删除标记（0否 1是） */ + private Integer deleted; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setOrgCode(String orgCode) + { + this.orgCode = orgCode; + } + + public String getOrgCode() + { + return orgCode; + } + public void setOrgName(String orgName) + { + this.orgName = orgName; + } + + public String getOrgName() + { + return orgName; + } + public void setDeptId(String deptId) + { + this.deptId = deptId; + } + + public String getDeptId() + { + return deptId; + } + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + public void setDoctorId(String doctorId) + { + this.doctorId = doctorId; + } + + public String getDoctorId() + { + return doctorId; + } + public void setDoctorName(String doctorName) + { + this.doctorName = doctorName; + } + + public String getDoctorName() + { + return doctorName; + } + public void setScheduleDate(Date scheduleDate) + { + this.scheduleDate = scheduleDate; + } + + public Date getScheduleDate() + { + return scheduleDate; + } + public void setScheduleTag(Integer scheduleTag) + { + this.scheduleTag = scheduleTag; + } + + public Integer getScheduleTag() + { + return scheduleTag; + } + public void setScheduleShift(String scheduleShift) + { + this.scheduleShift = scheduleShift; + } + + public String getScheduleShift() + { + return scheduleShift; + } + public void setOnLimitNum(Integer onLimitNum) + { + this.onLimitNum = onLimitNum; + } + + public Integer getOnLimitNum() + { + return onLimitNum; + } + public void setOnNum(Integer onNum) + { + this.onNum = onNum; + } + + public Integer getOnNum() + { + return onNum; + } + public void setOffLimitNum(Integer offLimitNum) + { + this.offLimitNum = offLimitNum; + } + + public Integer getOffLimitNum() + { + return offLimitNum; + } + public void setOffNum(Integer offNum) + { + this.offNum = offNum; + } + + public Integer getOffNum() + { + return offNum; + } + public void setIsShow(Integer isShow) + { + this.isShow = isShow; + } + + public Integer getIsShow() + { + return isShow; + } + public void setDeleted(Integer deleted) + { + this.deleted = deleted; + } + + public Integer getDeleted() + { + return deleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("orgCode", getOrgCode()) + .append("orgName", getOrgName()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("doctorId", getDoctorId()) + .append("doctorName", getDoctorName()) + .append("scheduleDate", getScheduleDate()) + .append("scheduleTag", getScheduleTag()) + .append("scheduleShift", getScheduleShift()) + .append("onLimitNum", getOnLimitNum()) + .append("onNum", getOnNum()) + .append("offLimitNum", getOffLimitNum()) + .append("offNum", getOffNum()) + .append("isShow", getIsShow()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("deleted", getDeleted()) + .toString(); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisEhealthClient.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisEhealthClient.java new file mode 100644 index 000000000..733657141 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisEhealthClient.java @@ -0,0 +1,59 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 健康卡对象 his_ehealth_client + * + * @author bend + * @date 2020-07-27 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "健康卡") +@Table(name = "his_ehealth_client") +public class HisEhealthClient extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** APPID */ + @ApiModelProperty(notes = "APPID") + @Excel(name = "APPID") + private String appId; + + /** APP密钥 */ + @ApiModelProperty(notes = "APP密钥") + @Excel(name = "APP密钥") + private String appSecret; + + /** 机构代码 */ + @ApiModelProperty(notes = "机构代码") + @Excel(name = "机构代码") + private String orgCode; + + /** 机构名称 */ + @ApiModelProperty(notes = "机构名称") + @Excel(name = "机构名称") + private String orgName; + + /** 接口地址 */ + @ApiModelProperty(notes = "接口地址") + @Excel(name = "接口地址") + private String openApi; + + /** 版本号 */ + @ApiModelProperty(notes = "版本号") + @Excel(name = "版本号") + private String version; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisFeeItem.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisFeeItem.java new file mode 100644 index 000000000..b74e751d5 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisFeeItem.java @@ -0,0 +1,44 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 费用类型对象 his_fee_item + * + * @author bend + * @date 2020-07-14 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "费用类型") +@Table(name = "his_fee_item") +public class HisFeeItem extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 类型ID */ + @ApiModelProperty(notes = "类型ID") + @Excel(name = "类型ID") + private String feeTypeId; + + /** 类型名称 */ + @ApiModelProperty(notes = "类型名称") + @Excel(name = "类型名称") + private String feeTypeName; + + /** 默认显示（0否 1是） */ + @ApiModelProperty(notes = "默认显示（0否 1是）") + @Excel(name = "默认显示", readConverterExp = "0=否,1=是") + private Integer isShow; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisHospitalInfo.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisHospitalInfo.java new file mode 100644 index 000000000..bc8b29a8b --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisHospitalInfo.java @@ -0,0 +1,362 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import java.math.BigDecimal; + +/** + * 医疗机构对象 his_hospital_info + * + * @author bend + * @date 2020-06-28 + */ +public class HisHospitalInfo extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 机构编码 */ + private String orgCode; + + /** 机构名称 */ + @Excel(name = "机构名称") + private String orgName; + + /** 注册地址 */ + @Excel(name = "注册地址") + private String orgAddress; + + /** 联系电话 */ + @Excel(name = "联系电话") + private String contactPhone; + + /** 联系人 */ + @Excel(name = "联系人") + private String contactPerson; + + /** 邮政编码 */ + private String postalCode; + + /** 机构图标 */ + @Excel(name = "机构图标") + private String logo; + + /** 机构简介 */ + @Excel(name = "机构简介") + private String introduction; + + /** 医院类别（1医院 2乡镇卫生院 3社区卫生服务中心 4诊所） */ + @Excel(name = "医院类别", readConverterExp = "1=医院,2=乡镇卫生院,3=社区卫生服务中心,4=诊所") + private Integer orgType; + + /** 医院等级（1三甲医院 2三乙医院 3三丙医院 4二甲医院 5二乙医院 6二丙医院 7一甲医院 8一乙医院 9一丙医院 10社区卫生服务中心 11社区卫生服务站 ） */ + @Excel(name = "医院等级", readConverterExp = "1=三甲医院,2=三乙医院,3=三丙医院,4=二甲医院,5=二乙医院,6=二丙医院,7=一甲医院,8=一乙医院,9=一丙医院,1=0社区卫生服务中心,1=1社区卫生服务站") + private Integer orgLevel; + + /** 优秀科室 */ + private String excellentDeptIds; + + /** 优秀医生 */ + private String excellentDoctorIds; + + /** 粉丝量 */ + private Long fans; + + /** 星级评分 */ + private BigDecimal starRating; + + /** 营业执照 */ + private String businessLicense; + + /** 排序号 */ + @Excel(name = "排序号") + private Long sortNo; + + /** 经度 */ + private BigDecimal longitude; + + /** 纬度 */ + private BigDecimal latitude; + + /** 区划ID */ + private String regionId; + + /** 区划代码 */ + private String regionCode; + + /**机构虚拟操作员ID*/ + private String vmUserId; + + /**虚拟操作员*/ + private String vmUserName; + + /** 显示状态（0否 1是） */ + @Excel(name = "显示状态", readConverterExp = "0=否,1=是") + private Integer isShow; + + /** 删除标记（0否 1是） */ + private Integer deleted; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setOrgCode(String orgCode) + { + this.orgCode = orgCode; + } + + public String getOrgCode() + { + return orgCode; + } + public void setOrgName(String orgName) + { + this.orgName = orgName; + } + + public String getOrgName() + { + return orgName; + } + public void setOrgAddress(String orgAddress) + { + this.orgAddress = orgAddress; + } + + public String getOrgAddress() + { + return orgAddress; + } + public void setContactPhone(String contactPhone) + { + this.contactPhone = contactPhone; + } + + public String getContactPhone() + { + return contactPhone; + } + public void setContactPerson(String contactPerson) + { + this.contactPerson = contactPerson; + } + + public String getContactPerson() + { + return contactPerson; + } + public void setPostalCode(String postalCode) + { + this.postalCode = postalCode; + } + + public String getPostalCode() + { + return postalCode; + } + public void setLogo(String logo) + { + this.logo = logo; + } + + public String getLogo() + { + return logo; + } + public void setIntroduction(String introduction) + { + this.introduction = introduction; + } + + public String getIntroduction() + { + return introduction; + } + public void setOrgType(Integer orgType) + { + this.orgType = orgType; + } + + public Integer getOrgType() + { + return orgType; + } + public void setOrgLevel(Integer orgLevel) + { + this.orgLevel = orgLevel; + } + + public Integer getOrgLevel() + { + return orgLevel; + } + public void setExcellentDeptIds(String excellentDeptIds) + { + this.excellentDeptIds = excellentDeptIds; + } + + public String getExcellentDeptIds() + { + return excellentDeptIds; + } + public void setExcellentDoctorIds(String excellentDoctorIds) + { + this.excellentDoctorIds = excellentDoctorIds; + } + + public String getExcellentDoctorIds() + { + return excellentDoctorIds; + } + public void setFans(Long fans) + { + this.fans = fans; + } + + public Long getFans() + { + return fans; + } + public void setStarRating(BigDecimal starRating) + { + this.starRating = starRating; + } + + public BigDecimal getStarRating() + { + return starRating; + } + public void setBusinessLicense(String businessLicense) + { + this.businessLicense = businessLicense; + } + + public String getBusinessLicense() + { + return businessLicense; + } + public void setSortNo(Long sortNo) + { + this.sortNo = sortNo; + } + + public Long getSortNo() + { + return sortNo; + } + public void setLongitude(BigDecimal longitude) + { + this.longitude = longitude; + } + + public BigDecimal getLongitude() + { + return longitude; + } + public void setLatitude(BigDecimal latitude) + { + this.latitude = latitude; + } + + public BigDecimal getLatitude() + { + return latitude; + } + public void setRegionId(String regionId) + { + this.regionId = regionId; + } + + public String getRegionId() + { + return regionId; + } + public void setRegionCode(String regionCode) + { + this.regionCode = regionCode; + } + + public String getRegionCode() + { + return regionCode; + } + + public String getVmUserId() { + return vmUserId; + } + + public void setVmUserId(String vmUserId) { + this.vmUserId = vmUserId; + } + + public String getVmUserName() { + return vmUserName; + } + + public void setVmUserName(String vmUserName) { + this.vmUserName = vmUserName; + } + + public void setIsShow(Integer isShow) + { + this.isShow = isShow; + } + + public Integer getIsShow() + { + return isShow; + } + public void setDeleted(Integer deleted) + { + this.deleted = deleted; + } + + public Integer getDeleted() + { + return deleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("orgCode", getOrgCode()) + .append("orgName", getOrgName()) + .append("orgAddress", getOrgAddress()) + .append("contactPhone", getContactPhone()) + .append("contactPerson", getContactPerson()) + .append("postalCode", getPostalCode()) + .append("logo", getLogo()) + .append("introduction", getIntroduction()) + .append("orgType", getOrgType()) + .append("orgLevel", getOrgLevel()) + .append("excellentDeptIds", getExcellentDeptIds()) + .append("excellentDoctorIds", getExcellentDoctorIds()) + .append("fans", getFans()) + .append("starRating", getStarRating()) + .append("businessLicense", getBusinessLicense()) + .append("sortNo", getSortNo()) + .append("longitude", getLongitude()) + .append("latitude", getLatitude()) + .append("regionId", getRegionId()) + .append("regionCode", getRegionCode()) + .append("vmUserId", getVmUserId()) + .append("vmUserName", getVmUserName()) + .append("isShow", getIsShow()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("deleted", getDeleted()) + .toString(); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInpatient.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInpatient.java new file mode 100644 index 000000000..d26a2b812 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInpatient.java @@ -0,0 +1,218 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 住院病人对象 his_inpatient + * + * @author bend + * @date 2020-07-08 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "住院病人") +@Table(name = "his_inpatient") +public class HisInpatient extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 就诊人 */ + @ApiModelProperty(notes = "就诊人") + private Long patientId; + + /** 姓名 */ + @ApiModelProperty(notes = "姓名") + @Excel(name = "姓名") + private String patientName; + + /** 身份证号 */ + @ApiModelProperty(notes = "身份证号") + @Excel(name = "身份证号") + private String idCardNo; + + /** 性别 */ + @ApiModelProperty(notes = "性别") + @Excel(name = "性别") + private String patientSex; + + /** 出生日期 */ + @ApiModelProperty(notes = "出生日期") + @Excel(name = "出生日期") + private String birthday; + + /** 联系人 */ + @ApiModelProperty(notes = "联系人") + private String contactName; + + /** 联系电话 */ + @ApiModelProperty(notes = "联系电话") + private String mobilePhone; + + /** 家庭地址 */ + @ApiModelProperty(notes = "家庭地址") + private String familyAddress; + + /** 入院日期 */ + @ApiModelProperty(notes = "入院日期") + @Excel(name = "入院日期") + private String admissionDate; + + /** 出院日期 */ + @ApiModelProperty(notes = "出院日期") + @Excel(name = "出院日期") + private String leaveDate; + + /** 住院号 */ + @ApiModelProperty(notes = "住院号") + @Excel(name = "住院号") + private String hospitalizedNo; + + /** 住院ID */ + @ApiModelProperty(notes = "住院ID") + @Excel(name = "住院ID") + private String businessId; + + /** 医院ID */ + @ApiModelProperty(notes = "医院ID") + private String orgCode; + + /** 医院名称 */ + @ApiModelProperty(notes = "医院名称") + @Excel(name = "医院名称") + private String orgName; + + /** 入院科室 */ + @ApiModelProperty(notes = "入院科室") + private String deptId; + + /** 入院科室名称 */ + @ApiModelProperty(notes = "入院科室名称") + @Excel(name = "入院科室名称") + private String deptName; + + /** 入院诊断医生ID */ + @ApiModelProperty(notes = "入院诊断医生ID") + private String doctorId; + + /** 入院诊断医生 */ + @ApiModelProperty(notes = "入院诊断医生") + @Excel(name = "入院诊断医生") + private String doctorName; + + /** 入院床位编码 */ + @ApiModelProperty(notes = "入院床位编码") + private String bedId; + + /** 入院床位 */ + @ApiModelProperty(notes = "入院床位") + private String bedName; + + /** 入院主诊断 */ + @ApiModelProperty(notes = "入院主诊断") + @Excel(name = "入院主诊断") + private String mainDiagnose; + + /** 入院主诊断ICD10 */ + @ApiModelProperty(notes = "入院主诊断ICD10") + @Excel(name = "入院主诊断ICD10") + private String mainDiagnoseIcd10; + + /** 入院次诊断 */ + @ApiModelProperty(notes = "入院次诊断") + @Excel(name = "入院次诊断") + private String secondaryDiagnose; + + /** 入院次诊断ICD10 */ + @ApiModelProperty(notes = "入院次诊断ICD10") + private String secondaryDiagnoseIcd10; + + /** 入院病区编码 */ + @ApiModelProperty(notes = "入院病区编码") + private String wardId; + + /** 入院病区 */ + @ApiModelProperty(notes = "入院病区") + private String wardName; + + /** 入院经办人 */ + @ApiModelProperty(notes = "入院经办人") + private String operator; + + /** 入院经办时间 */ + @ApiModelProperty(notes = "入院经办时间") + private String operateTime; + + /** 住院总费用 */ + @ApiModelProperty(notes = "住院总费用") + @Excel(name = "住院总费用") + private BigDecimal totalFee; + + /** 出院科室编码 */ + @ApiModelProperty(notes = "出院科室编码") + private String leaveDeptId; + + /** 出院科室名称 */ + @ApiModelProperty(notes = "出院科室名称") + @Excel(name = "出院科室名称") + private String leaveDeptName; + + /** 出院病区编码 */ + @ApiModelProperty(notes = "出院病区编码") + private String leaveWardId; + + /** 出院病区 */ + @ApiModelProperty(notes = "出院病区") + private String leaveWardName; + + /** 出院床位编码 */ + @ApiModelProperty(notes = "出院床位编码") + private String leaveBedId; + + /** 出院床位 */ + @ApiModelProperty(notes = "出院床位") + private String leaveBedName; + + /** 出院主诊断 */ + @ApiModelProperty(notes = "出院主诊断") + @Excel(name = "出院主诊断") + private String leaveMainDiagnose; + + /** 出院主诊断ICD10 */ + @ApiModelProperty(notes = "出院主诊断ICD10") + private String leaveMainDiagnoseIcd10; + + /** 出院次诊断 */ + @ApiModelProperty(notes = "出院次诊断") + @Excel(name = "出院次诊断") + private String leaveSecondaryDiagnose; + + /** 出院次诊断ICD10 */ + @ApiModelProperty(notes = "出院次诊断ICD10") + private String leaveSecondaryDiagnoseIcd10; + + /** 在院状态（0在院无床 1在院有床 2出院未结算 3出院已结算 -1撤销入院） */ + @ApiModelProperty(notes = "在院状态（0在院无床 1在院有床 2出院未结算 3出院已结算 -1撤销入院）") + @Excel(name = "在院状态", readConverterExp = "0=在院无床,1=在院有床,2=出院未结算,3=出院已结算,-=1撤销入院") + private Integer inpatientStatus; + + /** 住院总预交费 */ + @ApiModelProperty(notes = "住院总预交费") + @Excel(name = "住院总预交费") + private BigDecimal prepaidTotalFee; + + /** 执业医师证号 */ + @ApiModelProperty(notes = "执业医师证号") + private String doctorNumber; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInpatientPrepayment.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInpatientPrepayment.java new file mode 100644 index 000000000..ffd71faf0 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInpatientPrepayment.java @@ -0,0 +1,122 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 住院预交对象 his_inpatient_prepayment + * + * @author bend + * @date 2020-07-14 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "住院预交") +@Table(name = "his_inpatient_prepayment") +public class HisInpatientPrepayment extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 用户ID */ + @ApiModelProperty(notes = "用户ID") + private Long memberId; + + /** 手机号 */ + @ApiModelProperty(notes = "手机号") + @Excel(name = "手机号") + private String mobilePhone; + + /** 就诊人ID */ + @ApiModelProperty(notes = "就诊人ID") + private Long patientId; + + /** 就诊人 */ + @ApiModelProperty(notes = "就诊人") + @Excel(name = "就诊人") + private String patientName; + + /** 身份证 */ + @ApiModelProperty(notes = "身份证") + @Excel(name = "身份证") + private String idCardNo; + + /** 住院ID */ + @ApiModelProperty(notes = "住院ID") + @Excel(name = "住院ID") + private String businessId; + + /** 订单编号 */ + @ApiModelProperty(notes = "订单编号") + @Excel(name = "订单编号") + private String orderCode; + + /** 预缴费ID */ + @ApiModelProperty(notes = "预缴费ID") + @Excel(name = "预缴费ID") + private String prepayId; + + /** 流水号 */ + @ApiModelProperty(notes = "流水号") + @Excel(name = "流水号") + private String paySerialNo; + + /** 缴费方式列表 */ + @ApiModelProperty(notes = "缴费方式列表") + @Excel(name = "缴费方式列表") + private String paymentListStr; + + /** 收费人员ID */ + @ApiModelProperty(notes = "收费人员ID") + @Excel(name = "收费人员ID") + private String userId; + + /** 收费人员 */ + @ApiModelProperty(notes = "收费人员") + @Excel(name = "收费人员") + private String userName; + + /** 厂商标识 */ + @ApiModelProperty(notes = "厂商标识") + @Excel(name = "厂商标识") + private String vendorId; + + /** 基层流水号 */ + @ApiModelProperty(notes = "基层流水号") + @Excel(name = "基层流水号") + private String hisSerialNo; + + /** 预交金额 */ + @ApiModelProperty(notes = "预交金额") + @Excel(name = "预交金额") + private BigDecimal totalFee; + + /** 实际金额 */ + @ApiModelProperty(notes = "实际金额") + @Excel(name = "实际金额") + private BigDecimal totalCost; + + /** 机构ID */ + @ApiModelProperty(notes = "机构ID") + private String orgCode; + + /** 机构名称 */ + @ApiModelProperty(notes = "机构名称") + @Excel(name = "机构名称") + private String orgName; + + /** 状态（0未交费 1已支付） */ + @ApiModelProperty(notes = "状态（0未交费 1已支付）") + @Excel(name = "状态", readConverterExp = "0=未交费,1=已支付") + private Integer prepayStatus; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInspectionApply.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInspectionApply.java new file mode 100644 index 000000000..3c556c8d2 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInspectionApply.java @@ -0,0 +1,78 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 申请单对象 his_inspection_apply + * + * @author bend + * @date 2020-07-10 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "申请单") +@Table(name = "his_inspection_apply") +public class HisInspectionApply extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 机构编码 */ + @ApiModelProperty(notes = "机构编码") + private String orgCode; + + /** 姓名 */ + @ApiModelProperty(notes = "姓名") + @Excel(name = "姓名") + private String patientName; + + /** 身份证号 */ + @ApiModelProperty(notes = "身份证号") + @Excel(name = "身份证号") + private String idCardNo; + + /** 机构名称 */ + @ApiModelProperty(notes = "机构名称") + @Excel(name = "机构名称") + private String orgName; + + /** 申请单ID */ + @ApiModelProperty(notes = "申请单ID") + @Excel(name = "申请单ID") + private String applyId; + + /** 项目名称 */ + @ApiModelProperty(notes = "项目名称") + @Excel(name = "项目名称") + private String applyItemName; + + /** 开单时间 */ + @ApiModelProperty(notes = "开单时间") + @Excel(name = "开单时间") + private String billTime; + + /** 开单人 */ + @ApiModelProperty(notes = "开单人") + @Excel(name = "开单人") + private String operator; + + /** 操作人员 */ + @ApiModelProperty(notes = "操作人员") + @Excel(name = "操作人员") + private String userId; + + /** 业务ID */ + @ApiModelProperty(notes = "业务ID") + @Excel(name = "业务ID") + private String businessId; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInspectionReport.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInspectionReport.java new file mode 100644 index 000000000..4c799fc8f --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInspectionReport.java @@ -0,0 +1,168 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; +import java.util.List; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 检查检验对象 his_inspection_report + * + * @author bend + * @date 2020-07-10 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "检查检验报告单") +@Table(name = "his_inspection_report") +public class HisInspectionReport extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 申请单ID */ + @ApiModelProperty(notes = "申请单ID") + @Excel(name = "申请单ID") + private String applyId; + + /** 身份证号 */ + @ApiModelProperty(notes = "身份证号") + @Excel(name = "身份证号") + private String idCardNo; + + /** 病人姓名 */ + @ApiModelProperty(notes = "病人姓名") + @Excel(name = "病人姓名") + private String patientName; + + /** 性别 */ + @ApiModelProperty(notes = "性别") + @Excel(name = "性别") + private String patientSex; + + /** 年龄 */ + @ApiModelProperty(notes = "年龄") + @Excel(name = "年龄") + private String age; + + /** 金额 */ + @ApiModelProperty(notes = "金额") + @Excel(name = "金额") + private BigDecimal fee; + + /** 单据号 */ + @ApiModelProperty(notes = "单据号") + @Excel(name = "单据号") + private String billCode; + + /** 单据类型（8检查 9检验） */ + @ApiModelProperty(notes = "单据类型（8检查 9检验）") + @Excel(name = "单据类型", readConverterExp = "8=检查,9=检验") + private Integer billType; + + /** 单据状态 */ + @ApiModelProperty(notes = "单据状态") + private Integer billStatus; + + /** 开单时间 */ + @ApiModelProperty(notes = "开单时间") + @Excel(name = "开单时间") + private String billTime; + + /** 数据来源 */ + @ApiModelProperty(notes = "数据来源") + private Integer dataSource; + + /** 主诉 */ + @ApiModelProperty(notes = "主诉") + @Excel(name = "主诉") + private String subjective; + + /** 诊断 */ + @ApiModelProperty(notes = "诊断") + @Excel(name = "诊断") + private String assessment; + + /** 包名称 */ + @ApiModelProperty(notes = "包名称") + @Excel(name = "包名称") + private String packName; + + /** 标本类型（1全血 2血清 3粪便 4白带 5穿刺液） */ + @ApiModelProperty(notes = "标本类型（1全血 2血清 3粪便 4白带 5穿刺液）") + @Excel(name = "标本类型", readConverterExp = "1=全血,2=血清,3=粪便,4=白带,5=穿刺液") + private Integer specimenType; + + /** 标本号 */ + @ApiModelProperty(notes = "标本号") + private String specimen; + + /** 图片源 */ + @ApiModelProperty(notes = "图片源") + private String imageSrc; + + /** 结果 */ + @ApiModelProperty(notes = "结果") + @Excel(name = "结果") + private String dataResult; + + /** 异常类型（0否 1是 2无） */ + @ApiModelProperty(notes = "异常类型（0否 1是 2无）") + @Excel(name = "异常类型", readConverterExp = "0=否,1=是,2=无") + private Integer infectious; + + /** 结论 */ + @ApiModelProperty(notes = "结论") + @Excel(name = "结论") + private String conclusion; + + /** 模板ID */ + @ApiModelProperty(notes = "模板ID") + private String templateId; + + /** 科室ID */ + @ApiModelProperty(notes = "科室ID") + private String deptId; + + /** 科室名称 */ + @ApiModelProperty(notes = "科室名称") + @Excel(name = "科室名称") + private String deptName; + + /** 开单医生 */ + @ApiModelProperty(notes = "开单医生") + @Excel(name = "开单医生") + private String userName; + + /** 机构ID */ + @ApiModelProperty(notes = "机构ID") + private String orgCode; + + /** 执行人 */ + @ApiModelProperty(notes = "执行人") + @Excel(name = "执行人") + private String actorName; + + /** 操作员 */ + @ApiModelProperty(notes = "操作员") + @Excel(name = "操作员") + private String operators; + + /** 报告时间 */ + @ApiModelProperty(notes = "报告时间") + @Excel(name = "报告时间") + private String execTime; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + + /** 检查检验明细信息 */ + @ApiModelProperty(notes = "检查检验明细信息") + private List hisInspectionReportItemList; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInspectionReportItem.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInspectionReportItem.java new file mode 100644 index 000000000..4b4479dd4 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisInspectionReportItem.java @@ -0,0 +1,83 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; +/** + * 检查检验明细对象 his_inspection_report_item + * + * @author bend + * @date 2020-07-10 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "检查检验明细") +@Table(name = "his_inspection_report_item") +public class HisInspectionReportItem extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 报告ID */ + @ApiModelProperty(notes = "报告ID") + @Excel(name = "报告ID") + private Long reportId; + + /** 检查项ID */ + @ApiModelProperty(notes = "检查项ID") + @Excel(name = "检查项ID") + private String itemId; + + /** 执行记录ID */ + @ApiModelProperty(notes = "执行记录ID") + @Excel(name = "执行记录ID") + private String execRecordId; + + /** 项目名称 */ + @ApiModelProperty(notes = "项目名称") + @Excel(name = "项目名称") + private String itemName; + + /** 项目内容 */ + @ApiModelProperty(notes = "项目内容") + @Excel(name = "项目内容") + private String itemValue; + + /** 排序 */ + @ApiModelProperty(notes = "排序") + @Excel(name = "排序") + private String sortNo; + + /** 单位 */ + @ApiModelProperty(notes = "单位") + @Excel(name = "单位") + private String unit; + + /** 参考值 */ + @ApiModelProperty(notes = "参考值") + @Excel(name = "参考值") + private String referenceValue; + + /** 定性结果 */ + @ApiModelProperty(notes = "定性结果") + @Excel(name = "定性结果") + private String qualityResult; + + /** 档案标志 */ + @ApiModelProperty(notes = "档案标志") + @Excel(name = "档案标志") + private String archivedFlag; + + /** 金额 */ + @ApiModelProperty(notes = "金额") + @Excel(name = "金额") + private String fee; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisMerchantScrcu.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisMerchantScrcu.java new file mode 100644 index 000000000..6e7c952c2 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisMerchantScrcu.java @@ -0,0 +1,104 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 农信商户对象 his_merchant_scrcu + * + * @author bend + * @date 2020-07-27 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "农信商户") +@Table(name = "his_merchant_scrcu") +public class HisMerchantScrcu extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主商户号 */ + @ApiModelProperty(notes = "主商户号") + @Excel(name = "主商户号") + private String mchNo; + + /** 主商户名 */ + @ApiModelProperty(notes = "主商户名") + @Excel(name = "主商户名") + private String mchName; + + /** 子商户号 */ + @ApiModelProperty(notes = "子商户号") + @Excel(name = "子商户号") + private String subMchNo; + + /** 子商户名 */ + @ApiModelProperty(notes = "子商户名") + @Excel(name = "子商户名") + private String subMchName; + + /** 机构ID */ + @ApiModelProperty(notes = "机构ID") + @Excel(name = "机构ID") + private String orgCode; + + /** 机构名称 */ + @ApiModelProperty(notes = "机构名称") + @Excel(name = "机构名称") + private String orgName; + + /** 客户端ID */ + @ApiModelProperty(notes = "客户端ID") + @Excel(name = "客户端ID") + private String clientId; + + /** 客户端密钥 */ + @ApiModelProperty(notes = "客户端密钥") + @Excel(name = "客户端密钥") + private String secret; + + /** 开放平台 */ + @ApiModelProperty(notes = "开放平台") + @Excel(name = "开放平台") + private String openClientId; + + /** 接口地址 */ + @ApiModelProperty(notes = "接口地址") + @Excel(name = "接口地址") + private String openApi; + + /** 公钥路径 */ + @ApiModelProperty(notes = "公钥路径") + @Excel(name = "公钥路径") + private String publicKeyPath; + + /** 私钥路径 */ + @ApiModelProperty(notes = "私钥路径") + @Excel(name = "私钥路径") + private String privateKeyPath; + + /** 私钥密码 */ + @ApiModelProperty(notes = "私钥密码") + @Excel(name = "私钥密码") + private String privateKeyPassword; + + /** 区划代码 */ + @ApiModelProperty(notes = "区划代码") + @Excel(name = "区划代码") + private String txnAreaInfo; + + /** 版本号 */ + @ApiModelProperty(notes = "版本号") + @Excel(name = "版本号") + private String version; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisMerchantWechat.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisMerchantWechat.java new file mode 100644 index 000000000..a642d80f3 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisMerchantWechat.java @@ -0,0 +1,48 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; +/** + * 特约商户对象 his_merchant_wechat + * + * @author bend + * @date 2020-07-27 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "微信服务商") +@Table(name = "his_wechat_provider") +public class HisMerchantWechat extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 服务商ID */ + @ApiModelProperty(notes = "服务商ID") + @Excel(name = "服务商ID") + private Long providerId; + + /** 特约商户 */ + @ApiModelProperty(notes = "特约商户") + @Excel(name = "特约商户") + private String subAppId; + + /** 机构ID */ + @ApiModelProperty(notes = "机构ID") + @Excel(name = "机构ID") + private String orgCode; + + /** 机构名称 */ + @ApiModelProperty(notes = "机构名称") + @Excel(name = "机构名称") + private String orgName; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatient.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatient.java new file mode 100644 index 000000000..a71ecdaf8 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatient.java @@ -0,0 +1,127 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 门诊病人对象 his_outpatient + * + * @author bend + * @date 2020-07-08 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "门诊病人") +@Table(name = "his_outpatient") +public class HisOutpatient extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 就诊人 */ + @ApiModelProperty(notes = "就诊人") + private Long patientId; + + /** 姓名 */ + @ApiModelProperty(notes = "姓名") + @Excel(name = "姓名") + private String patientName; + + /** 身份证 */ + @ApiModelProperty(notes = "身份证") + @Excel(name = "身份证") + private String idCardNo; + + /** 性别 */ + @ApiModelProperty(notes = "性别") + @Excel(name = "性别") + private String patientSex; + + /** 医院名称 */ + @ApiModelProperty(notes = "医院名称") + @Excel(name = "医院名称") + private String orgName; + + /** 医院ID */ + @ApiModelProperty(notes = "医院ID") + private String orgCode; + + /** 门诊ID */ + @ApiModelProperty(notes = "门诊ID") + @Excel(name = "门诊ID") + private String businessId; + + /** 挂号ID */ + @ApiModelProperty(notes = "挂号ID") + private String registeredId; + + /** 挂号费 */ + @ApiModelProperty(notes = "挂号费") + private BigDecimal registeredFee; + + /** 门诊号 */ + @ApiModelProperty(notes = "门诊号") + @Excel(name = "门诊号") + private String outpatientNumber; + + /** 就诊时间 */ + @ApiModelProperty(notes = "就诊时间") + @Excel(name = "就诊时间") + private String visitDate; + + /** 科室ID */ + @ApiModelProperty(notes = "科室ID") + private String deptId; + + /** 科室名称 */ + @ApiModelProperty(notes = "科室名称") + @Excel(name = "科室名称") + private String deptName; + + /** 医生ID */ + @ApiModelProperty(notes = "医生ID") + private String doctorId; + + /** 医生名称 */ + @ApiModelProperty(notes = "医生名称") + @Excel(name = "医生名称") + private String doctorName; + + /** 诊断编码 */ + @ApiModelProperty(notes = "诊断编码") + private String diagnoseDiseaseCode; + + /** 诊断名称 */ + @ApiModelProperty(notes = "诊断名称") + @Excel(name = "诊断名称") + private String diagnoseDiseaseName; + + /** 病情描述 */ + @ApiModelProperty(notes = "病情描述") + @Excel(name = "病情描述") + private String diseaseDesc; + + /** 经办人 */ + @ApiModelProperty(notes = "经办人") + private String operator; + + /** 总费用 */ + @ApiModelProperty(notes = "总费用") + @Excel(name = "总费用") + private BigDecimal totalCost; + + /** 接诊状态（-1已取消 0未接诊 1接诊中 2已结诊） */ + @ApiModelProperty(notes = "接诊状态（-1已取消 0未接诊 1接诊中 2已结诊）") + @Excel(name = "接诊状态", readConverterExp = "-1=已取消,0=未接诊,1=接诊中,2=已结诊") + private Integer receptionStatus; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatientExpensesBill.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatientExpensesBill.java new file mode 100644 index 000000000..dd05d38dd --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatientExpensesBill.java @@ -0,0 +1,133 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; +import java.util.List; +import java.util.Date; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; +import javax.persistence.Transient; + +/** + * 待缴费单对象 his_outpatient_expenses_bill + * + * @author bend + * @date 2020-07-09 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "待缴费单") +@Table(name = "his_outpatient_expenses_bill") +public class HisOutpatientExpensesBill extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 用户ID */ + @ApiModelProperty(notes = "用户ID") + private Long memberId; + + /** 患者ID */ + @ApiModelProperty(notes = "患者ID") + private Long patientId; + + + /** 病人姓名 */ + @ApiModelProperty(notes = "病人姓名") + @Excel(name = "病人姓名") + private String patientName; + + /** 身份证号 */ + @ApiModelProperty(notes = "身份证号") + @Excel(name = "身份证号") + private String idCardNo; + + /** 门诊ID */ + @ApiModelProperty(notes = "门诊ID") + @Excel(name = "门诊ID") + private String businessId; + + /** 挂号ID */ + @ApiModelProperty(notes = "挂号ID") + private String registeredId; + + /** 处方ID */ + @ApiModelProperty(notes = "处方ID") + private String recipeId; + + /** 处方号 */ + @ApiModelProperty(notes = "处方号") + @Excel(name = "处方号") + private String recipeCode; + + /** 处方费用 */ + @ApiModelProperty(notes = "处方费用") + @Excel(name = "处方费用") + private BigDecimal recipeFee; + + /** 处方医生 */ + @ApiModelProperty(notes = "处方医生") + @Excel(name = "处方医生") + private String billDoctor; + + /** 开单科室 */ + @ApiModelProperty(notes = "开单科室") + @Excel(name = "开单科室") + private String billDept; + + /** 开单时间 */ + @ApiModelProperty(notes = "开单时间") + @Excel(name = "开单时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date billTime; + + /** 费用名称 */ + @ApiModelProperty(notes = "费用名称") + @Excel(name = "费用名称") + private String feeName; + + /** 执行科室 */ + @ApiModelProperty(notes = "执行科室") + private String operateDept; + + /** 处方状态（0待缴费 1已缴费） */ + @ApiModelProperty(notes = "处方状态（0待缴费 1已缴费）") + @Excel(name = "处方状态", readConverterExp = "0=待缴费,1=已缴费") + private Integer recipeStatus; + + /** 收费记录ID */ + @ApiModelProperty(notes = "收费记录ID") + @Excel(name = "收费记录ID") + private String chargeRecordId; + + /** 订单编号 */ + @ApiModelProperty(notes = "订单编号") + @Excel(name = "订单编号") + private String orderCode; + + /** 机构ID */ + @ApiModelProperty(notes = "机构ID") + private String orgCode; + + /** 机构名称 */ + @ApiModelProperty(notes = "机构名称") + @Excel(name = "机构名称") + private String orgName; + + /** 缴费时间 */ + @ApiModelProperty(notes = "缴费时间") + @Excel(name = "缴费时间") + private String payTime; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + + /** 清单详情信息 */ + @ApiModelProperty(notes = "清单详情信息") + @Transient + private List hisOutpatientExpensesBillDetailList; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatientExpensesBillDetail.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatientExpensesBillDetail.java new file mode 100644 index 000000000..c5b240bac --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatientExpensesBillDetail.java @@ -0,0 +1,115 @@ +package com.ruoyi.his.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.persistence.*; +import java.math.BigDecimal; +import java.util.Date; + +/** + * 清单详情对象 his_outpatient_expenses_bill_detail + * + * @author bend + * @date 2020-07-09 + */ +@Data +@ApiModel(value = "待缴费单详情") +@Table(name = "his_outpatient_expenses_bill") +public class HisOutpatientExpensesBillDetail +{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty(notes = "主键ID") + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private String id; + + /** 清单ID */ + @ApiModelProperty(notes = "清单ID") + @Excel(name = "清单ID") + private Long billId; + + /** 清单详情ID */ + @ApiModelProperty(notes = "清单详情ID") + @Excel(name = "清单详情ID") + private String billDetailId; + + /** 处方ID */ + @ApiModelProperty(notes = "处方ID") + @Excel(name = "处方ID") + private String recipeId; + + /** 处方号 */ + @ApiModelProperty(notes = "处方号") + @Excel(name = "处方号") + private String recipeCode; + + /** 金额 */ + @ApiModelProperty(notes = "金额") + @Excel(name = "金额") + private BigDecimal fee; + + /** 费用名称 */ + @ApiModelProperty(notes = "费用名称") + @Excel(name = "费用名称") + private String feeName; + + /** 处方医生 */ + @ApiModelProperty(notes = "处方医生") + @Excel(name = "处方医生") + private String billDoctor; + + /** 开单科室 */ + @ApiModelProperty(notes = "开单科室") + @Excel(name = "开单科室") + private String billDept; + + /** 执行科室 */ + @ApiModelProperty(notes = "执行科室") + @Excel(name = "执行科室") + private String operateDept; + + /** 开单时间 */ + @ApiModelProperty(notes = "开单时间") + @Excel(name = "开单时间") + private String billTime; + + /** 数量 */ + @ApiModelProperty(notes = "数量") + @Excel(name = "数量") + private Long amount; + + /** 单位 */ + @ApiModelProperty(notes = "单位") + @Excel(name = "单位") + private String unit; + + /** 规格 */ + @ApiModelProperty(notes = "规格") + @Excel(name = "规格") + private String specification; + + /** 单价 */ + @ApiModelProperty(notes = "单价") + @Excel(name = "单价") + private BigDecimal unitPrice; + + /** 费用项目名称 */ + @ApiModelProperty(notes = "费用项目名称") + @Excel(name = "费用项目名称") + private String costItemName; + + /** 创建时间 */ + @ApiModelProperty(notes = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatientPayment.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatientPayment.java new file mode 100644 index 000000000..202ef4631 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisOutpatientPayment.java @@ -0,0 +1,79 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.math.BigDecimal; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 门诊预交对象 his_outpatient_payment + * + * @author bend + * @date 2020-07-14 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "门诊预交") +@Table(name = "his_outpatient_payment") +public class HisOutpatientPayment extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 订单编号 */ + @ApiModelProperty(notes = "订单编号") + @Excel(name = "订单编号") + private String orderCode; + + /** 挂号ID */ + @ApiModelProperty(notes = "挂号ID") + @Excel(name = "挂号ID") + private String registeredId; + + /** 处方IDS */ + @ApiModelProperty(notes = "处方IDS") + @Excel(name = "处方IDS") + private String recipeIds; + + /** 收费人员ID */ + @ApiModelProperty(notes = "收费人员ID") + @Excel(name = "收费人员ID") + private String userId; + + /** 总金额 */ + @ApiModelProperty(notes = "总金额") + @Excel(name = "总金额") + private BigDecimal totalFee; + + /** 缴费流水号 */ + @ApiModelProperty(notes = "缴费流水号") + @Excel(name = "缴费流水号") + private String paySerialNo; + + /** 缴费方式列表 */ + @ApiModelProperty(notes = "缴费方式列表") + @Excel(name = "缴费方式列表") + private String paymentListStr; + + /** 厂商标识 */ + @ApiModelProperty(notes = "厂商标识") + @Excel(name = "厂商标识") + private String vendorId; + + /** 机构ID */ + @ApiModelProperty(notes = "机构ID") + private String orgCode; + + /** 机构名称 */ + @ApiModelProperty(notes = "机构名称") + @Excel(name = "机构名称") + private String orgName; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisPatientExpenses.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisPatientExpenses.java new file mode 100644 index 000000000..dcb579116 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisPatientExpenses.java @@ -0,0 +1,95 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.util.List; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 费用记录对象 his_patient_expenses + * + * @author bend + * @date 2020-07-09 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "费用记录") +@Table(name = "his_patient_expenses") +public class HisPatientExpenses extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 用户ID */ + @ApiModelProperty(notes = "用户ID") + private Long memberId; + + /** 患者ID */ + @ApiModelProperty(notes = "患者ID") + private Long patientId; + + /** 病人姓名 */ + @ApiModelProperty(notes = "病人姓名") + @Excel(name = "病人姓名") + private String patientName; + + /** 身份证号 */ + @ApiModelProperty(notes = "身份证号") + @Excel(name = "身份证号") + private String idCardNo; + + /** 订单号 */ + @ApiModelProperty(notes = "订单号") + private String orderCode; + + /** 机构ID */ + @ApiModelProperty(notes = "机构ID") + private String orgCode; + + /** 医院名称 */ + @ApiModelProperty(notes = "医院名称") + @Excel(name = "医院名称") + private String orgName; + + /** 开单科室 */ + @ApiModelProperty(notes = "开单科室") + @Excel(name = "开单科室") + private String billDept; + + /** 开单医生 */ + @ApiModelProperty(notes = "开单医生") + @Excel(name = "开单医生") + private String billDoctor; + + /** 业务ID[分别对应门诊和住院] */ + @ApiModelProperty(notes = "业务ID[分别对应门诊和住院]") + @Excel(name = "业务ID") + private String businessId; + + /** 业务编号[分别对应门诊号和住院号] */ + @ApiModelProperty(notes = "业务编号[分别对应门诊号和住院号]") + @Excel(name = "业务编号") + private String expenseBusinessNo; + + /** 业务类型（1门诊 2住院） */ + @ApiModelProperty(notes = "业务类型（1门诊 2住院）") + @Excel(name = "业务类型", readConverterExp = "1=门诊,2=住院") + private Integer expenseType; + + /** 收费记录ID */ + @ApiModelProperty(notes = "收费记录ID") + @Excel(name = "收费记录ID") + private String chargeRecordId; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + + /** 费用详情信息 */ + @ApiModelProperty(notes = "费用详情信息") + private List hisPatientExpensesDetailList; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisPatientExpensesDetail.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisPatientExpensesDetail.java new file mode 100644 index 000000000..01bd34699 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisPatientExpensesDetail.java @@ -0,0 +1,241 @@ +package com.ruoyi.his.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.ruoyi.common.annotation.Excel; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +import java.math.BigDecimal; +import java.util.Date; +/** + * 费用详情对象 his_patient_expenses_detail + * + * @author bend + * @date 2020-07-09 + */ +@Data +@ApiModel(value = "费用记录") +@Table(name = "his_patient_expenses") +public class HisPatientExpensesDetail +{ + private static final long serialVersionUID = 1L; + + @ApiModelProperty(notes = "主键ID") + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private String id; + + /** 费用ID（分别对应门诊费和住院费） */ + @ApiModelProperty(notes = "费用ID（分别对应门诊费和住院费）") + @Excel(name = "费用ID") + private Long expensesId; + + /** 费用明细ID */ + @ApiModelProperty(notes = "费用明细ID") + @Excel(name = "费用明细ID") + private String costDetailId; + + /** 项目名称 */ + @ApiModelProperty(notes = "项目名称") + @Excel(name = "项目名称") + private String costItemName; + + /** 项目编码 */ + @ApiModelProperty(notes = "项目编码") + private String costItemCode; + + /** 项目类别名称 */ + @ApiModelProperty(notes = "项目类别名称") + @Excel(name = "项目类别名称") + private String costItemCategoryName; + + /** 项目类别编码 */ + @ApiModelProperty(notes = "项目类别编码") + private String costItemCategoryCode; + + /** 单位 */ + @ApiModelProperty(notes = "单位") + @Excel(name = "单位") + private String unit; + + /** 剂型 */ + @ApiModelProperty(notes = "剂型") + @Excel(name = "剂型") + private String formulation; + + /** 规格 */ + @ApiModelProperty(notes = "规格") + @Excel(name = "规格") + private String specification; + + /** 单价 */ + @ApiModelProperty(notes = "单价") + @Excel(name = "单价") + private BigDecimal unitPrice; + + /** 数量 */ + @ApiModelProperty(notes = "数量") + @Excel(name = "数量") + private Long quantity; + + /** 金额 */ + @ApiModelProperty(notes = "金额") + @Excel(name = "金额") + private BigDecimal amount; + + /** 药品用量 */ + @ApiModelProperty(notes = "药品用量") + @Excel(name = "药品用量") + private String drugDosage; + + /** 药品用法 */ + @ApiModelProperty(notes = "药品用法") + @Excel(name = "药品用法") + private String drugUsage; + + /** 用药频次 */ + @ApiModelProperty(notes = "用药频次") + @Excel(name = "用药频次") + private String frequency; + + /** 用药天数 */ + @ApiModelProperty(notes = "用药天数") + @Excel(name = "用药天数") + private Long medicateDays; + + /** 医院计价单位 */ + @ApiModelProperty(notes = "医院计价单位") + private String hospitalPricingUnit; + + /** 是否进口药品 */ + @ApiModelProperty(notes = "是否进口药品") + private String isImportedDrugs; + + /** 药品产地 */ + @ApiModelProperty(notes = "药品产地") + private String drugProducingArea; + + /** 处方号 */ + @ApiModelProperty(notes = "处方号") + @Excel(name = "处方号") + private String recipeCode; + + /** 费用单据类型 */ + @ApiModelProperty(notes = "费用单据类型") + @Excel(name = "费用单据类型") + private String costDocumentType; + + /** 开单科室名称 */ + @ApiModelProperty(notes = "开单科室名称") + @Excel(name = "开单科室名称") + private String billDeptName; + + /** 开单科室编码 */ + @ApiModelProperty(notes = "开单科室编码") + private String billDeptId; + + /** 开单医生姓名 */ + @ApiModelProperty(notes = "开单医生姓名") + @Excel(name = "开单医生姓名") + private String billDoctorName; + + /** 开单医生编码 */ + @ApiModelProperty(notes = "开单医生编码") + private String billDoctorId; + + /** 开单时间 */ + @ApiModelProperty(notes = "开单时间") + @Excel(name = "开单时间") + private String billTime; + + /** 执行科室名称 */ + @ApiModelProperty(notes = "执行科室名称") + @Excel(name = "执行科室名称") + private String operateDeptName; + + /** 执行科室编码 */ + @ApiModelProperty(notes = "执行科室编码") + private String operateDeptId; + + /** 执行医生姓名 */ + @ApiModelProperty(notes = "执行医生姓名") + @Excel(name = "执行医生姓名") + private String operateDoctorName; + + /** 执行医生编码 */ + @ApiModelProperty(notes = "执行医生编码") + private String operateDoctorId; + + /** 执行时间 */ + @ApiModelProperty(notes = "执行时间") + @Excel(name = "执行时间") + private String operateTime; + + /** 处方医师 */ + @ApiModelProperty(notes = "处方医师") + @Excel(name = "处方医师") + private String prescribe; + + /** 经办人 */ + @ApiModelProperty(notes = "经办人") + @Excel(name = "经办人") + private String operator; + + /** 执业医师证号 */ + @ApiModelProperty(notes = "执业医师证号") + private String doctorNumber; + + /** 费用冲销ID */ + @ApiModelProperty(notes = "费用冲销ID") + private String costWriteOffId; + + /** 是否收费（0否 1是） */ + @ApiModelProperty(notes = "是否收费（0否 1是）") + @Excel(name = "是否收费", readConverterExp = "0=否,1=是") + private Integer isChargeFee; + + /** 费用时间 */ + @ApiModelProperty(notes = "费用时间") + @Excel(name = "费用时间", width = 30, dateFormat = "yyyy-MM-dd") + private Date chargeTime; + + /** 机构编码 */ + @ApiModelProperty(notes = "机构编码") + private String orgCode; + + /** 机构名称 */ + @ApiModelProperty(notes = "机构名称") + @Excel(name = "机构名称") + private String orgName; + + /** 包装规格 */ + @ApiModelProperty(notes = "包装规格") + private String packageSpec; + + /** 与单次用量同单位规格 */ + @ApiModelProperty(notes = "与单次用量同单位规格") + private String dosageSpec; + + /** 每次用量 */ + @ApiModelProperty(notes = "每次用量") + private String everyTimeDosage; + + /** 目录CODE */ + @ApiModelProperty(notes = "目录CODE") + private String dirCode; + + /** 创建时间 */ + @ApiModelProperty(notes = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisPayAccount.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisPayAccount.java new file mode 100644 index 000000000..0f5f9e1ab --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisPayAccount.java @@ -0,0 +1,69 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 支付账户对象 his_pay_account + * + * @author bend + * @date 2020-07-14 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "支付账户") +@Table(name = "his_pay_account") +public class HisPayAccount extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 账户ID */ + @ApiModelProperty(notes = "账户ID") + @Excel(name = "账户ID") + private String accId; + + /** 拼音简写 */ + @ApiModelProperty(notes = "拼音简写") + @Excel(name = "拼音简写") + private String accPy; + + /** 支付方式名称 */ + @ApiModelProperty(notes = "支付方式名称") + @Excel(name = "支付方式名称") + private String accName; + + /** 支付类型 */ + @ApiModelProperty(notes = "支付类型") + @Excel(name = "支付类型") + private String payment; + + /** 拼音简写 */ + @ApiModelProperty(notes = "拼音简写") + @Excel(name = "拼音简写") + private String payPy; + + /** 支付方式ID */ + @ApiModelProperty(notes = "支付方式ID") + @Excel(name = "支付方式ID") + private String paymentId; + + /** 默认显示（0否 1是） */ + @ApiModelProperty(notes = "默认显示（0否 1是）") + @Excel(name = "默认显示", readConverterExp = "0=否,1=是") + private Integer isDefaultShow; + + /** 排序号 */ + @ApiModelProperty(notes = "排序号") + @Excel(name = "排序号") + private Long sortNo; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisRegistrationRecord.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisRegistrationRecord.java new file mode 100644 index 000000000..6d4632d08 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisRegistrationRecord.java @@ -0,0 +1,492 @@ +package com.ruoyi.his.domain; + +import java.math.BigDecimal; +import java.util.Date; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 挂号记录对象 his_registration_record + * + * @author bend + * @date 2020-06-28 + */ +public class HisRegistrationRecord extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 用户ID */ + private Long memberId; + + /** 就诊人 */ + private Long patientId; + + /** 姓名 */ + @Excel(name = "姓名") + private String patientName; + + /** 病人性别（0未知 1男 2女 9未说明） */ + @Excel(name = "病人性别", readConverterExp = "0=未知,1=男,2=女,9=未说明") + private Integer patientSex; + + /** 身份证号 */ + @Excel(name = "身份证号") + private String idCardNo; + + /** 医院ID */ + private String orgCode; + + /** 医院名称 */ + @Excel(name = "医院名称") + private String orgName; + + /** 科室ID */ + private String deptId; + + /** 科室名称 */ + @Excel(name = "科室名称") + private String deptName; + + /** 医生ID */ + private String doctorId; + + /** 医生名称 */ + @Excel(name = "医生名称") + private String doctorName; + + /** 厂商标识 */ + private String vendorId; + + /** 挂号费 */ + @Excel(name = "挂号费") + private BigDecimal fee; + + /** 流水号 */ + @Excel(name = "流水号") + private String paySerialNo; + + /** 缴费方式列表[{PaymentID:支付方式ID,OrgAccID:账户ID,Fee:金额}] */ + private String paymentListStr; + + /** 虚拟收费员ID */ + private String userId; + + /** 挂号ID */ + @Excel(name = "挂号ID") + private String registeredId; + + /** 挂号CODE */ + private String registeredCode; + + /** 挂号日期 */ + @Excel(name = "挂号日期", width = 30, dateFormat = "yyyy-MM-dd") + private Date registeredDate; + + /** 就诊日期 */ + @Excel(name = "就诊日期") + private String visitDate; + + /** 就诊时段（1上午 2下午） */ + @Excel(name = "就诊时段", readConverterExp = "1=上午,2=下午") + private String visitTime; + + /** 挂号类型（0预约挂号 1当日挂号 2分诊挂号） */ + @Excel(name = "挂号类型", readConverterExp = "0=预约挂号,1=当日挂号,2=分诊挂号") + private Integer registeredType; + + /** 门诊ID */ + @Excel(name = "门诊ID") + private String businessId; + + /** 门诊号 */ + @Excel(name = "门诊号") + private String outpatientNumber; + + /** 就诊序号 */ + @Excel(name = "就诊序号") + private String seq; + + /** 是否可退（0否 1是） */ + @Excel(name = "是否可退", readConverterExp = "0=否,1=是") + private Integer refundAble; + + /** 费用类型ID */ + private String feeTypeId; + + /** 挂号模板ID */ + private String templateId; + + /** 订单编号 */ + @Excel(name = "订单编号") + private String orderCode; + + /** 挂号来源（0线下 1线上 2自助分诊终端） */ + @Excel(name = "挂号来源", readConverterExp = "0=线下,1=线上,2=自助分诊终端") + private Integer registeredSource; + + /** 状态（0新建 1待接诊 2已就诊 3已退费） */ + @Excel(name = "状态", readConverterExp = "0=新建,1=待接诊,2=已就诊,3=已退费") + private Integer registeredStatus; + + /** 取消时间 */ + @Excel(name = "取消时间") + private String cancelTime; + + /** 删除标记（0否 1是） */ + private Integer deleted; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setMemberId(Long memberId) + { + this.memberId = memberId; + } + + public Long getMemberId() + { + return memberId; + } + public void setPatientId(Long patientId) + { + this.patientId = patientId; + } + + public Long getPatientId() + { + return patientId; + } + public void setPatientName(String patientName) + { + this.patientName = patientName; + } + + public String getPatientName() + { + return patientName; + } + public void setPatientSex(Integer patientSex) + { + this.patientSex = patientSex; + } + + public Integer getPatientSex() + { + return patientSex; + } + public void setIdCardNo(String idCardNo) + { + this.idCardNo = idCardNo; + } + + public String getIdCardNo() + { + return idCardNo; + } + public void setOrgCode(String orgCode) + { + this.orgCode = orgCode; + } + + public String getOrgCode() + { + return orgCode; + } + public void setOrgName(String orgName) + { + this.orgName = orgName; + } + + public String getOrgName() + { + return orgName; + } + public void setDeptId(String deptId) + { + this.deptId = deptId; + } + + public String getDeptId() + { + return deptId; + } + public void setDeptName(String deptName) + { + this.deptName = deptName; + } + + public String getDeptName() + { + return deptName; + } + public void setDoctorId(String doctorId) + { + this.doctorId = doctorId; + } + + public String getDoctorId() + { + return doctorId; + } + public void setDoctorName(String doctorName) + { + this.doctorName = doctorName; + } + + public String getDoctorName() + { + return doctorName; + } + public void setVendorId(String vendorId) + { + this.vendorId = vendorId; + } + + public String getVendorId() + { + return vendorId; + } + public void setFee(BigDecimal fee) + { + this.fee = fee; + } + + public BigDecimal getFee() + { + return fee; + } + public void setPaySerialNo(String paySerialNo) + { + this.paySerialNo = paySerialNo; + } + + public String getPaySerialNo() + { + return paySerialNo; + } + public void setPaymentListStr(String paymentListStr) + { + this.paymentListStr = paymentListStr; + } + + public String getPaymentListStr() + { + return paymentListStr; + } + public void setUserId(String userId) + { + this.userId = userId; + } + + public String getUserId() + { + return userId; + } + public void setRegisteredId(String registeredId) + { + this.registeredId = registeredId; + } + + public String getRegisteredId() + { + return registeredId; + } + public void setRegisteredCode(String registeredCode) + { + this.registeredCode = registeredCode; + } + + public String getRegisteredCode() + { + return registeredCode; + } + public void setRegisteredDate(Date registeredDate) + { + this.registeredDate = registeredDate; + } + + public Date getRegisteredDate() + { + return registeredDate; + } + public void setVisitDate(String visitDate) + { + this.visitDate = visitDate; + } + + public String getVisitDate() + { + return visitDate; + } + public void setVisitTime(String visitTime) + { + this.visitTime = visitTime; + } + + public String getVisitTime() + { + return visitTime; + } + public void setRegisteredType(Integer registeredType) + { + this.registeredType = registeredType; + } + + public Integer getRegisteredType() + { + return registeredType; + } + public void setBusinessId(String businessId) + { + this.businessId = businessId; + } + + public String getBusinessId() + { + return businessId; + } + public void setOutpatientNumber(String outpatientNumber) + { + this.outpatientNumber = outpatientNumber; + } + + public String getOutpatientNumber() + { + return outpatientNumber; + } + public void setSeq(String seq) + { + this.seq = seq; + } + + public String getSeq() + { + return seq; + } + public void setRefundAble(Integer refundAble) + { + this.refundAble = refundAble; + } + + public Integer getRefundAble() + { + return refundAble; + } + public void setFeeTypeId(String feeTypeId) + { + this.feeTypeId = feeTypeId; + } + + public String getFeeTypeId() + { + return feeTypeId; + } + public void setTemplateId(String templateId) + { + this.templateId = templateId; + } + + public String getTemplateId() + { + return templateId; + } + public void setOrderCode(String orderCode) + { + this.orderCode = orderCode; + } + + public String getOrderCode() + { + return orderCode; + } + public void setRegisteredSource(Integer registeredSource) + { + this.registeredSource = registeredSource; + } + + public Integer getRegisteredSource() + { + return registeredSource; + } + public void setRegisteredStatus(Integer registeredStatus) + { + this.registeredStatus = registeredStatus; + } + + public Integer getRegisteredStatus() + { + return registeredStatus; + } + public void setCancelTime(String cancelTime) + { + this.cancelTime = cancelTime; + } + + public String getCancelTime() + { + return cancelTime; + } + public void setDeleted(Integer deleted) + { + this.deleted = deleted; + } + + public Integer getDeleted() + { + return deleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("memberId", getMemberId()) + .append("patientId", getPatientId()) + .append("patientName", getPatientName()) + .append("patientSex", getPatientSex()) + .append("idCardNo", getIdCardNo()) + .append("orgCode", getOrgCode()) + .append("orgName", getOrgName()) + .append("deptId", getDeptId()) + .append("deptName", getDeptName()) + .append("doctorId", getDoctorId()) + .append("doctorName", getDoctorName()) + .append("vendorId", getVendorId()) + .append("fee", getFee()) + .append("paySerialNo", getPaySerialNo()) + .append("paymentListStr", getPaymentListStr()) + .append("userId", getUserId()) + .append("registeredId", getRegisteredId()) + .append("registeredCode", getRegisteredCode()) + .append("registeredDate", getRegisteredDate()) + .append("visitDate", getVisitDate()) + .append("visitTime", getVisitTime()) + .append("registeredType", getRegisteredType()) + .append("businessId", getBusinessId()) + .append("outpatientNumber", getOutpatientNumber()) + .append("seq", getSeq()) + .append("refundAble", getRefundAble()) + .append("feeTypeId", getFeeTypeId()) + .append("templateId", getTemplateId()) + .append("orderCode", getOrderCode()) + .append("registeredSource", getRegisteredSource()) + .append("registeredStatus", getRegisteredStatus()) + .append("cancelTime", getCancelTime()) + .append("remark", getRemark()) + .append("createTime", getCreateTime()) + .append("updateTime", getUpdateTime()) + .append("deleted", getDeleted()) + .toString(); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisRegistrationTemplate.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisRegistrationTemplate.java new file mode 100644 index 000000000..07fd7da6b --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisRegistrationTemplate.java @@ -0,0 +1,136 @@ +package com.ruoyi.his.domain; + +import java.math.BigDecimal; +import java.util.List; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 挂号模板对象 his_registration_template + * + * @author bend + * @date 2020-07-01 + */ +public class HisRegistrationTemplate extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 机构ID */ + private String orgCode; + + /** 机构名称 */ + @Excel(name = "机构名称") + private String orgName; + + /** 模板ID */ + @Excel(name = "模板ID") + private String templateId; + + /** 模板名称 */ + @Excel(name = "模板名称") + private String templateName; + + /** 挂号金额 */ + @Excel(name = "挂号金额") + private BigDecimal fee; + + /** 显示状态（0否 1是） */ + @Excel(name = "显示状态", readConverterExp = "0=否,1=是") + private Integer isShow; + + /** 删除标记（0否 1是） */ + private Integer deleted; + + public void setId(Long id) + { + this.id = id; + } + + public Long getId() + { + return id; + } + public void setOrgCode(String orgCode) + { + this.orgCode = orgCode; + } + + public String getOrgCode() + { + return orgCode; + } + public void setOrgName(String orgName) + { + this.orgName = orgName; + } + + public String getOrgName() + { + return orgName; + } + public void setTemplateId(String templateId) + { + this.templateId = templateId; + } + + public String getTemplateId() + { + return templateId; + } + public void setTemplateName(String templateName) + { + this.templateName = templateName; + } + + public String getTemplateName() + { + return templateName; + } + public void setFee(BigDecimal fee) + { + this.fee = fee; + } + + public BigDecimal getFee() + { + return fee; + } + public void setIsShow(Integer isShow) + { + this.isShow = isShow; + } + + public Integer getIsShow() + { + return isShow; + } + public void setDeleted(Integer deleted) + { + this.deleted = deleted; + } + + public Integer getDeleted() + { + return deleted; + } + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("orgCode", getOrgCode()) + .append("orgName", getOrgName()) + .append("templateId", getTemplateId()) + .append("templateName", getTemplateName()) + .append("fee", getFee()) + .append("isShow", getIsShow()) + .append("createTime", getCreateTime()) + .append("deleted", getDeleted()) + .toString(); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisWechatProvider.java b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisWechatProvider.java new file mode 100644 index 000000000..76aeef9cf --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/domain/HisWechatProvider.java @@ -0,0 +1,86 @@ +package com.ruoyi.his.domain; + +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; +import java.util.List; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.persistence.Table; + +/** + * 微信服务商对象 his_wechat_provider + * + * @author bend + * @date 2020-07-27 + */ +@EqualsAndHashCode(callSuper = true) +@Data +@ApiModel(value = "微信服务商") +@Table(name = "his_wechat_provider") +public class HisWechatProvider extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 客户端ID */ + @ApiModelProperty(notes = "客户端ID") + @Excel(name = "客户端ID") + private String clientId; + + /** 客户端密钥 */ + @ApiModelProperty(notes = "客户端密钥") + @Excel(name = "客户端密钥") + private String clientSecret; + + /** AppID */ + @ApiModelProperty(notes = "AppID") + @Excel(name = "AppID") + private String appId; + + /** AppSecret */ + @ApiModelProperty(notes = "AppSecret") + @Excel(name = "AppSecret") + private String appSecret; + + /** 服务商AppId */ + @ApiModelProperty(notes = "服务商AppId") + @Excel(name = "服务商AppId") + private String mchAppId; + + /** 服务商账号 */ + @ApiModelProperty(notes = "服务商账号") + @Excel(name = "服务商账号") + private String mchId; + + /** 服务商密钥 */ + @ApiModelProperty(notes = "服务商密钥") + @Excel(name = "服务商密钥") + private String mchKey; + + /** 证书路径 */ + @ApiModelProperty(notes = "证书路径") + @Excel(name = "证书路径") + private String keyPath; + + /** + * 前端地址(公众号） + */ + @ApiModelProperty(value = "前端地址(公众号）") + @Excel(name = "前端地址") + private String frontUrl; + + /** 后台接口 */ + @ApiModelProperty(notes = "后台接口") + @Excel(name = "后台接口") + private String openApi; + + /** 删除标记（0否 1是） */ + @ApiModelProperty(notes = "删除标记（0否 1是）") + private Integer deleted; + + /** 特约商户信息 */ + @ApiModelProperty(notes = "特约商户信息") + private List hisMerchantWechatList; + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDepartmentMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDepartmentMapper.java new file mode 100644 index 000000000..551b3266d --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDepartmentMapper.java @@ -0,0 +1,71 @@ +package com.ruoyi.his.mapper; + +import java.util.List; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisDepartment; + +/** + * 科室Mapper接口 + * + * @author bend + * @date 2020-07-01 + */ +public interface HisDepartmentMapper extends RuoYiBaseMapper +{ + /** + * 查询科室 + * + * @param id 科室ID + * @return 科室 + */ + public HisDepartment selectHisDepartmentById(Long id); + + /** + * 查询科室列表 + * + * @param hisDepartment 科室 + * @return 科室集合 + */ + public List selectHisDepartmentList(HisDepartment hisDepartment); + + /** + * 新增科室 + * + * @param hisDepartment 科室 + * @return 结果 + */ + public int insertHisDepartment(HisDepartment hisDepartment); + + /** + * 修改科室 + * + * @param hisDepartment 科室 + * @return 结果 + */ + public int updateHisDepartment(HisDepartment hisDepartment); + + /** + * 删除科室 + * + * @param id 科室ID + * @return 结果 + */ + public int deleteHisDepartmentById(Long id); + + /** + * 批量删除科室 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisDepartmentByIds(String[] ids); + + /** + * 查询科室 + * + * @param deptId 科室ID + * @return 科室 + */ + public HisDepartment selectHisDepartmentByDeptId(String deptId); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDoctorDepartmentMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDoctorDepartmentMapper.java new file mode 100644 index 000000000..c2961783a --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDoctorDepartmentMapper.java @@ -0,0 +1,65 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisDoctorDepartment; + +import java.util.List; + +/** + * 医生科室关系Mapper接口 + * + * @author bend + * @date 2020-07-01 + */ +public interface HisDoctorDepartmentMapper extends RuoYiBaseMapper +{ + /** + * 查询医生科室关系 + * + * @param id 医生科室关系ID + * @return 医生科室关系 + */ + public HisDoctorDepartment selectHisDoctorDepartmentById(Long id); + + /** + * 查询医生科室关系列表 + * + * @param hisDoctorDepartment 医生科室关系 + * @return 医生科室关系集合 + */ + public List selectHisDoctorDepartmentList(HisDoctorDepartment hisDoctorDepartment); + + /** + * 新增医生科室关系 + * + * @param hisDoctorDepartment 医生科室关系 + * @return 结果 + */ + public int insertHisDoctorDepartment(HisDoctorDepartment hisDoctorDepartment); + + /** + * 修改医生科室关系 + * + * @param hisDoctorDepartment 医生科室关系 + * @return 结果 + */ + public int updateHisDoctorDepartment(HisDoctorDepartment hisDoctorDepartment); + + public int updateHisDoctorDepartmentByDeptId(HisDoctorDepartment hisDoctorDepartment); + + /** + * 删除医生科室关系 + * + * @param id 医生科室关系ID + * @return 结果 + */ + public int deleteHisDoctorDepartmentById(Long id); + + /** + * 批量删除医生科室关系 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisDoctorDepartmentByIds(String[] ids); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDoctorMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDoctorMapper.java new file mode 100644 index 000000000..e68d08b1b --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDoctorMapper.java @@ -0,0 +1,85 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisDoctor; + +import java.util.List; + +/** + * 医生Mapper接口 + * + * @author bend + * @date 2020-07-01 + */ +public interface HisDoctorMapper extends RuoYiBaseMapper +{ + /** + * 查询医生 + * + * @param id 医生ID + * @return 医生 + */ + public HisDoctor selectHisDoctorById(Long id); + + /** + * 查询医生列表 + * + * @param hisDoctor 医生 + * @return 医生集合 + */ + public List selectHisDoctorList(HisDoctor hisDoctor); + + /** + * 新增医生 + * + * @param hisDoctor 医生 + * @return 结果 + */ + public int insertHisDoctor(HisDoctor hisDoctor); + + /** + * 修改医生 + * + * @param hisDoctor 医生 + * @return 结果 + */ + public int updateHisDoctor(HisDoctor hisDoctor); + + /** + * 删除医生 + * + * @param id 医生ID + * @return 结果 + */ + public int deleteHisDoctorById(Long id); + + /** + * 批量删除医生 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisDoctorByIds(String[] ids); + + /** + * 查询医生列表 + * + * @param orgCode 机构编码 + * @return 医生集合 + */ + public List selectHisDoctorOrgCode(String orgCode); + + /** + * 获取机构虚拟账户 + * @param orgCode 机构编码 + * @return 虚拟账户 + */ + public HisDoctor getVirtualAccount(String orgCode); + + /** + * + * @param vmUserId 虚拟用户ID + * @return + */ + public HisDoctor getVirtualAccountById(String vmUserId); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDoctorScheduleMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDoctorScheduleMapper.java new file mode 100644 index 000000000..68e3a26e5 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisDoctorScheduleMapper.java @@ -0,0 +1,79 @@ +package com.ruoyi.his.mapper; + +import java.util.List; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisDoctorSchedule; + +/** + * 医生排班Mapper接口 + * + * @author bend + * @date 2020-07-03 + */ +public interface HisDoctorScheduleMapper extends RuoYiBaseMapper +{ + /** + * 查询医生排班 + * + * @param id 医生排班ID + * @return 医生排班 + */ + public HisDoctorSchedule selectHisDoctorScheduleById(Long id); + + /** + * 查询医生排班 + * + * @param hisDoctorSchedule 医生排班 + * @return 医生排班 + */ + public HisDoctorSchedule selectHisDoctorSchedule(HisDoctorSchedule hisDoctorSchedule); + + /** + * 查询医生排班列表 + * + * @param hisDoctorSchedule 医生排班 + * @return 医生排班集合 + */ + public List selectHisDoctorScheduleList(HisDoctorSchedule hisDoctorSchedule); + + /** + * 新增医生排班 + * + * @param hisDoctorSchedule 医生排班 + * @return 结果 + */ + public int insertHisDoctorSchedule(HisDoctorSchedule hisDoctorSchedule); + + /** + * 新增医生排班 + * @param doctorScheduleList 医生排班列表 + * @return 结果 + */ + public int insertHisDoctorScheduleBatch(List doctorScheduleList); + + /** + * 修改医生排班 + * + * @param hisDoctorSchedule 医生排班 + * @return 结果 + */ + public int updateHisDoctorSchedule(HisDoctorSchedule hisDoctorSchedule); + + /** + * 删除医生排班 + * + * @param id 医生排班ID + * @return 结果 + */ + public int deleteHisDoctorScheduleById(Long id); + + /** + * 批量删除医生排班 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisDoctorScheduleByIds(String[] ids); + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisEhealthClientMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisEhealthClientMapper.java new file mode 100644 index 000000000..5bc63f7b5 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisEhealthClientMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisEhealthClient; + +import java.util.List; + +/** + * 健康卡Mapper接口 + * + * @author bend + * @date 2020-07-27 + */ +public interface HisEhealthClientMapper extends RuoYiBaseMapper +{ + + /** + * 查询健康卡 + * + * @param id 健康卡ID + * @return 健康卡 + */ + public HisEhealthClient selectHisEhealthClientById(Long id); + + /** + * 查询健康卡列表 + * + * @param hisEhealthClient 健康卡 + * @return 健康卡集合 + */ + public List selectHisEhealthClientList(HisEhealthClient hisEhealthClient); + + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisFeeItemMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisFeeItemMapper.java new file mode 100644 index 000000000..af706a24b --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisFeeItemMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisFeeItem; + +import java.util.List; + +/** + * 费用类型Mapper接口 + * + * @author bend + * @date 2020-07-14 + */ +public interface HisFeeItemMapper extends RuoYiBaseMapper +{ + + /** + * 查询费用类型 + * + * @param id 费用类型ID + * @return 费用类型 + */ + public HisFeeItem selectHisFeeItemById(Long id); + + /** + * 查询费用类型列表 + * + * @param hisFeeItem 费用类型 + * @return 费用类型集合 + */ + public List selectHisFeeItemList(HisFeeItem hisFeeItem); + + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisHospitalInfoMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisHospitalInfoMapper.java new file mode 100644 index 000000000..e9de069af --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisHospitalInfoMapper.java @@ -0,0 +1,70 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisHospitalInfo; + +import java.util.List; + +/** + * 医疗机构Mapper接口 + * + * @author bend + * @date 2020-06-28 + */ +public interface HisHospitalInfoMapper extends RuoYiBaseMapper +{ + /** + * 查询医疗机构 + * + * @param id 医疗机构ID + * @return 医疗机构 + */ + public HisHospitalInfo selectHisHospitalInfoById(Long id); + + /** + * 查询医疗机构 + * @param orgCode 医疗机构编码 + * @return 医疗机构 + */ + public HisHospitalInfo selectHisHospitalInfoByOrgCode(String orgCode); + + /** + * 查询医疗机构列表 + * + * @param hisHospitalInfo 医疗机构 + * @return 医疗机构集合 + */ + public List selectHisHospitalInfoList(HisHospitalInfo hisHospitalInfo); + + /** + * 新增医疗机构 + * + * @param hisHospitalInfo 医疗机构 + * @return 结果 + */ + public int insertHisHospitalInfo(HisHospitalInfo hisHospitalInfo); + + /** + * 修改医疗机构 + * + * @param hisHospitalInfo 医疗机构 + * @return 结果 + */ + public int updateHisHospitalInfo(HisHospitalInfo hisHospitalInfo); + + /** + * 删除医疗机构 + * + * @param id 医疗机构ID + * @return 结果 + */ + public int deleteHisHospitalInfoById(Long id); + + /** + * 批量删除医疗机构 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisHospitalInfoByIds(String[] ids); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInpatientMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInpatientMapper.java new file mode 100644 index 000000000..4f11a4a12 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInpatientMapper.java @@ -0,0 +1,25 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisInpatient; + +import java.util.List; + +/** + * 住院病人Mapper接口 + * + * @author bend + * @date 2020-07-08 + */ +public interface HisInpatientMapper extends RuoYiBaseMapper +{ + + /** + * 查询住院病人列表 + * + * @param hisInpatient 住院病人 + * @return 住院病人集合 + */ + public List selectHisInpatientList(HisInpatient hisInpatient); + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInpatientPrepaymentMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInpatientPrepaymentMapper.java new file mode 100644 index 000000000..016715067 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInpatientPrepaymentMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisInpatientPrepayment; + +import java.util.List; + +/** + * 住院预交Mapper接口 + * + * @author bend + * @date 2020-07-14 + */ +public interface HisInpatientPrepaymentMapper extends RuoYiBaseMapper +{ + + /** + * 查询住院预交 + * + * @param id 住院预交ID + * @return 住院预交 + */ + public HisInpatientPrepayment selectHisInpatientPrepaymentById(Long id); + + /** + * 查询住院预交列表 + * + * @param hisInpatientPrepayment 住院预交 + * @return 住院预交集合 + */ + public List selectHisInpatientPrepaymentList(HisInpatientPrepayment hisInpatientPrepayment); + + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInspectionApplyMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInspectionApplyMapper.java new file mode 100644 index 000000000..149ed38ee --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInspectionApplyMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisInspectionApply; + +import java.util.List; + +/** + * 申请单Mapper接口 + * + * @author bend + * @date 2020-07-10 + */ +public interface HisInspectionApplyMapper extends RuoYiBaseMapper +{ + + /** + * 查询申请单 + * + * @param id 申请单ID + * @return 申请单 + */ + public HisInspectionApply selectHisInspectionApplyById(Long id); + + /** + * 查询申请单列表 + * + * @param hisInspectionApply 申请单 + * @return 申请单集合 + */ + public List selectHisInspectionApplyList(HisInspectionApply hisInspectionApply); + + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInspectionReportItemMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInspectionReportItemMapper.java new file mode 100644 index 000000000..7dc309d24 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInspectionReportItemMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisInspectionReportItem; + +import java.util.List; + +/** + * 检查检验明细Mapper接口 + * + * @author bend + * @date 2020-07-10 + */ +public interface HisInspectionReportItemMapper extends RuoYiBaseMapper +{ + + /** + * 查询检查检验明细 + * + * @param id 检查检验明细ID + * @return 检查检验明细 + */ + public HisInspectionReportItem selectHisInspectionReportItemById(Long id); + + /** + * 查询检查检验明细列表 + * + * @param hisInspectionReportItem 检查检验明细 + * @return 检查检验明细集合 + */ + public List selectHisInspectionReportItemList(HisInspectionReportItem hisInspectionReportItem); + + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInspectionReportMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInspectionReportMapper.java new file mode 100644 index 000000000..14f183658 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisInspectionReportMapper.java @@ -0,0 +1,60 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisInspectionReport; +import com.ruoyi.his.domain.HisInspectionReportItem; + +import java.util.List; + +/** + * 检查检验Mapper接口 + * + * @author bend + * @date 2020-07-10 + */ +public interface HisInspectionReportMapper extends RuoYiBaseMapper +{ + + /** + * 查询检查检验 + * + * @param id 检查检验ID + * @return 检查检验 + */ + public HisInspectionReport selectHisInspectionReportById(Long id); + + /** + * 查询检查检验列表 + * + * @param hisInspectionReport 检查检验 + * @return 检查检验集合 + */ + public List selectHisInspectionReportList(HisInspectionReport hisInspectionReport); + + + /** + * 批量删除检查检验明细 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisInspectionReportItemByReportIds(String[] ids); + + /** + * 批量新增检查检验明细 + * + * @param hisInspectionReportItemList 检查检验明细列表 + * @return 结果 + */ + public int batchHisInspectionReportItem(List hisInspectionReportItemList); + + + /** + * 通过检查检验ID删除检查检验明细信息 + * + * @param id 角色ID + * @return 结果 + */ + public int deleteHisInspectionReportItemByReportId(Long id); + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisMerchantScrcuMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisMerchantScrcuMapper.java new file mode 100644 index 000000000..80d25e662 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisMerchantScrcuMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisMerchantScrcu; + +import java.util.List; + +/** + * 农信商户Mapper接口 + * + * @author bend + * @date 2020-07-27 + */ +public interface HisMerchantScrcuMapper extends RuoYiBaseMapper +{ + + /** + * 查询农信商户 + * + * @param id 农信商户ID + * @return 农信商户 + */ + public HisMerchantScrcu selectHisMerchantScrcuById(Long id); + + /** + * 查询农信商户列表 + * + * @param hisMerchantScrcu 农信商户 + * @return 农信商户集合 + */ + public List selectHisMerchantScrcuList(HisMerchantScrcu hisMerchantScrcu); + + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisMerchantWechatMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisMerchantWechatMapper.java new file mode 100644 index 000000000..711df37ca --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisMerchantWechatMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisMerchantWechat; + +import java.util.List; + +/** + * 特约商户Mapper接口 + * + * @author bend + * @date 2020-07-27 + */ +public interface HisMerchantWechatMapper extends RuoYiBaseMapper +{ + + /** + * 查询特约商户 + * + * @param id 特约商户ID + * @return 特约商户 + */ + public HisMerchantWechat selectHisMerchantWechatById(Long id); + + /** + * 查询特约商户列表 + * + * @param hisMerchantWechat 特约商户 + * @return 特约商户集合 + */ + public List selectHisMerchantWechatList(HisMerchantWechat hisMerchantWechat); + + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientExpensesBillDetailMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientExpensesBillDetailMapper.java new file mode 100644 index 000000000..bb7b09aad --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientExpensesBillDetailMapper.java @@ -0,0 +1,33 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.his.domain.HisOutpatientExpensesBillDetail; + +import java.util.List; + +/** + * 清单详情Mapper接口 + * + * @author bend + * @date 2020-07-09 + */ +public interface HisOutpatientExpensesBillDetailMapper +{ + + /** + * 查询清单详情 + * + * @param id 清单详情ID + * @return 清单详情 + */ + public HisOutpatientExpensesBillDetail selectHisOutpatientExpensesBillDetailById(String id); + + /** + * 查询清单详情列表 + * + * @param hisOutpatientExpensesBillDetail 清单详情 + * @return 清单详情集合 + */ + public List selectHisOutpatientExpensesBillDetailList(HisOutpatientExpensesBillDetail hisOutpatientExpensesBillDetail); + + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientExpensesBillMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientExpensesBillMapper.java new file mode 100644 index 000000000..ba031f290 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientExpensesBillMapper.java @@ -0,0 +1,60 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisOutpatientExpensesBill; +import com.ruoyi.his.domain.HisOutpatientExpensesBillDetail; + +import java.util.List; + +/** + * 待缴费单Mapper接口 + * + * @author bend + * @date 2020-07-09 + */ +public interface HisOutpatientExpensesBillMapper extends RuoYiBaseMapper +{ + + /** + * 查询待缴费单 + * + * @param id 待缴费单ID + * @return 待缴费单 + */ + public HisOutpatientExpensesBill selectHisOutpatientExpensesBillById(Long id); + + /** + * 查询待缴费单列表 + * + * @param hisOutpatientExpensesBill 待缴费单 + * @return 待缴费单集合 + */ + public List selectHisOutpatientExpensesBillList(HisOutpatientExpensesBill hisOutpatientExpensesBill); + + + /** + * 批量删除清单详情 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisOutpatientExpensesBillDetailByBillIds(String[] ids); + + /** + * 批量新增清单详情 + * + * @param hisOutpatientExpensesBillDetailList 清单详情列表 + * @return 结果 + */ + public int batchHisOutpatientExpensesBillDetail(List hisOutpatientExpensesBillDetailList); + + + /** + * 通过待缴费单ID删除清单详情信息 + * + * @param id 角色ID + * @return 结果 + */ + public int deleteHisOutpatientExpensesBillDetailByBillId(Long id); + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientMapper.java new file mode 100644 index 000000000..c651b2886 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientMapper.java @@ -0,0 +1,25 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisOutpatient; + +import java.util.List; + +/** + * 门诊病人Mapper接口 + * + * @author bend + * @date 2020-07-08 + */ +public interface HisOutpatientMapper extends RuoYiBaseMapper +{ + + /** + * 查询门诊病人列表 + * + * @param hisOutpatient 门诊病人 + * @return 门诊病人集合 + */ + public List selectHisOutpatientList(HisOutpatient hisOutpatient); + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientPaymentMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientPaymentMapper.java new file mode 100644 index 000000000..5e474fe43 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisOutpatientPaymentMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisOutpatientPayment; + +import java.util.List; + +/** + * 门诊预交Mapper接口 + * + * @author bend + * @date 2020-07-14 + */ +public interface HisOutpatientPaymentMapper extends RuoYiBaseMapper +{ + + /** + * 查询门诊预交 + * + * @param id 门诊预交ID + * @return 门诊预交 + */ + public HisOutpatientPayment selectHisOutpatientPaymentById(Long id); + + /** + * 查询门诊预交列表 + * + * @param hisOutpatientPayment 门诊预交 + * @return 门诊预交集合 + */ + public List selectHisOutpatientPaymentList(HisOutpatientPayment hisOutpatientPayment); + + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisPatientExpensesDetailMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisPatientExpensesDetailMapper.java new file mode 100644 index 000000000..088481933 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisPatientExpensesDetailMapper.java @@ -0,0 +1,25 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.his.domain.HisPatientExpensesDetail; + +import java.util.List; + +/** + * 费用详情Mapper接口 + * + * @author bend + * @date 2020-07-09 + */ +public interface HisPatientExpensesDetailMapper +{ + + /** + * 查询费用详情列表 + * + * @param hisPatientExpensesDetail 费用详情 + * @return 费用详情集合 + */ + public List selectHisPatientExpensesDetailList(HisPatientExpensesDetail hisPatientExpensesDetail); + + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisPatientExpensesMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisPatientExpensesMapper.java new file mode 100644 index 000000000..1d8e70a23 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisPatientExpensesMapper.java @@ -0,0 +1,60 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisPatientExpenses; +import com.ruoyi.his.domain.HisPatientExpensesDetail; + +import java.util.List; + +/** + * 费用记录Mapper接口 + * + * @author bend + * @date 2020-07-09 + */ +public interface HisPatientExpensesMapper extends RuoYiBaseMapper +{ + + /** + * 查询费用记录 + * + * @param id 费用记录ID + * @return 费用记录 + */ + public HisPatientExpenses selectHisPatientExpensesById(Long id); + + /** + * 查询费用记录列表 + * + * @param hisPatientExpenses 费用记录 + * @return 费用记录集合 + */ + public List selectHisPatientExpensesList(HisPatientExpenses hisPatientExpenses); + + + /** + * 批量删除费用详情 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisPatientExpensesDetailByExpensesIds(String[] ids); + + /** + * 批量新增费用详情 + * + * @param hisPatientExpensesDetailList 费用详情列表 + * @return 结果 + */ + public int batchHisPatientExpensesDetail(List hisPatientExpensesDetailList); + + + /** + * 通过费用记录ID删除费用详情信息 + * + * @param id 角色ID + * @return 结果 + */ + public int deleteHisPatientExpensesDetailByExpensesId(Long id); + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisPayAccountMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisPayAccountMapper.java new file mode 100644 index 000000000..899aed0b2 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisPayAccountMapper.java @@ -0,0 +1,34 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisPayAccount; + +import java.util.List; + +/** + * 支付账户Mapper接口 + * + * @author bend + * @date 2020-07-14 + */ +public interface HisPayAccountMapper extends RuoYiBaseMapper +{ + + /** + * 查询支付账户 + * + * @param id 支付账户ID + * @return 支付账户 + */ + public HisPayAccount selectHisPayAccountById(Long id); + + /** + * 查询支付账户列表 + * + * @param hisPayAccount 支付账户 + * @return 支付账户集合 + */ + public List selectHisPayAccountList(HisPayAccount hisPayAccount); + + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisRegistrationRecordMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisRegistrationRecordMapper.java new file mode 100644 index 000000000..b65c3b7b8 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisRegistrationRecordMapper.java @@ -0,0 +1,71 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisRegistrationRecord; + +import java.util.List; + +/** + * 挂号记录Mapper接口 + * + * @author bend + * @date 2020-06-28 + */ +public interface HisRegistrationRecordMapper extends RuoYiBaseMapper +{ + /** + * 查询挂号记录 + * + * @param id 挂号记录ID + * @return 挂号记录 + */ + public HisRegistrationRecord selectHisRegistrationRecordById(Long id); + + /** + * 查询挂号记录列表 + * + * @param hisRegistrationRecord 挂号记录 + * @return 挂号记录集合 + */ + public List selectHisRegistrationRecordList(HisRegistrationRecord hisRegistrationRecord); + + /** + * 新增挂号记录 + * + * @param hisRegistrationRecord 挂号记录 + * @return 结果 + */ + public int insertHisRegistrationRecord(HisRegistrationRecord hisRegistrationRecord); + + /** + * 修改挂号记录 + * + * @param hisRegistrationRecord 挂号记录 + * @return 结果 + */ + public int updateHisRegistrationRecord(HisRegistrationRecord hisRegistrationRecord); + + /** + * 删除挂号记录 + * + * @param id 挂号记录ID + * @return 结果 + */ + public int deleteHisRegistrationRecordById(Long id); + + /** + * 批量删除挂号记录 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisRegistrationRecordByIds(String[] ids); + + /** + * 查询挂号记录 + * @param hisRegistrationRecord 挂号记录 + * @return 查询挂号记录 + */ + public HisRegistrationRecord selectHisRegistrationRecord(HisRegistrationRecord hisRegistrationRecord); + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisRegistrationTemplateMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisRegistrationTemplateMapper.java new file mode 100644 index 000000000..46cabe8c8 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisRegistrationTemplateMapper.java @@ -0,0 +1,65 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisRegistrationTemplate; + +import java.util.List; + +/** + * 挂号模板Mapper接口 + * + * @author bend + * @date 2020-07-01 + */ +public interface HisRegistrationTemplateMapper extends RuoYiBaseMapper +{ + /** + * 查询挂号模板 + * + * @param id 挂号模板ID + * @return 挂号模板 + */ + public HisRegistrationTemplate selectHisRegistrationTemplateById(Long id); + + /** + * 查询挂号模板列表 + * + * @param hisRegistrationTemplate 挂号模板 + * @return 挂号模板集合 + */ + public List selectHisRegistrationTemplateList(HisRegistrationTemplate hisRegistrationTemplate); + + /** + * 新增挂号模板 + * + * @param hisRegistrationTemplate 挂号模板 + * @return 结果 + */ + public int insertHisRegistrationTemplate(HisRegistrationTemplate hisRegistrationTemplate); + + /** + * 修改挂号模板 + * + * @param hisRegistrationTemplate 挂号模板 + * @return 结果 + */ + public int updateHisRegistrationTemplate(HisRegistrationTemplate hisRegistrationTemplate); + + /** + * 删除挂号模板 + * + * @param id 挂号模板ID + * @return 结果 + */ + public int deleteHisRegistrationTemplateById(Long id); + + /** + * 批量删除挂号模板 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisRegistrationTemplateByIds(String[] ids); + + public HisRegistrationTemplate selectHisRegistrationTemplate(HisRegistrationTemplate hisRegistrationTemplate); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisWechatProviderMapper.java b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisWechatProviderMapper.java new file mode 100644 index 000000000..ce80e27c3 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/mapper/HisWechatProviderMapper.java @@ -0,0 +1,60 @@ +package com.ruoyi.his.mapper; + +import com.ruoyi.common.mappers.RuoYiBaseMapper; +import com.ruoyi.his.domain.HisWechatProvider; +import com.ruoyi.his.domain.HisMerchantWechat; + +import java.util.List; + +/** + * 微信服务商Mapper接口 + * + * @author bend + * @date 2020-07-27 + */ +public interface HisWechatProviderMapper extends RuoYiBaseMapper +{ + + /** + * 查询微信服务商 + * + * @param id 微信服务商ID + * @return 微信服务商 + */ + public HisWechatProvider selectHisWechatProviderById(Long id); + + /** + * 查询微信服务商列表 + * + * @param hisWechatProvider 微信服务商 + * @return 微信服务商集合 + */ + public List selectHisWechatProviderList(HisWechatProvider hisWechatProvider); + + + /** + * 批量删除特约商户 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisMerchantWechatByProviderIds(String[] ids); + + /** + * 批量新增特约商户 + * + * @param hisMerchantWechatList 特约商户列表 + * @return 结果 + */ + public int batchHisMerchantWechat(List hisMerchantWechatList); + + + /** + * 通过微信服务商ID删除特约商户信息 + * + * @param providerId ID + * @return 结果 + */ + public int deleteHisMerchantWechatByProviderId(Long providerId); + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDepartmentService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDepartmentService.java new file mode 100644 index 000000000..b573fa99d --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDepartmentService.java @@ -0,0 +1,69 @@ +package com.ruoyi.his.service; + +import java.util.List; +import com.ruoyi.his.domain.HisDepartment; + +/** + * 科室Service接口 + * + * @author bend + * @date 2020-07-01 + */ +public interface IHisDepartmentService +{ + /** + * 查询科室 + * + * @param id 科室ID + * @return 科室 + */ + public HisDepartment selectHisDepartmentById(Long id); + + /** + * 查询科室 + * + * @param deptId 科室ID + * @return 科室 + */ + public HisDepartment selectHisDepartmentByDeptId(String deptId); + + /** + * 查询科室列表 + * + * @param hisDepartment 科室 + * @return 科室集合 + */ + public List selectHisDepartmentList(HisDepartment hisDepartment); + + /** + * 新增科室 + * + * @param hisDepartment 科室 + * @return 结果 + */ + public int insertHisDepartment(HisDepartment hisDepartment); + + /** + * 修改科室 + * + * @param hisDepartment 科室 + * @return 结果 + */ + public int updateHisDepartment(HisDepartment hisDepartment); + + /** + * 批量删除科室 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisDepartmentByIds(String ids); + + /** + * 删除科室信息 + * + * @param id 科室ID + * @return 结果 + */ + public int deleteHisDepartmentById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDoctorDepartmentService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDoctorDepartmentService.java new file mode 100644 index 000000000..d8435e8e9 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDoctorDepartmentService.java @@ -0,0 +1,68 @@ +package com.ruoyi.his.service; + +import java.util.List; +import com.ruoyi.his.domain.HisDoctorDepartment; + +/** + * 医生科室关系Service接口 + * + * @author bend + * @date 2020-07-01 + */ +public interface IHisDoctorDepartmentService +{ + /** + * 查询医生科室关系 + * + * @param id 医生科室关系ID + * @return 医生科室关系 + */ + public HisDoctorDepartment selectHisDoctorDepartmentById(Long id); + + /** + * 查询医生科室关系列表 + * + * @param hisDoctorDepartment 医生科室关系 + * @return 医生科室关系集合 + */ + public List selectHisDoctorDepartmentList(HisDoctorDepartment hisDoctorDepartment); + + /** + * 新增医生科室关系 + * + * @param hisDoctorDepartment 医生科室关系 + * @return 结果 + */ + public int insertHisDoctorDepartment(HisDoctorDepartment hisDoctorDepartment); + + /** + * 修改医生科室关系 + * + * @param hisDoctorDepartment 医生科室关系 + * @return 结果 + */ + public int updateHisDoctorDepartment(HisDoctorDepartment hisDoctorDepartment); + + /** + * 修改医生科室关系 + * + * @param hisDoctorDepartment 医生科室关系 + * @return 结果 + */ + public int updateHisDoctorDepartmentByDeptId(HisDoctorDepartment hisDoctorDepartment); + /** + * 批量删除医生科室关系 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisDoctorDepartmentByIds(String ids); + + /** + * 删除医生科室关系信息 + * + * @param id 医生科室关系ID + * @return 结果 + */ + public int deleteHisDoctorDepartmentById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDoctorScheduleService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDoctorScheduleService.java new file mode 100644 index 000000000..b658aa5eb --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDoctorScheduleService.java @@ -0,0 +1,81 @@ +package com.ruoyi.his.service; + +import java.util.List; +import com.ruoyi.his.domain.HisDoctorSchedule; + +/** + * 医生排班Service接口 + * + * @author bend + * @date 2020-07-03 + */ +public interface IHisDoctorScheduleService +{ + /** + * 查询医生排班 + * + * @param id 医生排班ID + * @return 医生排班 + */ + public HisDoctorSchedule selectHisDoctorScheduleById(Long id); + + /** + * 查询医生排班 + * @param hisDoctorSchedule 医生排班 + * @return one + */ + public HisDoctorSchedule selectHisDoctorSchedule(HisDoctorSchedule hisDoctorSchedule); + + /** + * 查询医生排班列表 + * + * @param hisDoctorSchedule 医生排班 + * @return 医生排班集合 + */ + public List selectHisDoctorScheduleList(HisDoctorSchedule hisDoctorSchedule); + + /** + * 新增医生排班 + * + * @param hisDoctorSchedule 医生排班 + * @return 结果 + */ + public int insertHisDoctorSchedule(HisDoctorSchedule hisDoctorSchedule); + + /** + * 新增医生排班 + * @param doctorScheduleList 医生排班列表 + * @return 结果 + */ + public int insertHisDoctorScheduleBatch(List doctorScheduleList); + + /** + * 修改医生排班 + * + * @param hisDoctorSchedule 医生排班 + * @return 结果 + */ + public int updateHisDoctorSchedule(HisDoctorSchedule hisDoctorSchedule); + + /** + * 批量删除医生排班 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisDoctorScheduleByIds(String ids); + + /** + * 删除医生排班信息 + * + * @param id 医生排班ID + * @return 结果 + */ + public int deleteHisDoctorScheduleById(Long id); + + /** + * + * @param hisDoctorScheduleList 排班列表 + */ + public void updateHisDoctorScheduleBatch(List hisDoctorScheduleList); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDoctorService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDoctorService.java new file mode 100644 index 000000000..c0843793e --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisDoctorService.java @@ -0,0 +1,77 @@ +package com.ruoyi.his.service; + +import java.util.List; +import com.ruoyi.his.domain.HisDoctor; + +/** + * 医生Service接口 + * + * @author bend + * @date 2020-07-01 + */ +public interface IHisDoctorService +{ + /** + * 查询医生 + * + * @param id 医生ID + * @return 医生 + */ + public HisDoctor selectHisDoctorById(Long id); + + /** + * 查询医生列表 + * + * @param hisDoctor 医生 + * @return 医生集合 + */ + public List selectHisDoctorList(HisDoctor hisDoctor); + + /** + * 查询医生列表 + * + * @param orgCode 机构编码 + * @return 医生集合 + */ + public List selectHisDoctorOrgCode(String orgCode); + + /** + * 新增医生 + * + * @param hisDoctor 医生 + * @return 结果 + */ + public int insertHisDoctor(HisDoctor hisDoctor); + + /** + * 修改医生 + * + * @param hisDoctor 医生 + * @return 结果 + */ + public int updateHisDoctor(HisDoctor hisDoctor); + + /** + * 批量删除医生 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisDoctorByIds(String ids); + + /** + * 删除医生信息 + * + * @param id 医生ID + * @return 结果 + */ + public int deleteHisDoctorById(Long id); + + /** + * 获取机构虚拟账户 + * @param orgCode 机构编码 + * @return 虚拟账户 + */ + public HisDoctor getVirtualAccount(String orgCode); + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisEhealthClientService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisEhealthClientService.java new file mode 100644 index 000000000..8cb5eeeba --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisEhealthClientService.java @@ -0,0 +1,78 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisEhealthClient; + +import java.util.List; + +/** + * 健康卡Service接口 + * + * @author bend + * @date 2020-07-27 + */ +public interface IHisEhealthClientService +{ + /** + * 查询健康卡 + * + * @param id 健康卡ID + * @return 健康卡 + */ + public HisEhealthClient selectHisEhealthClientById(Long id); + + /** + * 查询健康卡 + * + * @param hisEhealthClient 健康卡 + * @return 健康卡 + */ + public HisEhealthClient selectHisEhealthClient(HisEhealthClient hisEhealthClient); + + /** + * 查询健康卡列表 + * + * @param hisEhealthClient 健康卡 + * @return 健康卡集合 + */ + public List selectHisEhealthClientList(HisEhealthClient hisEhealthClient); + + /** + * 新增健康卡 + * + * @param hisEhealthClient 健康卡 + * @return 结果 + */ + public int insertHisEhealthClient(HisEhealthClient hisEhealthClient); + + /** + * 批量新增健康卡 + * + * @param hisEhealthClientList 健康卡列表 + * @return 结果 + */ + public int insertHisEhealthClientBatch(List hisEhealthClientList); + + /** + * 修改健康卡 + * + * @param hisEhealthClient 健康卡 + * @return 结果 + */ + public int updateHisEhealthClient(HisEhealthClient hisEhealthClient); + + /** + * 批量删除健康卡 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisEhealthClientByIds(String ids); + + /** + * 删除健康卡信息 + * + * @param id 健康卡ID + * @return 结果 + */ + public int deleteHisEhealthClientById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisFeeItemService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisFeeItemService.java new file mode 100644 index 000000000..d2b8a9fb6 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisFeeItemService.java @@ -0,0 +1,80 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisFeeItem; + +import java.util.List; + +/** + * 费用类型Service接口 + * + * @author bend + * @date 2020-07-14 + */ +public interface IHisFeeItemService +{ + /** + * 查询费用类型 + * + * @param id 费用类型ID + * @return 费用类型 + */ + public HisFeeItem selectHisFeeItemById(Long id); + + /** + * 查询费用类型 + * + * @param hisFeeItem 费用类型 + * @return 费用类型 + */ + public HisFeeItem selectHisFeeItem(HisFeeItem hisFeeItem); + + /** + * 查询费用类型列表 + * + * @param hisFeeItem 费用类型 + * @return 费用类型集合 + */ + public List selectHisFeeItemList(HisFeeItem hisFeeItem); + + /** + * 新增费用类型 + * + * @param hisFeeItem 费用类型 + * @return 结果 + */ + public int insertHisFeeItem(HisFeeItem hisFeeItem); + + /** + * 批量新增费用类型 + * + * @param hisFeeItemList 费用类型列表 + * @return 结果 + */ + public int insertHisFeeItemBatch(List hisFeeItemList); + + /** + * 修改费用类型 + * + * @param hisFeeItem 费用类型 + * @return 结果 + */ + public int updateHisFeeItem(HisFeeItem hisFeeItem); + + /** + * 批量删除费用类型 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisFeeItemByIds(String ids); + + /** + * 删除费用类型信息 + * + * @param id 费用类型ID + * @return 结果 + */ + public int deleteHisFeeItemById(Long id); + + public int changeStatus(HisFeeItem hisFeeItem); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisHospitalInfoService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisHospitalInfoService.java new file mode 100644 index 000000000..bdba996ba --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisHospitalInfoService.java @@ -0,0 +1,68 @@ +package com.ruoyi.his.service; + +import java.util.List; +import com.ruoyi.his.domain.HisHospitalInfo; + +/** + * 医疗机构Service接口 + * + * @author bend + * @date 2020-06-28 + */ +public interface IHisHospitalInfoService +{ + /** + * 查询医疗机构 + * + * @param id 医疗机构ID + * @return 医疗机构 + */ + public HisHospitalInfo selectHisHospitalInfoById(Long id); + + /** + * 查询医疗机构 + * @param orgCode 医疗机构编码 + * @return 医疗机构 + */ + public HisHospitalInfo selectHisHospitalInfoByOrgCode(String orgCode); + + /** + * 查询医疗机构列表 + * + * @param hisHospitalInfo 医疗机构 + * @return 医疗机构集合 + */ + public List selectHisHospitalInfoList(HisHospitalInfo hisHospitalInfo); + + /** + * 新增医疗机构 + * + * @param hisHospitalInfo 医疗机构 + * @return 结果 + */ + public int insertHisHospitalInfo(HisHospitalInfo hisHospitalInfo); + + /** + * 修改医疗机构 + * + * @param hisHospitalInfo 医疗机构 + * @return 结果 + */ + public int updateHisHospitalInfo(HisHospitalInfo hisHospitalInfo); + + /** + * 批量删除医疗机构 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisHospitalInfoByIds(String ids); + + /** + * 删除医疗机构信息 + * + * @param id 医疗机构ID + * @return 结果 + */ + public int deleteHisHospitalInfoById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInpatientPrepaymentService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInpatientPrepaymentService.java new file mode 100644 index 000000000..c80b79ef2 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInpatientPrepaymentService.java @@ -0,0 +1,78 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisInpatientPrepayment; + +import java.util.List; + +/** + * 住院预交Service接口 + * + * @author bend + * @date 2020-07-14 + */ +public interface IHisInpatientPrepaymentService +{ + /** + * 查询住院预交 + * + * @param id 住院预交ID + * @return 住院预交 + */ + public HisInpatientPrepayment selectHisInpatientPrepaymentById(Long id); + + /** + * 查询住院预交 + * + * @param hisInpatientPrepayment 住院预交 + * @return 住院预交 + */ + public HisInpatientPrepayment selectHisInpatientPrepayment(HisInpatientPrepayment hisInpatientPrepayment); + + /** + * 查询住院预交列表 + * + * @param hisInpatientPrepayment 住院预交 + * @return 住院预交集合 + */ + public List selectHisInpatientPrepaymentList(HisInpatientPrepayment hisInpatientPrepayment); + + /** + * 新增住院预交 + * + * @param hisInpatientPrepayment 住院预交 + * @return 结果 + */ + public int insertHisInpatientPrepayment(HisInpatientPrepayment hisInpatientPrepayment); + + /** + * 批量新增住院预交 + * + * @param hisInpatientPrepaymentList 住院预交列表 + * @return 结果 + */ + public int insertHisInpatientPrepaymentBatch(List hisInpatientPrepaymentList); + + /** + * 修改住院预交 + * + * @param hisInpatientPrepayment 住院预交 + * @return 结果 + */ + public int updateHisInpatientPrepayment(HisInpatientPrepayment hisInpatientPrepayment); + + /** + * 批量删除住院预交 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisInpatientPrepaymentByIds(String ids); + + /** + * 删除住院预交信息 + * + * @param id 住院预交ID + * @return 结果 + */ + public int deleteHisInpatientPrepaymentById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInpatientService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInpatientService.java new file mode 100644 index 000000000..8e7decbc1 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInpatientService.java @@ -0,0 +1,84 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisInpatient; + +import java.util.List; + +/** + * 住院病人Service接口 + * + * @author bend + * @date 2020-07-08 + */ +public interface IHisInpatientService +{ + /** + * 查询住院病人 + * + * @param id 住院病人ID + * @return 住院病人 + */ + public HisInpatient selectHisInpatientById(Long id); + + /** + * 查询住院病人 + * + * @param hisInpatient 住院病人 + * @return 住院病人 + */ + public HisInpatient selectHisInpatient(HisInpatient hisInpatient); + + /** + * 查询住院病人列表 + * + * @param hisInpatient 住院病人 + * @return 住院病人集合 + */ + public List selectHisInpatientList(HisInpatient hisInpatient); + + /** + * 新增住院病人 + * + * @param hisInpatient 住院病人 + * @return 结果 + */ + public int insertHisInpatient(HisInpatient hisInpatient); + + /** + * 批量新增住院病人 + * + * @param hisInpatientList 住院病人 + * @return 结果 + */ + public int insertHisInpatientBatch(List hisInpatientList); + + /** + * 修改住院病人 + * + * @param hisInpatient 住院病人 + * @return 结果 + */ + public int updateHisInpatient(HisInpatient hisInpatient); + + /** + * 批量删除住院病人 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisInpatientByIds(String ids); + + /** + * 删除住院病人信息 + * + * @param id 住院病人ID + * @return 结果 + */ + public int deleteHisInpatientById(Long id); + + /** + * + * @param hisInpatientList 住院病人列表 + */ + public void updateHisInpatientBatch(List hisInpatientList); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInspectionApplyService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInspectionApplyService.java new file mode 100644 index 000000000..cd0cf84d1 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInspectionApplyService.java @@ -0,0 +1,78 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisInspectionApply; + +import java.util.List; + +/** + * 申请单Service接口 + * + * @author bend + * @date 2020-07-10 + */ +public interface IHisInspectionApplyService +{ + /** + * 查询申请单 + * + * @param id 申请单ID + * @return 申请单 + */ + public HisInspectionApply selectHisInspectionApplyById(Long id); + + /** + * 查询申请单 + * + * @param hisInspectionApply 申请单 + * @return 申请单 + */ + public HisInspectionApply selectHisInspectionApply(HisInspectionApply hisInspectionApply); + + /** + * 查询申请单列表 + * + * @param hisInspectionApply 申请单 + * @return 申请单集合 + */ + public List selectHisInspectionApplyList(HisInspectionApply hisInspectionApply); + + /** + * 新增申请单 + * + * @param hisInspectionApply 申请单 + * @return 结果 + */ + public int insertHisInspectionApply(HisInspectionApply hisInspectionApply); + + /** + * 批量新增申请单 + * + * @param hisInspectionApplyList 申请单列表 + * @return 结果 + */ + public int insertHisInspectionApplyBatch(List hisInspectionApplyList); + + /** + * 修改申请单 + * + * @param hisInspectionApply 申请单 + * @return 结果 + */ + public int updateHisInspectionApply(HisInspectionApply hisInspectionApply); + + /** + * 批量删除申请单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisInspectionApplyByIds(String ids); + + /** + * 删除申请单信息 + * + * @param id 申请单ID + * @return 结果 + */ + public int deleteHisInspectionApplyById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInspectionReportItemService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInspectionReportItemService.java new file mode 100644 index 000000000..c68784f61 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInspectionReportItemService.java @@ -0,0 +1,78 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisInspectionReportItem; + +import java.util.List; + +/** + * 检查检验明细Service接口 + * + * @author bend + * @date 2020-07-10 + */ +public interface IHisInspectionReportItemService +{ + /** + * 查询检查检验明细 + * + * @param id 检查检验明细ID + * @return 检查检验明细 + */ + public HisInspectionReportItem selectHisInspectionReportItemById(Long id); + + /** + * 查询检查检验明细 + * + * @param hisInspectionReportItem 检查检验明细 + * @return 检查检验明细 + */ + public HisInspectionReportItem selectHisInspectionReportItem(HisInspectionReportItem hisInspectionReportItem); + + /** + * 查询检查检验明细列表 + * + * @param hisInspectionReportItem 检查检验明细 + * @return 检查检验明细集合 + */ + public List selectHisInspectionReportItemList(HisInspectionReportItem hisInspectionReportItem); + + /** + * 新增检查检验明细 + * + * @param hisInspectionReportItem 检查检验明细 + * @return 结果 + */ + public int insertHisInspectionReportItem(HisInspectionReportItem hisInspectionReportItem); + + /** + * 批量新增检查检验明细 + * + * @param hisInspectionReportItemList 检查检验明细列表 + * @return 结果 + */ + public int insertHisInspectionReportItemBatch(List hisInspectionReportItemList); + + /** + * 修改检查检验明细 + * + * @param hisInspectionReportItem 检查检验明细 + * @return 结果 + */ + public int updateHisInspectionReportItem(HisInspectionReportItem hisInspectionReportItem); + + /** + * 批量删除检查检验明细 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisInspectionReportItemByIds(String ids); + + /** + * 删除检查检验明细信息 + * + * @param id 检查检验明细ID + * @return 结果 + */ + public int deleteHisInspectionReportItemById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInspectionReportService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInspectionReportService.java new file mode 100644 index 000000000..e98ea45cb --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisInspectionReportService.java @@ -0,0 +1,86 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisInspectionReport; +import com.ruoyi.his.domain.HisInspectionReportItem; + +import java.util.List; + +/** + * 检查检验Service接口 + * + * @author bend + * @date 2020-07-10 + */ +public interface IHisInspectionReportService +{ + /** + * 查询检查检验 + * + * @param id 检查检验ID + * @return 检查检验 + */ + public HisInspectionReport selectHisInspectionReportById(Long id); + + /** + * 查询检查检验 + * + * @param hisInspectionReport 检查检验 + * @return 检查检验 + */ + public HisInspectionReport selectHisInspectionReport(HisInspectionReport hisInspectionReport); + + /** + * 查询检查检验列表 + * + * @param hisInspectionReport 检查检验 + * @return 检查检验集合 + */ + public List selectHisInspectionReportList(HisInspectionReport hisInspectionReport); + + /** + * 新增检查检验 + * + * @param hisInspectionReport 检查检验 + * @return 结果 + */ + public int insertHisInspectionReport(HisInspectionReport hisInspectionReport); + + /** + * 批量新增检查检验 + * + * @param hisInspectionReportList 检查检验列表 + * @return 结果 + */ + public int insertHisInspectionReportBatch(List hisInspectionReportList); + + /** + * 修改检查检验 + * + * @param hisInspectionReport 检查检验 + * @return 结果 + */ + public int updateHisInspectionReport(HisInspectionReport hisInspectionReport); + + /** + * 批量删除检查检验 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisInspectionReportByIds(String ids); + + /** + * 删除检查检验信息 + * + * @param id 检查检验ID + * @return 结果 + */ + public int deleteHisInspectionReportById(Long id); + + /** + * + * @param hisInspectionReportItem 检查检验项目详情 + * @return 检查检验项目详情列表 + */ + public List selectHisInspectionReportItemList(HisInspectionReportItem hisInspectionReportItem); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisMerchantScrcuService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisMerchantScrcuService.java new file mode 100644 index 000000000..46b63c641 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisMerchantScrcuService.java @@ -0,0 +1,78 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisMerchantScrcu; + +import java.util.List; + +/** + * 农信商户Service接口 + * + * @author bend + * @date 2020-07-27 + */ +public interface IHisMerchantScrcuService +{ + /** + * 查询农信商户 + * + * @param id 农信商户ID + * @return 农信商户 + */ + public HisMerchantScrcu selectHisMerchantScrcuById(Long id); + + /** + * 查询农信商户 + * + * @param hisMerchantScrcu 农信商户 + * @return 农信商户 + */ + public HisMerchantScrcu selectHisMerchantScrcu(HisMerchantScrcu hisMerchantScrcu); + + /** + * 查询农信商户列表 + * + * @param hisMerchantScrcu 农信商户 + * @return 农信商户集合 + */ + public List selectHisMerchantScrcuList(HisMerchantScrcu hisMerchantScrcu); + + /** + * 新增农信商户 + * + * @param hisMerchantScrcu 农信商户 + * @return 结果 + */ + public int insertHisMerchantScrcu(HisMerchantScrcu hisMerchantScrcu); + + /** + * 批量新增农信商户 + * + * @param hisMerchantScrcuList 农信商户列表 + * @return 结果 + */ + public int insertHisMerchantScrcuBatch(List hisMerchantScrcuList); + + /** + * 修改农信商户 + * + * @param hisMerchantScrcu 农信商户 + * @return 结果 + */ + public int updateHisMerchantScrcu(HisMerchantScrcu hisMerchantScrcu); + + /** + * 批量删除农信商户 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisMerchantScrcuByIds(String ids); + + /** + * 删除农信商户信息 + * + * @param id 农信商户ID + * @return 结果 + */ + public int deleteHisMerchantScrcuById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisMerchantWechatService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisMerchantWechatService.java new file mode 100644 index 000000000..89d38ed2e --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisMerchantWechatService.java @@ -0,0 +1,78 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisMerchantWechat; + +import java.util.List; + +/** + * 微信商户Service接口 + * + * @author bend + * @date 2020-07-14 + */ +public interface IHisMerchantWechatService +{ + /** + * 查询微信商户 + * + * @param id 微信商户ID + * @return 微信商户 + */ + public HisMerchantWechat selectHisMerchantWechatById(Long id); + + /** + * 查询微信商户 + * + * @param hisMerchantWechat 微信商户 + * @return 微信商户 + */ + public HisMerchantWechat selectHisMerchantWechat(HisMerchantWechat hisMerchantWechat); + + /** + * 查询微信商户列表 + * + * @param hisMerchantWechat 微信商户 + * @return 微信商户集合 + */ + public List selectHisMerchantWechatList(HisMerchantWechat hisMerchantWechat); + + /** + * 新增微信商户 + * + * @param hisMerchantWechat 微信商户 + * @return 结果 + */ + public int insertHisMerchantWechat(HisMerchantWechat hisMerchantWechat); + + /** + * 批量新增微信商户 + * + * @param hisMerchantWechatList 微信商户列表 + * @return 结果 + */ + public int insertHisMerchantWechatBatch(List hisMerchantWechatList); + + /** + * 修改微信商户 + * + * @param hisMerchantWechat 微信商户 + * @return 结果 + */ + public int updateHisMerchantWechat(HisMerchantWechat hisMerchantWechat); + + /** + * 批量删除微信商户 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisMerchantWechatByIds(String ids); + + /** + * 删除微信商户信息 + * + * @param id 微信商户ID + * @return 结果 + */ + public int deleteHisMerchantWechatById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisOutpatientExpensesBillService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisOutpatientExpensesBillService.java new file mode 100644 index 000000000..6529f6a96 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisOutpatientExpensesBillService.java @@ -0,0 +1,107 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisOutpatientExpensesBill; +import com.ruoyi.his.domain.HisOutpatientExpensesBillDetail; + +import java.util.List; + +/** + * 待缴费单Service接口 + * + * @author bend + * @date 2020-07-09 + */ +public interface IHisOutpatientExpensesBillService { + /** + * 查询待缴费单 + * + * @param id 待缴费单ID + * @return 待缴费单 + */ + public HisOutpatientExpensesBill selectHisOutpatientExpensesBillById(Long id); + + /** + * 查询待缴费单 + * + * @param hisOutpatientExpensesBill 待缴费单 + * @return 待缴费单 + */ + public HisOutpatientExpensesBill selectHisOutpatientExpensesBill(HisOutpatientExpensesBill hisOutpatientExpensesBill); + + /** + * 查询待缴费单列表 + * + * @param hisOutpatientExpensesBill 待缴费单 + * @return 待缴费单集合 + */ + public List selectHisOutpatientExpensesBillList(HisOutpatientExpensesBill hisOutpatientExpensesBill); + + /** + * 新增待缴费单 + * + * @param hisOutpatientExpensesBill 待缴费单 + * @return 结果 + */ + public int insertHisOutpatientExpensesBill(HisOutpatientExpensesBill hisOutpatientExpensesBill); + + /** + * 批量新增待缴费单 + * + * @param hisOutpatientExpensesBillList 待缴费单列表 + * @return 结果 + */ + public int insertHisOutpatientExpensesBillBatch(List hisOutpatientExpensesBillList); + + /** + * 修改待缴费单 + * + * @param hisOutpatientExpensesBill 待缴费单 + * @return 结果 + */ + public int updateHisOutpatientExpensesBill(HisOutpatientExpensesBill hisOutpatientExpensesBill); + + /** + * 批量删除待缴费单 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisOutpatientExpensesBillByIds(String ids); + + /** + * 删除待缴费单信息 + * + * @param id 待缴费单ID + * @return 结果 + */ + public int deleteHisOutpatientExpensesBillById(Long id); + + /** + * 查询待缴费单详情 + * + * @param hisOutpatientExpensesBillDetail 待缴费单详情 + * @return 列表 + */ + public List selectHisOutpatientExpensesBillDetailList(HisOutpatientExpensesBillDetail hisOutpatientExpensesBillDetail); + + /** + * 批量更新 + * + * @param hisOutpatientExpensesBillUpdateList 待缴费单详情 + */ + public void updateHisOutpatientExpensesBillBatch(List hisOutpatientExpensesBillUpdateList); + + /** + * 更新状态 + * + * @param hisOutpatientExpensesBill 待缴费单 + */ + public void updateHisOutpatientExpensesBillStatus(HisOutpatientExpensesBill hisOutpatientExpensesBill); + + /** + * 批量删除 + * + * @param hisOutpatientExpensesBillList + */ + public void deleteHisOutpatientExpensesBillBatch(List hisOutpatientExpensesBillList); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisOutpatientPaymentService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisOutpatientPaymentService.java new file mode 100644 index 000000000..9557f2780 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisOutpatientPaymentService.java @@ -0,0 +1,78 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisOutpatientPayment; + +import java.util.List; + +/** + * 门诊预交Service接口 + * + * @author bend + * @date 2020-07-14 + */ +public interface IHisOutpatientPaymentService +{ + /** + * 查询门诊预交 + * + * @param id 门诊预交ID + * @return 门诊预交 + */ + public HisOutpatientPayment selectHisOutpatientPaymentById(Long id); + + /** + * 查询门诊预交 + * + * @param hisOutpatientPayment 门诊预交 + * @return 门诊预交 + */ + public HisOutpatientPayment selectHisOutpatientPayment(HisOutpatientPayment hisOutpatientPayment); + + /** + * 查询门诊预交列表 + * + * @param hisOutpatientPayment 门诊预交 + * @return 门诊预交集合 + */ + public List selectHisOutpatientPaymentList(HisOutpatientPayment hisOutpatientPayment); + + /** + * 新增门诊预交 + * + * @param hisOutpatientPayment 门诊预交 + * @return 结果 + */ + public int insertHisOutpatientPayment(HisOutpatientPayment hisOutpatientPayment); + + /** + * 批量新增门诊预交 + * + * @param hisOutpatientPaymentList 门诊预交列表 + * @return 结果 + */ + public int insertHisOutpatientPaymentBatch(List hisOutpatientPaymentList); + + /** + * 修改门诊预交 + * + * @param hisOutpatientPayment 门诊预交 + * @return 结果 + */ + public int updateHisOutpatientPayment(HisOutpatientPayment hisOutpatientPayment); + + /** + * 批量删除门诊预交 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisOutpatientPaymentByIds(String ids); + + /** + * 删除门诊预交信息 + * + * @param id 门诊预交ID + * @return 结果 + */ + public int deleteHisOutpatientPaymentById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisOutpatientService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisOutpatientService.java new file mode 100644 index 000000000..cf666e5ce --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisOutpatientService.java @@ -0,0 +1,84 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisOutpatient; + +import java.util.List; + +/** + * 门诊病人Service接口 + * + * @author bend + * @date 2020-07-08 + */ +public interface IHisOutpatientService +{ + /** + * 查询门诊病人 + * + * @param id 门诊病人ID + * @return 门诊病人 + */ + public HisOutpatient selectHisOutpatientById(Long id); + + /** + * 查询门诊病人 + * + * @param hisOutpatient 门诊病人 + * @return 门诊病人 + */ + public HisOutpatient selectHisOutpatient(HisOutpatient hisOutpatient); + + /** + * 查询门诊病人列表 + * + * @param hisOutpatient 门诊病人 + * @return 门诊病人集合 + */ + public List selectHisOutpatientList(HisOutpatient hisOutpatient); + + /** + * 新增门诊病人 + * + * @param hisOutpatient 门诊病人 + * @return 结果 + */ + public int insertHisOutpatient(HisOutpatient hisOutpatient); + + /** + * 批量新增门诊病人 + * + * @param hisOutpatientList 门诊病人列表 + * @return 结果 + */ + public int insertHisOutpatientBatch(List hisOutpatientList); + + /** + * 修改门诊病人 + * + * @param hisOutpatient 门诊病人 + * @return 结果 + */ + public int updateHisOutpatient(HisOutpatient hisOutpatient); + + /** + * 批量删除门诊病人 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisOutpatientByIds(String ids); + + /** + * 删除门诊病人信息 + * + * @param id 门诊病人ID + * @return 结果 + */ + public int deleteHisOutpatientById(Long id); + + /** + * 批量更新 + * @param hisOutpatientList 病人列表 + */ + public void updateHisOutpatientBatch(List hisOutpatientList); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisPatientExpensesDetailService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisPatientExpensesDetailService.java new file mode 100644 index 000000000..e271b61a3 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisPatientExpensesDetailService.java @@ -0,0 +1,24 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisPatientExpensesDetail; + +import java.util.List; + +/** + * 费用详情Service接口 + * + * @author bend + * @date 2020-07-09 + */ +public interface IHisPatientExpensesDetailService +{ + + /** + * 查询费用详情列表 + * + * @param hisPatientExpensesDetail 费用详情 + * @return 费用详情集合 + */ + public List selectHisPatientExpensesDetailList(HisPatientExpensesDetail hisPatientExpensesDetail); + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisPatientExpensesService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisPatientExpensesService.java new file mode 100644 index 000000000..75b53eebb --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisPatientExpensesService.java @@ -0,0 +1,97 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisPatientExpenses; +import com.ruoyi.his.domain.HisPatientExpensesDetail; + +import java.util.List; + +/** + * 费用记录Service接口 + * + * @author bend + * @date 2020-07-09 + */ +public interface IHisPatientExpensesService +{ + /** + * 查询费用记录 + * + * @param id 费用记录ID + * @return 费用记录 + */ + public HisPatientExpenses selectHisPatientExpensesById(Long id); + + /** + * 查询费用记录 + * + * @param hisPatientExpenses 费用记录 + * @return 费用记录 + */ + public HisPatientExpenses selectHisPatientExpenses(HisPatientExpenses hisPatientExpenses); + + /** + * 查询费用记录列表 + * + * @param hisPatientExpenses 费用记录 + * @return 费用记录集合 + */ + public List selectHisPatientExpensesList(HisPatientExpenses hisPatientExpenses); + + /** + * 新增费用记录 + * + * @param hisPatientExpenses 费用记录 + * @return 结果 + */ + public int insertHisPatientExpenses(HisPatientExpenses hisPatientExpenses); + + /** + * 批量新增费用记录 + * + * @param hisPatientExpensesList 费用记录列表 + */ + public void insertHisPatientExpensesBatch(List hisPatientExpensesList); + + /** + * 修改费用记录 + * + * @param hisPatientExpenses 费用记录 + * @return 结果 + */ + public int updateHisPatientExpenses(HisPatientExpenses hisPatientExpenses); + + /** + * 批量删除费用记录 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisPatientExpensesByIds(String ids); + + /** + * 删除费用记录信息 + * + * @param id 费用记录ID + * @return 结果 + */ + public int deleteHisPatientExpensesById(Long id); + + /** + * + * @param hisPatientExpensesList 费用列表 + */ + public void updateHisPatientExpensesBatch(List hisPatientExpensesList); + + /** + * + * @param hisPatientExpensesDetail 费用详情 + * @return 费用详情列表 + */ + public List selectHisPatientExpensesDetailList(HisPatientExpensesDetail hisPatientExpensesDetail); + + /** + * + * @param hisPatientExpensesList + */ + public void deleteHisPatientExpensesBatch(List hisPatientExpensesList); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisPayAccountService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisPayAccountService.java new file mode 100644 index 000000000..b7ec6e7c1 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisPayAccountService.java @@ -0,0 +1,80 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisPayAccount; + +import java.util.List; + +/** + * 支付账户Service接口 + * + * @author bend + * @date 2020-07-14 + */ +public interface IHisPayAccountService +{ + /** + * 查询支付账户 + * + * @param id 支付账户ID + * @return 支付账户 + */ + public HisPayAccount selectHisPayAccountById(Long id); + + /** + * 查询支付账户 + * + * @param hisPayAccount 支付账户 + * @return 支付账户 + */ + public HisPayAccount selectHisPayAccount(HisPayAccount hisPayAccount); + + /** + * 查询支付账户列表 + * + * @param hisPayAccount 支付账户 + * @return 支付账户集合 + */ + public List selectHisPayAccountList(HisPayAccount hisPayAccount); + + /** + * 新增支付账户 + * + * @param hisPayAccount 支付账户 + * @return 结果 + */ + public int insertHisPayAccount(HisPayAccount hisPayAccount); + + /** + * 批量新增支付账户 + * + * @param hisPayAccountList 支付账户列表 + * @return 结果 + */ + public int insertHisPayAccountBatch(List hisPayAccountList); + + /** + * 修改支付账户 + * + * @param hisPayAccount 支付账户 + * @return 结果 + */ + public int updateHisPayAccount(HisPayAccount hisPayAccount); + + /** + * 批量删除支付账户 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisPayAccountByIds(String ids); + + /** + * 删除支付账户信息 + * + * @param id 支付账户ID + * @return 结果 + */ + public int deleteHisPayAccountById(Long id); + + public int changeStatus(HisPayAccount hisPayAccount); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisRegistrationRecordService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisRegistrationRecordService.java new file mode 100644 index 000000000..9134a4dda --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisRegistrationRecordService.java @@ -0,0 +1,84 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisRegistrationRecord; + +import java.util.List; + +/** + * 挂号记录Service接口 + * + * @author bend + * @date 2020-06-28 + */ +public interface IHisRegistrationRecordService +{ + /** + * 查询挂号记录 + * + * @param id 挂号记录ID + * @return 挂号记录 + */ + public HisRegistrationRecord selectHisRegistrationRecordById(Long id); + + /** + * 查询挂号记录 + * @param hisRegistrationRecord 挂号记录 + * @return 查询挂号记录 + */ + public HisRegistrationRecord selectHisRegistrationRecord(HisRegistrationRecord hisRegistrationRecord); + + /** + * 查询挂号记录列表 + * + * @param hisRegistrationRecord 挂号记录 + * @return 挂号记录集合 + */ + public List selectHisRegistrationRecordList(HisRegistrationRecord hisRegistrationRecord); + + /** + * 新增挂号记录 + * + * @param hisRegistrationRecord 挂号记录 + * @return 结果 + */ + public int insertHisRegistrationRecord(HisRegistrationRecord hisRegistrationRecord); + + /** + * 批量新增挂号记录 + * @param hisRegistrationRecordList 挂号记录列表 + * @return 结果 + */ + public int insertHisRegistrationRecordBatch(List hisRegistrationRecordList); + + /** + * 修改挂号记录 + * + * @param hisRegistrationRecord 挂号记录 + * @return 结果 + */ + public int updateHisRegistrationRecord(HisRegistrationRecord hisRegistrationRecord); + + /** + * 批量修改挂号记录 + * + * @param hisRegistrationRecordList 挂号记录 + * @return 结果 + */ + public void updateHisRegistrationRecordBatch(List hisRegistrationRecordList); + + /** + * 批量删除挂号记录 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisRegistrationRecordByIds(String ids); + + /** + * 删除挂号记录信息 + * + * @param id 挂号记录ID + * @return 结果 + */ + public int deleteHisRegistrationRecordById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisRegistrationTemplateService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisRegistrationTemplateService.java new file mode 100644 index 000000000..7e64dc71f --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisRegistrationTemplateService.java @@ -0,0 +1,77 @@ +package com.ruoyi.his.service; + +import java.util.List; +import com.ruoyi.his.domain.HisRegistrationTemplate; + +/** + * 挂号模板Service接口 + * + * @author bend + * @date 2020-07-01 + */ +public interface IHisRegistrationTemplateService +{ + /** + * 查询挂号模板 + * + * @param id 挂号模板ID + * @return 挂号模板 + */ + public HisRegistrationTemplate selectHisRegistrationTemplateById(Long id); + + /** + * 查询挂号模板 + * + * @param hisRegistrationTemplate 挂号模板ID + * @return 挂号模板 + */ + public HisRegistrationTemplate selectHisRegistrationTemplate(HisRegistrationTemplate hisRegistrationTemplate); + + /** + * 查询挂号模板列表 + * + * @param hisRegistrationTemplate 挂号模板 + * @return 挂号模板集合 + */ + public List selectHisRegistrationTemplateList(HisRegistrationTemplate hisRegistrationTemplate); + + /** + * 新增挂号模板 + * + * @param hisRegistrationTemplate 挂号模板 + * @return 结果 + */ + public int insertHisRegistrationTemplate(HisRegistrationTemplate hisRegistrationTemplate); + + /** + * 修改挂号模板 + * + * @param hisRegistrationTemplate 挂号模板 + * @return 结果 + */ + public int updateHisRegistrationTemplate(HisRegistrationTemplate hisRegistrationTemplate); + + /** + * 批量删除挂号模板 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisRegistrationTemplateByIds(String ids); + + /** + * 删除挂号模板信息 + * + * @param id 挂号模板ID + * @return 结果 + */ + public int deleteHisRegistrationTemplateById(Long id); + + /** + * 修改模板信息 + * + * @param hisRegistrationTemplate 模板信息 + * @return 结果 + */ + public int changeStatus(HisRegistrationTemplate hisRegistrationTemplate); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisService.java new file mode 100644 index 000000000..3540c6792 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisService.java @@ -0,0 +1,64 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisDoctor; +import com.ruoyi.his.domain.HisOutpatient; +import com.ruoyi.his.domain.HisRegistrationRecord; + +import java.util.List; + +public interface IHisService { + + + /** + * 同步机构挂号记录 + * + * @param orgCode 机构编码 + * @param idCardNo 身份证号码,非必须参数！ + * @param beginTime 开始日期,格式:yyyy-MM-dd + * @param endTime 结束日期,格式:yyyy-MM-dd + * @return 如果提供idCardNo，则返回与之对应的列表，否则就返回该机构下所有挂号记录！ + */ + public List syncRegistrationRecord(String orgCode, String idCardNo, String beginTime, String endTime); + + + /** + * 实时同步门诊病人 + * + * @param orgCode 机构编码 + * @param registrationRecordList 挂号记录 + * @param beginTime 开始时间,格式:yyyy-MM-dd HH:mm:ss + * @param endTime 结束时间,格式:yyyy-MM-dd HH:mm:ss + */ + public void syncOutpatient(String orgCode, List registrationRecordList, String beginTime, String endTime); + + /** + * 实时同步门诊病人待缴费清单 + * + * @param hisOutpatientList 门诊病人列表 + */ + public void syncPrePayOutpatientExpensesBill(List hisOutpatientList); + + /** + * 同步住院病人信息 + * + * @param orgCode 机构编码 + * @param idCardNoList 身份证 + * @param beginTime 开始时间,格式:yyyy-MM-dd HH:mm:ss + * @param endTime 结束时间,格式:yyyy-MM-dd HH:mm:ss + */ + public void syncInpatient(String orgCode, List idCardNoList, String beginTime, String endTime); + + /** + * 同步门诊病人费用记录 + * + * @param hisOutpatientList 门诊病人 + */ + public void syncOutpatientExpenses(List hisOutpatientList); + + /** + * 医生排班 + * + * @param doctorList 医生列表 + */ + public void syncDoctorSchedule(List doctorList,String beginTime, String endTime); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisWechatProviderService.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisWechatProviderService.java new file mode 100644 index 000000000..e80e3657d --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/IHisWechatProviderService.java @@ -0,0 +1,78 @@ +package com.ruoyi.his.service; + +import com.ruoyi.his.domain.HisWechatProvider; + +import java.util.List; + +/** + * 微信服务商Service接口 + * + * @author bend + * @date 2020-07-27 + */ +public interface IHisWechatProviderService +{ + /** + * 查询微信服务商 + * + * @param id 微信服务商ID + * @return 微信服务商 + */ + public HisWechatProvider selectHisWechatProviderById(Long id); + + /** + * 查询微信服务商 + * + * @param hisWechatProvider 微信服务商 + * @return 微信服务商 + */ + public HisWechatProvider selectHisWechatProvider(HisWechatProvider hisWechatProvider); + + /** + * 查询微信服务商列表 + * + * @param hisWechatProvider 微信服务商 + * @return 微信服务商集合 + */ + public List selectHisWechatProviderList(HisWechatProvider hisWechatProvider); + + /** + * 新增微信服务商 + * + * @param hisWechatProvider 微信服务商 + * @return 结果 + */ + public int insertHisWechatProvider(HisWechatProvider hisWechatProvider); + + /** + * 批量新增微信服务商 + * + * @param hisWechatProviderList 微信服务商列表 + * @return 结果 + */ + public int insertHisWechatProviderBatch(List hisWechatProviderList); + + /** + * 修改微信服务商 + * + * @param hisWechatProvider 微信服务商 + * @return 结果 + */ + public int updateHisWechatProvider(HisWechatProvider hisWechatProvider); + + /** + * 批量删除微信服务商 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + public int deleteHisWechatProviderByIds(String ids); + + /** + * 删除微信服务商信息 + * + * @param id 微信服务商ID + * @return 结果 + */ + public int deleteHisWechatProviderById(Long id); +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDepartmentServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDepartmentServiceImpl.java new file mode 100644 index 000000000..c604123b5 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDepartmentServiceImpl.java @@ -0,0 +1,107 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.his.domain.HisDepartment; +import com.ruoyi.his.mapper.HisDepartmentMapper; +import com.ruoyi.his.service.IHisDepartmentService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 科室Service业务层处理 + * + * @author bend + * @date 2020-07-01 + */ +@Service +public class HisDepartmentServiceImpl implements IHisDepartmentService +{ + @Resource + private HisDepartmentMapper hisDepartmentMapper; + + /** + * 查询科室 + * + * @param id 科室ID + * @return 科室 + */ + @Override + public HisDepartment selectHisDepartmentById(Long id) + { + return hisDepartmentMapper.selectHisDepartmentById(id); + } + + /** + * 查询科室 + * + * @param deptId 科室ID + * @return 科室 + */ + @Override + public HisDepartment selectHisDepartmentByDeptId(String deptId) + { + return hisDepartmentMapper.selectHisDepartmentByDeptId(deptId); + } + + /** + * 查询科室列表 + * + * @param hisDepartment 科室 + * @return 科室 + */ + @Override + public List selectHisDepartmentList(HisDepartment hisDepartment) + { + return hisDepartmentMapper.selectHisDepartmentList(hisDepartment); + } + + /** + * 新增科室 + * + * @param hisDepartment 科室 + * @return 结果 + */ + @Override + public int insertHisDepartment(HisDepartment hisDepartment) + { + return hisDepartmentMapper.insertHisDepartment(hisDepartment); + } + + /** + * 修改科室 + * + * @param hisDepartment 科室 + * @return 结果 + */ + @Override + public int updateHisDepartment(HisDepartment hisDepartment) + { + return hisDepartmentMapper.updateHisDepartment(hisDepartment); + } + + /** + * 删除科室对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisDepartmentByIds(String ids) + { + return hisDepartmentMapper.deleteHisDepartmentByIds(Convert.toStrArray(ids)); + } + + /** + * 删除科室信息 + * + * @param id 科室ID + * @return 结果 + */ + @Override + public int deleteHisDepartmentById(Long id) + { + return hisDepartmentMapper.deleteHisDepartmentById(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDoctorDepartmentServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDoctorDepartmentServiceImpl.java new file mode 100644 index 000000000..b76731636 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDoctorDepartmentServiceImpl.java @@ -0,0 +1,107 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.his.domain.HisDoctorDepartment; +import com.ruoyi.his.mapper.HisDoctorDepartmentMapper; +import com.ruoyi.his.service.IHisDoctorDepartmentService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 医生科室关系Service业务层处理 + * + * @author bend + * @date 2020-07-01 + */ +@Service +public class HisDoctorDepartmentServiceImpl implements IHisDoctorDepartmentService +{ + @Resource + private HisDoctorDepartmentMapper hisDoctorDepartmentMapper; + + /** + * 查询医生科室关系 + * + * @param id 医生科室关系ID + * @return 医生科室关系 + */ + @Override + public HisDoctorDepartment selectHisDoctorDepartmentById(Long id) + { + return hisDoctorDepartmentMapper.selectHisDoctorDepartmentById(id); + } + + /** + * 查询医生科室关系列表 + * + * @param hisDoctorDepartment 医生科室关系 + * @return 医生科室关系 + */ + @Override + public List selectHisDoctorDepartmentList(HisDoctorDepartment hisDoctorDepartment) + { + return hisDoctorDepartmentMapper.selectHisDoctorDepartmentList(hisDoctorDepartment); + } + + /** + * 新增医生科室关系 + * + * @param hisDoctorDepartment 医生科室关系 + * @return 结果 + */ + @Override + public int insertHisDoctorDepartment(HisDoctorDepartment hisDoctorDepartment) + { + return hisDoctorDepartmentMapper.insertHisDoctorDepartment(hisDoctorDepartment); + } + + /** + * 修改医生科室关系 + * + * @param hisDoctorDepartment 医生科室关系 + * @return 结果 + */ + @Override + public int updateHisDoctorDepartment(HisDoctorDepartment hisDoctorDepartment) + { + return hisDoctorDepartmentMapper.updateHisDoctorDepartment(hisDoctorDepartment); + } + + /** + * 修改医生科室关系 + * + * @param hisDoctorDepartment 医生科室关系 + * @return 结果 + */ + @Override + public int updateHisDoctorDepartmentByDeptId(HisDoctorDepartment hisDoctorDepartment) + { + return hisDoctorDepartmentMapper.updateHisDoctorDepartmentByDeptId(hisDoctorDepartment); + } + + /** + * 删除医生科室关系对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisDoctorDepartmentByIds(String ids) + { + return hisDoctorDepartmentMapper.deleteHisDoctorDepartmentByIds(Convert.toStrArray(ids)); + } + + /** + * 删除医生科室关系信息 + * + * @param id 医生科室关系ID + * @return 结果 + */ + @Override + public int deleteHisDoctorDepartmentById(Long id) + { + return hisDoctorDepartmentMapper.deleteHisDoctorDepartmentById(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDoctorScheduleServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDoctorScheduleServiceImpl.java new file mode 100644 index 000000000..23f032afe --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDoctorScheduleServiceImpl.java @@ -0,0 +1,121 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.func.Func; +import com.ruoyi.his.domain.HisDoctorSchedule; +import com.ruoyi.his.mapper.HisDoctorScheduleMapper; +import com.ruoyi.his.service.IHisDoctorScheduleService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 医生排班Service业务层处理 + * + * @author bend + * @date 2020-07-03 + */ +@Service +public class HisDoctorScheduleServiceImpl implements IHisDoctorScheduleService +{ + @Resource + private HisDoctorScheduleMapper hisDoctorScheduleMapper; + + /** + * 查询医生排班 + * + * @param id 医生排班ID + * @return 医生排班 + */ + @Override + public HisDoctorSchedule selectHisDoctorScheduleById(Long id) + { + return hisDoctorScheduleMapper.selectHisDoctorScheduleById(id); + } + + @Override + public HisDoctorSchedule selectHisDoctorSchedule(HisDoctorSchedule hisDoctorSchedule) { + return hisDoctorScheduleMapper.selectHisDoctorSchedule(hisDoctorSchedule); + } + + /** + * 查询医生排班列表 + * + * @param hisDoctorSchedule 医生排班 + * @return 医生排班 + */ + @Override + public List selectHisDoctorScheduleList(HisDoctorSchedule hisDoctorSchedule) + { + return hisDoctorScheduleMapper.selectHisDoctorScheduleList(hisDoctorSchedule); + } + + /** + * 新增医生排班 + * + * @param hisDoctorSchedule 医生排班 + * @return 结果 + */ + @Override + public int insertHisDoctorSchedule(HisDoctorSchedule hisDoctorSchedule) + { + return hisDoctorScheduleMapper.insertHisDoctorSchedule(hisDoctorSchedule); + } + + @Override + public int insertHisDoctorScheduleBatch(List doctorScheduleList) + { + return hisDoctorScheduleMapper.insertHisDoctorScheduleBatch(doctorScheduleList); + } + + /** + * 修改医生排班 + * + * @param hisDoctorSchedule 医生排班 + * @return 结果 + */ + @Override + public int updateHisDoctorSchedule(HisDoctorSchedule hisDoctorSchedule) + { + return hisDoctorScheduleMapper.updateHisDoctorSchedule(hisDoctorSchedule); + } + + /** + * 删除医生排班对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisDoctorScheduleByIds(String ids) + { + return hisDoctorScheduleMapper.deleteHisDoctorScheduleByIds(Convert.toStrArray(ids)); + } + + /** + * 删除医生排班信息 + * + * @param id 医生排班ID + * @return 结果 + */ + @Override + public int deleteHisDoctorScheduleById(Long id) + { + return hisDoctorScheduleMapper.deleteHisDoctorScheduleById(id); + } + + /** + * + * @param hisDoctorScheduleList 排班列表 + */ + @Override + public void updateHisDoctorScheduleBatch(List hisDoctorScheduleList) + { + if (Func.isNotEmpty(hisDoctorScheduleList)) { + hisDoctorScheduleList.forEach(hisDoctorSchedule -> { + hisDoctorScheduleMapper.updateByPrimaryKeySelective(hisDoctorSchedule); + }); + } + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDoctorServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDoctorServiceImpl.java new file mode 100644 index 000000000..d7c842c95 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisDoctorServiceImpl.java @@ -0,0 +1,117 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.his.domain.HisDoctor; +import com.ruoyi.his.mapper.HisDoctorMapper; +import com.ruoyi.his.service.IHisDoctorService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 医生Service业务层处理 + * + * @author bend + * @date 2020-07-01 + */ +@Service +public class HisDoctorServiceImpl implements IHisDoctorService +{ + @Resource + private HisDoctorMapper hisDoctorMapper; + + /** + * 查询医生 + * + * @param id 医生ID + * @return 医生 + */ + @Override + public HisDoctor selectHisDoctorById(Long id) + { + return hisDoctorMapper.selectHisDoctorById(id); + } + + /** + * 查询医生列表 + * + * @param hisDoctor 医生 + * @return 医生 + */ + @Override + public List selectHisDoctorList(HisDoctor hisDoctor) + { + return hisDoctorMapper.selectHisDoctorList(hisDoctor); + } + + /** + * 查询医生列表 + * + * @param orgCode 机构编码 + * @return 医生集合 + */ + @Override + public List selectHisDoctorOrgCode(String orgCode) { + return hisDoctorMapper.selectHisDoctorOrgCode(orgCode); + } + + /** + * 新增医生 + * + * @param hisDoctor 医生 + * @return 结果 + */ + @Override + public int insertHisDoctor(HisDoctor hisDoctor) + { + return hisDoctorMapper.insertHisDoctor(hisDoctor); + } + + /** + * 修改医生 + * + * @param hisDoctor 医生 + * @return 结果 + */ + @Override + public int updateHisDoctor(HisDoctor hisDoctor) + { + return hisDoctorMapper.updateHisDoctor(hisDoctor); + } + + /** + * 删除医生对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisDoctorByIds(String ids) + { + return hisDoctorMapper.deleteHisDoctorByIds(Convert.toStrArray(ids)); + } + + /** + * 删除医生信息 + * + * @param id 医生ID + * @return 结果 + */ + @Override + public int deleteHisDoctorById(Long id) + { + return hisDoctorMapper.deleteHisDoctorById(id); + } + + /** + * 获取机构虚拟账户 + * @param orgCode 机构编码 + * @return 虚拟账户 + */ + @Override + public HisDoctor getVirtualAccount(String orgCode) + { + return hisDoctorMapper.getVirtualAccount(orgCode); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisEhealthClientServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisEhealthClientServiceImpl.java new file mode 100644 index 000000000..475ee59e2 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisEhealthClientServiceImpl.java @@ -0,0 +1,123 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.his.mapper.HisEhealthClientMapper; +import com.ruoyi.his.domain.HisEhealthClient; +import com.ruoyi.his.service.IHisEhealthClientService; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 健康卡Service业务层处理 + * + * @author bend + * @date 2020-07-27 + */ +@Service +public class HisEhealthClientServiceImpl implements IHisEhealthClientService +{ + @Resource + private HisEhealthClientMapper hisEhealthClientMapper; + + /** + * 查询健康卡 + * + * @param id 健康卡ID + * @return 健康卡 + */ + @Override + public HisEhealthClient selectHisEhealthClientById(Long id) + { + return hisEhealthClientMapper.selectHisEhealthClientById(id); + } + + /** + * 查询健康卡 + * + * @param hisEhealthClient 健康卡ID + * @return 健康卡 + */ + @Override + public HisEhealthClient selectHisEhealthClient(HisEhealthClient hisEhealthClient) + { + return hisEhealthClientMapper.selectOne(hisEhealthClient); + } + + /** + * 查询健康卡列表 + * + * @param hisEhealthClient 健康卡 + * @return 健康卡 + */ + @Override + public List selectHisEhealthClientList(HisEhealthClient hisEhealthClient) + { + return hisEhealthClientMapper.selectHisEhealthClientList(hisEhealthClient); + } + + /** + * 新增健康卡 + * + * @param hisEhealthClient 健康卡 + * @return 结果 + */ + @Override + public int insertHisEhealthClient(HisEhealthClient hisEhealthClient) + { + hisEhealthClient.setCreateTime(DateUtils.getNowDate()); + return hisEhealthClientMapper.insertSelective(hisEhealthClient); + } + + /** + * 批量新增健康卡 + * + * @param hisEhealthClientList 健康卡列表 + * @return 结果 + */ + @Override + public int insertHisEhealthClientBatch(List hisEhealthClientList) + { + return hisEhealthClientMapper.insertList(hisEhealthClientList); + } + + /** + * 修改健康卡 + * + * @param hisEhealthClient 健康卡 + * @return 结果 + */ + @Override + public int updateHisEhealthClient(HisEhealthClient hisEhealthClient) + { + return hisEhealthClientMapper.updateByPrimaryKeySelective(hisEhealthClient); + } + + /** + * 删除健康卡对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisEhealthClientByIds(String ids) + { + return hisEhealthClientMapper.deleteByIds(ids); + } + + /** + * 删除健康卡信息 + * + * @param id 健康卡ID + * @return 结果 + */ + @Override + public int deleteHisEhealthClientById(Long id) + { + return hisEhealthClientMapper.deleteByPrimaryKey(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisFeeItemServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisFeeItemServiceImpl.java new file mode 100644 index 000000000..80e06f731 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisFeeItemServiceImpl.java @@ -0,0 +1,128 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.his.mapper.HisFeeItemMapper; +import com.ruoyi.his.domain.HisFeeItem; +import com.ruoyi.his.service.IHisFeeItemService; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 费用类型Service业务层处理 + * + * @author bend + * @date 2020-07-14 + */ +@Service +public class HisFeeItemServiceImpl implements IHisFeeItemService +{ + @Resource + private HisFeeItemMapper hisFeeItemMapper; + + /** + * 查询费用类型 + * + * @param id 费用类型ID + * @return 费用类型 + */ + @Override + public HisFeeItem selectHisFeeItemById(Long id) + { + return hisFeeItemMapper.selectHisFeeItemById(id); + } + + /** + * 查询费用类型 + * + * @param hisFeeItem 费用类型ID + * @return 费用类型 + */ + @Override + public HisFeeItem selectHisFeeItem(HisFeeItem hisFeeItem) + { + return hisFeeItemMapper.selectOne(hisFeeItem); + } + + /** + * 查询费用类型列表 + * + * @param hisFeeItem 费用类型 + * @return 费用类型 + */ + @Override + public List selectHisFeeItemList(HisFeeItem hisFeeItem) + { + return hisFeeItemMapper.selectHisFeeItemList(hisFeeItem); + } + + /** + * 新增费用类型 + * + * @param hisFeeItem 费用类型 + * @return 结果 + */ + @Override + public int insertHisFeeItem(HisFeeItem hisFeeItem) + { + return hisFeeItemMapper.insertSelective(hisFeeItem); + } + + /** + * 批量新增费用类型 + * + * @param hisFeeItemList 费用类型列表 + * @return 结果 + */ + @Override + public int insertHisFeeItemBatch(List hisFeeItemList) + { + return hisFeeItemMapper.insertList(hisFeeItemList); + } + + /** + * 修改费用类型 + * + * @param hisFeeItem 费用类型 + * @return 结果 + */ + @Override + public int updateHisFeeItem(HisFeeItem hisFeeItem) + { + return hisFeeItemMapper.updateByPrimaryKeySelective(hisFeeItem); + } + + /** + * 删除费用类型对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisFeeItemByIds(String ids) + { + return hisFeeItemMapper.deleteByIds(ids); + } + + /** + * 删除费用类型信息 + * + * @param id 费用类型ID + * @return 结果 + */ + @Override + public int deleteHisFeeItemById(Long id) + { + return hisFeeItemMapper.deleteByPrimaryKey(id); + } + + @Override + public int changeStatus(HisFeeItem hisFeeItem) + { + return hisFeeItemMapper.updateByPrimaryKeySelective(hisFeeItem); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisHospitalInfoServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisHospitalInfoServiceImpl.java new file mode 100644 index 000000000..1755f7f30 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisHospitalInfoServiceImpl.java @@ -0,0 +1,126 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.his.domain.HisDoctor; +import com.ruoyi.his.domain.HisHospitalInfo; +import com.ruoyi.his.mapper.HisDoctorMapper; +import com.ruoyi.his.mapper.HisHospitalInfoMapper; +import com.ruoyi.his.service.IHisHospitalInfoService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 医疗机构Service业务层处理 + * + * @author bend + * @date 2020-06-28 + */ +@Service +public class HisHospitalInfoServiceImpl implements IHisHospitalInfoService +{ + @Resource + private HisHospitalInfoMapper hisHospitalInfoMapper; + @Resource + private HisDoctorMapper doctorMapper; + + /** + * 查询医疗机构 + * + * @param id 医疗机构ID + * @return 医疗机构 + */ + @Override + public HisHospitalInfo selectHisHospitalInfoById(Long id) + { + return hisHospitalInfoMapper.selectHisHospitalInfoById(id); + } + + /** + * 查询医疗机构 + * @param orgCode 医疗机构编码 + * @return 医疗机构 + */ + @Override + public HisHospitalInfo selectHisHospitalInfoByOrgCode(String orgCode) + { + return hisHospitalInfoMapper.selectHisHospitalInfoByOrgCode(orgCode); + } + + /** + * 查询医疗机构列表 + * + * @param hisHospitalInfo 医疗机构 + * @return 医疗机构 + */ + @Override + public List selectHisHospitalInfoList(HisHospitalInfo hisHospitalInfo) + { + + List hospitalInfoList = hisHospitalInfoMapper.selectHisHospitalInfoList(hisHospitalInfo); + + if(StringUtils.isNotEmpty(hospitalInfoList)){ + hospitalInfoList.forEach(info ->{ + String vmUserId = info.getVmUserId(); + if (StringUtils.isNotEmpty(vmUserId)){ + HisDoctor hisDoctor =doctorMapper.getVirtualAccountById(vmUserId); + if (null!=hisDoctor){ + //虚拟操作员 + info.setVmUserName(hisDoctor.getDoctorName()); + } + } + }); + } + return hospitalInfoList; + } + + /** + * 新增医疗机构 + * + * @param hisHospitalInfo 医疗机构 + * @return 结果 + */ + @Override + public int insertHisHospitalInfo(HisHospitalInfo hisHospitalInfo) + { + return hisHospitalInfoMapper.insertHisHospitalInfo(hisHospitalInfo); + } + + /** + * 修改医疗机构 + * + * @param hisHospitalInfo 医疗机构 + * @return 结果 + */ + @Override + public int updateHisHospitalInfo(HisHospitalInfo hisHospitalInfo) + { + return hisHospitalInfoMapper.updateHisHospitalInfo(hisHospitalInfo); + } + + /** + * 删除医疗机构对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisHospitalInfoByIds(String ids) + { + return hisHospitalInfoMapper.deleteHisHospitalInfoByIds(Convert.toStrArray(ids)); + } + + /** + * 删除医疗机构信息 + * + * @param id 医疗机构ID + * @return 结果 + */ + @Override + public int deleteHisHospitalInfoById(Long id) + { + return hisHospitalInfoMapper.deleteHisHospitalInfoById(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInpatientPrepaymentServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInpatientPrepaymentServiceImpl.java new file mode 100644 index 000000000..d969cedbf --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInpatientPrepaymentServiceImpl.java @@ -0,0 +1,122 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.his.mapper.HisInpatientPrepaymentMapper; +import com.ruoyi.his.domain.HisInpatientPrepayment; +import com.ruoyi.his.service.IHisInpatientPrepaymentService; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 住院预交Service业务层处理 + * + * @author bend + * @date 2020-07-14 + */ +@Service +public class HisInpatientPrepaymentServiceImpl implements IHisInpatientPrepaymentService +{ + @Resource + private HisInpatientPrepaymentMapper hisInpatientPrepaymentMapper; + + /** + * 查询住院预交 + * + * @param id 住院预交ID + * @return 住院预交 + */ + @Override + public HisInpatientPrepayment selectHisInpatientPrepaymentById(Long id) + { + return hisInpatientPrepaymentMapper.selectHisInpatientPrepaymentById(id); + } + + /** + * 查询住院预交 + * + * @param hisInpatientPrepayment 住院预交ID + * @return 住院预交 + */ + @Override + public HisInpatientPrepayment selectHisInpatientPrepayment(HisInpatientPrepayment hisInpatientPrepayment) + { + return hisInpatientPrepaymentMapper.selectOne(hisInpatientPrepayment); + } + + /** + * 查询住院预交列表 + * + * @param hisInpatientPrepayment 住院预交 + * @return 住院预交 + */ + @Override + public List selectHisInpatientPrepaymentList(HisInpatientPrepayment hisInpatientPrepayment) + { + return hisInpatientPrepaymentMapper.selectHisInpatientPrepaymentList(hisInpatientPrepayment); + } + + /** + * 新增住院预交 + * + * @param hisInpatientPrepayment 住院预交 + * @return 结果 + */ + @Override + public int insertHisInpatientPrepayment(HisInpatientPrepayment hisInpatientPrepayment) + { + return hisInpatientPrepaymentMapper.insertSelective(hisInpatientPrepayment); + } + + /** + * 批量新增住院预交 + * + * @param hisInpatientPrepaymentList 住院预交列表 + * @return 结果 + */ + @Override + public int insertHisInpatientPrepaymentBatch(List hisInpatientPrepaymentList) + { + return hisInpatientPrepaymentMapper.insertList(hisInpatientPrepaymentList); + } + + /** + * 修改住院预交 + * + * @param hisInpatientPrepayment 住院预交 + * @return 结果 + */ + @Override + public int updateHisInpatientPrepayment(HisInpatientPrepayment hisInpatientPrepayment) + { + return hisInpatientPrepaymentMapper.updateByPrimaryKeySelective(hisInpatientPrepayment); + } + + /** + * 删除住院预交对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisInpatientPrepaymentByIds(String ids) + { + return hisInpatientPrepaymentMapper.deleteByIds(ids); + } + + /** + * 删除住院预交信息 + * + * @param id 住院预交ID + * @return 结果 + */ + @Override + public int deleteHisInpatientPrepaymentById(Long id) + { + return hisInpatientPrepaymentMapper.deleteByPrimaryKey(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInpatientServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInpatientServiceImpl.java new file mode 100644 index 000000000..0c4b2bcaa --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInpatientServiceImpl.java @@ -0,0 +1,134 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.func.Func; +import com.ruoyi.his.domain.HisInpatient; +import com.ruoyi.his.mapper.HisInpatientMapper; +import com.ruoyi.his.service.IHisInpatientService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 住院病人Service业务层处理 + * + * @author bend + * @date 2020-07-08 + */ +@Service +public class HisInpatientServiceImpl implements IHisInpatientService +{ + + @Resource + private HisInpatientMapper hisInpatientMapper; + + + /** + * 查询住院病人 + * + * @param id 住院病人ID + * @return 住院病人 + */ + @Override + public HisInpatient selectHisInpatientById(Long id) + { + return hisInpatientMapper.selectByPrimaryKey(id); + } + + /** + * 查询住院病人 + * + * @param hisInpatient 住院病人 + * @return 住院病人 + */ + @Override + public HisInpatient selectHisInpatient(HisInpatient hisInpatient) { + return hisInpatientMapper.selectOne(hisInpatient); + } + + /** + * 查询住院病人列表 + * + * @param hisInpatient 住院病人 + * @return 住院病人 + */ + @Override + public List selectHisInpatientList(HisInpatient hisInpatient) + { + return hisInpatientMapper.selectHisInpatientList(hisInpatient); + } + + /** + * 新增住院病人 + * + * @param hisInpatient 住院病人 + * @return 结果 + */ + @Override + public int insertHisInpatient(HisInpatient hisInpatient) + { + return hisInpatientMapper.insertSelective(hisInpatient); + } + + /** + * 批量新增住院病人 + * + * @param hisInpatientList 住院病人 + * @return 结果 + */ + @Override + public int insertHisInpatientBatch(List hisInpatientList) { + return hisInpatientMapper.insertList(hisInpatientList); + } + + /** + * 修改住院病人 + * + * @param hisInpatient 住院病人 + * @return 结果 + */ + @Override + public int updateHisInpatient(HisInpatient hisInpatient) + { + return hisInpatientMapper.updateByPrimaryKeySelective(hisInpatient); + } + + /** + * 删除住院病人对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisInpatientByIds(String ids) + { + return hisInpatientMapper.deleteByIds(ids); + } + + /** + * 删除住院病人信息 + * + * @param id 住院病人ID + * @return 结果 + */ + @Override + public int deleteHisInpatientById(Long id) + { + return hisInpatientMapper.deleteByPrimaryKey(id); + } + + /** + * + * @param hisInpatientList 住院病人列表 + */ + @Override + public void updateHisInpatientBatch(List hisInpatientList) + { + if (Func.isNotEmpty(hisInpatientList)) { + hisInpatientList.forEach(hisInpatient -> { + hisInpatientMapper.updateByPrimaryKeySelective(hisInpatient); + }); + } + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInspectionApplyServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInspectionApplyServiceImpl.java new file mode 100644 index 000000000..acbfd4aa1 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInspectionApplyServiceImpl.java @@ -0,0 +1,122 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.his.mapper.HisInspectionApplyMapper; +import com.ruoyi.his.domain.HisInspectionApply; +import com.ruoyi.his.service.IHisInspectionApplyService; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 申请单Service业务层处理 + * + * @author bend + * @date 2020-07-10 + */ +@Service +public class HisInspectionApplyServiceImpl implements IHisInspectionApplyService +{ + @Resource + private HisInspectionApplyMapper hisInspectionApplyMapper; + + /** + * 查询申请单 + * + * @param id 申请单ID + * @return 申请单 + */ + @Override + public HisInspectionApply selectHisInspectionApplyById(Long id) + { + return hisInspectionApplyMapper.selectHisInspectionApplyById(id); + } + + /** + * 查询申请单 + * + * @param hisInspectionApply 申请单ID + * @return 申请单 + */ + @Override + public HisInspectionApply selectHisInspectionApply(HisInspectionApply hisInspectionApply) + { + return hisInspectionApplyMapper.selectOne(hisInspectionApply); + } + + /** + * 查询申请单列表 + * + * @param hisInspectionApply 申请单 + * @return 申请单 + */ + @Override + public List selectHisInspectionApplyList(HisInspectionApply hisInspectionApply) + { + return hisInspectionApplyMapper.selectHisInspectionApplyList(hisInspectionApply); + } + + /** + * 新增申请单 + * + * @param hisInspectionApply 申请单 + * @return 结果 + */ + @Override + public int insertHisInspectionApply(HisInspectionApply hisInspectionApply) + { + return hisInspectionApplyMapper.insertSelective(hisInspectionApply); + } + + /** + * 批量新增申请单 + * + * @param hisInspectionApplyList 申请单列表 + * @return 结果 + */ + @Override + public int insertHisInspectionApplyBatch(List hisInspectionApplyList) + { + return hisInspectionApplyMapper.insertList(hisInspectionApplyList); + } + + /** + * 修改申请单 + * + * @param hisInspectionApply 申请单 + * @return 结果 + */ + @Override + public int updateHisInspectionApply(HisInspectionApply hisInspectionApply) + { + return hisInspectionApplyMapper.updateByPrimaryKeySelective(hisInspectionApply); + } + + /** + * 删除申请单对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisInspectionApplyByIds(String ids) + { + return hisInspectionApplyMapper.deleteByIds(ids); + } + + /** + * 删除申请单信息 + * + * @param id 申请单ID + * @return 结果 + */ + @Override + public int deleteHisInspectionApplyById(Long id) + { + return hisInspectionApplyMapper.deleteByPrimaryKey(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInspectionReportItemServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInspectionReportItemServiceImpl.java new file mode 100644 index 000000000..58537d1d8 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInspectionReportItemServiceImpl.java @@ -0,0 +1,122 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.his.mapper.HisInspectionReportItemMapper; +import com.ruoyi.his.domain.HisInspectionReportItem; +import com.ruoyi.his.service.IHisInspectionReportItemService; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 检查检验明细Service业务层处理 + * + * @author bend + * @date 2020-07-10 + */ +@Service +public class HisInspectionReportItemServiceImpl implements IHisInspectionReportItemService +{ + @Resource + private HisInspectionReportItemMapper hisInspectionReportItemMapper; + + /** + * 查询检查检验明细 + * + * @param id 检查检验明细ID + * @return 检查检验明细 + */ + @Override + public HisInspectionReportItem selectHisInspectionReportItemById(Long id) + { + return hisInspectionReportItemMapper.selectHisInspectionReportItemById(id); + } + + /** + * 查询检查检验明细 + * + * @param hisInspectionReportItem 检查检验明细ID + * @return 检查检验明细 + */ + @Override + public HisInspectionReportItem selectHisInspectionReportItem(HisInspectionReportItem hisInspectionReportItem) + { + return hisInspectionReportItemMapper.selectOne(hisInspectionReportItem); + } + + /** + * 查询检查检验明细列表 + * + * @param hisInspectionReportItem 检查检验明细 + * @return 检查检验明细 + */ + @Override + public List selectHisInspectionReportItemList(HisInspectionReportItem hisInspectionReportItem) + { + return hisInspectionReportItemMapper.selectHisInspectionReportItemList(hisInspectionReportItem); + } + + /** + * 新增检查检验明细 + * + * @param hisInspectionReportItem 检查检验明细 + * @return 结果 + */ + @Override + public int insertHisInspectionReportItem(HisInspectionReportItem hisInspectionReportItem) + { + return hisInspectionReportItemMapper.insertSelective(hisInspectionReportItem); + } + + /** + * 批量新增检查检验明细 + * + * @param hisInspectionReportItemList 检查检验明细列表 + * @return 结果 + */ + @Override + public int insertHisInspectionReportItemBatch(List hisInspectionReportItemList) + { + return hisInspectionReportItemMapper.insertList(hisInspectionReportItemList); + } + + /** + * 修改检查检验明细 + * + * @param hisInspectionReportItem 检查检验明细 + * @return 结果 + */ + @Override + public int updateHisInspectionReportItem(HisInspectionReportItem hisInspectionReportItem) + { + return hisInspectionReportItemMapper.updateByPrimaryKeySelective(hisInspectionReportItem); + } + + /** + * 删除检查检验明细对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisInspectionReportItemByIds(String ids) + { + return hisInspectionReportItemMapper.deleteByIds(ids); + } + + /** + * 删除检查检验明细信息 + * + * @param id 检查检验明细ID + * @return 结果 + */ + @Override + public int deleteHisInspectionReportItemById(Long id) + { + return hisInspectionReportItemMapper.deleteByPrimaryKey(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInspectionReportServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInspectionReportServiceImpl.java new file mode 100644 index 000000000..96a20e9f2 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisInspectionReportServiceImpl.java @@ -0,0 +1,184 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.func.Func; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.his.mapper.HisInspectionReportItemMapper; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import com.ruoyi.his.domain.HisInspectionReportItem; +import com.ruoyi.his.mapper.HisInspectionReportMapper; +import com.ruoyi.his.domain.HisInspectionReport; +import com.ruoyi.his.service.IHisInspectionReportService; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + + +/** + * 检查检验Service业务层处理 + * + * @author bend + * @date 2020-07-10 + */ +@Service +public class HisInspectionReportServiceImpl implements IHisInspectionReportService +{ + @Resource + private HisInspectionReportMapper hisInspectionReportMapper; + @Resource + private HisInspectionReportItemMapper hisInspectionReportItemMapper; + + /** + * 查询检查检验 + * + * @param id 检查检验ID + * @return 检查检验 + */ + @Override + public HisInspectionReport selectHisInspectionReportById(Long id) + { + return hisInspectionReportMapper.selectHisInspectionReportById(id); + } + + /** + * 查询检查检验 + * + * @param hisInspectionReport 检查检验ID + * @return 检查检验 + */ + @Override + public HisInspectionReport selectHisInspectionReport(HisInspectionReport hisInspectionReport) + { + return hisInspectionReportMapper.selectOne(hisInspectionReport); + } + + /** + * 查询检查检验列表 + * + * @param hisInspectionReport 检查检验 + * @return 检查检验 + */ + @Override + public List selectHisInspectionReportList(HisInspectionReport hisInspectionReport) + { + return hisInspectionReportMapper.selectHisInspectionReportList(hisInspectionReport); + } + + /** + * 新增检查检验 + * + * @param hisInspectionReport 检查检验 + * @return 结果 + */ + @Transactional + @Override + public int insertHisInspectionReport(HisInspectionReport hisInspectionReport) + { + int rows = hisInspectionReportMapper.insertSelective(hisInspectionReport); + insertHisInspectionReportItem(hisInspectionReport); + return rows; + } + + /** + * 批量新增检查检验 + * + * @param hisInspectionReportList 检查检验列表 + * @return 结果 + */ + @Transactional(rollbackFor = Exception.class) + @Override + public int insertHisInspectionReportBatch(List hisInspectionReportList) + { + //return hisInspectionReportMapper.insertList(hisInspectionReportList); + AtomicInteger rows= new AtomicInteger(); + if (Func.isNotEmpty(hisInspectionReportList)){ + hisInspectionReportList.forEach(hisInspectionReport -> { + rows.addAndGet(hisInspectionReportMapper.insertSelective(hisInspectionReport)); + insertHisInspectionReportItem(hisInspectionReport); + }); + return rows.get(); + } else return -1; + + } + + /** + * 修改检查检验 + * + * @param hisInspectionReport 检查检验 + * @return 结果 + */ + @Transactional + @Override + public int updateHisInspectionReport(HisInspectionReport hisInspectionReport) + { + hisInspectionReportMapper.deleteHisInspectionReportItemByReportId(hisInspectionReport.getId()); + insertHisInspectionReportItem(hisInspectionReport); + return hisInspectionReportMapper.updateByPrimaryKeySelective(hisInspectionReport); + } + + /** + * 删除检查检验对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Transactional + @Override + public int deleteHisInspectionReportByIds(String ids) + { + hisInspectionReportMapper.deleteHisInspectionReportItemByReportIds(Convert.toStrArray(ids)); + return hisInspectionReportMapper.deleteByIds(ids); + } + + /** + * 删除检查检验信息 + * + * @param id 检查检验ID + * @return 结果 + */ + @Override + public int deleteHisInspectionReportById(Long id) + { + hisInspectionReportMapper.deleteHisInspectionReportItemByReportId(id); + return hisInspectionReportMapper.deleteByPrimaryKey(id); + } + + /** + * 新增检查检验明细信息 + * + * @param hisInspectionReport 检查检验对象 + */ + public void insertHisInspectionReportItem(HisInspectionReport hisInspectionReport) + { + List hisInspectionReportItemList = hisInspectionReport.getHisInspectionReportItemList(); + Long id = hisInspectionReport.getId(); + if (StringUtils.isNotNull(hisInspectionReportItemList)) + { + List list = new ArrayList(); + for (HisInspectionReportItem hisInspectionReportItem : hisInspectionReportItemList) + { + hisInspectionReportItem.setReportId(id); + list.add(hisInspectionReportItem); + } + if (list.size() > 0) + { + hisInspectionReportMapper.batchHisInspectionReportItem(list); + } + } + } + + /** + * + * @param hisInspectionReportItem 检查检验项目详情 + * @return 检查检验项目详情列表 + */ + @Override + public List selectHisInspectionReportItemList(HisInspectionReportItem hisInspectionReportItem) + { + return hisInspectionReportItemMapper.selectHisInspectionReportItemList(hisInspectionReportItem); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisMerchantScrcuServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisMerchantScrcuServiceImpl.java new file mode 100644 index 000000000..4541eb3e4 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisMerchantScrcuServiceImpl.java @@ -0,0 +1,122 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.his.mapper.HisMerchantScrcuMapper; +import com.ruoyi.his.domain.HisMerchantScrcu; +import com.ruoyi.his.service.IHisMerchantScrcuService; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 农信商户Service业务层处理 + * + * @author bend + * @date 2020-07-27 + */ +@Service +public class HisMerchantScrcuServiceImpl implements IHisMerchantScrcuService +{ + @Resource + private HisMerchantScrcuMapper hisMerchantScrcuMapper; + + /** + * 查询农信商户 + * + * @param id 农信商户ID + * @return 农信商户 + */ + @Override + public HisMerchantScrcu selectHisMerchantScrcuById(Long id) + { + return hisMerchantScrcuMapper.selectHisMerchantScrcuById(id); + } + + /** + * 查询农信商户 + * + * @param hisMerchantScrcu 农信商户ID + * @return 农信商户 + */ + @Override + public HisMerchantScrcu selectHisMerchantScrcu(HisMerchantScrcu hisMerchantScrcu) + { + return hisMerchantScrcuMapper.selectOne(hisMerchantScrcu); + } + + /** + * 查询农信商户列表 + * + * @param hisMerchantScrcu 农信商户 + * @return 农信商户 + */ + @Override + public List selectHisMerchantScrcuList(HisMerchantScrcu hisMerchantScrcu) + { + return hisMerchantScrcuMapper.selectHisMerchantScrcuList(hisMerchantScrcu); + } + + /** + * 新增农信商户 + * + * @param hisMerchantScrcu 农信商户 + * @return 结果 + */ + @Override + public int insertHisMerchantScrcu(HisMerchantScrcu hisMerchantScrcu) + { + return hisMerchantScrcuMapper.insertSelective(hisMerchantScrcu); + } + + /** + * 批量新增农信商户 + * + * @param hisMerchantScrcuList 农信商户列表 + * @return 结果 + */ + @Override + public int insertHisMerchantScrcuBatch(List hisMerchantScrcuList) + { + return hisMerchantScrcuMapper.insertList(hisMerchantScrcuList); + } + + /** + * 修改农信商户 + * + * @param hisMerchantScrcu 农信商户 + * @return 结果 + */ + @Override + public int updateHisMerchantScrcu(HisMerchantScrcu hisMerchantScrcu) + { + return hisMerchantScrcuMapper.updateByPrimaryKeySelective(hisMerchantScrcu); + } + + /** + * 删除农信商户对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisMerchantScrcuByIds(String ids) + { + return hisMerchantScrcuMapper.deleteByIds(ids); + } + + /** + * 删除农信商户信息 + * + * @param id 农信商户ID + * @return 结果 + */ + @Override + public int deleteHisMerchantScrcuById(Long id) + { + return hisMerchantScrcuMapper.deleteByPrimaryKey(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisMerchantWechatServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisMerchantWechatServiceImpl.java new file mode 100644 index 000000000..eba65a7ce --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisMerchantWechatServiceImpl.java @@ -0,0 +1,122 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.his.mapper.HisMerchantWechatMapper; +import com.ruoyi.his.domain.HisMerchantWechat; +import com.ruoyi.his.service.IHisMerchantWechatService; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 特约商户Service业务层处理 + * + * @author bend + * @date 2020-07-27 + */ +@Service +public class HisMerchantWechatServiceImpl implements IHisMerchantWechatService +{ + @Resource + private HisMerchantWechatMapper hisMerchantWechatMapper; + + /** + * 查询特约商户 + * + * @param id 特约商户ID + * @return 特约商户 + */ + @Override + public HisMerchantWechat selectHisMerchantWechatById(Long id) + { + return hisMerchantWechatMapper.selectHisMerchantWechatById(id); + } + + /** + * 查询特约商户 + * + * @param hisMerchantWechat 特约商户ID + * @return 特约商户 + */ + @Override + public HisMerchantWechat selectHisMerchantWechat(HisMerchantWechat hisMerchantWechat) + { + return hisMerchantWechatMapper.selectOne(hisMerchantWechat); + } + + /** + * 查询特约商户列表 + * + * @param hisMerchantWechat 特约商户 + * @return 特约商户 + */ + @Override + public List selectHisMerchantWechatList(HisMerchantWechat hisMerchantWechat) + { + return hisMerchantWechatMapper.selectHisMerchantWechatList(hisMerchantWechat); + } + + /** + * 新增特约商户 + * + * @param hisMerchantWechat 特约商户 + * @return 结果 + */ + @Override + public int insertHisMerchantWechat(HisMerchantWechat hisMerchantWechat) + { + return hisMerchantWechatMapper.insertSelective(hisMerchantWechat); + } + + /** + * 批量新增特约商户 + * + * @param hisMerchantWechatList 特约商户列表 + * @return 结果 + */ + @Override + public int insertHisMerchantWechatBatch(List hisMerchantWechatList) + { + return hisMerchantWechatMapper.insertList(hisMerchantWechatList); + } + + /** + * 修改特约商户 + * + * @param hisMerchantWechat 特约商户 + * @return 结果 + */ + @Override + public int updateHisMerchantWechat(HisMerchantWechat hisMerchantWechat) + { + return hisMerchantWechatMapper.updateByPrimaryKeySelective(hisMerchantWechat); + } + + /** + * 删除特约商户对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisMerchantWechatByIds(String ids) + { + return hisMerchantWechatMapper.deleteByIds(ids); + } + + /** + * 删除特约商户信息 + * + * @param id 特约商户ID + * @return 结果 + */ + @Override + public int deleteHisMerchantWechatById(Long id) + { + return hisMerchantWechatMapper.deleteByPrimaryKey(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisOutpatientExpensesBillServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisOutpatientExpensesBillServiceImpl.java new file mode 100644 index 000000000..7adbd697d --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisOutpatientExpensesBillServiceImpl.java @@ -0,0 +1,200 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.func.Func; +import com.ruoyi.common.func.RandomType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.his.domain.HisOutpatientExpensesBill; +import com.ruoyi.his.domain.HisOutpatientExpensesBillDetail; +import com.ruoyi.his.mapper.HisOutpatientExpensesBillDetailMapper; +import com.ruoyi.his.mapper.HisOutpatientExpensesBillMapper; +import com.ruoyi.his.service.IHisOutpatientExpensesBillService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + + +/** + * 待缴费单Service业务层处理 + * + * @author bend + * @date 2020-07-09 + */ +@Service +public class HisOutpatientExpensesBillServiceImpl implements IHisOutpatientExpensesBillService { + @Resource + private HisOutpatientExpensesBillMapper hisOutpatientExpensesBillMapper; + @Resource + private HisOutpatientExpensesBillDetailMapper hisOutpatientExpensesBillDetailMapper; + + /** + * 查询待缴费单 + * + * @param id 待缴费单ID + * @return 待缴费单 + */ + @Override + public HisOutpatientExpensesBill selectHisOutpatientExpensesBillById(Long id) { + return hisOutpatientExpensesBillMapper.selectHisOutpatientExpensesBillById(id); + } + + /** + * 查询待缴费单 + * + * @param hisOutpatientExpensesBill 待缴费单ID + * @return 待缴费单 + */ + @Override + public HisOutpatientExpensesBill selectHisOutpatientExpensesBill(HisOutpatientExpensesBill hisOutpatientExpensesBill) { + return hisOutpatientExpensesBillMapper.selectOne(hisOutpatientExpensesBill); + } + + /** + * 查询待缴费单列表 + * + * @param hisOutpatientExpensesBill 待缴费单 + * @return 待缴费单 + */ + @Override + public List selectHisOutpatientExpensesBillList(HisOutpatientExpensesBill hisOutpatientExpensesBill) { + return hisOutpatientExpensesBillMapper.selectHisOutpatientExpensesBillList(hisOutpatientExpensesBill); + } + + /** + * 新增待缴费单 + * + * @param hisOutpatientExpensesBill 待缴费单 + * @return 结果 + */ + @Transactional + @Override + public int insertHisOutpatientExpensesBill(HisOutpatientExpensesBill hisOutpatientExpensesBill) { + int rows = hisOutpatientExpensesBillMapper.insertSelective(hisOutpatientExpensesBill); + insertHisOutpatientExpensesBillDetail(hisOutpatientExpensesBill); + return rows; + } + + /** + * 批量新增待缴费单 + * + * @param hisOutpatientExpensesBillList 待缴费单列表 + * @return 结果 + */ + @Transactional + @Override + public int insertHisOutpatientExpensesBillBatch(List hisOutpatientExpensesBillList) { + AtomicInteger rows = new AtomicInteger(); + if (Func.isNotEmpty(hisOutpatientExpensesBillList)) { + hisOutpatientExpensesBillList.forEach(hisOutpatientExpensesBill -> { + rows.addAndGet(hisOutpatientExpensesBillMapper.insertSelective(hisOutpatientExpensesBill)); + insertHisOutpatientExpensesBillDetail(hisOutpatientExpensesBill); + }); + return rows.get(); + } else return -1; + } + + /** + * 修改待缴费单 + * + * @param hisOutpatientExpensesBill 待缴费单 + * @return 结果 + */ + @Transactional + @Override + public int updateHisOutpatientExpensesBill(HisOutpatientExpensesBill hisOutpatientExpensesBill) { + hisOutpatientExpensesBillMapper.deleteHisOutpatientExpensesBillDetailByBillId(hisOutpatientExpensesBill.getId()); + insertHisOutpatientExpensesBillDetail(hisOutpatientExpensesBill); + return hisOutpatientExpensesBillMapper.updateByPrimaryKeySelective(hisOutpatientExpensesBill); + } + + /** + * 删除待缴费单对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Transactional + @Override + public int deleteHisOutpatientExpensesBillByIds(String ids) { + hisOutpatientExpensesBillMapper.deleteHisOutpatientExpensesBillDetailByBillIds(Convert.toStrArray(ids)); + return hisOutpatientExpensesBillMapper.deleteByIds(ids); + } + + /** + * 删除待缴费单信息 + * + * @param id 待缴费单ID + * @return 结果 + */ + @Override + public int deleteHisOutpatientExpensesBillById(Long id) { + hisOutpatientExpensesBillMapper.deleteHisOutpatientExpensesBillDetailByBillId(id); + return hisOutpatientExpensesBillMapper.deleteByPrimaryKey(id); + } + + /** + * 新增清单详情信息 + * + * @param hisOutpatientExpensesBill 待缴费单对象 + */ + public void insertHisOutpatientExpensesBillDetail(HisOutpatientExpensesBill hisOutpatientExpensesBill) { + List hisOutpatientExpensesBillDetailList = hisOutpatientExpensesBill.getHisOutpatientExpensesBillDetailList(); + Long billId = hisOutpatientExpensesBill.getId(); + if (StringUtils.isNotNull(hisOutpatientExpensesBillDetailList)) { + List list = new ArrayList(); + for (HisOutpatientExpensesBillDetail hisOutpatientExpensesBillDetail : hisOutpatientExpensesBillDetailList) { + //自定义ID规则 + hisOutpatientExpensesBillDetail.setId(Func.random(32, RandomType.INT)); + hisOutpatientExpensesBillDetail.setBillId(billId); + list.add(hisOutpatientExpensesBillDetail); + } + if (list.size() > 0) { + hisOutpatientExpensesBillMapper.batchHisOutpatientExpensesBillDetail(list); + } + } + } + + @Override + public List selectHisOutpatientExpensesBillDetailList(HisOutpatientExpensesBillDetail hisOutpatientExpensesBillDetail) { + return hisOutpatientExpensesBillDetailMapper.selectHisOutpatientExpensesBillDetailList(hisOutpatientExpensesBillDetail); + } + + /** + * @param hisOutpatientExpensesBillUpdateList 待缴费单详情 + */ + @Transactional + @Override + public void updateHisOutpatientExpensesBillBatch(List hisOutpatientExpensesBillUpdateList) { + if (Func.isNotEmpty(hisOutpatientExpensesBillUpdateList)) { + //更新详情 + hisOutpatientExpensesBillUpdateList.forEach(hisOutpatientExpensesBill -> { + hisOutpatientExpensesBillMapper.updateByPrimaryKeySelective(hisOutpatientExpensesBill); + hisOutpatientExpensesBillMapper.deleteHisOutpatientExpensesBillDetailByBillId(hisOutpatientExpensesBill.getId()); + insertHisOutpatientExpensesBillDetail(hisOutpatientExpensesBill); + }); + } + } + + /** + * @param hisOutpatientExpensesBill 待缴费单 + */ + @Override + public void updateHisOutpatientExpensesBillStatus(HisOutpatientExpensesBill hisOutpatientExpensesBill) { + hisOutpatientExpensesBillMapper.updateByPrimaryKeySelective(hisOutpatientExpensesBill); + } + + @Transactional + @Override + public void deleteHisOutpatientExpensesBillBatch(List hisOutpatientExpensesBillList) { + if (Func.isNotEmpty(hisOutpatientExpensesBillList)) { + hisOutpatientExpensesBillList.forEach(hisOutpatientExpensesBill -> { + hisOutpatientExpensesBillMapper.deleteHisOutpatientExpensesBillDetailByBillId(hisOutpatientExpensesBill.getId()); + hisOutpatientExpensesBillMapper.deleteByPrimaryKey(hisOutpatientExpensesBill.getId()); + }); + } + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisOutpatientPaymentServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisOutpatientPaymentServiceImpl.java new file mode 100644 index 000000000..d06e3d481 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisOutpatientPaymentServiceImpl.java @@ -0,0 +1,122 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.his.mapper.HisOutpatientPaymentMapper; +import com.ruoyi.his.domain.HisOutpatientPayment; +import com.ruoyi.his.service.IHisOutpatientPaymentService; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 门诊预交Service业务层处理 + * + * @author bend + * @date 2020-07-14 + */ +@Service +public class HisOutpatientPaymentServiceImpl implements IHisOutpatientPaymentService +{ + @Resource + private HisOutpatientPaymentMapper hisOutpatientPaymentMapper; + + /** + * 查询门诊预交 + * + * @param id 门诊预交ID + * @return 门诊预交 + */ + @Override + public HisOutpatientPayment selectHisOutpatientPaymentById(Long id) + { + return hisOutpatientPaymentMapper.selectHisOutpatientPaymentById(id); + } + + /** + * 查询门诊预交 + * + * @param hisOutpatientPayment 门诊预交ID + * @return 门诊预交 + */ + @Override + public HisOutpatientPayment selectHisOutpatientPayment(HisOutpatientPayment hisOutpatientPayment) + { + return hisOutpatientPaymentMapper.selectOne(hisOutpatientPayment); + } + + /** + * 查询门诊预交列表 + * + * @param hisOutpatientPayment 门诊预交 + * @return 门诊预交 + */ + @Override + public List selectHisOutpatientPaymentList(HisOutpatientPayment hisOutpatientPayment) + { + return hisOutpatientPaymentMapper.selectHisOutpatientPaymentList(hisOutpatientPayment); + } + + /** + * 新增门诊预交 + * + * @param hisOutpatientPayment 门诊预交 + * @return 结果 + */ + @Override + public int insertHisOutpatientPayment(HisOutpatientPayment hisOutpatientPayment) + { + return hisOutpatientPaymentMapper.insertSelective(hisOutpatientPayment); + } + + /** + * 批量新增门诊预交 + * + * @param hisOutpatientPaymentList 门诊预交列表 + * @return 结果 + */ + @Override + public int insertHisOutpatientPaymentBatch(List hisOutpatientPaymentList) + { + return hisOutpatientPaymentMapper.insertList(hisOutpatientPaymentList); + } + + /** + * 修改门诊预交 + * + * @param hisOutpatientPayment 门诊预交 + * @return 结果 + */ + @Override + public int updateHisOutpatientPayment(HisOutpatientPayment hisOutpatientPayment) + { + return hisOutpatientPaymentMapper.updateByPrimaryKeySelective(hisOutpatientPayment); + } + + /** + * 删除门诊预交对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisOutpatientPaymentByIds(String ids) + { + return hisOutpatientPaymentMapper.deleteByIds(ids); + } + + /** + * 删除门诊预交信息 + * + * @param id 门诊预交ID + * @return 结果 + */ + @Override + public int deleteHisOutpatientPaymentById(Long id) + { + return hisOutpatientPaymentMapper.deleteByPrimaryKey(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisOutpatientServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisOutpatientServiceImpl.java new file mode 100644 index 000000000..733ab1156 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisOutpatientServiceImpl.java @@ -0,0 +1,133 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.func.Func; +import com.ruoyi.his.domain.HisOutpatient; +import com.ruoyi.his.mapper.HisOutpatientMapper; +import com.ruoyi.his.service.IHisOutpatientService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 门诊病人Service业务层处理 + * + * @author bend + * @date 2020-07-08 + */ +@Service +public class HisOutpatientServiceImpl implements IHisOutpatientService +{ + @Resource + private HisOutpatientMapper hisOutpatientMapper; + + /** + * 查询门诊病人 + * + * @param id 门诊病人ID + * @return 门诊病人 + */ + @Override + public HisOutpatient selectHisOutpatientById(Long id) + { + return hisOutpatientMapper.selectByPrimaryKey(id); + } + + /** + * 查询门诊病人 + * + * @param hisOutpatient 门诊病人 + * @return 门诊病人 + */ + @Override + public HisOutpatient selectHisOutpatient(HisOutpatient hisOutpatient) + { + return hisOutpatientMapper.selectOne(hisOutpatient); + } + + /** + * 查询门诊病人列表 + * + * @param hisOutpatient 门诊病人 + * @return 门诊病人 + */ + @Override + public List selectHisOutpatientList(HisOutpatient hisOutpatient) + { + return hisOutpatientMapper.selectHisOutpatientList(hisOutpatient); + } + + /** + * 新增门诊病人 + * + * @param hisOutpatient 门诊病人 + * @return 结果 + */ + @Override + public int insertHisOutpatient(HisOutpatient hisOutpatient) + { + return hisOutpatientMapper.insertSelective(hisOutpatient); + } + + /** + * 批量新增门诊病人 + * + * @param hisOutpatientList 门诊病人列表 + * @return 结果 + */ + @Override + public int insertHisOutpatientBatch(List hisOutpatientList) { + return hisOutpatientMapper.insertList(hisOutpatientList); + } + + /** + * 修改门诊病人 + * + * @param hisOutpatient 门诊病人 + * @return 结果 + */ + @Override + public int updateHisOutpatient(HisOutpatient hisOutpatient) + { + return hisOutpatientMapper.updateByPrimaryKeySelective(hisOutpatient); + } + + /** + * 删除门诊病人对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisOutpatientByIds(String ids) + { + return hisOutpatientMapper.deleteByIds(ids); + } + + /** + * 删除门诊病人信息 + * + * @param id 门诊病人ID + * @return 结果 + */ + @Override + public int deleteHisOutpatientById(Long id) + { + return hisOutpatientMapper.deleteByPrimaryKey(id); + } + + /** + * + * @param hisOutpatientList 病人列表 + */ + @Override + public void updateHisOutpatientBatch(List hisOutpatientList) + { + if (Func.isNotEmpty(hisOutpatientList)){ + hisOutpatientList.forEach(hisOutpatient -> { + hisOutpatientMapper.updateByPrimaryKeySelective(hisOutpatient); + }); + } + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisPatientExpensesDetailServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisPatientExpensesDetailServiceImpl.java new file mode 100644 index 000000000..57561dc1a --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisPatientExpensesDetailServiceImpl.java @@ -0,0 +1,40 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.his.mapper.HisPatientExpensesDetailMapper; +import com.ruoyi.his.domain.HisPatientExpensesDetail; +import com.ruoyi.his.service.IHisPatientExpensesDetailService; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 费用详情Service业务层处理 + * + * @author bend + * @date 2020-07-09 + */ +@Service +public class HisPatientExpensesDetailServiceImpl implements IHisPatientExpensesDetailService +{ + @Resource + private HisPatientExpensesDetailMapper hisPatientExpensesDetailMapper; + + + /** + * 查询费用详情列表 + * + * @param hisPatientExpensesDetail 费用详情 + * @return 费用详情 + */ + @Override + public List selectHisPatientExpensesDetailList(HisPatientExpensesDetail hisPatientExpensesDetail) + { + return hisPatientExpensesDetailMapper.selectHisPatientExpensesDetailList(hisPatientExpensesDetail); + } + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisPatientExpensesServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisPatientExpensesServiceImpl.java new file mode 100644 index 000000000..08e3b7b1f --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisPatientExpensesServiceImpl.java @@ -0,0 +1,216 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.func.Func; +import com.ruoyi.common.func.RandomType; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.his.domain.HisPatientExpenses; +import com.ruoyi.his.domain.HisPatientExpensesDetail; +import com.ruoyi.his.mapper.HisPatientExpensesDetailMapper; +import com.ruoyi.his.mapper.HisPatientExpensesMapper; +import com.ruoyi.his.service.IHisPatientExpensesService; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; + + +/** + * 费用记录Service业务层处理 + * + * @author bend + * @date 2020-07-09 + */ +@Service +public class HisPatientExpensesServiceImpl implements IHisPatientExpensesService +{ + @Resource + private HisPatientExpensesMapper hisPatientExpensesMapper; + @Resource + private HisPatientExpensesDetailMapper hisPatientExpensesDetailMapper; + + /** + * 查询费用记录 + * + * @param id 费用记录ID + * @return 费用记录 + */ + @Override + public HisPatientExpenses selectHisPatientExpensesById(Long id) + { + return hisPatientExpensesMapper.selectHisPatientExpensesById(id); + } + + /** + * 查询费用记录 + * + * @param hisPatientExpenses 费用记录ID + * @return 费用记录 + */ + @Override + public HisPatientExpenses selectHisPatientExpenses(HisPatientExpenses hisPatientExpenses) + { + return hisPatientExpensesMapper.selectOne(hisPatientExpenses); + } + + /** + * 查询费用记录列表 + * + * @param hisPatientExpenses 费用记录 + * @return 费用记录 + */ + @Override + public List selectHisPatientExpensesList(HisPatientExpenses hisPatientExpenses) + { + return hisPatientExpensesMapper.selectHisPatientExpensesList(hisPatientExpenses); + } + + /** + * 新增费用记录 + * + * @param hisPatientExpenses 费用记录 + * @return 结果 + */ + @Transactional + @Override + public int insertHisPatientExpenses(HisPatientExpenses hisPatientExpenses) + { + int rows = hisPatientExpensesMapper.insertSelective(hisPatientExpenses); + insertHisPatientExpensesDetail(hisPatientExpenses); + return rows; + } + + /** + * 批量新增费用记录 + * + * @param hisPatientExpensesList 费用记录列表 + */ + @Transactional + @Override + public void insertHisPatientExpensesBatch(List hisPatientExpensesList) + { + AtomicInteger rows= new AtomicInteger(); + if (Func.isNotEmpty(hisPatientExpensesList)){ + hisPatientExpensesList.forEach(hisPatientExpenses -> { + rows.addAndGet(hisPatientExpensesMapper.insertSelective(hisPatientExpenses)); + insertHisPatientExpensesDetail(hisPatientExpenses); + }); + rows.get(); + } + } + + /** + * 修改费用记录 + * + * @param hisPatientExpenses 费用记录 + * @return 结果 + */ + @Transactional + @Override + public int updateHisPatientExpenses(HisPatientExpenses hisPatientExpenses) + { + hisPatientExpensesMapper.deleteHisPatientExpensesDetailByExpensesId(hisPatientExpenses.getId()); + insertHisPatientExpensesDetail(hisPatientExpenses); + return hisPatientExpensesMapper.updateByPrimaryKeySelective(hisPatientExpenses); + } + + /** + * 删除费用记录对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Transactional + @Override + public int deleteHisPatientExpensesByIds(String ids) + { + hisPatientExpensesMapper.deleteHisPatientExpensesDetailByExpensesIds(Convert.toStrArray(ids)); + return hisPatientExpensesMapper.deleteByIds(ids); + } + + /** + * 删除费用记录信息 + * + * @param id 费用记录ID + * @return 结果 + */ + @Override + public int deleteHisPatientExpensesById(Long id) + { + hisPatientExpensesMapper.deleteHisPatientExpensesDetailByExpensesId(id); + return hisPatientExpensesMapper.deleteByPrimaryKey(id); + } + + /** + * 新增费用详情信息 + * + * @param hisPatientExpenses 费用记录对象 + */ + public void insertHisPatientExpensesDetail(HisPatientExpenses hisPatientExpenses) + { + List hisPatientExpensesDetailList = hisPatientExpenses.getHisPatientExpensesDetailList(); + Long expensesId = hisPatientExpenses.getId(); + if (StringUtils.isNotNull(hisPatientExpensesDetailList)) + { + List list = new ArrayList<>(); + for (HisPatientExpensesDetail hisPatientExpensesDetail : hisPatientExpensesDetailList) + { + //自定义ID规则 + hisPatientExpensesDetail.setId(Func.random(32, RandomType.INT)); + hisPatientExpensesDetail.setExpensesId(expensesId); + list.add(hisPatientExpensesDetail); + } + if (list.size() > 0) + { + hisPatientExpensesMapper.batchHisPatientExpensesDetail(list); + } + } + } + + /** + * + * @param hisPatientExpensesList 费用列表 + */ + @Override + public void updateHisPatientExpensesBatch(List hisPatientExpensesList) + { + if (Func.isNotEmpty(hisPatientExpensesList)) { + //更新详情 + hisPatientExpensesList.forEach(hisPatientExpenses -> { + hisPatientExpensesMapper.updateByPrimaryKeySelective(hisPatientExpenses); + hisPatientExpensesMapper.deleteHisPatientExpensesDetailByExpensesId(hisPatientExpenses.getId()); + insertHisPatientExpensesDetail(hisPatientExpenses); + //属性 isChargeFee是否收费 不是必须的！ + }); + } + } + + /** + * + * @param hisPatientExpensesDetail 费用详情 + */ + @Override + public List selectHisPatientExpensesDetailList(HisPatientExpensesDetail hisPatientExpensesDetail) + { + return hisPatientExpensesDetailMapper.selectHisPatientExpensesDetailList(hisPatientExpensesDetail); + } + + /** + * 批量删除 + * @param hisPatientExpensesList + */ + @Transactional + @Override + public void deleteHisPatientExpensesBatch(List hisPatientExpensesList) + { + if (Func.isNotEmpty(hisPatientExpensesList)) { + hisPatientExpensesList.forEach(hisPatientExpenses -> { + hisPatientExpensesMapper.deleteHisPatientExpensesDetailByExpensesId(hisPatientExpenses.getId()); + hisPatientExpensesMapper.deleteByPrimaryKey(hisPatientExpenses.getId()); + }); + } + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisPayAccountServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisPayAccountServiceImpl.java new file mode 100644 index 000000000..cfc92324b --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisPayAccountServiceImpl.java @@ -0,0 +1,128 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.his.mapper.HisPayAccountMapper; +import com.ruoyi.his.domain.HisPayAccount; +import com.ruoyi.his.service.IHisPayAccountService; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * 支付账户Service业务层处理 + * + * @author bend + * @date 2020-07-14 + */ +@Service +public class HisPayAccountServiceImpl implements IHisPayAccountService +{ + @Resource + private HisPayAccountMapper hisPayAccountMapper; + + /** + * 查询支付账户 + * + * @param id 支付账户ID + * @return 支付账户 + */ + @Override + public HisPayAccount selectHisPayAccountById(Long id) + { + return hisPayAccountMapper.selectHisPayAccountById(id); + } + + /** + * 查询支付账户 + * + * @param hisPayAccount 支付账户ID + * @return 支付账户 + */ + @Override + public HisPayAccount selectHisPayAccount(HisPayAccount hisPayAccount) + { + return hisPayAccountMapper.selectOne(hisPayAccount); + } + + /** + * 查询支付账户列表 + * + * @param hisPayAccount 支付账户 + * @return 支付账户 + */ + @Override + public List selectHisPayAccountList(HisPayAccount hisPayAccount) + { + return hisPayAccountMapper.selectHisPayAccountList(hisPayAccount); + } + + /** + * 新增支付账户 + * + * @param hisPayAccount 支付账户 + * @return 结果 + */ + @Override + public int insertHisPayAccount(HisPayAccount hisPayAccount) + { + return hisPayAccountMapper.insertSelective(hisPayAccount); + } + + /** + * 批量新增支付账户 + * + * @param hisPayAccountList 支付账户列表 + * @return 结果 + */ + @Override + public int insertHisPayAccountBatch(List hisPayAccountList) + { + return hisPayAccountMapper.insertList(hisPayAccountList); + } + + /** + * 修改支付账户 + * + * @param hisPayAccount 支付账户 + * @return 结果 + */ + @Override + public int updateHisPayAccount(HisPayAccount hisPayAccount) + { + return hisPayAccountMapper.updateByPrimaryKeySelective(hisPayAccount); + } + + /** + * 删除支付账户对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisPayAccountByIds(String ids) + { + return hisPayAccountMapper.deleteByIds(ids); + } + + /** + * 删除支付账户信息 + * + * @param id 支付账户ID + * @return 结果 + */ + @Override + public int deleteHisPayAccountById(Long id) + { + return hisPayAccountMapper.deleteByPrimaryKey(id); + } + + @Override + public int changeStatus(HisPayAccount hisPayAccount) + { + return hisPayAccountMapper.updateByPrimaryKeySelective(hisPayAccount); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisRegistrationRecordServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisRegistrationRecordServiceImpl.java new file mode 100644 index 000000000..41f42125b --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisRegistrationRecordServiceImpl.java @@ -0,0 +1,123 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.func.Func; +import com.ruoyi.his.domain.HisRegistrationRecord; +import com.ruoyi.his.mapper.HisRegistrationRecordMapper; +import com.ruoyi.his.service.IHisRegistrationRecordService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 挂号记录Service业务层处理 + * + * @author bend + * @date 2020-06-28 + */ +@Service +public class HisRegistrationRecordServiceImpl implements IHisRegistrationRecordService +{ + @Resource + private HisRegistrationRecordMapper hisRegistrationRecordMapper; + + /** + * 查询挂号记录 + * + * @param id 挂号记录ID + * @return 挂号记录 + */ + @Override + public HisRegistrationRecord selectHisRegistrationRecordById(Long id) + { + return hisRegistrationRecordMapper.selectHisRegistrationRecordById(id); + } + /** + * 查询挂号记录 + * @param hisRegistrationRecord 挂号记录 + * @return 查询挂号记录 + */ + @Override + public HisRegistrationRecord selectHisRegistrationRecord(HisRegistrationRecord hisRegistrationRecord) + { + return hisRegistrationRecordMapper.selectHisRegistrationRecord(hisRegistrationRecord); + } + + + /** + * 查询挂号记录列表 + * + * @param hisRegistrationRecord 挂号记录 + * @return 挂号记录 + */ + @Override + public List selectHisRegistrationRecordList(HisRegistrationRecord hisRegistrationRecord) + { + return hisRegistrationRecordMapper.selectHisRegistrationRecordList(hisRegistrationRecord); + } + + /** + * 新增挂号记录 + * + * @param hisRegistrationRecord 挂号记录 + * @return 结果 + */ + @Override + public int insertHisRegistrationRecord(HisRegistrationRecord hisRegistrationRecord) + { + return hisRegistrationRecordMapper.insertHisRegistrationRecord(hisRegistrationRecord); + } + + @Override + public int insertHisRegistrationRecordBatch(List hisRegistrationRecordList) + { + return hisRegistrationRecordMapper.insertList(hisRegistrationRecordList); + } + + @Override + public void updateHisRegistrationRecordBatch(List hisRegistrationRecordList) + { + if (Func.isNotEmpty(hisRegistrationRecordList)){ + hisRegistrationRecordList.forEach(hisRegistrationRecord -> { + hisRegistrationRecordMapper.updateByPrimaryKeySelective(hisRegistrationRecord); + }); + } + } + + /** + * 修改挂号记录 + * + * @param hisRegistrationRecord 挂号记录 + * @return 结果 + */ + @Override + public int updateHisRegistrationRecord(HisRegistrationRecord hisRegistrationRecord) + { + return hisRegistrationRecordMapper.updateHisRegistrationRecord(hisRegistrationRecord); + } + + /** + * 删除挂号记录对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisRegistrationRecordByIds(String ids) + { + return hisRegistrationRecordMapper.deleteHisRegistrationRecordByIds(Convert.toStrArray(ids)); + } + + /** + * 删除挂号记录信息 + * + * @param id 挂号记录ID + * @return 结果 + */ + @Override + public int deleteHisRegistrationRecordById(Long id) + { + return hisRegistrationRecordMapper.deleteHisRegistrationRecordById(id); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisRegistrationTemplateServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisRegistrationTemplateServiceImpl.java new file mode 100644 index 000000000..87150ac77 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisRegistrationTemplateServiceImpl.java @@ -0,0 +1,110 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.his.domain.HisRegistrationTemplate; +import com.ruoyi.his.mapper.HisRegistrationTemplateMapper; +import com.ruoyi.his.service.IHisRegistrationTemplateService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 挂号模板Service业务层处理 + * + * @author bend + * @date 2020-07-01 + */ +@Service +public class HisRegistrationTemplateServiceImpl implements IHisRegistrationTemplateService +{ + @Resource + private HisRegistrationTemplateMapper hisRegistrationTemplateMapper; + + /** + * 查询挂号模板 + * + * @param id 挂号模板ID + * @return 挂号模板 + */ + @Override + public HisRegistrationTemplate selectHisRegistrationTemplateById(Long id) + { + return hisRegistrationTemplateMapper.selectHisRegistrationTemplateById(id); + } + + @Override + public HisRegistrationTemplate selectHisRegistrationTemplate(HisRegistrationTemplate hisRegistrationTemplate) { + return hisRegistrationTemplateMapper.selectHisRegistrationTemplate(hisRegistrationTemplate); + } + + /** + * 查询挂号模板列表 + * + * @param hisRegistrationTemplate 挂号模板 + * @return 挂号模板 + */ + @Override + public List selectHisRegistrationTemplateList(HisRegistrationTemplate hisRegistrationTemplate) + { + return hisRegistrationTemplateMapper.selectHisRegistrationTemplateList(hisRegistrationTemplate); + } + + /** + * 新增挂号模板 + * + * @param hisRegistrationTemplate 挂号模板 + * @return 结果 + */ + @Override + public int insertHisRegistrationTemplate(HisRegistrationTemplate hisRegistrationTemplate) + { + return hisRegistrationTemplateMapper.insertHisRegistrationTemplate(hisRegistrationTemplate); + } + + /** + * 修改挂号模板 + * + * @param hisRegistrationTemplate 挂号模板 + * @return 结果 + */ + @Override + public int updateHisRegistrationTemplate(HisRegistrationTemplate hisRegistrationTemplate) + { + return hisRegistrationTemplateMapper.updateByPrimaryKeySelective(hisRegistrationTemplate); + } + + /** + * 删除挂号模板对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Override + public int deleteHisRegistrationTemplateByIds(String ids) + { + return hisRegistrationTemplateMapper.deleteHisRegistrationTemplateByIds(Convert.toStrArray(ids)); + } + + /** + * 删除挂号模板信息 + * + * @param id 挂号模板ID + * @return 结果 + */ + @Override + public int deleteHisRegistrationTemplateById(Long id) + { + return hisRegistrationTemplateMapper.deleteHisRegistrationTemplateById(id); + } + + /** + * + * @param hisRegistrationTemplate 模板信息 + */ + @Override + public int changeStatus(HisRegistrationTemplate hisRegistrationTemplate) + { + return hisRegistrationTemplateMapper.updateByPrimaryKeySelective(hisRegistrationTemplate); + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisServiceImpl.java new file mode 100644 index 000000000..4eca99b51 --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisServiceImpl.java @@ -0,0 +1,639 @@ +package com.ruoyi.his.service.impl; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; +import com.bending.core.his.bo.ExpensesBillBO; +import com.bending.core.his.common.HISResult; +import com.bending.core.his.constant.HisConstant; +import com.bending.core.his.entity.*; +import com.bending.core.his.vo.*; +import com.bending.core.utils.HISClientUtil; +import com.ruoyi.common.func.IConstant; +import com.ruoyi.common.func.Func; +import com.ruoyi.common.func.IdCardUtil; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.his.domain.*; +import com.ruoyi.his.service.*; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; + +@Service +public class HisServiceImpl implements IHisService { + + private static final Logger log = LoggerFactory.getLogger(HisServiceImpl.class); + + @Resource + private HISClientUtil hisClientUtil; + @Resource + private IHisOutpatientService outpatientService; + @Resource + private IHisInpatientService inpatientService; + @Resource + private IHisRegistrationRecordService registrationRecordService; + @Resource + private IHisHospitalInfoService hospitalInfoService; + @Resource + private IHisOutpatientExpensesBillService outpatientExpensesBillService; + @Resource + private IHisPatientExpensesService patientExpensesService; + @Resource + private IHisDoctorScheduleService doctorScheduleService; + + /** + * 同步机构挂号记录 + * + * @param orgCode 机构编码 + * @param idCardNo 身份证号码,非必须参数！ + * @param beginTime 开始日期,格式:yyyy-MM-dd + * @param endTime 结束日期,格式:yyyy-MM-dd + * @return 如果提供idCardNo，则返回与之对应的列表，否则就返回该机构下所有挂号记录！ + */ + @Override + public List syncRegistrationRecord(String orgCode, String idCardNo, String beginTime, String endTime) { + //存放每次同步最新的数据 + List newRegistrationRecordList = new ArrayList<>(); + + RegistrationRecord registrationRecord = new RegistrationRecord(); + registrationRecord.setOrgCode(orgCode); + registrationRecord.setIdCardNo(idCardNo); + registrationRecord.setBeginTime(beginTime); + registrationRecord.setEndTime(endTime); + //HIS拿到当日的挂号记录(线上和线下全部的)所有的 + HISResult hisResult = hisClientUtil.getRegistrationRecordList(registrationRecord); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + if (Func.isNotEmpty(list)) { + for (RegistrationRecordVO vo : list) { + String _idCardNo = vo.getIdCardNo(); + if (Func.isNotEmpty(_idCardNo) && IdCardUtil.validate(_idCardNo)) { + //身份证验证,过滤无效的身份证数据 + HisRegistrationRecord hisRegistrationRecord = new HisRegistrationRecord(); + hisRegistrationRecord.setPatientSex(IdCardUtil.verifyGender(_idCardNo));//获取性别 + hisRegistrationRecord.setOrgCode(orgCode); + String registeredTime = vo.getRegisteredDate();//挂号时间 + //挂号日期 处理 + if (Func.isNotEmpty(registeredTime)) { + Date date = DateUtils.parseDate(registeredTime); + Date registeredDate = Func.parse(registeredTime, DateUtils.YYYY_MM_DD); + hisRegistrationRecord.setRegisteredDate(registeredDate); //挂号日期[YYYY-MM-DD] + hisRegistrationRecord.setVisitDate(Func.formatDate(date, DateUtils.YYYY_MM_DD)); //就诊日期[YYYY-MM-DD] + hisRegistrationRecord.setVisitTime(Func.getDuringDay(date));//就诊时段 上午或下午 + hisRegistrationRecord.setCreateTime(date); //挂号时间[yyyy-MM-dd HH:mm:ss] + //0=预约挂号,1=当日挂号,2=分诊挂号 + if (registeredDate.compareTo(DateUtils.getNowDate()) == 0) { + hisRegistrationRecord.setRegisteredType(IConstant.ONE.getValue()); + } else { + hisRegistrationRecord.setRegisteredType(IConstant.ZERO.getValue()); + } + } + //线下同步过来的挂号记录状态默认“1:已支付/待接诊”|需要同步病人门诊信息来更新(挂号状态)** + hisRegistrationRecord.setRegisteredStatus(1); + hisRegistrationRecord.setRegisteredSource(0);//挂号来源[0:线下,1:线上,2:自助分诊终端] + Func.copy(vo, hisRegistrationRecord); + hisRegistrationRecord.setRefundAble(vo.getRefundAble()); //挂号是否可退状态 + + newRegistrationRecordList.add(hisRegistrationRecord); + } + } + } + } + + HisRegistrationRecord hisRegistrationRecordQuery = new HisRegistrationRecord(); + hisRegistrationRecordQuery.setIdCardNo(idCardNo); + hisRegistrationRecordQuery.setOrgCode(orgCode); + Map paramsQuery = new HashMap<>(); + paramsQuery.put("beginCreateTime", beginTime); + paramsQuery.put("endCreateTime", endTime); + hisRegistrationRecordQuery.setParams(paramsQuery); + List existRegistrationRecordList = registrationRecordService.selectHisRegistrationRecordList(hisRegistrationRecordQuery); + existRegistrationRecordList.forEach(this::refundRegistration);//微信挂号-->过期作废处理！ + //数据处理 + List updateRegList = sameRegList(existRegistrationRecordList, newRegistrationRecordList); + List delRegList = diffRegList(existRegistrationRecordList, newRegistrationRecordList); + List addRegList = diffRegList(newRegistrationRecordList, existRegistrationRecordList); + if (Func.isNotEmpty(updateRegList)) { + registrationRecordService.updateHisRegistrationRecordBatch(updateRegList); + } + if (Func.isNotEmpty(delRegList)) { + List ids = delRegList.stream().map(HisRegistrationRecord::getId).distinct().collect(Collectors.toList()); + registrationRecordService.deleteHisRegistrationRecordByIds(Func.join(ids, ",")); + } + if (Func.isNotEmpty(addRegList)) { + registrationRecordService.insertHisRegistrationRecordBatch(addRegList); + } + //返回所有数据！ + updateRegList.addAll(addRegList); + //根据身份证过滤数据！ + if (Func.isNotEmpty(idCardNo)) { + return updateRegList.stream().filter(record -> record.getIdCardNo().equals(idCardNo)).collect(Collectors.toList()); + } + return updateRegList; + } + + @Override + public void syncPrePayOutpatientExpensesBill(List hisOutpatientList) { + hisOutpatientList.forEach(outpatient -> { + log.info("=========开始获取 {} 的待缴费清单==========", outpatient.getPatientName()); + String businessId = outpatient.getBusinessId(); + String orgCode = outpatient.getOrgCode(); + String orgName = outpatient.getOrgName(); + //每次更新时,查询是否已经存在 + HisOutpatientExpensesBill hisOutpatientExpensesBillQuery = new HisOutpatientExpensesBill(); + hisOutpatientExpensesBillQuery.setBusinessId(businessId); + hisOutpatientExpensesBillQuery.setRecipeStatus(IConstant.ZERO.getValue()); + List existBillList = outpatientExpensesBillService.selectHisOutpatientExpensesBillList(hisOutpatientExpensesBillQuery); + List newBillList = new ArrayList<>(); + String registeredId = outpatient.getRegisteredId();//与门诊业务ID相同 + OutpatientExpensesBill bill = new OutpatientExpensesBill();//HIS待缴费清单查询 + bill.setRegisteredId(registeredId); + HISResult hisResult = hisClientUtil.getPrePayOutpatientExpensesBillList(bill); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + if (Func.isNotEmpty(list)) { + for (OutpatientExpensesBillVO vo : list) { + String prescriptionDetail = vo.getPrescriptionDetail();//门诊费用清单详情 + List expensesBillBOList = JSON.parseArray(prescriptionDetail, ExpensesBillBO.class); + vo.setExpensesBillList(expensesBillBOList); + //清单 + HisOutpatientExpensesBill hisOutpatientExpensesBill = new HisOutpatientExpensesBill(); + //处方缴费状态[0:待缴费,1:已缴费] 清单缴费之后会返回门诊ID，收费记录ID + hisOutpatientExpensesBill.setRecipeStatus(IConstant.ZERO.getValue()); + hisOutpatientExpensesBill.setRegisteredId(registeredId); + hisOutpatientExpensesBill.setBusinessId(registeredId); + hisOutpatientExpensesBill.setIdCardNo(outpatient.getIdCardNo()); + hisOutpatientExpensesBill.setPatientName(outpatient.getPatientName()); + hisOutpatientExpensesBill.setOrgCode(orgCode); + hisOutpatientExpensesBill.setOrgName(orgName); + Func.copy(vo, hisOutpatientExpensesBill); + hisOutpatientExpensesBill.setBusinessId(outpatient.getBusinessId()); + //门诊待缴费清单-详情 + List expensesBillList = vo.getExpensesBillList(); + if (Func.isNotEmpty(expensesBillList)) { + List detailList = new ArrayList<>(); + for (ExpensesBillBO billBO : expensesBillList) { + //每次更新时,查询是否已经存在 + HisOutpatientExpensesBillDetail billDetail = new HisOutpatientExpensesBillDetail(); + Func.copy(billBO, billDetail); + String billTime = billBO.getBillTime(); + Date billDateTime = DateUtils.parseDate(billTime); + billDetail.setBillDetailId(billBO.getId()); + billDetail.setCreateTime(billDateTime); + //费用主项冗余字段 + hisOutpatientExpensesBill.setFeeName(billDetail.getFeeName());//新增费用名称 + hisOutpatientExpensesBill.setOperateDept(billDetail.getOperateDept());//执行科室名称 + hisOutpatientExpensesBill.setBillTime(billDateTime); + hisOutpatientExpensesBill.setCreateTime(billDateTime); + detailList.add(billDetail); + } + //添加详情 + hisOutpatientExpensesBill.setHisOutpatientExpensesBillDetailList(detailList); + // + newBillList.add(hisOutpatientExpensesBill); + } + } + //需要更新的数据,参数顺序注意 + List updateExpensesBillList = sameExpensesBillList(existBillList, newBillList); + //需要删除的数据 + List delExpensesBillList = diffExpensesBillList(existBillList, newBillList); + //需要新增的数据 + List addExpensesBillList = diffExpensesBillList(newBillList, existBillList); + if (Func.isNotEmpty(updateExpensesBillList)) { + outpatientExpensesBillService.updateHisOutpatientExpensesBillBatch(updateExpensesBillList); + } + if (Func.isNotEmpty(delExpensesBillList)) { + outpatientExpensesBillService.deleteHisOutpatientExpensesBillBatch(delExpensesBillList); + } + if (Func.isNotEmpty(addExpensesBillList)) { + outpatientExpensesBillService.insertHisOutpatientExpensesBillBatch(addExpensesBillList); + } + } + } + }); + } + + @Override + public void syncOutpatient(String orgCode, List registrationRecordList, String beginTime, String endTime) { + if (Func.isNotEmpty(registrationRecordList)) { + registrationRecordList.forEach(registrationRecord -> { + String businessId = registrationRecord.getBusinessId(); + String idCardNo = registrationRecord.getIdCardNo(); + //每次更新时,查询是否已经存在 + HisOutpatient hisOutpatientQuery = new HisOutpatient(); + hisOutpatientQuery.setBusinessId(businessId); + hisOutpatientQuery.setIdCardNo(idCardNo); + hisOutpatientQuery.setOrgCode(orgCode); + Map paramsQuery = new HashMap<>(); + paramsQuery.put("beginCreateTime", beginTime); + paramsQuery.put("endCreateTime", endTime); + hisOutpatientQuery.setParams(paramsQuery); + //每次更新时,查询是否已经存在 + List existOutpatientList = outpatientService.selectHisOutpatientList(hisOutpatientQuery); + List newOutpatientList = new ArrayList<>(); + Outpatient outpatient = new Outpatient(); + outpatient.setOrgCode(orgCode); + outpatient.setBusinessId(businessId);//挂号ID等于门诊业务ID + outpatient.setIdCardNo(idCardNo); + outpatient.setBeginTime(beginTime); + outpatient.setEndTime(endTime); + HISResult hisResult = hisClientUtil.getOutpatientList(outpatient); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + if (Func.isNotEmpty(list)) { + for (OutpatientVO vo : list) { + String _idCardNo = vo.getIdCardNo(); + boolean validate = IdCardUtil.validate(_idCardNo); + if (validate) { + HisOutpatient hisOutpatient = new HisOutpatient(); + hisOutpatient.setOrgCode(orgCode); + Func.copy(vo, hisOutpatient); + hisOutpatient.setRegisteredId(vo.getBusinessId());//设置门诊病人的挂号ID 其实就是门诊病人的业务ID + hisOutpatient.setCreateTime(DateUtils.parseDate(vo.getVisitDate()));//创建时间 <-- 门诊病人的就诊时间(日期) + hisOutpatient.setReceptionStatus(vo.getReceptionStatus()); //接诊状态 (-1 表示挂号已取消) + newOutpatientList.add(hisOutpatient); + } else { + log.info("实时获取门诊病人信息:非法身份证号码 | {} |", _idCardNo); + } + } + } + } + //需要更新的数据,参数顺序注意 + List sameOutpatientList = sameOutpatientList(existOutpatientList, newOutpatientList); + //需要删除的数据 + List delOutpatientList = diffOutpatientList(existOutpatientList, newOutpatientList); + //需要新增的数据 + List addOutpatientList = diffOutpatientList(newOutpatientList, existOutpatientList); + + if (Func.isNotEmpty(sameOutpatientList)) { + outpatientService.updateHisOutpatientBatch(sameOutpatientList); + } + if (Func.isNotEmpty(delOutpatientList)) { + List ids = delOutpatientList.stream().map(HisOutpatient::getId).distinct().collect(Collectors.toList()); + outpatientService.deleteHisOutpatientByIds(Func.join(ids, ",")); + } + if (Func.isNotEmpty(addOutpatientList)) { + outpatientService.insertHisOutpatientBatch(addOutpatientList); + } + //过滤列表 + if (Func.isNotBlank(businessId)) { + Optional outpatientOptional = newOutpatientList.stream().filter(item -> item.getBusinessId().equals(businessId)).findFirst(); + if (outpatientOptional.isPresent()) { + HisOutpatient hisOutpatient = outpatientOptional.get(); + this.updateHisRegistrationRecordStatus(hisOutpatient, registrationRecord); + } + } + }); + } + } + + /** + * 通过门诊病人来更新挂号状态 + * + * @param hisOutpatient 门诊病人 + * @param hisRegistrationRecord 挂号记录 + */ + private void updateHisRegistrationRecordStatus(HisOutpatient hisOutpatient, HisRegistrationRecord hisRegistrationRecord) { + // 门诊：接诊状态 -1已取消 0未接诊、1接诊中、2已接诊 ; + // 挂号：状态[-1:已取消,0:新建,1:已支付/待接诊,2:已就诊,3:已退费] + if (hisOutpatient.getReceptionStatus() == -1 || hisOutpatient.getReceptionStatus() == 2) { + hisRegistrationRecord.setBusinessId(hisOutpatient.getBusinessId()); + hisRegistrationRecord.setRegisteredStatus(hisOutpatient.getReceptionStatus()); + int res = registrationRecordService.updateHisRegistrationRecord(hisRegistrationRecord); + log.info("-----|门诊挂号状态|更新是否成功 :{} ------", res); + } + if (hisOutpatient.getReceptionStatus() == 1) { + hisRegistrationRecord.setRegisteredStatus(2); + hisRegistrationRecord.setBusinessId(hisOutpatient.getBusinessId()); + int res = registrationRecordService.updateHisRegistrationRecord(hisRegistrationRecord); + log.info("-----|门诊挂号状态|更新是否成功 :{} ------", res); + } + } + + /** + * 两list并集 + */ + private List sameRegList(List oldArrayList, List newArrayList) { + return newArrayList.stream().filter(item -> oldArrayList.stream().map(HisRegistrationRecord::getRegisteredId).collect(Collectors.toList()).contains(item.getRegisteredId())).collect(Collectors.toList()); + } + + /** + * 两list差集 + */ + private List diffRegList(List firstArrayList, List secondArrayList) { + return firstArrayList.stream().filter(item -> !secondArrayList.stream().map(HisRegistrationRecord::getRegisteredId).collect(Collectors.toList()).contains(item.getRegisteredId())).collect(Collectors.toList()); + } + + private List sameOutpatientList(List oldArrayList, List newArrayList) { + return newArrayList.stream().filter(item -> oldArrayList.stream().map(HisOutpatient::getBusinessId).collect(Collectors.toList()).contains(item.getBusinessId())).collect(Collectors.toList()); + } + + private List diffOutpatientList(List firstArrayList, List secondArrayList) { + return firstArrayList.stream().filter(item -> !secondArrayList.stream().map(HisOutpatient::getBusinessId).collect(Collectors.toList()).contains(item.getBusinessId())).collect(Collectors.toList()); + } + + private List sameInpatientList(List oldArrayList, List newArrayList) { + return newArrayList.stream().filter(item -> oldArrayList.stream().map(HisInpatient::getBusinessId).collect(Collectors.toList()).contains(item.getBusinessId())).collect(Collectors.toList()); + } + + private List diffInpatientList(List firstArrayList, List secondArrayList) { + return firstArrayList.stream().filter(item -> !secondArrayList.stream().map(HisInpatient::getBusinessId).collect(Collectors.toList()).contains(item.getBusinessId())).collect(Collectors.toList()); + } + + private List sameExpensesBillList(List oldArrayList, List newArrayList) { + return newArrayList.stream().filter(item -> oldArrayList.stream().map(HisOutpatientExpensesBill::getRecipeId).collect(Collectors.toList()).contains(item.getRecipeId())).collect(Collectors.toList()); + } + + private List diffExpensesBillList(List firstArrayList, List secondArrayList) { + return firstArrayList.stream().filter(item -> !secondArrayList.stream().map(HisOutpatientExpensesBill::getRecipeId).collect(Collectors.toList()).contains(item.getRecipeId())).collect(Collectors.toList()); + } + + private List samePatientExpensesList(List oldArrayList, List newArrayList) { + return newArrayList.stream().filter(item -> oldArrayList.stream().map(HisPatientExpenses::getBusinessId).collect(Collectors.toList()).contains(item.getBusinessId())).collect(Collectors.toList()); + } + + private List diffPatientExpensesList(List firstArrayList, List secondArrayList) { + return firstArrayList.stream().filter(item -> !secondArrayList.stream().map(HisPatientExpenses::getBusinessId).collect(Collectors.toList()).contains(item.getBusinessId())).collect(Collectors.toList()); + } + + + /** + * 调用HIS退号接口 + * + * @param hisRegistrationRecord 挂号记录 + * @return 退挂号是否成功 + */ + private void refundRegistration(HisRegistrationRecord hisRegistrationRecord) { + String userId = hisRegistrationRecord.getUserId(); + if (Func.isNotEmpty(userId)) { + Date registeredDate = hisRegistrationRecord.getRegisteredDate(); + Integer registeredStatus = hisRegistrationRecord.getRegisteredStatus(); + //挂号日期与当前日期比较，待就诊的挂号记录 + if (Func.isNotEmpty(registeredDate) && Func.isNotEmpty(registeredStatus) && DateUtils.getNowDate().compareTo(registeredDate) > 0 && registeredStatus == IConstant.ONE.getValue()) { + log.info("====处理过期未就诊的挂号记录===="); + //HIS退挂号参数 + RegistrationCancel registrationCancel = new RegistrationCancel(); + registrationCancel.setRegisteredId(hisRegistrationRecord.getRegisteredId()); + registrationCancel.setUserId(hisRegistrationRecord.getUserId()); + registrationCancel.setVendorId(hisRegistrationRecord.getVendorId()); + HISResult hisResult = hisClientUtil.cancelRegistration(registrationCancel); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + log.info("退挂号成功 : {}", hisResult.getMsg()); + hisRegistrationRecord.setRefundAble(IConstant.ZERO.getValue());//[0:否,1:是] + hisRegistrationRecord.setRegisteredStatus(-1);//状态[-1:已取消,0:新建,1:已支付/待接诊,2:已就诊,3:已退费] + hisRegistrationRecord.setCancelTime(Func.formatDateTime(new Date())); + log.info("自动退号成功"); + } + } + } + } + + /** + * 同步住院病人信息 + * + * @param orgCode 机构编码 + * @param idCardNoList 身份证列表 + * @param beginTime 开始时间,格式:yyyy-MM-dd HH:mm:ss + * @param endTime 结束时间,格式:yyyy-MM-dd HH:mm:ss + */ + @Override + public void syncInpatient(String orgCode, List idCardNoList, String beginTime, String endTime) { + //机构信息 + HisHospitalInfo hospitalInfo = hospitalInfoService.selectHisHospitalInfoByOrgCode(orgCode); + String orgName = Func.isNotEmpty(hospitalInfo) ? hospitalInfo.getOrgName() : ""; + //每次更新时,查询是否已经存在 + HisInpatient hisInpatientQuery = new HisInpatient(); + hisInpatientQuery.setOrgCode(orgCode); + Map paramsQuery = new HashMap<>(); + paramsQuery.put("beginAdmissionDate", beginTime); + paramsQuery.put("endAdmissionDate", endTime); + hisInpatientQuery.setParams(paramsQuery); + //每次更新时,查询是否已经存在 + List existInpatientList = inpatientService.selectHisInpatientList(hisInpatientQuery); + List newInpatientList = new ArrayList<>(); + if (Func.isNotEmpty(idCardNoList)) { + idCardNoList.forEach(idCardNo -> { + Inpatient inpatient = new Inpatient(); + inpatient.setOrgCode(orgCode); + inpatient.setIdCardNo(idCardNo); + //inpatient.setBusinessId(businessId);//业务ID是门诊，不能用来查询住院. + inpatient.setBeginTime(beginTime); + inpatient.setEndTime(endTime); + inpatient.setState(IConstant.ZERO.getValue()); //默认 + HISResult hisResult = hisClientUtil.getInpatientList(inpatient); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + if (Func.isNotEmpty(list)) { + for (InpatientVO vo : list) { + HisInpatient hisInpatient = new HisInpatient(); + //创建时间 -> 为患者入院时间 + hisInpatient.setCreateTime(DateUtils.parseDate(vo.getAdmissionDate())); + hisInpatient.setOrgCode(orgCode); + hisInpatient.setOrgName(orgName); + Func.copy(vo, hisInpatient); + //在院状态 [0:在院无床;1:在院有床;2:出院未结算;3:出院已结算;-1:撤销入院] + hisInpatient.setInpatientStatus(Integer.valueOf(vo.getInpatientStatus())); + newInpatientList.add(hisInpatient); + } + } + } + }); + + //需要更新的数据,参数顺序注意 + List updateInpatientList = this.sameInpatientList(existInpatientList, newInpatientList); + //需要删除的数据 + List delInpatientList = diffInpatientList(existInpatientList, newInpatientList); + //需要新增的数据 + List addInpatientList = diffInpatientList(newInpatientList, existInpatientList); + if (Func.isNotEmpty(updateInpatientList)) { + inpatientService.updateHisInpatientBatch(updateInpatientList); + } + if (Func.isNotEmpty(delInpatientList)) { + List ids = delInpatientList.stream().map(HisInpatient::getId).distinct().collect(Collectors.toList()); + inpatientService.deleteHisInpatientByIds(Func.join(ids, ",")); + } + if (Func.isNotEmpty(addInpatientList)) { + inpatientService.insertHisInpatientBatch(addInpatientList); + } + } + } + + + /** + * 同步门诊病人费用记录 + * + * @param hisOutpatientList 门诊病人 + */ + @Override + public void syncOutpatientExpenses(List hisOutpatientList) { + hisOutpatientList.forEach(hisOutpatient -> { + //每次更新时,查询是否已经存在 + HisPatientExpenses hisPatientExpensesQuery = new HisPatientExpenses(); + hisPatientExpensesQuery.setBusinessId(hisOutpatient.getBusinessId());//门诊业务ID + hisPatientExpensesQuery.setExpenseBusinessNo(hisOutpatient.getOutpatientNumber()); + List existPatientExpensesList = patientExpensesService.selectHisPatientExpensesList(hisPatientExpensesQuery); + List newPatientExpensesList = new ArrayList<>(); + // + OutpatientFee outpatientFee = new OutpatientFee(); + outpatientFee.setBusinessId(hisOutpatient.getBusinessId()); + outpatientFee.setOutpatientNumber(hisOutpatient.getOutpatientNumber()); + //HIS所有门诊费用 + HISResult hisResult = hisClientUtil.getOutpatientFeeList(outpatientFee); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + if (Func.isNotEmpty(list)) { + list.forEach(vo -> vo.setBusinessId(hisOutpatient.getBusinessId())); + // 提取费用明细字段,需要注意的是：(List -> Map ) toMap 如果集合对象有重复的key，会报错Duplicate key .... apple1,apple12的id都为1；可以用 (k1,k2)->k1 来设置，如果有重复的key,则保留key1,舍弃key2 + Map outpatientFeeVOmap = list.stream().collect(Collectors.toMap(OutpatientFeeVO::getBusinessId, OutpatientFeeVO::getOutpatientNumber, (k1, k2) -> k1)); + //只有一个费用主项 + outpatientFeeVOmap.forEach((businessIdN, outpatientNumberN) -> { + HisPatientExpenses hisPatientExpenses = new HisPatientExpenses(); + hisPatientExpenses.setBusinessId(businessIdN); + hisPatientExpenses.setExpenseBusinessNo(outpatientNumberN); + hisPatientExpenses.setExpenseType(IConstant.ONE.getValue()); + hisPatientExpenses.setOrgCode(hisOutpatient.getOrgCode()); + hisPatientExpenses.setOrgName(hisOutpatient.getOrgName()); + hisPatientExpenses.setIdCardNo(hisOutpatient.getIdCardNo()); + hisPatientExpenses.setPatientName(hisOutpatient.getPatientName()); + //开单科室和医生 暂时取 门诊记录里面的 + hisPatientExpenses.setBillDept(hisOutpatient.getDeptName()); + hisPatientExpenses.setBillDoctor(hisOutpatient.getDoctorName()); + //费用明细详情 + List expensesDetailList = new ArrayList<>(); + final Date[] tempTime = {DateUtils.getNowDate()}; + list.forEach(outpatientFeeVO -> { + Date billDateTime = DateUtils.parseDate(outpatientFeeVO.getBillTime()); + HisPatientExpensesDetail patientExpensesDetail = new HisPatientExpensesDetail(); + patientExpensesDetail.setCreateTime(billDateTime); + Func.copy(outpatientFeeVO, patientExpensesDetail); + expensesDetailList.add(patientExpensesDetail); + tempTime[0] = billDateTime; + }); + hisPatientExpenses.setCreateTime(tempTime[0]);//设置主项的开单时间 + hisPatientExpenses.setHisPatientExpensesDetailList(expensesDetailList); + + newPatientExpensesList.add(hisPatientExpenses); + }); + } + } + + //需要更新的数据,参数顺序注意 + List updatePatientExpensesList = samePatientExpensesList(existPatientExpensesList, newPatientExpensesList); + //需要删除的数据 + List delPatientExpensesList = diffPatientExpensesList(existPatientExpensesList, newPatientExpensesList); + //需要新增的数据 + List addPatientExpensesList = diffPatientExpensesList(newPatientExpensesList, existPatientExpensesList); + + if (Func.isNotEmpty(updatePatientExpensesList)) { + patientExpensesService.updateHisPatientExpensesBatch(updatePatientExpensesList); + } + if (Func.isNotEmpty(delPatientExpensesList)) { + patientExpensesService.deleteHisPatientExpensesBatch(delPatientExpensesList); + } + if (Func.isNotEmpty(addPatientExpensesList)) { + patientExpensesService.insertHisPatientExpensesBatch(addPatientExpensesList); + } + }); + } + + @Override + public void syncDoctorSchedule(List doctorList, String beginTime, String endTime) { + doctorList.forEach(doctor -> { + List existDoctorScheduleList = new ArrayList<>(); + List newDoctorScheduleList = new ArrayList<>(); + DoctorSchedule doctorSchedule = new DoctorSchedule(); + doctorSchedule.setOrgCode(doctor.getOrgCode()); + doctorSchedule.setDoctorId(doctor.getDoctorId()); + //查询日期限制在7天内，yyyy-MM-dd + doctorSchedule.setBeginTime(beginTime); + doctorSchedule.setEndTime(endTime); + HISResult hisResult = hisClientUtil.getDoctorScheduleList(doctorSchedule); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + if (Func.isNotEmpty(list)) { + for (DoctorScheduleVO vo : list) { + String shift = Func.trimWhitespace(vo.getScheduleShift()); + Date scheduleDate = Func.parse(vo.getScheduleDate(), DateUtils.YYYY_MM_DD); + //班次判断是否存在 --老数据 + HisDoctorSchedule hisDoctorScheduleQuery = new HisDoctorSchedule(); + hisDoctorScheduleQuery.setOrgCode(doctor.getOrgCode()); + hisDoctorScheduleQuery.setDoctorId(vo.getDoctorId()); + hisDoctorScheduleQuery.setScheduleDate(scheduleDate); + hisDoctorScheduleQuery.setScheduleShift(shift); + HisDoctorSchedule hisDoctorSchedule = doctorScheduleService.selectHisDoctorSchedule(hisDoctorScheduleQuery); + if (Func.isNotEmpty(hisDoctorSchedule)) { + existDoctorScheduleList.add(hisDoctorSchedule); + } else { + hisDoctorSchedule = new HisDoctorSchedule(); + hisDoctorSchedule.setScheduleDate(scheduleDate); + hisDoctorSchedule.setOrgCode(doctor.getOrgCode()); + hisDoctorSchedule.setOrgName(doctor.getOrgName()); + hisDoctorSchedule.setCreateTime(DateUtils.getNowDate()); + hisDoctorSchedule.setIsShow(IConstant.ONE.getValue()); + Func.copy(vo, hisDoctorSchedule); + if (HisConstant.MORNING.equals(shift)) { + hisDoctorSchedule.setScheduleTag(IConstant.ONE.getValue()); + } + if (HisConstant.AFTERNOON.equals(shift)) { + hisDoctorSchedule.setScheduleTag(IConstant.TWO.getValue()); + } + newDoctorScheduleList.add(hisDoctorSchedule); + } + } + } + } + + //需要更新的数据,参数顺序注意 + List sameDoctorScheduleList = sameDoctorScheduleList(existDoctorScheduleList, newDoctorScheduleList); + //需要删除的数据 + List delDoctorScheduleList = diffDoctorScheduleList(existDoctorScheduleList, newDoctorScheduleList); + //需要新增的数据 + List addDoctorScheduleList = diffDoctorScheduleList(newDoctorScheduleList, existDoctorScheduleList); + + if (Func.isNotEmpty(sameDoctorScheduleList)) { + doctorScheduleService.updateHisDoctorScheduleBatch(sameDoctorScheduleList); + } + if (Func.isNotEmpty(delDoctorScheduleList)) { + List ids = delDoctorScheduleList.stream().map(HisDoctorSchedule::getId).distinct().collect(Collectors.toList()); + doctorScheduleService.deleteHisDoctorScheduleByIds(Func.join(ids, ",")); + } + if (Func.isNotEmpty(addDoctorScheduleList)) { + doctorScheduleService.insertHisDoctorScheduleBatch(addDoctorScheduleList); + } + + }); + } + + private List sameDoctorScheduleList(List oldArrayList, List newArrayList) { + return newArrayList.stream().filter(item -> oldArrayList.stream().map( + e -> e.getOrgCode() + "&" + e.getDoctorId() + "&" + e.getScheduleDate() + "&" + e.getScheduleShift() + ).collect(Collectors.toList()) + .contains( + item.getOrgCode() + "&" + item.getDoctorId() + "&" + item.getScheduleDate() + "&" + item.getScheduleShift() + )).collect(Collectors.toList()); + } + + private List diffDoctorScheduleList(List firstArrayList, List secondArrayList) { + return firstArrayList.stream().filter(item -> !secondArrayList.stream().map( + e -> e.getOrgCode() + "&" + e.getDoctorId() + "&" + e.getScheduleDate() + "&" + e.getScheduleShift() + ).collect(Collectors.toList()).contains( + item.getOrgCode() + "&" + item.getDoctorId() + "&" + item.getScheduleDate() + "&" + item.getScheduleShift() + )).collect(Collectors.toList()); + } + +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisWechatProviderServiceImpl.java b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisWechatProviderServiceImpl.java new file mode 100644 index 000000000..e40ef318d --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/his/service/impl/HisWechatProviderServiceImpl.java @@ -0,0 +1,162 @@ +package com.ruoyi.his.service.impl; + +import com.ruoyi.common.core.text.Convert; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.common.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; +import com.ruoyi.his.domain.HisMerchantWechat; +import com.ruoyi.his.mapper.HisWechatProviderMapper; +import com.ruoyi.his.domain.HisWechatProvider; +import com.ruoyi.his.service.IHisWechatProviderService; + +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import javax.xml.crypto.Data; +import java.util.List; + + +/** + * 微信服务商Service业务层处理 + * + * @author bend + * @date 2020-07-27 + */ +@Service +public class HisWechatProviderServiceImpl implements IHisWechatProviderService +{ + @Resource + private HisWechatProviderMapper hisWechatProviderMapper; + + /** + * 查询微信服务商 + * + * @param id 微信服务商ID + * @return 微信服务商 + */ + @Override + public HisWechatProvider selectHisWechatProviderById(Long id) + { + return hisWechatProviderMapper.selectHisWechatProviderById(id); + } + + /** + * 查询微信服务商 + * + * @param hisWechatProvider 微信服务商ID + * @return 微信服务商 + */ + @Override + public HisWechatProvider selectHisWechatProvider(HisWechatProvider hisWechatProvider) + { + return hisWechatProviderMapper.selectOne(hisWechatProvider); + } + + /** + * 查询微信服务商列表 + * + * @param hisWechatProvider 微信服务商 + * @return 微信服务商 + */ + @Override + public List selectHisWechatProviderList(HisWechatProvider hisWechatProvider) + { + return hisWechatProviderMapper.selectHisWechatProviderList(hisWechatProvider); + } + + /** + * 新增微信服务商 + * + * @param hisWechatProvider 微信服务商 + * @return 结果 + */ + @Transactional + @Override + public int insertHisWechatProvider(HisWechatProvider hisWechatProvider) + { + hisWechatProvider.setCreateTime(DateUtils.getNowDate()); + int rows = hisWechatProviderMapper.insertSelective(hisWechatProvider); + insertHisMerchantWechat(hisWechatProvider); + return rows; + } + + /** + * 批量新增微信服务商 + * + * @param hisWechatProviderList 微信服务商列表 + * @return 结果 + */ + @Override + public int insertHisWechatProviderBatch(List hisWechatProviderList) + { + return hisWechatProviderMapper.insertList(hisWechatProviderList); + } + + /** + * 修改微信服务商 + * + * @param hisWechatProvider 微信服务商 + * @return 结果 + */ + @Transactional + @Override + public int updateHisWechatProvider(HisWechatProvider hisWechatProvider) + { + hisWechatProviderMapper.deleteHisMerchantWechatByProviderId(hisWechatProvider.getId()); + insertHisMerchantWechat(hisWechatProvider); + return hisWechatProviderMapper.updateByPrimaryKeySelective(hisWechatProvider); + } + + /** + * 删除微信服务商对象 + * + * @param ids 需要删除的数据ID + * @return 结果 + */ + @Transactional + @Override + public int deleteHisWechatProviderByIds(String ids) + { + hisWechatProviderMapper.deleteHisMerchantWechatByProviderIds(Convert.toStrArray(ids)); + return hisWechatProviderMapper.deleteByIds(ids); + } + + /** + * 删除微信服务商信息 + * + * @param id 微信服务商ID + * @return 结果 + */ + @Override + public int deleteHisWechatProviderById(Long id) + { + hisWechatProviderMapper.deleteHisMerchantWechatByProviderId(id); + return hisWechatProviderMapper.deleteByPrimaryKey(id); + } + + /** + * 新增特约商户信息 + * + * @param hisWechatProvider 微信服务商对象 + */ + public void insertHisMerchantWechat(HisWechatProvider hisWechatProvider) + { + List hisMerchantWechatList = hisWechatProvider.getHisMerchantWechatList(); + Long id = hisWechatProvider.getId(); + if (StringUtils.isNotNull(hisMerchantWechatList)) + { + List list = new ArrayList<>(); + for (HisMerchantWechat hisMerchantWechat : hisMerchantWechatList) + { + hisMerchantWechat.setProviderId(id); + hisMerchantWechat.setCreateTime(hisWechatProvider.getCreateTime()); + list.add(hisMerchantWechat); + } + if (list.size() > 0) + { + hisWechatProviderMapper.batchHisMerchantWechat(list); + } + } + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/quartz/task/SyncHisTask.java b/ruoyi-his/src/main/java/com/ruoyi/quartz/task/SyncHisTask.java new file mode 100644 index 000000000..b003f0f1c --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/quartz/task/SyncHisTask.java @@ -0,0 +1,573 @@ +package com.ruoyi.quartz.task; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.TypeReference; +import com.bending.core.his.bo.ExpensesBillBO; +import com.bending.core.his.bo.InspectionReportBO; +import com.bending.core.his.bo.InspectionReportItemBO; +import com.bending.core.his.common.HISResult; +import com.bending.core.his.constant.HisConstant; +import com.bending.core.his.entity.ExpenseBill; +import com.bending.core.his.entity.InspectionApplyForm; +import com.bending.core.his.entity.InspectionReport; +import com.bending.core.his.entity.OutpatientPaid; +import com.bending.core.his.vo.InspectionApplyFormVO; +import com.bending.core.his.vo.InspectionReportVO; +import com.bending.core.his.vo.OutpatientPaidVO; +import com.bending.core.utils.HISClientUtil; +import com.ruoyi.common.annotation.TraceId; +import com.ruoyi.common.func.Func; +import com.ruoyi.common.func.IConstant; +import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.his.domain.*; +import com.ruoyi.his.service.*; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import javax.annotation.Resource; +import java.util.*; +import java.util.stream.Collectors; + +import static java.util.stream.Collectors.toList; + +/** + * HIS 同步定时任务 + */ +@Slf4j +@Component("syncHisTask") +public class SyncHisTask { + + @Resource + private HISClientUtil hisClientUtil; + @Resource + private IHisService hisService; + @Resource + private IHisRegistrationRecordService iHisRegistrationRecordService; + @Resource + private IHisHospitalInfoService iHisHospitalInfoService; + @Resource + private IHisDoctorScheduleService iHisDoctorScheduleService; + @Resource + private IHisDoctorService iHisDoctorService; + @Resource + private IHisOutpatientService iHisOutpatientService; + @Resource + private IHisInpatientService iHisInpatientService; + @Resource + private IHisOutpatientExpensesBillService iHisOutpatientExpensesBillService; + @Resource + private IHisInspectionApplyService iHisInspectionApplyService; + @Resource + private IHisInspectionReportService iHisInspectionReportService; + + /** + *

查询挂号记录:有效的挂号记录,过滤身份证不为空的、挂号成功就有挂号ID

+ * + * @param orgCode 机构ID + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 挂号记录列表 + */ + private List registrationRecordQuery(String orgCode, Date beginTime, Date endTime) { + //有效的挂号记录,过滤身份证不为空的、挂号成功就有挂号ID + HisRegistrationRecord hisRegistrationRecordQuery = new HisRegistrationRecord(); + hisRegistrationRecordQuery.setOrgCode(orgCode); + Map paramsQuery = new HashMap<>(); + paramsQuery.put("beginCreateTime", Func.formatDate(beginTime)); + paramsQuery.put("endCreateTime", Func.formatDate(endTime)); + hisRegistrationRecordQuery.setParams(paramsQuery); + List registrationRecordList = iHisRegistrationRecordService.selectHisRegistrationRecordList(hisRegistrationRecordQuery); + //有效的挂号记录,过滤身份证不为空的、挂号成功就有挂号ID + return registrationRecordList.stream().filter(registrationRecord -> null != registrationRecord.getRegisteredId() && null != registrationRecord.getIdCardNo()).collect(toList()); + } + + /** + *

查询门诊病人记录:有效的门诊病人,过滤接诊状态不为零的、有挂号ID

+ * 门诊病人：接诊状态 -1已取消 0未接诊、1接诊中、2已接(结)诊 + * 过滤不为空的挂号ID，接诊状态为-1，1，2(!=0) + * + * @param orgCode 机构ID + * @param beginTime 开始时间 + * @param endTime 结束时间 + * @return 挂号记录列表 + */ + private List hisOutpatientQuery(String orgCode, Date beginTime, Date endTime) { + //门诊病人 + HisOutpatient hisOutpatientQuery = new HisOutpatient(); + hisOutpatientQuery.setOrgCode(orgCode); + Map paramsQuery = new HashMap<>(); + paramsQuery.put("beginCreateTime", Func.formatDate(beginTime)); + paramsQuery.put("endCreateTime", Func.formatDate(endTime)); + hisOutpatientQuery.setParams(paramsQuery); + List outpatientList = iHisOutpatientService.selectHisOutpatientList(hisOutpatientQuery); + //过滤不为空的挂号ID，接诊状态为-1，1，2(!=0) + return outpatientList.stream().filter(hisOutpatient -> null != hisOutpatient.getRegisteredId() && 0 != hisOutpatient.getReceptionStatus()).collect(toList()); + } + + + /** + * 主题：同步机构所有门诊挂号记录 + * 业务：同步机构的所有线上和线下的挂号记录，需要指定医院ID,日期等参数（多参数使用JSON数据） + * 1：数据同步的挂号（默认状态）,后面根据门诊接诊来更新该状态； + * 2：后续还需要绑定用户ID和就诊人ID，方便信息推送 + */ + @TraceId + public void registrationRecord(String params) { + if (Func.isNotBlank(params)) { + List taskParams = JSON.parseArray(params, TaskParam.class); + if (Func.isNotEmpty(taskParams)) { + //计算同步时间--> + long startTime = System.currentTimeMillis(); + taskParams.forEach(taskParam -> { + String orgCode = taskParam.getOrgCode(); + Integer days = taskParam.getDays(); + Date endTime = DateUtils.getNowDate(); + Date beginTime = Func.minusDays(endTime, days); + hisService.syncRegistrationRecord(orgCode, "", Func.formatDate(beginTime), Func.formatDate(endTime)); + }); + long entTime = System.currentTimeMillis(); + log.info("同步挂号记录:共耗时 {} 秒", (float) (entTime - startTime) / 1000); + } + } + } + + /** + * 同步门诊病人 + */ + @TraceId + public void outpatientTask(String params) { + if (Func.isNotBlank(params)) { + List taskParams = JSON.parseArray(params, TaskParam.class); + if (Func.isNotEmpty(taskParams)) { + //计算同步时间--> + long startTime = System.currentTimeMillis(); + taskParams.forEach(taskParam -> { + String orgCode = taskParam.getOrgCode(); + Integer days = taskParam.getDays(); + Date nowDate = DateUtils.getNowDate(); + Date beginTime = Func.minusDays(nowDate, days); + Date endTime = Func.plusDays(nowDate, 1); + //有效的挂号记录,过滤身份证不为空的、挂号成功就有挂号ID + List registrationRecordList = this.registrationRecordQuery(orgCode, beginTime, endTime); + if (Func.isNotEmpty(registrationRecordList)) { + hisService.syncOutpatient(orgCode, registrationRecordList, Func.formatDateTime(beginTime), Func.formatDateTime(endTime)); + } + long entTime = System.currentTimeMillis(); + log.info("同步门诊病人:共耗时 {} 秒", (float) (entTime - startTime) / 1000); + }); + } + } + } + + + /** + * 住院病人同步 + */ + @TraceId + public void inpatientTask(String params) { + if (Func.isNotBlank(params)) { + //计算同步时间--> + long startTime = System.currentTimeMillis(); + List taskParams = JSON.parseArray(params, TaskParam.class); + if (Func.isNotEmpty(taskParams)) { + taskParams.forEach(taskParam -> { + String orgCode = taskParam.getOrgCode(); + Integer days = taskParam.getDays(); + Date nowDate = DateUtils.getNowDate(); + Date beginTime = Func.minusDays(nowDate, days); + Date endTime = Func.plusDays(nowDate, 1); + List idCardNoList = new ArrayList<>();//取出身份证信息 + //有效的挂号记录,过滤身份证不为空的、挂号成功就有挂号ID + List registrationRecordList = this.registrationRecordQuery(orgCode, beginTime, endTime); + if (Func.isNotEmpty(registrationRecordList)) { + List list = registrationRecordList.stream().map(HisRegistrationRecord::getIdCardNo).distinct().collect(toList()); + idCardNoList.addAll(list); + } + //过滤不为空的挂号ID，接诊状态为-1，1，2(!=0) + List hisOutpatientList = this.hisOutpatientQuery(orgCode, beginTime, endTime); + if (Func.isNotEmpty(hisOutpatientList)) { + List list = hisOutpatientList.stream().map(HisOutpatient::getIdCardNo).distinct().collect(toList()); + idCardNoList.addAll(list); + } + // 去重并集 + List idCardNoListAll = idCardNoList.stream().distinct().collect(toList()); + hisService.syncInpatient(orgCode, idCardNoListAll, Func.formatDateTime(beginTime), Func.formatDateTime(endTime)); + }); + } + long entTime = System.currentTimeMillis(); + log.info("同步住院病人:共耗时 {} 秒", (float) (entTime - startTime) / 1000); + } + } + + /** + * 门诊待缴费清单 + * ***** 注意：待缴费清单存在变化！就需要同步更新远程数据和本地数据 + */ + @TraceId + public void expensesBillTask(String params) { + //计算同步时间--> + long startTime = System.currentTimeMillis(); + if (Func.isNotBlank(params)) { + List taskParams = JSON.parseArray(params, TaskParam.class); + if (Func.isNotEmpty(taskParams)) { + taskParams.forEach(taskParam -> { + Integer days = taskParam.getDays(); + Date nowDate = DateUtils.getNowDate(); + Date beginTime = Func.minusDays(nowDate, days); + Date endTime = Func.plusDays(nowDate, 1); + List hisOutpatientList = this.hisOutpatientQuery(taskParam.getOrgCode(), beginTime, endTime); + if (Func.isNotEmpty(hisOutpatientList)) { + hisService.syncPrePayOutpatientExpensesBill(hisOutpatientList); + } + }); + } + } + long entTime = System.currentTimeMillis(); + log.info("同步待缴费清单:共耗时 {} 秒", (float) (entTime - startTime) / 1000); + } + + /** + * 主题:同步门诊待交费清单的所有状态 + * 调用 + * 30-81接口 已缴费列表获取 + * #30-82接口 获取缴费清单明细 + */ + @TraceId + public void outpatientFeeTask(String params) { + if (Func.isNotBlank(params)) { + List taskParams = JSON.parseArray(params, TaskParam.class); + if (Func.isNotEmpty(taskParams)) { + taskParams.forEach(taskParam -> { + Date nowDate = DateUtils.getNowDate(); + Date beginTime = Func.minusDays(nowDate, taskParam.getDays()); + Date endTime = Func.plusDays(nowDate, 1); + List hisOutpatientList = this.hisOutpatientQuery(taskParam.getOrgCode(), beginTime, endTime); + hisOutpatientList.forEach(hisOutpatient -> { + String businessId = hisOutpatient.getBusinessId(); + OutpatientPaid outpatientPaid = new OutpatientPaid(); + outpatientPaid.setBusinessId(businessId); + HISResult hisResult = hisClientUtil.getOutpatientPaidList(outpatientPaid); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + if (Func.isNotEmpty(list)) { + for (OutpatientPaidVO vo : list) { + ExpenseBill expenseBill = new ExpenseBill(); //30-82 获取缴费清单明细 + String recordId = vo.getRecordId(); // 根据收费记录ID判断 --> 获取缴费清单明细 + String payTime = vo.getOperateDate(); //操作时间 缴费时间 + expenseBill.setChargeRecordId(recordId); + HISResult result = hisClientUtil.getOutpatientBillDetail(expenseBill); + if (HisConstant.RESULT_SUCCESS_CODE.equals(result.getResult())) { + TypeReference> typeRef1 = new TypeReference>() { + }; + List billBOList = JSON.parseObject(result.getMsg(), typeRef1); + if (Func.isNotEmpty(billBOList)) { + billBOList.forEach(expensesBillBO -> { + String recipeId = expensesBillBO.getRecipeId(); + HisOutpatientExpensesBill hisOutpatientExpensesBillQuery = new HisOutpatientExpensesBill(); + hisOutpatientExpensesBillQuery.setRecipeId(recipeId); + HisOutpatientExpensesBill hisOutpatientExpensesBill = iHisOutpatientExpensesBillService.selectHisOutpatientExpensesBill(hisOutpatientExpensesBillQuery); + if (null != hisOutpatientExpensesBill) { + hisOutpatientExpensesBill.setRecipeStatus(IConstant.ONE.getValue()); + hisOutpatientExpensesBill.setChargeRecordId(recordId); + hisOutpatientExpensesBill.setPayTime(payTime); + iHisOutpatientExpensesBillService.updateHisOutpatientExpensesBillStatus(hisOutpatientExpensesBill); + } + }); + } + } + } + } + } + }); + }); + } + } + } + + /** + * 门诊病人费用记录 + */ + @TraceId + public void outPatientExpensesTask(String params) { + //计算同步时间--> + long startTime = System.currentTimeMillis(); + if (Func.isNotBlank(params)) { + List taskParams = JSON.parseArray(params, TaskParam.class); + if (Func.isNotEmpty(taskParams)) { + taskParams.forEach(taskParam -> { + String orgCode = taskParam.getOrgCode(); + Integer days = taskParam.getDays(); + Date nowDate = DateUtils.getNowDate(); + Date beginTime = Func.minusDays(nowDate, days); + Date endTime = Func.plusDays(nowDate, 1); + List hisOutpatientList = this.hisOutpatientQuery(orgCode, beginTime, endTime); + if (Func.isNotEmpty(hisOutpatientList)) { + hisService.syncOutpatientExpenses(hisOutpatientList); + } + }); + } + } + long entTime = System.currentTimeMillis(); + log.info("同步门诊病人费用:共耗时 {} 秒", (float) (entTime - startTime) / 1000); + } + + /** + * 门诊病人 - 检查检验申请获取 + */ + @TraceId + public void inspectionApplyTask(String params) { + if (Func.isNotBlank(params)) { + List taskParams = JSON.parseArray(params, TaskParam.class); + if (Func.isNotEmpty(taskParams)) { + taskParams.forEach(taskParam -> { + String orgCode = taskParam.getOrgCode(); + Integer days = taskParam.getDays(); + Date nowDate = DateUtils.getNowDate(); + Date beginTime = Func.minusDays(nowDate, days); + Date endTime = Func.plusDays(nowDate, 1); + //机构信息-虚拟操作员 + HisHospitalInfo hospitalInfo = iHisHospitalInfoService.selectHisHospitalInfoByOrgCode(orgCode); + String userId = hospitalInfo.getVmUserId(); + //门诊病人：接诊状态 -1已取消 0未接诊、1接诊中、2已接(结)诊 + List outpatientList = this.hisOutpatientQuery(orgCode, beginTime, endTime); + //过滤不为空的挂号ID，接诊状态为-1，1，2(!=0) + Map map = outpatientList.stream().collect(Collectors.toMap(HisOutpatient::getBusinessId, HisOutpatient::getIdCardNo, (k1, k2) -> k2)); + applyList(orgCode, userId, map); + }); + } + } + } + + + /** + * 住院病人 - 检查检验申请获取 + */ + @TraceId + public void inspectionApplyForInpatientTask(String params) { + if (Func.isNotBlank(params)) { + List taskParams = JSON.parseArray(params, TaskParam.class); + if (Func.isNotEmpty(taskParams)) { + taskParams.forEach(taskParam -> { + String orgCode = taskParam.getOrgCode(); + Integer days = taskParam.getDays(); + Date nowDate = DateUtils.getNowDate(); + Date beginTime = Func.minusDays(nowDate, days); + Date endTime = Func.plusDays(nowDate, 1); + //机构信息-虚拟操作员 + HisHospitalInfo hospitalInfo = iHisHospitalInfoService.selectHisHospitalInfoByOrgCode(orgCode); + String userId = hospitalInfo.getVmUserId(); + + HisInpatient hisInpatientQuery = new HisInpatient(); + hisInpatientQuery.setOrgCode(orgCode); + Map paramsQuery = new HashMap<>(); + paramsQuery.put("beginCreateTime", Func.formatDate(beginTime)); + paramsQuery.put("endCreateTime", Func.formatDate(endTime)); + hisInpatientQuery.setParams(paramsQuery); + List inpatientList = iHisInpatientService.selectHisInpatientList(hisInpatientQuery); + //过滤不为空的挂号ID，接诊状态为-1，1，2(!=0) + Map map = inpatientList.stream().filter(hisInpatient -> null != hisInpatient.getBusinessId()).collect(Collectors.toMap(HisInpatient::getBusinessId, HisInpatient::getIdCardNo, (k1, k2) -> k2)); + applyList(orgCode, userId, map); + }); + } + } + } + + private void applyList(String orgCode, String userId, Map map) { + List hisInspectionApplyList = new ArrayList<>(); + map.forEach((businessId, idCardNo) -> { + //检查检验 查询申请表 + InspectionApplyForm applyForm = new InspectionApplyForm(); + applyForm.setBusinessId(businessId); + HISResult hisResult = hisClientUtil.getInspectionApplyFormList(applyForm); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference> typeRef = new TypeReference>() { + }; + List list = JSON.parseObject(hisResult.getMsg(), typeRef); + if (Func.isNotEmpty(list)) { + for (InspectionApplyFormVO vo : list) { + String applyId = vo.getApplyId(); + HisInspectionApply hisInspectionApplyQuery = new HisInspectionApply(); + hisInspectionApplyQuery.setApplyId(applyId); + hisInspectionApplyQuery.setBusinessId(businessId); + HisInspectionApply hisInspectionApply = iHisInspectionApplyService.selectHisInspectionApply(hisInspectionApplyQuery); + if (null == hisInspectionApply) { + hisInspectionApply = new HisInspectionApply(); + hisInspectionApply.setApplyId(applyId); + hisInspectionApply.setApplyItemName(vo.getApplyItemName()); + hisInspectionApply.setOperator(vo.getOperator()); + hisInspectionApply.setUserId(userId); + hisInspectionApply.setOrgCode(orgCode); + hisInspectionApply.setBusinessId(businessId); + hisInspectionApply.setIdCardNo(idCardNo); + Date billTime = Func.parse(vo.getBillTime(), "yyyy-MM-dd HH:mm"); + hisInspectionApply.setBillTime(Func.formatDateTime(billTime)); //格式化 + hisInspectionApply.setCreateTime(billTime); + hisInspectionApplyList.add(hisInspectionApply); + } + } + } else { + log.info("-----idCardNo:{} ,businessId :{} 暂无申请单 ------", idCardNo, businessId); + } + } + }); + if (Func.isNotEmpty(hisInspectionApplyList)) { + iHisInspectionApplyService.insertHisInspectionApplyBatch(hisInspectionApplyList); + } + } + + + /** + * 同步检验检查报告结果 + */ + @TraceId + public void inspectionReportTask(String params) { + if (Func.isNotBlank(params)) { + List taskParams = JSON.parseArray(params, TaskParam.class); + if (Func.isNotEmpty(taskParams)) { + taskParams.forEach(taskParam -> { + String orgCode = taskParam.getOrgCode(); + Integer days = taskParam.getDays(); + Date nowDate = DateUtils.getNowDate(); + Date beginTime = Func.minusDays(nowDate, days); + Date endTime = Func.plusDays(nowDate, 1); + + HisInspectionApply hisInspectionApplyQuery = new HisInspectionApply(); + hisInspectionApplyQuery.setOrgCode(orgCode); + Map paramsQuery = new HashMap<>(); + paramsQuery.put("beginCreateTime", Func.formatDate(beginTime)); + paramsQuery.put("endCreateTime", Func.formatDate(endTime)); + hisInspectionApplyQuery.setParams(paramsQuery); + + List hisInspectionReportList = new ArrayList<>(); + //申请单 + List inspectionApplyList = iHisInspectionApplyService.selectHisInspectionApplyList(hisInspectionApplyQuery); + if (Func.isNotEmpty(inspectionApplyList)) { + inspectionApplyList.forEach(inspectionApply -> { + //请求入参 + InspectionReport inspectionReport = new InspectionReport(); + inspectionReport.setApplyId(inspectionApply.getApplyId()); + inspectionReport.setUserId(inspectionApply.getUserId()); //虚拟操作人员ID + //检查检验报告/结果 + HISResult hisResult = hisClientUtil.getInspectionReport(inspectionReport); + if (HisConstant.RESULT_SUCCESS_CODE.equals(hisResult.getResult())) { + TypeReference typeRef = new TypeReference() { + }; + InspectionReportVO inspectionReportVO = JSON.parseObject(hisResult.getMsg(), typeRef); + if (Func.isNotEmpty(inspectionReportVO)) { + //患者信息、标本号 结论 结果等 + String perInfo = inspectionReportVO.getPerInfo(); + //指标值 参考值等 + String reportIdx = inspectionReportVO.getIdx(); + //检查检验报告 + InspectionReportBO inspectionReportBO = JSON.parseObject(perInfo, InspectionReportBO.class); + inspectionReportVO.setInspectionReportBO(inspectionReportBO); + + InspectionReportItemBO inspectionReportItemBO = JSON.parseObject(reportIdx, InspectionReportItemBO.class); + + if (Func.isNotEmpty(inspectionReportItemBO)) { + String idx = inspectionReportItemBO.getIdx(); + List inspectionReportItemList = JSON.parseArray(idx, InspectionReportItemBO.class); + inspectionReportBO.setInspectionReportItemList(inspectionReportItemList); + } + if (Func.isNotEmpty(inspectionReportBO)) { + //每次更新时,查询是否已经存在 + HisInspectionReport hisInspectionReportQuery = new HisInspectionReport(); + hisInspectionReportQuery.setApplyId(inspectionReportBO.getApplyId()); + HisInspectionReport hisInspectionReport = iHisInspectionReportService.selectHisInspectionReport(hisInspectionReportQuery); + //检查检验报告 + if (null == hisInspectionReport) { + hisInspectionReport = new HisInspectionReport(); + Func.copy(inspectionReportBO, hisInspectionReport); + hisInspectionReport.setOrgCode(inspectionApply.getOrgCode());//机构编码 + hisInspectionReport.setOperators(inspectionReportBO.getOperator()); + hisInspectionReport.setIdCardNo(inspectionApply.getIdCardNo());//需要保存患者的身份证号 + //开单时间--> createDate 时间格式转换 + Date billTime = Func.parse(inspectionReportBO.getBillTime(), "yyyy/MM/dd HH:mm"); + hisInspectionReport.setBillTime(Func.formatDateTime(billTime)); + hisInspectionReport.setCreateTime(billTime); + Date execTime = Func.parse(inspectionReportBO.getExecTime(), "yyyy/MM/dd HH:mm"); + hisInspectionReport.setExecTime(Func.formatDateTime(execTime)); + //检查检验项目明细 + List inspectionReportItemList = inspectionReportBO.getInspectionReportItemList(); + List itemList = new ArrayList<>(); + //保存数据到数据库 + if (Func.isNotEmpty(inspectionReportItemList)) { + inspectionReportItemList.forEach(item -> { + HisInspectionReportItem inspectionReportItem = new HisInspectionReportItem(); + //inspectionReportItem.setReportId(reportId); + Func.copy(item, inspectionReportItem); + if (Func.isNotEmpty(item.getFee())) { + inspectionReportItem.setFee(String.valueOf(item.getFee())); + } + inspectionReportItem.setCreateTime(billTime); + itemList.add(inspectionReportItem); + }); + hisInspectionReport.setHisInspectionReportItemList(itemList); + } + hisInspectionReportList.add(hisInspectionReport); + } + } + } + } + }); + } + + if (Func.isNotEmpty(hisInspectionReportList)) { + iHisInspectionReportService.insertHisInspectionReportBatch(hisInspectionReportList); + } + }); + } + } + } + + private void doctorScheduleQuery(String orgCode, Integer days) { + //班次判断是否存在 + HisDoctorSchedule doctorScheduleQuery = new HisDoctorSchedule(); + doctorScheduleQuery.setOrgCode(orgCode); + Map paramsQuery = new HashMap<>(); + //删除昨天以前的排班老数据 + Date beginScheduleDate = Func.minusDays(DateUtils.getNowDate(), days); //当前日期过去的days + Date endScheduleDate = Func.minusDays(DateUtils.getNowDate(), 1); //昨天 + paramsQuery.put("beginScheduleDate", Func.formatDate(beginScheduleDate)); + paramsQuery.put("endScheduleDate", Func.formatDate(endScheduleDate)); + doctorScheduleQuery.setParams(paramsQuery); + List oldScheduleList = iHisDoctorScheduleService.selectHisDoctorScheduleList(doctorScheduleQuery); + if (Func.isNotEmpty(oldScheduleList)) { + List idsList = oldScheduleList.stream().map(HisDoctorSchedule::getId).collect(toList()); + String ids = Func.join(idsList, ","); + iHisDoctorScheduleService.deleteHisDoctorScheduleByIds(ids); + } + } + + /** + * 机构、人员的排班信息 + * + * @param params JSON数据 + */ + @TraceId + public void doctorSchedule(String params) { + if (Func.isNotBlank(params)) { + List taskParams = JSON.parseArray(params, TaskParam.class); + if (Func.isNotEmpty(taskParams)) { + taskParams.forEach(taskParam -> { + String orgCode = taskParam.getOrgCode(); + Integer days = taskParam.getDays(); + Date nowDate = DateUtils.getNowDate(); + Date beginTime = Func.minusDays(nowDate, 1);//昨天 + Date endTime = Func.plusDays(nowDate, days); + this.doctorScheduleQuery(orgCode, days); + //医生列表(正常在线) + HisDoctor hisDoctor = new HisDoctor(); + hisDoctor.setOrgCode(orgCode); + hisDoctor.setIsShow(IConstant.ONE.getValue()); + List doctorList = iHisDoctorService.selectHisDoctorList(hisDoctor); + if (Func.isNotEmpty(doctorList)) { + hisService.syncDoctorSchedule(doctorList, Func.formatDate(beginTime), Func.formatDate(endTime)); + } + }); + } + } + } +} diff --git a/ruoyi-his/src/main/java/com/ruoyi/quartz/task/TaskParam.java b/ruoyi-his/src/main/java/com/ruoyi/quartz/task/TaskParam.java new file mode 100644 index 000000000..4df9ef66c --- /dev/null +++ b/ruoyi-his/src/main/java/com/ruoyi/quartz/task/TaskParam.java @@ -0,0 +1,20 @@ +package com.ruoyi.quartz.task; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; + +@Data +@ApiModel(description = "定时任务参数") +public class TaskParam implements Serializable { + + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "机构编码") + private String orgCode; + + @ApiModelProperty(value = "日期天数") + private Integer days; +} \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/bend/PatientListMapper.xml b/ruoyi-his/src/main/resources/mapper/bend/PatientListMapper.xml index aa57ca33c..102c3f03c 100644 --- a/ruoyi-his/src/main/resources/mapper/bend/PatientListMapper.xml +++ b/ruoyi-his/src/main/resources/mapper/bend/PatientListMapper.xml @@ -30,7 +30,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and real_name like concat('%', #{realName}, '%') and id_card_no = #{idCardNo} and mobile_phone = #{mobilePhone} - and bind_status = #{bindStatus} and create_time between #{params.beginCreateTime} and #{params.endCreateTime} diff --git a/ruoyi-his/src/main/resources/mapper/bend/ScrcuOfflineOrdersMapper.xml b/ruoyi-his/src/main/resources/mapper/bend/ScrcuOfflineOrdersMapper.xml new file mode 100644 index 000000000..2e1df089d --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/bend/ScrcuOfflineOrdersMapper.xml @@ -0,0 +1,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, member_id, req_ssn, req_time, mcht_no, txn_area_info, notify_url, order_amt, valid_time, order_desc, mch_token, user_token, sacn_type, txn_type, pay_no, org_code, his_trade_no, resp_ssn, resp_time, order_state, order_species, expense_type, create_time, update_time, deleted from scrcu_offline_orders + + + + + + + + insert into scrcu_offline_orders + + member_id, + req_ssn, + req_time, + mcht_no, + txn_area_info, + notify_url, + order_amt, + valid_time, + order_desc, + mch_token, + user_token, + sacn_type, + txn_type, + pay_no, + org_code, + his_trade_no, + resp_ssn, + resp_time, + order_state, + order_species, + expense_type, + create_time, + update_time, + deleted, + + + #{memberId}, + #{reqSsn}, + #{reqTime}, + #{mchtNo}, + #{txnAreaInfo}, + #{notifyUrl}, + #{orderAmt}, + #{validTime}, + #{orderDesc}, + #{mchToken}, + #{userToken}, + #{sacnType}, + #{txnType}, + #{payNo}, + #{orgCode}, + #{hisTradeNo}, + #{respSsn}, + #{respTime}, + #{orderState}, + #{orderSpecies}, + #{expenseType}, + #{createTime}, + #{updateTime}, + #{deleted}, + + + + + update scrcu_offline_orders + + member_id = #{memberId}, + req_ssn = #{reqSsn}, + req_time = #{reqTime}, + mcht_no = #{mchtNo}, + txn_area_info = #{txnAreaInfo}, + notify_url = #{notifyUrl}, + order_amt = #{orderAmt}, + valid_time = #{validTime}, + order_desc = #{orderDesc}, + mch_token = #{mchToken}, + user_token = #{userToken}, + sacn_type = #{sacnType}, + txn_type = #{txnType}, + pay_no = #{payNo}, + org_code = #{orgCode}, + his_trade_no = #{hisTradeNo}, + resp_ssn = #{respSsn}, + resp_time = #{respTime}, + order_state = #{orderState}, + order_species = #{orderSpecies}, + expense_type = #{expenseType}, + create_time = #{createTime}, + update_time = #{updateTime}, + deleted = #{deleted}, + + where id = #{id} + + + + delete from scrcu_offline_orders where id = #{id} + + + + delete from scrcu_offline_orders where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/bend/ScrcuOfflineRefundOrdersMapper.xml b/ruoyi-his/src/main/resources/mapper/bend/ScrcuOfflineRefundOrdersMapper.xml new file mode 100644 index 000000000..e78653475 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/bend/ScrcuOfflineRefundOrdersMapper.xml @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, mcht_no, req_ssn, req_time, orig_req_ssn, orig_req_time, orig_resp_ssn, orig_resp_time, order_amt, order_desc, resp_ssn, resp_time, order_state, create_time, deleted from scrcu_offline_refund_orders + + + + + + + + insert into scrcu_offline_refund_orders + + mcht_no, + req_ssn, + req_time, + orig_req_ssn, + orig_req_time, + orig_resp_ssn, + orig_resp_time, + order_amt, + order_desc, + resp_ssn, + resp_time, + order_state, + create_time, + deleted, + + + #{mchtNo}, + #{reqSsn}, + #{reqTime}, + #{origReqSsn}, + #{origReqTime}, + #{origRespSsn}, + #{origRespTime}, + #{orderAmt}, + #{orderDesc}, + #{respSsn}, + #{respTime}, + #{orderState}, + #{createTime}, + #{deleted}, + + + + + update scrcu_offline_refund_orders + + mcht_no = #{mchtNo}, + req_ssn = #{reqSsn}, + req_time = #{reqTime}, + orig_req_ssn = #{origReqSsn}, + orig_req_time = #{origReqTime}, + orig_resp_ssn = #{origRespSsn}, + orig_resp_time = #{origRespTime}, + order_amt = #{orderAmt}, + order_desc = #{orderDesc}, + resp_ssn = #{respSsn}, + resp_time = #{respTime}, + order_state = #{orderState}, + create_time = #{createTime}, + deleted = #{deleted}, + + where id = #{id} + + + + delete from scrcu_offline_refund_orders where id = #{id} + + + + delete from scrcu_offline_refund_orders where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/bend/ScrcuOnlineOrderDetailsMapper.xml b/ruoyi-his/src/main/resources/mapper/bend/ScrcuOnlineOrderDetailsMapper.xml new file mode 100644 index 000000000..153dd95bc --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/bend/ScrcuOnlineOrderDetailsMapper.xml @@ -0,0 +1,110 @@ + + + + + + + + + + + + + + + + + + + + + + + select id, mer_id, parent_mer_id, org_code, order_number, sub_order_number, sub_order_amt, sub_pay_amt, logis_code, red_packet_org_no, auto_settle_flag, goods_info, create_time, deleted from scrcu_online_order_details + + + + + + + + insert into scrcu_online_order_details + + mer_id, + parent_mer_id, + org_code, + order_number, + sub_order_number, + sub_order_amt, + sub_pay_amt, + logis_code, + red_packet_org_no, + auto_settle_flag, + goods_info, + create_time, + deleted, + + + #{merId}, + #{parentMerId}, + #{orgCode}, + #{orderNumber}, + #{subOrderNumber}, + #{subOrderAmt}, + #{subPayAmt}, + #{logisCode}, + #{redPacketOrgNo}, + #{autoSettleFlag}, + #{goodsInfo}, + #{createTime}, + #{deleted}, + + + + + update scrcu_online_order_details + + mer_id = #{merId}, + parent_mer_id = #{parentMerId}, + org_code = #{orgCode}, + order_number = #{orderNumber}, + sub_order_number = #{subOrderNumber}, + sub_order_amt = #{subOrderAmt}, + sub_pay_amt = #{subPayAmt}, + logis_code = #{logisCode}, + red_packet_org_no = #{redPacketOrgNo}, + auto_settle_flag = #{autoSettleFlag}, + goods_info = #{goodsInfo}, + create_time = #{createTime}, + deleted = #{deleted}, + + where id = #{id} + + + + delete from scrcu_online_order_details where id = #{id} + + + + delete from scrcu_online_order_details where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/bend/ScrcuOnlineOrdersMapper.xml b/ruoyi-his/src/main/resources/mapper/bend/ScrcuOnlineOrdersMapper.xml new file mode 100644 index 000000000..7c9e41e2f --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/bend/ScrcuOnlineOrdersMapper.xml @@ -0,0 +1,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, member_id, mer_id, order_type, order_number, order_send_time, order_amt, pay_amt, goods_subject, order_currency, channel, mobile_way, mobile_type, front_end_url, back_end_url, order_seq_id, pay_type, trans_type, pay_status, order_species, order_state, order_tran_time, order_create_time, expense_type, pay_way_type, pay_no, create_time, update_time, deleted from scrcu_online_orders + + + + + + + + insert into scrcu_online_orders + + member_id, + mer_id, + order_type, + order_number, + order_send_time, + order_amt, + pay_amt, + goods_subject, + order_currency, + channel, + mobile_way, + mobile_type, + front_end_url, + back_end_url, + order_seq_id, + pay_type, + trans_type, + pay_status, + order_species, + order_state, + order_tran_time, + order_create_time, + expense_type, + pay_way_type, + pay_no, + create_time, + update_time, + deleted, + + + #{memberId}, + #{merId}, + #{orderType}, + #{orderNumber}, + #{orderSendTime}, + #{orderAmt}, + #{payAmt}, + #{goodsSubject}, + #{orderCurrency}, + #{channel}, + #{mobileWay}, + #{mobileType}, + #{frontEndUrl}, + #{backEndUrl}, + #{orderSeqId}, + #{payType}, + #{transType}, + #{payStatus}, + #{orderSpecies}, + #{orderState}, + #{orderTranTime}, + #{orderCreateTime}, + #{expenseType}, + #{payWayType}, + #{payNo}, + #{createTime}, + #{updateTime}, + #{deleted}, + + + + + update scrcu_online_orders + + member_id = #{memberId}, + mer_id = #{merId}, + order_type = #{orderType}, + order_number = #{orderNumber}, + order_send_time = #{orderSendTime}, + order_amt = #{orderAmt}, + pay_amt = #{payAmt}, + goods_subject = #{goodsSubject}, + order_currency = #{orderCurrency}, + channel = #{channel}, + mobile_way = #{mobileWay}, + mobile_type = #{mobileType}, + front_end_url = #{frontEndUrl}, + back_end_url = #{backEndUrl}, + order_seq_id = #{orderSeqId}, + pay_type = #{payType}, + trans_type = #{transType}, + pay_status = #{payStatus}, + order_species = #{orderSpecies}, + order_state = #{orderState}, + order_tran_time = #{orderTranTime}, + order_create_time = #{orderCreateTime}, + expense_type = #{expenseType}, + pay_way_type = #{payWayType}, + pay_no = #{payNo}, + create_time = #{createTime}, + update_time = #{updateTime}, + deleted = #{deleted}, + + where id = #{id} + + + + delete from scrcu_online_orders where id = #{id} + + + + delete from scrcu_online_orders where id in + + #{id} + + + + + delete from scrcu_online_order_details where order_number in + + #{orderNumber} + + + + + delete from scrcu_online_order_details where order_number = #{orderNumber} + + + + insert into scrcu_online_order_details( id, mer_id, parent_mer_id, org_code, order_number, sub_order_number, sub_order_amt, sub_pay_amt, logis_code, red_packet_org_no, auto_settle_flag, goods_info, create_time, deleted) values + + ( #{item.id}, #{item.merId}, #{item.parentMerId}, #{item.orgCode}, #{item.orderNumber}, #{item.subOrderNumber}, #{item.subOrderAmt}, #{item.subPayAmt}, #{item.logisCode}, #{item.redPacketOrgNo}, #{item.autoSettleFlag}, #{item.goodsInfo}, #{item.createTime}, #{item.deleted}) + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/bend/ScrcuOnlineRefundOrdersMapper.xml b/ruoyi-his/src/main/resources/mapper/bend/ScrcuOnlineRefundOrdersMapper.xml new file mode 100644 index 000000000..9407e682f --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/bend/ScrcuOnlineRefundOrdersMapper.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + select id, mer_id, mer_no, order_number, order_send_time, back_end_url, ori_order_number, ori_sub_order_number, order_amt, channel, order_state, create_time, deleted from scrcu_online_refund_orders + + + + + + + + insert into scrcu_online_refund_orders + + mer_id, + mer_no, + order_number, + order_send_time, + back_end_url, + ori_order_number, + ori_sub_order_number, + order_amt, + channel, + order_state, + create_time, + deleted, + + + #{merId}, + #{merNo}, + #{orderNumber}, + #{orderSendTime}, + #{backEndUrl}, + #{oriOrderNumber}, + #{oriSubOrderNumber}, + #{orderAmt}, + #{channel}, + #{orderState}, + #{createTime}, + #{deleted}, + + + + + update scrcu_online_refund_orders + + mer_id = #{merId}, + mer_no = #{merNo}, + order_number = #{orderNumber}, + order_send_time = #{orderSendTime}, + back_end_url = #{backEndUrl}, + ori_order_number = #{oriOrderNumber}, + ori_sub_order_number = #{oriSubOrderNumber}, + order_amt = #{orderAmt}, + channel = #{channel}, + order_state = #{orderState}, + create_time = #{createTime}, + deleted = #{deleted}, + + where id = #{id} + + + + delete from scrcu_online_refund_orders where id = #{id} + + + + delete from scrcu_online_refund_orders where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisDepartmentMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisDepartmentMapper.xml new file mode 100644 index 000000000..5f39dcec1 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisDepartmentMapper.xml @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + select id, dept_id, dept_name, org_code, org_name, dept_profile, is_show, sort_no, create_time, update_time, deleted from his_department + + + + + + + + + insert into his_department + + dept_id, + dept_name, + org_code, + org_name, + dept_profile, + is_show, + sort_no, + create_time, + update_time, + deleted, + + + #{deptId}, + #{deptName}, + #{orgCode}, + #{orgName}, + #{deptProfile}, + #{isShow}, + #{sortNo}, + #{createTime}, + #{updateTime}, + #{deleted}, + + + + + update his_department + + dept_id = #{deptId}, + dept_name = #{deptName}, + org_code = #{orgCode}, + org_name = #{orgName}, + dept_profile = #{deptProfile}, + is_show = #{isShow}, + sort_no = #{sortNo}, + create_time = #{createTime}, + update_time = #{updateTime}, + deleted = #{deleted}, + + where id = #{id} + + + + delete from his_department where id = #{id} + + + + delete from his_department where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisDoctorDepartmentMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisDoctorDepartmentMapper.xml new file mode 100644 index 000000000..eb858890d --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisDoctorDepartmentMapper.xml @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + select id, dept_id, dept_name, doctor_id, org_code, is_show, create_time, deleted from his_doctor_department + + + + + + + + insert into his_doctor_department + + dept_id, + dept_name, + doctor_id, + org_code, + is_show, + create_time, + deleted, + + + #{deptId}, + #{deptName}, + #{doctorId}, + #{orgCode}, + #{isShow}, + #{createTime}, + #{deleted}, + + + + + update his_doctor_department + + dept_id = #{deptId}, + dept_name = #{deptName}, + doctor_id = #{doctorId}, + org_code = #{orgCode}, + is_show = #{isShow}, + create_time = #{createTime}, + deleted = #{deleted}, + + where id = #{id} + + + + update his_doctor_department + + dept_name = #{deptName}, + doctor_id = #{doctorId}, + org_code = #{orgCode}, + is_show = #{isShow}, + + where dept_id = #{deptId} + + + + delete from his_doctor_department where id = #{id} + + + + delete from his_doctor_department where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisDoctorMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisDoctorMapper.xml new file mode 100644 index 000000000..62304aedd --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisDoctorMapper.xml @@ -0,0 +1,173 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, member_id, doctor_id, doctor_name, org_code, org_name, dept_id, dept_name, mobile_phone, avatar, job_title, working_years, expertise_areas, doctor_profile, fans, star_rating, is_show, is_virtual_account, template_id, template_name, daily_registered_num, sort_no, create_time, update_time, deleted from his_doctor + + + + + + + + + + + + + insert into his_doctor + + member_id, + doctor_id, + doctor_name, + org_code, + org_name, + dept_id, + dept_name, + mobile_phone, + avatar, + job_title, + working_years, + expertise_areas, + doctor_profile, + fans, + star_rating, + is_show, + is_virtual_account, + template_id, + template_name, + daily_registered_num, + sort_no, + create_time, + update_time, + deleted, + + + #{memberId}, + #{doctorId}, + #{doctorName}, + #{orgCode}, + #{orgName}, + #{deptId}, + #{deptName}, + #{mobilePhone}, + #{avatar}, + #{jobTitle}, + #{workingYears}, + #{expertiseAreas}, + #{doctorProfile}, + #{fans}, + #{starRating}, + #{isShow}, + #{isVirtualAccount}, + #{templateId}, + #{templateName}, + #{dailyRegisteredNum}, + #{sortNo}, + #{createTime}, + #{updateTime}, + #{deleted}, + + + + + update his_doctor + + member_id = #{memberId}, + doctor_id = #{doctorId}, + doctor_name = #{doctorName}, + org_code = #{orgCode}, + org_name = #{orgName}, + dept_id = #{deptId}, + dept_name = #{deptName}, + mobile_phone = #{mobilePhone}, + avatar = #{avatar}, + job_title = #{jobTitle}, + working_years = #{workingYears}, + expertise_areas = #{expertiseAreas}, + doctor_profile = #{doctorProfile}, + fans = #{fans}, + star_rating = #{starRating}, + is_show = #{isShow}, + is_virtual_account = #{isVirtualAccount}, + template_id = #{templateId}, + template_name = #{templateName}, + daily_registered_num = #{dailyRegisteredNum}, + sort_no = #{sortNo}, + create_time = #{createTime}, + update_time = #{updateTime}, + deleted = #{deleted}, + + where id = #{id} + + + + delete from his_doctor where id = #{id} + + + + delete from his_doctor where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisDoctorScheduleMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisDoctorScheduleMapper.xml new file mode 100644 index 000000000..f83f095b2 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisDoctorScheduleMapper.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, org_code, org_name, dept_id, dept_name, doctor_id, doctor_name, schedule_date, schedule_tag, schedule_shift, on_limit_num, on_num, off_limit_num, off_num, is_show, create_time, update_time, deleted from his_doctor_schedule + + + + + + + + + insert into his_doctor_schedule + + org_code, + org_name, + dept_id, + dept_name, + doctor_id, + doctor_name, + schedule_date, + schedule_tag, + schedule_shift, + on_limit_num, + on_num, + off_limit_num, + off_num, + is_show, + create_time, + update_time, + deleted, + + + #{orgCode}, + #{orgName}, + #{deptId}, + #{deptName}, + #{doctorId}, + #{doctorName}, + #{scheduleDate}, + #{scheduleTag}, + #{scheduleShift}, + #{onLimitNum}, + #{onNum}, + #{offLimitNum}, + #{offNum}, + #{isShow}, + #{createTime}, + #{updateTime}, + #{deleted}, + + + + + + + SELECT LAST_INSERT_ID() + + insert into his_doctor_schedule + ( + org_code, org_name, dept_id, dept_name, doctor_id, doctor_name, + schedule_date, schedule_tag, schedule_shift, on_limit_num, on_num, + off_limit_num, off_num, is_show, create_time + ) + values + + ( + #{item.orgCode},#{item.orgName},#{item.deptId},#{item.deptName},#{item.doctorId},#{item.doctorName},#{item.scheduleDate},#{item.scheduleTag}, + #{item.scheduleShift},#{item.onLimitNum},#{item.onNum}, #{item.offLimitNum}, #{item.offNum},#{item.isShow},#{item.createTime} + ) + + + + update his_doctor_schedule + + org_code = #{orgCode}, + org_name = #{orgName}, + dept_id = #{deptId}, + dept_name = #{deptName}, + doctor_id = #{doctorId}, + doctor_name = #{doctorName}, + schedule_date = #{scheduleDate}, + schedule_tag = #{scheduleTag}, + schedule_shift = #{scheduleShift}, + on_limit_num = #{onLimitNum}, + on_num = #{onNum}, + off_limit_num = #{offLimitNum}, + off_num = #{offNum}, + is_show = #{isShow}, + create_time = #{createTime}, + update_time = #{updateTime}, + deleted = #{deleted}, + + where id = #{id} + + + + delete from his_doctor_schedule where id = #{id} + + + + delete from his_doctor_schedule where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisEhealthClientMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisEhealthClientMapper.xml new file mode 100644 index 000000000..7ba00281b --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisEhealthClientMapper.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + select id, app_id, app_secret, org_code, org_name, open_api, version, create_time, deleted from his_ehealth_client + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisFeeItemMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisFeeItemMapper.xml new file mode 100644 index 000000000..f990783ce --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisFeeItemMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + select id, fee_type_id, fee_type_name, is_show, create_time, deleted from his_fee_item + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisHospitalInfoMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisHospitalInfoMapper.xml new file mode 100644 index 000000000..6b0bd9153 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisHospitalInfoMapper.xml @@ -0,0 +1,161 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, org_code, org_name, org_address, contact_phone, contact_person, postal_code, logo, introduction, org_type, org_level, excellent_dept_ids, excellent_doctor_ids, fans, star_rating, business_license, sort_no, longitude, latitude, region_id, region_code, vm_user_id, is_show, create_time, update_time, deleted from his_hospital_info + + + + + + + + + + insert into his_hospital_info + + org_code, + org_name, + org_address, + contact_phone, + contact_person, + postal_code, + logo, + introduction, + org_type, + org_level, + excellent_dept_ids, + excellent_doctor_ids, + fans, + star_rating, + business_license, + sort_no, + longitude, + latitude, + region_id, + region_code, + vm_user_id, + is_show, + create_time, + update_time, + deleted, + + + #{orgCode}, + #{orgName}, + #{orgAddress}, + #{contactPhone}, + #{contactPerson}, + #{postalCode}, + #{logo}, + #{introduction}, + #{orgType}, + #{orgLevel}, + #{excellentDeptIds}, + #{excellentDoctorIds}, + #{fans}, + #{starRating}, + #{businessLicense}, + #{sortNo}, + #{longitude}, + #{latitude}, + #{regionId}, + #{regionCode}, + #{vmUserId}, + #{isShow}, + #{createTime}, + #{updateTime}, + #{deleted}, + + + + + update his_hospital_info + + org_code = #{orgCode}, + org_name = #{orgName}, + org_address = #{orgAddress}, + contact_phone = #{contactPhone}, + contact_person = #{contactPerson}, + postal_code = #{postalCode}, + logo = #{logo}, + introduction = #{introduction}, + org_type = #{orgType}, + org_level = #{orgLevel}, + excellent_dept_ids = #{excellentDeptIds}, + excellent_doctor_ids = #{excellentDoctorIds}, + fans = #{fans}, + star_rating = #{starRating}, + business_license = #{businessLicense}, + sort_no = #{sortNo}, + longitude = #{longitude}, + latitude = #{latitude}, + region_id = #{regionId}, + region_code = #{regionCode}, + vm_user_id = #{vmUserId}, + is_show = #{isShow}, + create_time = #{createTime}, + update_time = #{updateTime}, + deleted = #{deleted}, + + where id = #{id} + + + + delete from his_hospital_info where id = #{id} + + + + delete from his_hospital_info where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisInpatientMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisInpatientMapper.xml new file mode 100644 index 000000000..6198f0113 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisInpatientMapper.xml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, patient_id, patient_name, id_card_no, patient_sex, birthday, contact_name, mobile_phone, family_address, admission_date, leave_date, hospitalized_no, business_id, org_code, org_name, dept_id, dept_name, doctor_id, doctor_name, bed_id, bed_name, main_diagnose, main_diagnose_icd10, secondary_diagnose, secondary_diagnose_icd10, ward_id, ward_name, operator, operate_time, total_fee, remark, leave_dept_id, leave_dept_name, leave_ward_id, leave_ward_name, leave_bed_id, leave_bed_name, leave_main_diagnose, leave_main_diagnose_icd10, leave_secondary_diagnose, leave_secondary_diagnose_icd10, inpatient_status, prepaid_total_fee, doctor_number, create_time, update_time, deleted from his_inpatient + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisInpatientPrepaymentMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisInpatientPrepaymentMapper.xml new file mode 100644 index 000000000..88d4a7455 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisInpatientPrepaymentMapper.xml @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, member_id, mobile_phone, patient_id, patient_name, id_card_no, business_id, order_code, prepay_id, pay_serial_no, payment_list_str, user_id, user_name, vendor_id, his_serial_no, total_fee, total_cost, org_code, org_name, prepay_status, remark, create_time, update_time, deleted from his_inpatient_prepayment + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisInspectionApplyMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisInspectionApplyMapper.xml new file mode 100644 index 000000000..3f19d9b2f --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisInspectionApplyMapper.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + select id, org_code, patient_name, id_card_no, org_name, apply_id, apply_item_name, bill_time, operator, user_id, business_id, create_time, deleted from his_inspection_apply + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisInspectionReportItemMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisInspectionReportItemMapper.xml new file mode 100644 index 000000000..822fdfb36 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisInspectionReportItemMapper.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + select id, report_id, item_id, exec_record_id, item_name, item_value, sort_no, unit, reference_value, quality_result, archived_flag, fee, create_time, update_time, deleted from his_inspection_report_item + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisInspectionReportMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisInspectionReportMapper.xml new file mode 100644 index 000000000..69c999ffe --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisInspectionReportMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, apply_id, id_card_no, patient_name, patient_sex, age, fee, bill_code, bill_type, bill_status, bill_time, data_source, subjective, assessment, pack_name, specimen_type, specimen, image_src, data_result, infectious, conclusion, remark, template_id, dept_id, dept_name, user_name, org_code, actor_name, operators, exec_time, create_time, deleted from his_inspection_report + + + + + + + + delete from his_inspection_report_item where report_id in + + #{reportId} + + + + + delete from his_inspection_report_item where report_id = #{reportId} + + + + insert into his_inspection_report_item( report_id, item_id, exec_record_id, item_name, item_value, sort_no, unit, reference_value, quality_result, archived_flag, fee, create_time) values + + (#{item.reportId}, #{item.itemId}, #{item.execRecordId}, #{item.itemName}, #{item.itemValue}, #{item.sortNo}, #{item.unit}, #{item.referenceValue}, #{item.qualityResult}, #{item.archivedFlag}, #{item.fee}, #{item.createTime}) + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisMerchantScrcuMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisMerchantScrcuMapper.xml new file mode 100644 index 000000000..83751abf2 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisMerchantScrcuMapper.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, mch_no, mch_name, sub_mch_no, sub_mch_name, org_code, org_name, client_id, secret, open_client_id, open_api, public_key_path, private_key_path, private_key_password, txn_area_info, version, create_time, deleted from his_merchant_scrcu + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisMerchantWechatMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisMerchantWechatMapper.xml new file mode 100644 index 000000000..bdfefea30 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisMerchantWechatMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + select id, provider_id, sub_app_id, org_code, org_name, create_time, deleted from his_merchant_wechat + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisOutpatientExpensesBillDetailMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisOutpatientExpensesBillDetailMapper.xml new file mode 100644 index 000000000..c20c37801 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisOutpatientExpensesBillDetailMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, bill_id, bill_detail_id, recipe_id, recipe_code, fee, fee_name, bill_doctor, bill_dept, operate_dept, bill_time, amount, unit, specification, unit_price, cost_item_name, create_time, deleted from his_outpatient_expenses_bill_detail + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisOutpatientExpensesBillMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisOutpatientExpensesBillMapper.xml new file mode 100644 index 000000000..640ef3d0c --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisOutpatientExpensesBillMapper.xml @@ -0,0 +1,115 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, member_id, patient_id, id_card_no, patient_name, order_code, business_id, registered_id, recipe_id, recipe_code, recipe_fee, bill_doctor, bill_dept, bill_time, fee_name, operate_dept, recipe_status, charge_record_id, org_code, org_name, pay_time, create_time, update_time, deleted from his_outpatient_expenses_bill + + + + + + + + delete from his_outpatient_expenses_bill_detail where bill_id in + + #{billId} + + + + + delete from his_outpatient_expenses_bill_detail where bill_id = #{billId} + + + + insert into his_outpatient_expenses_bill_detail(id,bill_id, bill_detail_id, recipe_id, recipe_code, fee, fee_name, bill_doctor, bill_dept, operate_dept, bill_time, amount, unit, specification, unit_price, cost_item_name, create_time) values + + (#{item.id},#{item.billId}, #{item.billDetailId}, #{item.recipeId}, #{item.recipeCode}, #{item.fee}, #{item.feeName}, #{item.billDoctor}, #{item.billDept}, #{item.operateDept}, #{item.billTime}, #{item.amount}, #{item.unit}, #{item.specification}, #{item.unitPrice}, #{item.costItemName}, #{item.createTime}) + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisOutpatientMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisOutpatientMapper.xml new file mode 100644 index 000000000..685f38b73 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisOutpatientMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, patient_id, patient_name, id_card_no, patient_sex, org_name, org_code, business_id, registered_id, registered_fee, outpatient_number, visit_date, dept_id, dept_name, doctor_id, doctor_name, diagnose_disease_code, diagnose_disease_name, disease_desc, operator, total_cost, reception_status, remark, create_time, update_time, deleted from his_outpatient + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisOutpatientPaymentMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisOutpatientPaymentMapper.xml new file mode 100644 index 000000000..bff01741d --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisOutpatientPaymentMapper.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + select id, order_code, registered_id, recipe_ids, user_id, total_fee, pay_serial_no, payment_list_str, vendor_id, org_code, org_name, create_time, deleted from his_outpatient_payment + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisPatientExpensesDetailMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisPatientExpensesDetailMapper.xml new file mode 100644 index 000000000..97ab3941f --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisPatientExpensesDetailMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, expenses_id, cost_detail_id, cost_item_name, cost_item_code, cost_item_category_name, cost_item_category_code, unit, formulation, specification, unit_price, quantity, amount, drug_dosage, drug_usage, frequency, medicate_days, hospital_pricing_unit, is_imported_drugs, drug_producing_area, recipe_code, cost_document_type, bill_dept_name, bill_dept_id, bill_doctor_name, bill_doctor_id, bill_time, operate_dept_name, operate_dept_id, operate_doctor_name, operate_doctor_id, operate_time, prescribe, operator, doctor_number, cost_write_off_id, is_charge_fee, charge_time, org_code, org_name, package_spec, dosage_spec, every_time_dosage, dir_code, create_time, deleted from his_patient_expenses_detail + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisPatientExpensesMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisPatientExpensesMapper.xml new file mode 100644 index 000000000..253a8719c --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisPatientExpensesMapper.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, member_id, patient_id, patient_name, id_card_no, order_code, org_code, org_name, bill_dept, bill_doctor, business_id, expense_business_no, expense_type, charge_record_id, create_time, update_time, deleted from his_patient_expenses + + + + + + + + delete from his_patient_expenses_detail where expenses_id in + + #{expensesId} + + + + + delete from his_patient_expenses_detail where expenses_id = #{expensesId} + + + + insert into his_patient_expenses_detail(id ,expenses_id, cost_detail_id, cost_item_name, cost_item_code, cost_item_category_name, cost_item_category_code, unit, formulation, specification, unit_price, quantity, amount, drug_dosage, drug_usage, frequency, medicate_days, hospital_pricing_unit, is_imported_drugs, drug_producing_area, recipe_code, cost_document_type, bill_dept_name, bill_dept_id, bill_doctor_name, bill_doctor_id, bill_time, operate_dept_name, operate_dept_id, operate_doctor_name, operate_doctor_id, operate_time, prescribe, operator, doctor_number, cost_write_off_id, is_charge_fee, charge_time, org_code, org_name, package_spec, dosage_spec, every_time_dosage, dir_code, create_time) values + + (#{item.id}, #{item.expensesId}, #{item.costDetailId}, #{item.costItemName}, #{item.costItemCode}, #{item.costItemCategoryName}, #{item.costItemCategoryCode}, #{item.unit}, #{item.formulation}, #{item.specification}, #{item.unitPrice}, #{item.quantity}, #{item.amount}, #{item.drugDosage}, #{item.drugUsage}, #{item.frequency}, #{item.medicateDays}, #{item.hospitalPricingUnit}, #{item.isImportedDrugs}, #{item.drugProducingArea}, #{item.recipeCode}, #{item.costDocumentType}, #{item.billDeptName}, #{item.billDeptId}, #{item.billDoctorName}, #{item.billDoctorId}, #{item.billTime}, #{item.operateDeptName}, #{item.operateDeptId}, #{item.operateDoctorName}, #{item.operateDoctorId}, #{item.operateTime}, #{item.prescribe}, #{item.operator}, #{item.doctorNumber}, #{item.costWriteOffId}, #{item.isChargeFee}, #{item.chargeTime}, #{item.orgCode}, #{item.orgName}, #{item.packageSpec}, #{item.dosageSpec}, #{item.everyTimeDosage}, #{item.dirCode}, #{item.createTime}) + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisPayAccountMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisPayAccountMapper.xml new file mode 100644 index 000000000..1cdf52de8 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisPayAccountMapper.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + select id, acc_id, acc_py, acc_name, payment, pay_py, payment_id, is_default_show, sort_no, create_time, deleted from his_pay_account + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisRegistrationRecordMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisRegistrationRecordMapper.xml new file mode 100644 index 000000000..79e3195f0 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisRegistrationRecordMapper.xml @@ -0,0 +1,219 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, member_id, patient_id, patient_name, patient_sex, id_card_no, org_code, org_name, dept_id, dept_name, doctor_id, doctor_name, vendor_id, fee, pay_serial_no, payment_list_str, user_id, registered_id, registered_code, registered_date, visit_date, visit_time, registered_type, business_id, outpatient_number, seq, refund_able, fee_type_id, template_id, order_code, registered_source, registered_status, cancel_time, remark, create_time, update_time, deleted from his_registration_record + + + + + + + + + + insert into his_registration_record + + member_id, + patient_id, + patient_name, + patient_sex, + id_card_no, + org_code, + org_name, + dept_id, + dept_name, + doctor_id, + doctor_name, + vendor_id, + fee, + pay_serial_no, + payment_list_str, + user_id, + registered_id, + registered_code, + registered_date, + visit_date, + visit_time, + registered_type, + business_id, + outpatient_number, + seq, + refund_able, + fee_type_id, + template_id, + order_code, + registered_source, + registered_status, + cancel_time, + remark, + create_time, + update_time, + deleted, + + + #{memberId}, + #{patientId}, + #{patientName}, + #{patientSex}, + #{idCardNo}, + #{orgCode}, + #{orgName}, + #{deptId}, + #{deptName}, + #{doctorId}, + #{doctorName}, + #{vendorId}, + #{fee}, + #{paySerialNo}, + #{paymentListStr}, + #{userId}, + #{registeredId}, + #{registeredCode}, + #{registeredDate}, + #{visitDate}, + #{visitTime}, + #{registeredType}, + #{businessId}, + #{outpatientNumber}, + #{seq}, + #{refundAble}, + #{feeTypeId}, + #{templateId}, + #{orderCode}, + #{registeredSource}, + #{registeredStatus}, + #{cancelTime}, + #{remark}, + #{createTime}, + #{updateTime}, + #{deleted}, + + + + + update his_registration_record + + member_id = #{memberId}, + patient_id = #{patientId}, + patient_name = #{patientName}, + patient_sex = #{patientSex}, + id_card_no = #{idCardNo}, + org_code = #{orgCode}, + org_name = #{orgName}, + dept_id = #{deptId}, + dept_name = #{deptName}, + doctor_id = #{doctorId}, + doctor_name = #{doctorName}, + vendor_id = #{vendorId}, + fee = #{fee}, + pay_serial_no = #{paySerialNo}, + payment_list_str = #{paymentListStr}, + user_id = #{userId}, + registered_id = #{registeredId}, + registered_code = #{registeredCode}, + registered_date = #{registeredDate}, + visit_date = #{visitDate}, + visit_time = #{visitTime}, + registered_type = #{registeredType}, + business_id = #{businessId}, + outpatient_number = #{outpatientNumber}, + seq = #{seq}, + refund_able = #{refundAble}, + fee_type_id = #{feeTypeId}, + template_id = #{templateId}, + order_code = #{orderCode}, + registered_source = #{registeredSource}, + registered_status = #{registeredStatus}, + cancel_time = #{cancelTime}, + remark = #{remark}, + create_time = #{createTime}, + update_time = #{updateTime}, + deleted = #{deleted}, + + where id = #{id} + + + + delete from his_registration_record where id = #{id} + + + + delete from his_registration_record where id in + + #{id} + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisRegistrationTemplateMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisRegistrationTemplateMapper.xml new file mode 100644 index 000000000..aec263060 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisRegistrationTemplateMapper.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + select id, org_code, org_name, template_id, template_name, fee, is_show, create_time, deleted from his_registration_template + + + + + + + + + + insert into his_registration_template + + org_code, + org_name, + template_id, + template_name, + fee, + is_show, + create_time, + deleted, + + + #{orgCode}, + #{orgName}, + #{templateId}, + #{templateName}, + #{fee}, + #{isShow}, + #{createTime}, + #{deleted}, + + + + + update his_registration_template + + org_code = #{orgCode}, + org_name = #{orgName}, + template_id = #{templateId}, + template_name = #{templateName}, + fee = #{fee}, + is_show = #{isShow}, + create_time = #{createTime}, + deleted = #{deleted}, + + where id = #{id} + + + + delete from his_registration_template where id = #{id} + + + + delete from his_registration_template where id in + + #{id} + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/mapper/his/HisWechatProviderMapper.xml b/ruoyi-his/src/main/resources/mapper/his/HisWechatProviderMapper.xml new file mode 100644 index 000000000..014ddc287 --- /dev/null +++ b/ruoyi-his/src/main/resources/mapper/his/HisWechatProviderMapper.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, client_id, client_secret, app_id, app_secret, mch_app_id, mch_id, mch_key, key_path, front_url, open_api, create_time, deleted from his_wechat_provider + + + + + + + + delete from his_merchant_wechat where provider_id in + + #{providerId} + + + + + delete from his_merchant_wechat where provider_id = #{providerId} + + + + insert into his_merchant_wechat( id, provider_id, sub_app_id, org_code, org_name, create_time, deleted) values + + ( #{item.id}, #{item.providerId}, #{item.subAppId}, #{item.orgCode}, #{item.orgName}, #{item.createTime}, #{item.deleted}) + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/article/edit.html b/ruoyi-his/src/main/resources/templates/bend/article/edit.html index 5a624b23e..4b433a161 100644 --- a/ruoyi-his/src/main/resources/templates/bend/article/edit.html +++ b/ruoyi-his/src/main/resources/templates/bend/article/edit.html @@ -99,14 +99,14 @@ function submitHandler(status) { if ($.validate.form()) { - var data = $('#form-article-add').serializeArray(); - /*文章状态，草稿或正常*/ + var data = $('#form-article-edit').serializeArray(); + /*文章状态（0草稿 1正常 2删除）*/ if (status === 0){ data.push({"name": "articleStatus", "value": status}); } else { data.push({"name": "articleStatus", "value": status}); } - $.operate.save(prefix + "/add", data); + $.operate.save(prefix + "/edit", data); //$.operate.save(prefix + "/edit", $('#form-article-edit').serialize()); } } diff --git a/ruoyi-his/src/main/resources/templates/bend/offlineOrders/add.html b/ruoyi-his/src/main/resources/templates/bend/offlineOrders/add.html new file mode 100644 index 000000000..e1e148425 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/bend/offlineOrders/add.html @@ -0,0 +1,25 @@ + + + + + + +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/offlineOrders/edit.html b/ruoyi-his/src/main/resources/templates/bend/offlineOrders/edit.html new file mode 100644 index 000000000..b3d52b10a --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/bend/offlineOrders/edit.html @@ -0,0 +1,26 @@ + + + + + + +
+
+ +
+
+ + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/offlineOrders/offlineOrders.html b/ruoyi-his/src/main/resources/templates/bend/offlineOrders/offlineOrders.html new file mode 100644 index 000000000..2d20363ea --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/bend/offlineOrders/offlineOrders.html @@ -0,0 +1,272 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/offlineRefund/add.html b/ruoyi-his/src/main/resources/templates/bend/offlineRefund/add.html new file mode 100644 index 000000000..48325c907 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/bend/offlineRefund/add.html @@ -0,0 +1,25 @@ + + + + + + +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/offlineRefund/edit.html b/ruoyi-his/src/main/resources/templates/bend/offlineRefund/edit.html new file mode 100644 index 000000000..a799835f6 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/bend/offlineRefund/edit.html @@ -0,0 +1,26 @@ + + + + + + +
+
+ +
+
+ + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/offlineRefund/offlineRefund.html b/ruoyi-his/src/main/resources/templates/bend/offlineRefund/offlineRefund.html new file mode 100644 index 000000000..d3f620aaa --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/bend/offlineRefund/offlineRefund.html @@ -0,0 +1,209 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/onlineOrderDetails/add.html b/ruoyi-his/src/main/resources/templates/bend/onlineOrderDetails/add.html new file mode 100644 index 000000000..1463c6ab5 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/bend/onlineOrderDetails/add.html @@ -0,0 +1,25 @@ + + + + + + +
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/onlineOrderDetails/edit.html b/ruoyi-his/src/main/resources/templates/bend/onlineOrderDetails/edit.html new file mode 100644 index 000000000..ac34fb875 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/bend/onlineOrderDetails/edit.html @@ -0,0 +1,26 @@ + + + + + + +
+
+ +
+
+ + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/onlineOrderDetails/onlineOrderDetails.html b/ruoyi-his/src/main/resources/templates/bend/onlineOrderDetails/onlineOrderDetails.html new file mode 100644 index 000000000..f8f5c4abe --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/bend/onlineOrderDetails/onlineOrderDetails.html @@ -0,0 +1,144 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/onlineOrders/onlineOrderDetails.html b/ruoyi-his/src/main/resources/templates/bend/onlineOrders/onlineOrderDetails.html new file mode 100644 index 000000000..cc2e4ebad --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/bend/onlineOrders/onlineOrderDetails.html @@ -0,0 +1,177 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/onlineOrders/onlineOrders.html b/ruoyi-his/src/main/resources/templates/bend/onlineOrders/onlineOrders.html new file mode 100644 index 000000000..1575beedb --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/bend/onlineOrders/onlineOrders.html @@ -0,0 +1,343 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/onlineRefund/onlineRefund.html b/ruoyi-his/src/main/resources/templates/bend/onlineRefund/onlineRefund.html new file mode 100644 index 000000000..d54d1ccb9 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/bend/onlineRefund/onlineRefund.html @@ -0,0 +1,213 @@ + + + + + + +
+
+
+
+
+
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
  • + + + - + +
    • +
  • +  搜索 +  重置 +
    • +
+
+
+
+ + +
+
+
+
+
+ + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/bend/patientList/patientList.html b/ruoyi-his/src/main/resources/templates/bend/patientList/patientList.html index 50dea0f0b..2a2571e0b 100644 --- a/ruoyi-his/src/main/resources/templates/bend/patientList/patientList.html +++ b/ruoyi-his/src/main/resources/templates/bend/patientList/patientList.html @@ -22,13 +22,6 @@ -
  • - - -
  • diff --git a/ruoyi-his/src/main/resources/templates/his/department/add.html b/ruoyi-his/src/main/resources/templates/his/department/add.html new file mode 100644 index 000000000..c35c86bb7 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/department/add.html @@ -0,0 +1,58 @@ + + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/department/department.html b/ruoyi-his/src/main/resources/templates/his/department/department.html new file mode 100644 index 000000000..4cafdece0 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/department/department.html @@ -0,0 +1,121 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/department/edit.html b/ruoyi-his/src/main/resources/templates/his/department/edit.html new file mode 100644 index 000000000..4ad9cf67e --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/department/edit.html @@ -0,0 +1,60 @@ + + + + + + +
    +
    + + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/doctor/add.html b/ruoyi-his/src/main/resources/templates/his/doctor/add.html new file mode 100644 index 000000000..cb7c1c708 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/doctor/add.html @@ -0,0 +1,121 @@ + + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/doctor/doctor.html b/ruoyi-his/src/main/resources/templates/his/doctor/doctor.html new file mode 100644 index 000000000..ca417bcf2 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/doctor/doctor.html @@ -0,0 +1,169 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/doctor/edit.html b/ruoyi-his/src/main/resources/templates/his/doctor/edit.html new file mode 100644 index 000000000..9af6fddb4 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/doctor/edit.html @@ -0,0 +1,125 @@ + + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + + + 选择医生常用科室. +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/doctorDepartment/add.html b/ruoyi-his/src/main/resources/templates/his/doctorDepartment/add.html new file mode 100644 index 000000000..1059cf4de --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/doctorDepartment/add.html @@ -0,0 +1,25 @@ + + + + + + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/doctorDepartment/doctorDepartment.html b/ruoyi-his/src/main/resources/templates/his/doctorDepartment/doctorDepartment.html new file mode 100644 index 000000000..5a428f89d --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/doctorDepartment/doctorDepartment.html @@ -0,0 +1,78 @@ + + + + + + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/doctorDepartment/edit.html b/ruoyi-his/src/main/resources/templates/his/doctorDepartment/edit.html new file mode 100644 index 000000000..32b091e63 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/doctorDepartment/edit.html @@ -0,0 +1,26 @@ + + + + + + +
    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/doctorSchedule/add.html b/ruoyi-his/src/main/resources/templates/his/doctorSchedule/add.html new file mode 100644 index 000000000..2e2aa54fd --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/doctorSchedule/add.html @@ -0,0 +1,34 @@ + + + + + + +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/doctorSchedule/doctorSchedule.html b/ruoyi-his/src/main/resources/templates/his/doctorSchedule/doctorSchedule.html new file mode 100644 index 000000000..36e962e6d --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/doctorSchedule/doctorSchedule.html @@ -0,0 +1,181 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/doctorSchedule/edit.html b/ruoyi-his/src/main/resources/templates/his/doctorSchedule/edit.html new file mode 100644 index 000000000..41fa475e2 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/doctorSchedule/edit.html @@ -0,0 +1,35 @@ + + + + + + +
    +
    + +
    + +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/ehealthClient/add.html b/ruoyi-his/src/main/resources/templates/his/ehealthClient/add.html new file mode 100644 index 000000000..57c5f8b3e --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/ehealthClient/add.html @@ -0,0 +1,61 @@ + + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/ehealthClient/edit.html b/ruoyi-his/src/main/resources/templates/his/ehealthClient/edit.html new file mode 100644 index 000000000..5a627eea2 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/ehealthClient/edit.html @@ -0,0 +1,62 @@ + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/ehealthClient/ehealthClient.html b/ruoyi-his/src/main/resources/templates/his/ehealthClient/ehealthClient.html new file mode 100644 index 000000000..df3126cc1 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/ehealthClient/ehealthClient.html @@ -0,0 +1,126 @@ + + + + + + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/expensesBill/add.html b/ruoyi-his/src/main/resources/templates/his/expensesBill/add.html new file mode 100644 index 000000000..7c3cd7e83 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/expensesBill/add.html @@ -0,0 +1,25 @@ + + + + + + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/expensesBill/edit.html b/ruoyi-his/src/main/resources/templates/his/expensesBill/edit.html new file mode 100644 index 000000000..9cad82107 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/expensesBill/edit.html @@ -0,0 +1,26 @@ + + + + + + +
    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/expensesBill/expensesBill.html b/ruoyi-his/src/main/resources/templates/his/expensesBill/expensesBill.html new file mode 100644 index 000000000..51b05569f --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/expensesBill/expensesBill.html @@ -0,0 +1,240 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • + + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/expensesBill/expensesBillDetail.html b/ruoyi-his/src/main/resources/templates/his/expensesBill/expensesBillDetail.html new file mode 100644 index 000000000..5e718a0b2 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/expensesBill/expensesBillDetail.html @@ -0,0 +1,188 @@ + + + + + + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/feeItem/add.html b/ruoyi-his/src/main/resources/templates/his/feeItem/add.html new file mode 100644 index 000000000..4a2612121 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/feeItem/add.html @@ -0,0 +1,25 @@ + + + + + + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/feeItem/edit.html b/ruoyi-his/src/main/resources/templates/his/feeItem/edit.html new file mode 100644 index 000000000..b65caad80 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/feeItem/edit.html @@ -0,0 +1,26 @@ + + + + + + +
    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/feeItem/feeItem.html b/ruoyi-his/src/main/resources/templates/his/feeItem/feeItem.html new file mode 100644 index 000000000..128636980 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/feeItem/feeItem.html @@ -0,0 +1,131 @@ + + + + + + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/hospital/add.html b/ruoyi-his/src/main/resources/templates/his/hospital/add.html new file mode 100644 index 000000000..44c9d6d75 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/hospital/add.html @@ -0,0 +1,210 @@ + + + + + + + + +
    +
    + +

    基本信息

    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + + 最多可选5个优秀科室. +
    +
    +
    +
    +
    + +
    + + 最多可选5个优秀医生. +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +
    +

    其他信息

    +
    +
    +
    + +
    + +
    + +
    + 仅支持PNG,JPEG/JPG格式,图片大小不超过5MB。 +
    +
    +
    +
    +
    +
    +
    + +
    + + 机构简介最多600字. +
    +
    +
    +
    +
    +
    +
    +
    +   + +
    +
    + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/hospital/edit.html b/ruoyi-his/src/main/resources/templates/his/hospital/edit.html new file mode 100644 index 000000000..0e9861d96 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/hospital/edit.html @@ -0,0 +1,258 @@ + + + + + + + + +
    +
    + +

    基本信息

    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + + + 最多可选5个优秀科室. +
    +
    +
    +
    +
    + +
    + + + 最多可选5个优秀医生. +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + + 机构用于线上的虚拟操作员. +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    +
    + + +
    +
    +
    +
    +
    +
    + +
    + +
    +
    +
    +
    +

    其他信息

    +
    +
    +
    + +
    +
    + + +
    + 仅支持PNG,JPEG/JPG格式,图片大小不超过5MB。 +
    +
    +
    +
    +
    +
    +
    + +
    + + 机构简介最多600字. +
    +
    +
    +
    +
    +
    +
    +
    +   + +
    +
    + + + + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/hospital/hospital.html b/ruoyi-his/src/main/resources/templates/his/hospital/hospital.html new file mode 100644 index 000000000..bcecb0afa --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/hospital/hospital.html @@ -0,0 +1,183 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inpatient/add.html b/ruoyi-his/src/main/resources/templates/his/inpatient/add.html new file mode 100644 index 000000000..f5c406343 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inpatient/add.html @@ -0,0 +1,25 @@ + + + + + + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inpatient/edit.html b/ruoyi-his/src/main/resources/templates/his/inpatient/edit.html new file mode 100644 index 000000000..677aa2c85 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inpatient/edit.html @@ -0,0 +1,26 @@ + + + + + + +
    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inpatient/inpatient.html b/ruoyi-his/src/main/resources/templates/his/inpatient/inpatient.html new file mode 100644 index 000000000..0e79a91b5 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inpatient/inpatient.html @@ -0,0 +1,273 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • + + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inpatientPrepayment/add.html b/ruoyi-his/src/main/resources/templates/his/inpatientPrepayment/add.html new file mode 100644 index 000000000..666ffca5a --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inpatientPrepayment/add.html @@ -0,0 +1,25 @@ + + + + + + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inpatientPrepayment/edit.html b/ruoyi-his/src/main/resources/templates/his/inpatientPrepayment/edit.html new file mode 100644 index 000000000..d7bf68123 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inpatientPrepayment/edit.html @@ -0,0 +1,26 @@ + + + + + + +
    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inpatientPrepayment/inpatientPrepayment.html b/ruoyi-his/src/main/resources/templates/his/inpatientPrepayment/inpatientPrepayment.html new file mode 100644 index 000000000..b7435b74e --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inpatientPrepayment/inpatientPrepayment.html @@ -0,0 +1,211 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inspectionApply/add.html b/ruoyi-his/src/main/resources/templates/his/inspectionApply/add.html new file mode 100644 index 000000000..e779fbdcc --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inspectionApply/add.html @@ -0,0 +1,25 @@ + + + + + + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inspectionApply/edit.html b/ruoyi-his/src/main/resources/templates/his/inspectionApply/edit.html new file mode 100644 index 000000000..9329864bd --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inspectionApply/edit.html @@ -0,0 +1,26 @@ + + + + + + +
    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inspectionApply/inspectionApply.html b/ruoyi-his/src/main/resources/templates/his/inspectionApply/inspectionApply.html new file mode 100644 index 000000000..1a2c7a459 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inspectionApply/inspectionApply.html @@ -0,0 +1,126 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inspectionReport/add.html b/ruoyi-his/src/main/resources/templates/his/inspectionReport/add.html new file mode 100644 index 000000000..64ec1183d --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inspectionReport/add.html @@ -0,0 +1,202 @@ + + + + + + +
    +
    +

    检查检验信息

    +

    检查检验明细信息

    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inspectionReport/edit.html b/ruoyi-his/src/main/resources/templates/his/inspectionReport/edit.html new file mode 100644 index 000000000..c3a404e34 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inspectionReport/edit.html @@ -0,0 +1,204 @@ + + + + + + +
    +
    +

    检查检验信息

    + +

    检查检验明细信息

    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inspectionReport/inspectionReport.html b/ruoyi-his/src/main/resources/templates/his/inspectionReport/inspectionReport.html new file mode 100644 index 000000000..83cb69c91 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inspectionReport/inspectionReport.html @@ -0,0 +1,254 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • + + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/inspectionReport/inspectionReportItem.html b/ruoyi-his/src/main/resources/templates/his/inspectionReport/inspectionReportItem.html new file mode 100644 index 000000000..b4691dd50 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/inspectionReport/inspectionReportItem.html @@ -0,0 +1,156 @@ + + + + + + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/merchantScrcu/add.html b/ruoyi-his/src/main/resources/templates/his/merchantScrcu/add.html new file mode 100644 index 000000000..42def8a26 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/merchantScrcu/add.html @@ -0,0 +1,115 @@ + + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/merchantScrcu/edit.html b/ruoyi-his/src/main/resources/templates/his/merchantScrcu/edit.html new file mode 100644 index 000000000..9fb1246a5 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/merchantScrcu/edit.html @@ -0,0 +1,117 @@ + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/merchantScrcu/merchantScrcu.html b/ruoyi-his/src/main/resources/templates/his/merchantScrcu/merchantScrcu.html new file mode 100644 index 000000000..e164f9cca --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/merchantScrcu/merchantScrcu.html @@ -0,0 +1,188 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/merchantWechat/add.html b/ruoyi-his/src/main/resources/templates/his/merchantWechat/add.html new file mode 100644 index 000000000..98d93e9f1 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/merchantWechat/add.html @@ -0,0 +1,49 @@ + + + + + + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/merchantWechat/edit.html b/ruoyi-his/src/main/resources/templates/his/merchantWechat/edit.html new file mode 100644 index 000000000..3441df675 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/merchantWechat/edit.html @@ -0,0 +1,50 @@ + + + + + + +
    +
    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/merchantWechat/merchantWechat.html b/ruoyi-his/src/main/resources/templates/his/merchantWechat/merchantWechat.html new file mode 100644 index 000000000..fe97a9f24 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/merchantWechat/merchantWechat.html @@ -0,0 +1,108 @@ + + + + + + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/outpatient/add.html b/ruoyi-his/src/main/resources/templates/his/outpatient/add.html new file mode 100644 index 000000000..43ca6c2f2 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/outpatient/add.html @@ -0,0 +1,25 @@ + + + + + + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/outpatient/edit.html b/ruoyi-his/src/main/resources/templates/his/outpatient/edit.html new file mode 100644 index 000000000..38adb6ec0 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/outpatient/edit.html @@ -0,0 +1,26 @@ + + + + + + +
    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/outpatient/outpatient.html b/ruoyi-his/src/main/resources/templates/his/outpatient/outpatient.html new file mode 100644 index 000000000..52bc99fef --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/outpatient/outpatient.html @@ -0,0 +1,209 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/patientExpenses/add.html b/ruoyi-his/src/main/resources/templates/his/patientExpenses/add.html new file mode 100644 index 000000000..c7881c4f3 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/patientExpenses/add.html @@ -0,0 +1,513 @@ + + + + + + +
    +
    +

    费用记录信息

    +

    费用详情信息

    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/patientExpenses/edit.html b/ruoyi-his/src/main/resources/templates/his/patientExpenses/edit.html new file mode 100644 index 000000000..b4798a606 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/patientExpenses/edit.html @@ -0,0 +1,515 @@ + + + + + + +
    +
    +

    费用记录信息

    + +

    费用详情信息

    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/patientExpenses/patientExpenses.html b/ruoyi-his/src/main/resources/templates/his/patientExpenses/patientExpenses.html new file mode 100644 index 000000000..c324bca11 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/patientExpenses/patientExpenses.html @@ -0,0 +1,182 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/patientExpenses/patientExpensesDetail.html b/ruoyi-his/src/main/resources/templates/his/patientExpenses/patientExpensesDetail.html new file mode 100644 index 000000000..c85a88086 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/patientExpenses/patientExpensesDetail.html @@ -0,0 +1,245 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/payAccount/add.html b/ruoyi-his/src/main/resources/templates/his/payAccount/add.html new file mode 100644 index 000000000..f08a15def --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/payAccount/add.html @@ -0,0 +1,25 @@ + + + + + + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/payAccount/edit.html b/ruoyi-his/src/main/resources/templates/his/payAccount/edit.html new file mode 100644 index 000000000..d462e39b0 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/payAccount/edit.html @@ -0,0 +1,26 @@ + + + + + + +
    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/payAccount/payAccount.html b/ruoyi-his/src/main/resources/templates/his/payAccount/payAccount.html new file mode 100644 index 000000000..df793773d --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/payAccount/payAccount.html @@ -0,0 +1,157 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/registration/add.html b/ruoyi-his/src/main/resources/templates/his/registration/add.html new file mode 100644 index 000000000..31c1ea715 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/registration/add.html @@ -0,0 +1,25 @@ + + + + + + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/registration/edit.html b/ruoyi-his/src/main/resources/templates/his/registration/edit.html new file mode 100644 index 000000000..78499ca57 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/registration/edit.html @@ -0,0 +1,26 @@ + + + + + + +
    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/registration/registration.html b/ruoyi-his/src/main/resources/templates/his/registration/registration.html new file mode 100644 index 000000000..16faa2226 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/registration/registration.html @@ -0,0 +1,291 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + + - + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/registrationTemplate/add.html b/ruoyi-his/src/main/resources/templates/his/registrationTemplate/add.html new file mode 100644 index 000000000..d1d5ba3a5 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/registrationTemplate/add.html @@ -0,0 +1,25 @@ + + + + + + +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/registrationTemplate/edit.html b/ruoyi-his/src/main/resources/templates/his/registrationTemplate/edit.html new file mode 100644 index 000000000..b815f07a9 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/registrationTemplate/edit.html @@ -0,0 +1,26 @@ + + + + + + +
    +
    + +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/registrationTemplate/registrationTemplate.html b/ruoyi-his/src/main/resources/templates/his/registrationTemplate/registrationTemplate.html new file mode 100644 index 000000000..b4d3d3aed --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/registrationTemplate/registrationTemplate.html @@ -0,0 +1,149 @@ + + + + + + +
    +
    +
    +
    +
    +
      +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • + + +
      • +
    • +  搜索 +  重置 +
      • +
    +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/wechatProvider/add.html b/ruoyi-his/src/main/resources/templates/his/wechatProvider/add.html new file mode 100644 index 000000000..bb41ec122 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/wechatProvider/add.html @@ -0,0 +1,186 @@ + + + + + + +
    +
    +

    微信服务商信息

    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + + 公众号AppID. +
    +
    +
    + +
    + + 公众号AppSecret. +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + + 公众号前端地址. +
    +
    +
    + +
    + +
    +
    +

    特约商户信息

    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/wechatProvider/edit.html b/ruoyi-his/src/main/resources/templates/his/wechatProvider/edit.html new file mode 100644 index 000000000..d6374de6b --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/wechatProvider/edit.html @@ -0,0 +1,175 @@ + + + + + + +
    +
    +

    微信服务商信息

    + +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + + 公众号AppID. +
    +
    +
    + +
    + + 公众号AppSecret. +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    + +
    + + 公众号前端地址. +
    +
    +
    + +
    + +
    +
    +

    特约商户信息

    +
    +
    + + +
    +
    +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-his/src/main/resources/templates/his/wechatProvider/wechatProvider.html b/ruoyi-his/src/main/resources/templates/his/wechatProvider/wechatProvider.html new file mode 100644 index 000000000..c8742d721 --- /dev/null +++ b/ruoyi-his/src/main/resources/templates/his/wechatProvider/wechatProvider.html @@ -0,0 +1,144 @@ + + + + + + +
    +
    +
    +
    +
    + +
    +
    +
    + + +
    +
    +
    +
    +
    + + + + \ No newline at end of file diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java index 286555a2c..9aab4fa6d 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJob.java @@ -37,6 +37,10 @@ public class SysJob extends BaseEntity implements Serializable @Excel(name = "调用目标字符串") private String invokeTarget; + /** 调用目标参数列表 */ + @Excel(name = "调用目标参数列表") + private String methodParams; + /** cron执行表达式 */ @Excel(name = "执行表达式 ") private String cronExpression; @@ -97,6 +101,14 @@ public class SysJob extends BaseEntity implements Serializable this.invokeTarget = invokeTarget; } + public String getMethodParams() { + return methodParams; + } + + public void setMethodParams(String methodParams) { + this.methodParams = methodParams; + } + @NotBlank(message = "Cron执行表达式不能为空") @Size(min = 0, max = 255, message = "Cron执行表达式不能超过255个字符") public String getCronExpression() diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java index f044aea7f..c17aaeee3 100644 --- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java +++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/domain/SysJobLog.java @@ -31,6 +31,10 @@ public class SysJobLog extends BaseEntity @Excel(name = "调用目标字符串") private String invokeTarget; + /** 调用目标参数列表 */ + @Excel(name = "调用目标参数列表") + private String methodParams; + /** 日志信息 */ @Excel(name = "日志信息") private String jobMessage; @@ -89,6 +93,14 @@ public class SysJobLog extends BaseEntity this.invokeTarget = invokeTarget; } + public String getMethodParams() { + return methodParams; + } + + public void setMethodParams(String methodParams) { + this.methodParams = methodParams; + } + public String getJobMessage() { return jobMessage; diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml index 745bed364..eade6661e 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select job_log_id, job_name, job_group, invoke_target, job_message, status, exception_info, create_time + select job_log_id, job_name, job_group, invoke_target, method_params, job_message, status, exception_info, create_time from sys_job_log @@ -74,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" job_name, job_group, invoke_target, + method_params, job_message, status, exception_info, @@ -83,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{jobName}, #{jobGroup}, #{invokeTarget}, + #{methodParams}, #{jobMessage}, #{status}, #{exceptionInfo}, diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml index 69233bdf7..975a023be 100644 --- a/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml +++ b/ruoyi-quartz/src/main/resources/mapper/quartz/SysJobMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select job_id, job_name, job_group, invoke_target, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark + select job_id, job_name, job_group, invoke_target, method_params, cron_expression, misfire_policy, concurrent, status, create_by, create_time, remark from sys_job @@ -69,6 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" job_name = #{jobName}, job_group = #{jobGroup}, invoke_target = #{invokeTarget}, + method_params = #{methodParams}, cron_expression = #{cronExpression}, misfire_policy = #{misfirePolicy}, concurrent = #{concurrent}, @@ -86,6 +88,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" job_name, job_group, invoke_target, + method_params, cron_expression, misfire_policy, concurrent, @@ -98,6 +101,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{jobName}, #{jobGroup}, #{invokeTarget}, + #{methodParams}, #{cronExpression}, #{misfirePolicy}, #{concurrent}, diff --git a/ruoyi-quartz/src/main/resources/templates/monitor/job/add.html b/ruoyi-quartz/src/main/resources/templates/monitor/job/add.html index f4b4af8e6..683a0add0 100644 --- a/ruoyi-quartz/src/main/resources/templates/monitor/job/add.html +++ b/ruoyi-quartz/src/main/resources/templates/monitor/job/add.html @@ -30,6 +30,12 @@ 参数说明：支持字符串，布尔类型，长整型，浮点型，整型 +
    + +
    + +
    +
    diff --git a/ruoyi-quartz/src/main/resources/templates/monitor/job/detail.html b/ruoyi-quartz/src/main/resources/templates/monitor/job/detail.html index 7fd3f9413..3810885f4 100644 --- a/ruoyi-quartz/src/main/resources/templates/monitor/job/detail.html +++ b/ruoyi-quartz/src/main/resources/templates/monitor/job/detail.html @@ -27,6 +27,11 @@
    +
    + +
    +
    +
    diff --git a/ruoyi-quartz/src/main/resources/templates/monitor/job/edit.html b/ruoyi-quartz/src/main/resources/templates/monitor/job/edit.html index 208cbf678..9720c74c2 100644 --- a/ruoyi-quartz/src/main/resources/templates/monitor/job/edit.html +++ b/ruoyi-quartz/src/main/resources/templates/monitor/job/edit.html @@ -31,6 +31,12 @@ 参数说明：支持字符串，布尔类型，长整型，浮点型，整型
    +
    + +
    + +
    +
    diff --git a/ruoyi-quartz/src/main/resources/templates/monitor/job/job.html b/ruoyi-quartz/src/main/resources/templates/monitor/job/job.html index 45086b08d..30536ca10 100644 --- a/ruoyi-quartz/src/main/resources/templates/monitor/job/job.html +++ b/ruoyi-quartz/src/main/resources/templates/monitor/job/job.html @@ -102,6 +102,13 @@ return $.table.tooltip(value); } }, + { + field: 'methodParams', + title: '调用目标参数', + formatter: function(value, row, index) { + return $.table.tooltip(value,20,"open"); + } + }, { field: 'cronExpression', title: '执行表达式' diff --git a/ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html b/ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html index ee9d8ebea..fa8f396a0 100644 --- a/ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html +++ b/ruoyi-quartz/src/main/resources/templates/monitor/job/jobLog.html @@ -101,9 +101,16 @@ return $.table.tooltip(value); } }, - { - field: 'jobMessage', - title: '日志信息' + { + field: 'methodParams', + title: '调用目标参数', + formatter: function(value, row, index) { + return $.table.tooltip(value); + } + }, + { + field: 'jobMessage', + title: '日志信息' }, { field: 'status',