chart for drugs
Merge branch 'master' of https://github.com/chemo/ImmunologySpring.git

Conflicts:
	Immunology/src/main/java/com/immunology/logic/controller/CabinetController.java
	Immunology/src/main/java/com/immunology/logic/controller/StatisticController.java
	Immunology/src/main/java/com/immunology/logic/service/StatisticService.java
	Immunology/src/main/java/com/immunology/logic/service/impl/StatisticServiceImpl.java