Commit e688fe6075c0d201c37b8ab22808c20894b2e9e5
Exists in
master
and in
8 other branches
Merge remote-tracking branch 'origin/master'
# Conflicts: # platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
Warning! This is a large diff.
To preserve performance the diff is not shown. Please, download the diff as plain diff or email patch instead.
If you still want to see the diff click this link
Showing 59 changed files
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientDao.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPremaritalCheckupDao.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IResidentsArchiveDao.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientDaoImpl.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PremaritalCheckupDaoImpl.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ResidentsArchiveImpl.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PredictedStatisticsService.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PremaritalCheckupService.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ResidentsArchiveService.java
- platform-common/src/main/java/com/lyms/platform/common/enums/ForeskinStatusEnum.java
- platform-common/src/main/java/com/lyms/platform/common/enums/MedicalAdviceEnum.java
- platform-common/src/main/java/com/lyms/platform/common/enums/PhysiologyStatusEnum.java
- platform-common/src/main/java/com/lyms/platform/common/enums/PubesStatusEnum.java
- platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
- platform-common/src/main/java/com/lyms/platform/common/utils/SystemConfig.java
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
- platform-dal/src/main/java/com/lyms/platform/pojo/PredictedStatisticsCountModel.java
- platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
- platform-dal/src/main/java/com/lyms/platform/pojo/ResidentsArchiveModel.java
- platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
- platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
- platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java
- platform-dal/src/main/java/com/lyms/platform/query/ResidentsArchiveQuery.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BCTransferInController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBuildController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PredictedStatisticsController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentsArchiveController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RiskReportController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BCTransferInFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PredictedStatisticsRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PredictedStatisticsSumRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupQueryRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CjStatisticsListResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CjStatisticsResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsQueryModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsQuerySumModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PredictedStatisticsSumResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveHistoryResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskLevelResultModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskReportPatientResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskReportResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HiskCountTask.java