jiangjiazhi / regional-platform

Commit d4338af4ab0d8de574098b3f54676240cf34c14d

Authored by liquanyu almost 3 years ago

Exists in master and in 6 other branches

两癌

Showing 3 changed files with 17 additions and 7 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CancersConfig.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java

...	...	@@ -6,10 +6,19 @@
6	6	@Document(collection = "lyms_cancer_config")
7	7	public class CancersConfig extends BaseModel {
8	8	private String id;
9		- private String areaId;
10		- private Integer year;
11		- private Integer quarter;
12		- private Integer num;
	9	+ private String areaId; //区域id
	10	+ private Integer year;//年度
	11	+ private Integer quarter; //季度
	12	+ private Integer num; //任务数
	13	+ private Integer type;//1 宫颈癌 2 乳腺癌
	14	+
	15	+ public Integer getType() {
	16	+ return type;
	17	+ }
	18	+
	19	+ public void setType(Integer type) {
	20	+ this.type = type;
	21	+ }
13	22
14	23	public String getId() {
15	24	return id;

...	...	@@ -938,7 +938,7 @@
938	938	{
939	939	Map<String,Object> data = new LinkedHashMap<>();
940	940	data.put("areaName", basicConfigService.getOneBasicConfigById(areaId).getName());
941		- data.put("ndrws","-");
	941	+ data.put("ndrws", mongoTemplate.count(Query.query(Criteria.where("areaId").is(areaId).and("year").is(request.getYear()).and("quarter").is(request.getQuarter()).and("type").is(2)),CancersConfig.class));
942	942	int jcrs = (int)mongoTemplate.count(new Query(Criteria.where("orgAreaId").is(areaId).and("year").is(request.getYear()).and("quarter").is(request.getQuarter())), CancerScreeningModel.class);
943	943	data.put("jcrs",jcrs);
944	944	data.put("jwjcrs",mongoTemplate.count(new Query(Criteria.where("orgAreaId").is(areaId).and("ycRxajc.yesOrNo").is("yes").and("year").is(request.getYear()).and("quarter").is(request.getQuarter())), CancerScreeningModel.class));
...	...	@@ -1021,6 +1021,7 @@
1021	1021	data.put("year",config.getYear());
1022	1022	data.put("num",config.getNum());
1023	1023	data.put("quarter",config.getQuarter());
	1024	+ data.put("type",config.getType() == 1 ? "宫颈癌" : "乳腺癌");
1024	1025	data.put("areaName",basicConfigService.getOneBasicConfigById(config.getAreaId()).getName());
1025	1026	datas.add(data);
1026	1027	}

...	...	@@ -2041,7 +2041,7 @@
2041	2041	{
2042	2042	Map<String,Object> data = new LinkedHashMap<>();
2043	2043	data.put("areaName", basicConfigService.getOneBasicConfigById(areaId).getName());
2044		- data.put("ndrws","-");
	2044	+ data.put("ndrws",mongoTemplate.count(Query.query(Criteria.where("areaId").is(areaId).and("year").is(request.getYear()).and("quarter").is(request.getQuarter()).and("type").is(1)),CancersConfig.class));
2045	2045	int jcrs = (int)mongoTemplate.count(new Query(Criteria.where("orgAreaId").is(areaId).and("year").is(request.getYear()).and("quarter").is(request.getQuarter())), CervicalCancerModel.class);
2046	2046	data.put("jcrs",jcrs);
2047	2047	data.put("jwjcrs",mongoTemplate.count(new Query(Criteria.where("orgAreaId").is(areaId).and("jwgjajc").is("1").and("year").is(request.getYear()).and("quarter").is(request.getQuarter())), CervicalCancerModel.class));
...	...	@@ -2142,7 +2142,7 @@
2142	2142	{
2143	2143	Map<String,Object> data = new LinkedHashMap<>();
2144	2144	data.put("areaName", basicConfigService.getOneBasicConfigById(areaId).getName());
2145		- data.put("ndrws","-");
	2145	+ data.put("ndrws",mongoTemplate.count(Query.query(Criteria.where("areaId").is(areaId).and("year").is(request.getYear()).and("quarter").is(request.getQuarter()).and("type").is(1)),CancersConfig.class));
2146	2146	int jcrs = (int)mongoTemplate.count(new Query(Criteria.where("orgAreaId").is(areaId).and("year").is(request.getYear()).and("quarter").is(request.getQuarter())), CervicalCancerModel.class);
2147	2147	data.put("jcrs",jcrs);
2148	2148	data.put("jwjcrs",mongoTemplate.count(new Query(Criteria.where("orgAreaId").is(areaId).and("jwgjajc").is("1").and("year").is(request.getYear()).and("quarter").is(request.getQuarter())), CervicalCancerModel.class));