From 6977f8b749fd231641620b55e48812260430a98d Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 9 Aug 2022 14:07:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=99=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/CancersConfig.java     | 18 ++++++++++++++++++
 .../operate/web/facade/CancerScreeningFacade.java      |  6 ++++++
 2 files changed, 24 insertions(+)

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 592455b..5e11e2f 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
@@ -7,11 +7,29 @@ import org.springframework.data.mongodb.core.mapping.Document;
 public class CancersConfig extends BaseModel {
     private String id;
     private String areaId; //区域id
+    private String cityId; //市id
+    private String provinceId; //省域id
     private Integer year;//年度
     private Integer quarter; //季度
     private Integer num; //任务数
     private Integer type;//1 宫颈癌 2 乳腺癌
 
+    public String getCityId() {
+        return cityId;
+    }
+
+    public void setCityId(String cityId) {
+        this.cityId = cityId;
+    }
+
+    public String getProvinceId() {
+        return provinceId;
+    }
+
+    public void setProvinceId(String provinceId) {
+        this.provinceId = provinceId;
+    }
+
     public Integer getType() {
         return type;
     }
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 27f9f1c..4567094 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
@@ -1018,11 +1018,17 @@ public class CancerScreeningFacade {
             for (CancersConfig config :  list)
             {
                 Map data = new HashMap();
+                data.put("id",config.getId());
                 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());
+                data.put("cityName",basicConfigService.getOneBasicConfigById(config.getCityId()).getName());
+                data.put("provinceName",basicConfigService.getOneBasicConfigById(config.getProvinceId()).getName());
+                data.put("areaId",config.getAreaId());
+                data.put("cityId",config.getCityId());
+                data.put("provinceId",config.getProvinceId());
                 datas.add(data);
             }
         }
-- 
1.8.3.1