Commit d2e6f4d83cd91ca1920ca6522d1ce89e50cb9cdb
Exists in
master
and in
6 other branches
Merge branch 'master' of https://git.healthbaby.com.cn/jiangjiazhi/regional-platform
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 146 changed files
- .gitignore
- .idea/artifacts/platform_sync_data_war.xml
- .idea/artifacts/platform_sync_data_war_exploded.xml
- .idea/libraries/Maven__ch_qos_logback_logback_classic_1_1_11.xml
- .idea/libraries/Maven__ch_qos_logback_logback_core_1_1_11.xml
- .idea/libraries/Maven__com_alibaba_druid_1_0_31.xml
- .idea/libraries/Maven__com_alibaba_fastjson_1_2_8.xml
- .idea/libraries/Maven__com_jayway_jsonpath_json_path_2_2_0.xml
- .idea/libraries/Maven__com_vaadin_external_google_android_json_0_0_20131108_vaadin1.xml
- .idea/libraries/Maven__junit_junit_4_12.xml
- .idea/libraries/Maven__mysql_mysql_connector_java_5_1_41.xml
- .idea/libraries/Maven__net_minidev_accessors_smart_1_1.xml
- .idea/libraries/Maven__net_minidev_json_smart_2_2_1.xml
- .idea/libraries/Maven__org_apache_commons_commons_collections4_4_1.xml
- .idea/libraries/Maven__org_apache_commons_commons_lang3_3_4.xml
- .idea/libraries/Maven__org_apache_commons_commons_lang3_3_5.xml
- .idea/libraries/Maven__org_apache_tomcat_tomcat_jdbc_8_5_14.xml
- .idea/libraries/Maven__org_apache_tomcat_tomcat_juli_8_5_14.xml
- .idea/libraries/Maven__org_aspectj_aspectjweaver_1_8_10.xml
- .idea/libraries/Maven__org_assertj_assertj_core_2_6_0.xml
- .idea/libraries/Maven__org_eclipse_jetty_jetty_continuation_9_3_8_v20160314.xml
- .idea/libraries/Maven__org_eclipse_jetty_jetty_http_9_3_8_v20160314.xml
- .idea/libraries/Maven__org_eclipse_jetty_jetty_io_9_3_8_v20160314.xml
- .idea/libraries/Maven__org_eclipse_jetty_jetty_servlets_9_3_8_v20160314.xml
- .idea/libraries/Maven__org_eclipse_jetty_jetty_util_9_3_8_v20160314.xml
- .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_3.xml
- .idea/libraries/Maven__org_hamcrest_hamcrest_library_1_3.xml
- .idea/libraries/Maven__org_mockito_mockito_core_1_10_19.xml
- .idea/libraries/Maven__org_mongodb_bson_3_4_2.xml
- .idea/libraries/Maven__org_mongodb_mongodb_driver_3_4_2.xml
- .idea/libraries/Maven__org_mongodb_mongodb_driver_core_3_4_2.xml
- .idea/libraries/Maven__org_mybatis_mybatis_3_4_2.xml
- .idea/libraries/Maven__org_mybatis_mybatis_spring_1_3_1.xml
- .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_autoconfigure_1_2_0.xml
- .idea/libraries/Maven__org_mybatis_spring_boot_mybatis_spring_boot_starter_1_2_0.xml
- .idea/libraries/Maven__org_objenesis_objenesis_2_1.xml
- .idea/libraries/Maven__org_ow2_asm_asm_5_0_3.xml
- .idea/libraries/Maven__org_skyscreamer_jsonassert_1_4_0.xml
- .idea/libraries/Maven__org_slf4j_jcl_over_slf4j_1_7_25.xml
- .idea/libraries/Maven__org_slf4j_jul_to_slf4j_1_7_25.xml
- .idea/libraries/Maven__org_slf4j_log4j_over_slf4j_1_7_25.xml
- .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_25.xml
- .idea/libraries/Maven__org_springframework_boot_spring_boot_1_5_3_RELEASE.xml
- .idea/libraries/Maven__org_springframework_boot_spring_boot_autoconfigure_1_5_3_RELEASE.xml
- .idea/libraries/Maven__org_springframework_boot_spring_boot_devtools_1_5_3_RELEASE.xml
- .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_1_5_3_RELEASE.xml
- .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_aop_1_5_3_RELEASE.xml
- .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_data_mongodb_1_5_2_RELEASE.xml
- .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_jdbc_1_5_3_RELEASE.xml
- .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_logging_1_5_3_RELEASE.xml
- .idea/libraries/Maven__org_springframework_boot_spring_boot_starter_test_1_5_3_RELEASE.xml
- .idea/libraries/Maven__org_springframework_boot_spring_boot_test_1_5_3_RELEASE.xml
- .idea/libraries/Maven__org_springframework_boot_spring_boot_test_autoconfigure_1_5_3_RELEASE.xml
- .idea/libraries/Maven__org_springframework_data_spring_data_commons_1_13_3_RELEASE.xml
- .idea/libraries/Maven__org_springframework_data_spring_data_mongodb_1_10_3_RELEASE.xml
- .idea/libraries/Maven__org_springframework_spring_aop_4_3_8_RELEASE.xml
- .idea/libraries/Maven__org_springframework_spring_beans_4_3_8_RELEASE.xml
- .idea/libraries/Maven__org_springframework_spring_context_4_3_8_RELEASE.xml
- .idea/libraries/Maven__org_springframework_spring_core_4_3_8_RELEASE.xml
- .idea/libraries/Maven__org_springframework_spring_expression_4_3_8_RELEASE.xml
- .idea/libraries/Maven__org_springframework_spring_jdbc_4_3_8_RELEASE.xml
- .idea/libraries/Maven__org_springframework_spring_test_4_3_8_RELEASE.xml
- .idea/libraries/Maven__org_springframework_spring_tx_4_3_8_RELEASE.xml
- .idea/libraries/Maven__org_yaml_snakeyaml_1_17.xml
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ArchiveDataDao.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/ArchiveDataDaoImpl.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/ArchiveDataServicer.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/WeixinQrcodeConfigMapper.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/AbstracUuidEntity.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEar.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarBirth.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/BabyPatientExtendEarQuery.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/LisReportQuery.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/WeixinQrcodeConfig.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/model/WeixinQrcodeConfigQuery.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/LisService.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/WeixinQrcodeConfigService.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
- platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/WeixinQrcodeConfigServiceImpl.java
- platform-biz-service/src/main/resources/mainOrm/master/BabyPatientExtendEar.xml
- platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
- platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
- platform-biz-service/src/main/resources/mainOrm/master/WeixinQrcodeConfigMapper.xml
- platform-biz-service/src/main/resources/mainOrm/master/WeixinShowqrcodeConfig.xml
- platform-common/src/main/java/com/lyms/platform/common/dao/BaseMongoDAOImpl.java
- platform-common/src/main/java/com/lyms/platform/common/enums/BabyEarResultEnums.java
- platform-common/src/main/java/com/lyms/platform/common/enums/DeafEnums.java
- platform-common/src/main/java/com/lyms/platform/common/log4j/DailyRollingFileAppender.java
- platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java
- platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
- platform-common/src/main/java/com/lyms/platform/common/utils/EnumUtil.java
- platform-dal/src/main/java/com/lyms/platform/query/AntExRecordQuery.java
- platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
- platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
- platform-data-api/src/main/java/com/lyms/platform/data/controller/SmsController.java
- platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java
- platform-job-index/src/main/java/com/lyms/platform/job/index/restore/data/SyncDataWork.java
- platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/dzfy/DzfyHisService.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/ReportModel.java
- platform-operate-api/src/main/java/com/lyms/hospitalapi/qhdfy/QhdfyHisService.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEarController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BasicConfigController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LisController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReportController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AccessPermissionFacade.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/AntenatalExaminationFacade.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/BabyEarFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.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/ResidentsFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/jms/producer/SimpleMessageProducer.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/jms/receiver/SimpleMessageReceiver.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyEarBase.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyScreenAddRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BasicConfigUpdateRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.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/request/RiskPatientsQueryRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckPageResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyEarResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyPageResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IReportService.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CollectionUtils.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/PageUtil.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/ReflectUtil.java
- platform-operate-api/src/main/resources/spring/consumer-jms-context.xml
- platform-operate-api/src/main/resources/spring/producer-jms-context.xml
- platform-operate-api/src/main/webapp/WEB-INF/web.xml
- platform-sync-data/platform-sync-data.iml
- regional-etl/regional-etl.iml