diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancersConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancersConfig.java index cd9b9ea..592455b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancersConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancersConfig.java @@ -6,10 +6,19 @@ import org.springframework.data.mongodb.core.mapping.Document; @Document(collection = "lyms_cancer_config") public class CancersConfig extends BaseModel { private String id; - private String areaId; - private Integer year; - private Integer quarter; - private Integer num; + private String areaId; //区域id + private Integer year;//年度 + private Integer quarter; //季度 + private Integer num; //任务数 + private Integer type;//1 宫颈癌 2 乳腺癌 + + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } public String getId() { return id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index c69a996..27f9f1c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -938,7 +938,7 @@ public class CancerScreeningFacade { { Map data = new LinkedHashMap<>(); data.put("areaName", basicConfigService.getOneBasicConfigById(areaId).getName()); - data.put("ndrws","-"); + 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)); int jcrs = (int)mongoTemplate.count(new Query(Criteria.where("orgAreaId").is(areaId).and("year").is(request.getYear()).and("quarter").is(request.getQuarter())), CancerScreeningModel.class); data.put("jcrs",jcrs); 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 @@ public class CancerScreeningFacade { data.put("year",config.getYear()); data.put("num",config.getNum()); data.put("quarter",config.getQuarter()); + data.put("type",config.getType() == 1 ? "宫颈癌" : "乳腺癌"); data.put("areaName",basicConfigService.getOneBasicConfigById(config.getAreaId()).getName()); datas.add(data); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index e4cf251..2fd5a32 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -2041,7 +2041,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { { Map data = new LinkedHashMap<>(); data.put("areaName", basicConfigService.getOneBasicConfigById(areaId).getName()); - data.put("ndrws","-"); + 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)); int jcrs = (int)mongoTemplate.count(new Query(Criteria.where("orgAreaId").is(areaId).and("year").is(request.getYear()).and("quarter").is(request.getQuarter())), CervicalCancerModel.class); data.put("jcrs",jcrs); 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 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { { Map data = new LinkedHashMap<>(); data.put("areaName", basicConfigService.getOneBasicConfigById(areaId).getName()); - data.put("ndrws","-"); + 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)); int jcrs = (int)mongoTemplate.count(new Query(Criteria.where("orgAreaId").is(areaId).and("year").is(request.getYear()).and("quarter").is(request.getQuarter())), CervicalCancerModel.class); data.put("jcrs",jcrs); 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));