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 732f8fc..7d86c82 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
@@ -469,14 +469,21 @@ public class CervicalCancerServiceImpl implements CervicalCancerService {
                         model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));//住址
                 map.put("country", CommonsHelper.getResidence(null, null,
                         null, model.getStreetId(), null, basicConfigService));//住址
-                map.put("yc", model.getYc());
-                map.put("cc", model.getFmc());
+
+                Map<String,Object> data = model.getFormData();
+                map.put("yc", data.get("yunci"));
+                map.put("cc", data.get("chanci"));
                 String juejing = "";
-                if (StringUtils.isNotEmpty(model.getJuejing())){
-                    juejing = "1".equals(model.getJuejing()) ? "否" : "是";
+                if (data.get("juejin") != null){
+                    List<Object> jj = (ArrayList)data.get("juejin");
+                    if (jj.get(0) != null && StringUtils.isNotEmpty(String.valueOf(jj.get(0)))){
+                        juejing = Objects.equals("1", String.valueOf(jj.get(0)))  ? "否" : "是";
+                        map.put("juejing", juejing);
+                        map.put("juejingAge", jj.get(1));
+                    }
                 }
-                map.put("juejing", juejing);
-                map.put("juejingAge", model.getJuejingAge());
+
+
                 map.put("lastMenstrual", DateUtil.getyyyy_MM_dd(model.getLastMenstrual()));
 
                 gjaList.add(map);