新增special目录，将特例内容整理出来，这些内容之后不应该出现在svr-quota目录，只是配置的一个指标视图而已。

readme.MD

@@ -11,4 +11,10 @@
    
    
## 相关资料
powerdesign:https://192.168.1.103:888/svn/outwindow/基础开发部/doc/i健康2.0
powerdesign:https://192.168.1.103:888/svn/outwindow/基础开发部/doc/i健康2.0
## 改造点说明
- dao下的jpa目录去除，我们只使用jpa的方式
- util目录做了部分统一，未完全整理
- service和controller目录下新增special目录，表示特例（special case），将一些特殊的查询，如单病种等，

src/main/java/com/yihu/quota/controller/QuotaController.java

@@ -10,22 +10,17 @@ import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.model.jpa.save.TjQuotaDataSave;
import com.yihu.quota.model.jpa.source.TjQuotaDataSource;
import com.yihu.quota.model.rest.HospitalComposeModel;
import com.yihu.quota.model.rest.QuotaReport;
import com.yihu.quota.model.rest.ResultModel;
import com.yihu.quota.service.orgHealthCategory.OrgHealthCategoryStatisticsService;
import com.yihu.quota.service.quota.BaseStatistsService;
import com.yihu.quota.service.quota.QuotaService;
import com.yihu.quota.service.save.TjDataSaveService;
import com.yihu.quota.service.source.TjDataSourceService;
import com.yihu.quota.vo.OrgHealthCategoryShowModel;
import com.yihu.quota.vo.SaveModel;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.hdfs.server.namenode.Quota;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/yihu/quota/controller/QuotaReportController.java

@@ -17,7 +17,7 @@ import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.service.dimension.TjDimensionMainService;
import com.yihu.quota.service.dimension.TjDimensionSlaveService;
import com.yihu.quota.service.orgHealthCategory.OrgHealthCategoryStatisticsService;
import com.yihu.quota.service.special.org.OrgHealthCategoryStatisticsService;
import com.yihu.quota.service.quota.BaseStatistsService;
import com.yihu.quota.service.quota.DeviceService;
import com.yihu.quota.service.quota.QuotaService;

src/main/java/com/yihu/quota/controller/DiabetesController.java

@@ -1,11 +1,12 @@
package com.yihu.quota.controller;
package com.yihu.quota.controller.special;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.quota.service.singledisease.DiabetesCheckService;
import com.yihu.quota.service.singledisease.DiabetesMedicineService;
import com.yihu.quota.service.singledisease.DiabetesService;
import com.yihu.quota.service.singledisease.DiabetesSymptomService;
import com.yihu.quota.controller.BaseController;
import com.yihu.quota.service.special.singledisease.DiabetesCheckService;
import com.yihu.quota.service.special.singledisease.DiabetesMedicineService;
import com.yihu.quota.service.special.singledisease.DiabetesService;
import com.yihu.quota.service.special.singledisease.DiabetesSymptomService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

src/main/java/com/yihu/quota/controller/SingleDiseasesController.java

@@ -1,15 +1,14 @@
package com.yihu.quota.controller;
package com.yihu.quota.controller.special;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.quota.service.singledisease.SingleDiseaseService;
import com.yihu.quota.service.singledisease.SingleDiseaseServiceNew;
import com.yihu.quota.service.special.singledisease.SingleDiseaseService;
import com.yihu.quota.service.special.singledisease.SingleDiseaseServiceNew;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.apache.poi.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;

src/main/java/com/yihu/quota/etl/extract/es/EsExtract.java

@@ -9,7 +9,7 @@ import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.util.EsClientUtil;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.service.orgHealthCategory.OrgHealthCategoryStatisticsService;
import com.yihu.quota.service.special.org.OrgHealthCategoryStatisticsService;
import com.yihu.quota.service.quota.BaseStatistsService;
import com.yihu.quota.vo.QuotaVo;
import com.yihu.quota.vo.SaveModel;

src/main/java/com/yihu/quota/service/quota/BaseStatistsService.java

@@ -14,9 +14,9 @@ import com.yihu.quota.model.jpa.save.TjQuotaDataSave;
import com.yihu.quota.model.jpa.source.TjQuotaDataSource;
import com.yihu.quota.service.dimension.TjDimensionMainService;
import com.yihu.quota.service.dimension.TjDimensionSlaveService;
import com.yihu.quota.service.orgHealthCategory.OrgHealthCategoryStatisticsService;
import com.yihu.quota.service.special.org.OrgHealthCategoryStatisticsService;
import com.yihu.quota.service.save.TjDataSaveService;
import com.yihu.quota.service.singledisease.SingleDiseaseService;
import com.yihu.quota.service.special.singledisease.SingleDiseaseService;
import com.yihu.quota.service.source.TjDataSourceService;
import com.yihu.quota.util.BasesicUtil;
import com.yihu.quota.vo.DictModel;

src/main/java/com/yihu/quota/service/orgHealthCategory/OrgHealthCategoryStatisticsService.java

@@ -1,4 +1,4 @@
package com.yihu.quota.service.orgHealthCategory;
package com.yihu.quota.service.special.org;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.quota.vo.SaveModel;

src/main/java/com/yihu/quota/service/singledisease/DiabetesCheckService.java

@@ -1,4 +1,4 @@
package com.yihu.quota.service.singledisease;
package com.yihu.quota.service.special.singledisease;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/com/yihu/quota/service/singledisease/DiabetesMedicineService.java

@@ -1,4 +1,4 @@
package com.yihu.quota.service.singledisease;
package com.yihu.quota.service.special.singledisease;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/com/yihu/quota/service/singledisease/DiabetesService.java

@@ -1,4 +1,4 @@
package com.yihu.quota.service.singledisease;
package com.yihu.quota.service.special.singledisease;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/com/yihu/quota/service/singledisease/DiabetesSymptomService.java

@@ -1,4 +1,4 @@
package com.yihu.quota.service.singledisease;
package com.yihu.quota.service.special.singledisease;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/com/yihu/quota/service/singledisease/SingleDiseaseService.java

@@ -1,4 +1,4 @@
package com.yihu.quota.service.singledisease;
package com.yihu.quota.service.special.singledisease;
import com.yihu.quota.etl.extract.es.EsExtract;
import com.yihu.quota.util.ElasticsearchUtil;

src/main/java/com/yihu/quota/service/singledisease/SingleDiseaseServiceNew.java

@@ -1,4 +1,4 @@
package com.yihu.quota.service.singledisease;
package com.yihu.quota.service.special.singledisease;
import com.yihu.quota.etl.extract.es.EsExtract;
import com.yihu.quota.util.ElasticsearchUtil;