diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
index 1fa9f03..336d416 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java
@@ -67,79 +67,79 @@ public class CancerScreeningModel extends BaseModel {
     //哺乳史
     private String ycFrs;
     //是否接受过乳腺癌检査
-    private Map<String,String> ycRxajc;
+    private Map<String,Object> ycRxajc;
     //既往史
     //乳腺手术或活检史
-    private Map<String,String> jwsRxss;
+    private Map<String,Object> jwsRxss;
     //激素替代治疗史
-    private Map<String,String> jwsJstd;
+    private Map<String,Object> jwsJstd;
     //家族史病史
     //乳腺癌
-    private Map<String,String> jzsRxa;
+    private Map<String,Object> jzsRxa;
     //卵巢癌
-    private Map<String,String> jzsLca;
+    private Map<String,Object> jzsLca;
     //(二）乳腺临床检査
     //皮肤左
-    private Map<String,String> rxlPfz;
+    private Map<String,Object> rxlPfz;
     //皮肤右
-    private Map<String,String> rxlPfy;
+    private Map<String,Object> rxlPfy;
     //乳头左
-    private Map<String,String> rxlRtz;
+    private Map<String,Object> rxlRtz;
     //乳头右
-    private Map<String,String> rxlRty;
+    private Map<String,Object> rxlRty;
     //溢液左
-    private Map<String,String> rxlYyz;
+    private Map<String,Object> rxlYyz;
     //溢液右
-    private Map<String,String> rxlYyy;
+    private Map<String,Object> rxlYyy;
     //肿块左
-    private Map<String,String> rxlZkz;
+    private Map<String,Object> rxlZkz;
     //肿块右
-    private Map<String,String> rxlZky;
+    private Map<String,Object> rxlZky;
     //大小左
-    private Map<String,String> rxlDxz;
+    private Map<String,Object> rxlDxz;
     //大小右
-    private Map<String,String> rxlDxy;
+    private Map<String,Object> rxlDxy;
     //形状左
-    private Map<String,String> rxlXzz;
+    private Map<String,Object> rxlXzz;
     //形状右
-    private Map<String,String> rxlXzy;
+    private Map<String,Object> rxlXzy;
     //硬度左
-    private Map<String,String> rxlYdz;
+    private Map<String,Object> rxlYdz;
     //硬度右
-    private Map<String,String> rxlYdy;
+    private Map<String,Object> rxlYdy;
     //边缘左
-    private Map<String,String> rxlByz;
+    private Map<String,Object> rxlByz;
     //边缘右
-    private Map<String,String> rxlByy;
+    private Map<String,Object> rxlByy;
     //表面左
-    private Map<String,String> rxlBmz;
+    private Map<String,Object> rxlBmz;
     //表面右
-    private Map<String,String> rxlBmy;
+    private Map<String,Object> rxlBmy;
     //活动度左
-    private Map<String,String> rxlHddz;
+    private Map<String,Object> rxlHddz;
     //活动度右
-    private Map<String,String> rxlHddy;
+    private Map<String,Object> rxlHddy;
     //副乳1.无2.有
     private String rxlFr;
     //腋淋巴结左
-    private Map<String,String> rxlYlbz;
+    private Map<String,Object> rxlYlbz;
     //腋淋巴结右
-    private Map<String,String> rxlYlby;
+    private Map<String,Object> rxlYlby;
     //锁骨上淋巴结左
-    private Map<String,String> rxlSglbz;
+    private Map<String,Object> rxlSglbz;
     //锁骨上淋巴结右
-    private Map<String,String> rxlSglby;
+    private Map<String,Object> rxlSglby;
     //临床检査结果
-    private Map<String,String> rxlJcjg;
+    private Map<String,Object> rxlJcjg;
     //(三）乳腺彩色超声检査
     //超声所见
     private String rxCssj;
     //分类左
-    private Map<String,String> rxFlz;
+    private Map<String,Object> rxFlz;
     //分类右
-    private Map<String,String> rxlFly;
+    private Map<String,Object> rxlFly;
     //建议
-    private Map<String,String> rxlJy;
+    private Map<String,Object> rxlJy;
     //检查机构
     private String rxlJcdw;
     //检査人员
@@ -148,11 +148,11 @@ public class CancerScreeningModel extends BaseModel {
     private Date rxlJcrq;
     //(四〉乳腺X线检査（未作X线检査不填写此项）
     //乳腺X线评估左
-    private Map<String,String> rxPgz;
+    private Map<String,Object> rxPgz;
     //乳腺X线评估右
-    private Map<String,String> rxlPgy;
+    private Map<String,Object> rxlPgy;
     //建议
-    private Map<String,String> rxJy;
+    private Map<String,Object> rxJy;
     //(五〉最终随访结果
     //随访情况
     private String sfQk;
@@ -165,9 +165,9 @@ public class CancerScreeningModel extends BaseModel {
     //病理检査日期
     private Date sfJcrq;
     //最后诊断
-    private Map<String,String> sfZhzd;
+    private Map<String,Object> sfZhzd;
     //TNM分期
-    private Map<String,String> sfTnm;
+    private Map<String,Object> sfTnm;
     //诊治机构
     private String sfZzjg;
     //诊治日期
@@ -406,203 +406,203 @@ public class CancerScreeningModel extends BaseModel {
         this.ycFrs = ycFrs;
     }
 
-    public Map<String, String> getYcRxajc() {
+    public Map<String,Object> getYcRxajc() {
         return ycRxajc;
     }
 
-    public void setYcRxajc(Map<String, String> ycRxajc) {
+    public void setYcRxajc(Map<String,Object> ycRxajc) {
         this.ycRxajc = ycRxajc;
     }
 
-    public Map<String, String> getJwsRxss() {
+    public Map<String,Object> getJwsRxss() {
         return jwsRxss;
     }
 
-    public void setJwsRxss(Map<String, String> jwsRxss) {
+    public void setJwsRxss(Map<String,Object> jwsRxss) {
         this.jwsRxss = jwsRxss;
     }
 
-    public Map<String, String> getJwsJstd() {
+    public Map<String,Object> getJwsJstd() {
         return jwsJstd;
     }
 
-    public void setJwsJstd(Map<String, String> jwsJstd) {
+    public void setJwsJstd(Map<String,Object> jwsJstd) {
         this.jwsJstd = jwsJstd;
     }
 
-    public Map<String, String> getJzsRxa() {
+    public Map<String,Object> getJzsRxa() {
         return jzsRxa;
     }
 
-    public void setJzsRxa(Map<String, String> jzsRxa) {
+    public void setJzsRxa(Map<String,Object> jzsRxa) {
         this.jzsRxa = jzsRxa;
     }
 
-    public Map<String, String> getJzsLca() {
+    public Map<String,Object> getJzsLca() {
         return jzsLca;
     }
 
-    public void setJzsLca(Map<String, String> jzsLca) {
+    public void setJzsLca(Map<String,Object> jzsLca) {
         this.jzsLca = jzsLca;
     }
 
-    public Map<String, String> getRxlPfz() {
+    public Map<String,Object> getRxlPfz() {
         return rxlPfz;
     }
 
-    public void setRxlPfz(Map<String, String> rxlPfz) {
+    public void setRxlPfz(Map<String,Object> rxlPfz) {
         this.rxlPfz = rxlPfz;
     }
 
-    public Map<String, String> getRxlPfy() {
+    public Map<String,Object> getRxlPfy() {
         return rxlPfy;
     }
 
-    public void setRxlPfy(Map<String, String> rxlPfy) {
+    public void setRxlPfy(Map<String,Object> rxlPfy) {
         this.rxlPfy = rxlPfy;
     }
 
-    public Map<String, String> getRxlRtz() {
+    public Map<String,Object> getRxlRtz() {
         return rxlRtz;
     }
 
-    public void setRxlRtz(Map<String, String> rxlRtz) {
+    public void setRxlRtz(Map<String,Object> rxlRtz) {
         this.rxlRtz = rxlRtz;
     }
 
-    public Map<String, String> getRxlRty() {
+    public Map<String,Object> getRxlRty() {
         return rxlRty;
     }
 
-    public void setRxlRty(Map<String, String> rxlRty) {
+    public void setRxlRty(Map<String,Object> rxlRty) {
         this.rxlRty = rxlRty;
     }
 
-    public Map<String, String> getRxlYyz() {
+    public Map<String,Object> getRxlYyz() {
         return rxlYyz;
     }
 
-    public void setRxlYyz(Map<String, String> rxlYyz) {
+    public void setRxlYyz(Map<String,Object> rxlYyz) {
         this.rxlYyz = rxlYyz;
     }
 
-    public Map<String, String> getRxlYyy() {
+    public Map<String,Object> getRxlYyy() {
         return rxlYyy;
     }
 
-    public void setRxlYyy(Map<String, String> rxlYyy) {
+    public void setRxlYyy(Map<String,Object> rxlYyy) {
         this.rxlYyy = rxlYyy;
     }
 
-    public Map<String, String> getRxlZkz() {
+    public Map<String,Object> getRxlZkz() {
         return rxlZkz;
     }
 
-    public void setRxlZkz(Map<String, String> rxlZkz) {
+    public void setRxlZkz(Map<String,Object> rxlZkz) {
         this.rxlZkz = rxlZkz;
     }
 
-    public Map<String, String> getRxlZky() {
+    public Map<String,Object> getRxlZky() {
         return rxlZky;
     }
 
-    public void setRxlZky(Map<String, String> rxlZky) {
+    public void setRxlZky(Map<String,Object> rxlZky) {
         this.rxlZky = rxlZky;
     }
 
-    public Map<String, String> getRxlDxz() {
+    public Map<String,Object> getRxlDxz() {
         return rxlDxz;
     }
 
-    public void setRxlDxz(Map<String, String> rxlDxz) {
+    public void setRxlDxz(Map<String,Object> rxlDxz) {
         this.rxlDxz = rxlDxz;
     }
 
-    public Map<String, String> getRxlDxy() {
+    public Map<String,Object> getRxlDxy() {
         return rxlDxy;
     }
 
-    public void setRxlDxy(Map<String, String> rxlDxy) {
+    public void setRxlDxy(Map<String,Object> rxlDxy) {
         this.rxlDxy = rxlDxy;
     }
 
-    public Map<String, String> getRxlXzz() {
+    public Map<String,Object> getRxlXzz() {
         return rxlXzz;
     }
 
-    public void setRxlXzz(Map<String, String> rxlXzz) {
+    public void setRxlXzz(Map<String,Object> rxlXzz) {
         this.rxlXzz = rxlXzz;
     }
 
-    public Map<String, String> getRxlXzy() {
+    public Map<String,Object> getRxlXzy() {
         return rxlXzy;
     }
 
-    public void setRxlXzy(Map<String, String> rxlXzy) {
+    public void setRxlXzy(Map<String,Object> rxlXzy) {
         this.rxlXzy = rxlXzy;
     }
 
-    public Map<String, String> getRxlYdz() {
+    public Map<String,Object> getRxlYdz() {
         return rxlYdz;
     }
 
-    public void setRxlYdz(Map<String, String> rxlYdz) {
+    public void setRxlYdz(Map<String,Object> rxlYdz) {
         this.rxlYdz = rxlYdz;
     }
 
-    public Map<String, String> getRxlYdy() {
+    public Map<String,Object> getRxlYdy() {
         return rxlYdy;
     }
 
-    public void setRxlYdy(Map<String, String> rxlYdy) {
+    public void setRxlYdy(Map<String,Object> rxlYdy) {
         this.rxlYdy = rxlYdy;
     }
 
-    public Map<String, String> getRxlByz() {
+    public Map<String,Object> getRxlByz() {
         return rxlByz;
     }
 
-    public void setRxlByz(Map<String, String> rxlByz) {
+    public void setRxlByz(Map<String,Object> rxlByz) {
         this.rxlByz = rxlByz;
     }
 
-    public Map<String, String> getRxlByy() {
+    public Map<String,Object> getRxlByy() {
         return rxlByy;
     }
 
-    public void setRxlByy(Map<String, String> rxlByy) {
+    public void setRxlByy(Map<String,Object> rxlByy) {
         this.rxlByy = rxlByy;
     }
 
-    public Map<String, String> getRxlBmz() {
+    public Map<String,Object> getRxlBmz() {
         return rxlBmz;
     }
 
-    public void setRxlBmz(Map<String, String> rxlBmz) {
+    public void setRxlBmz(Map<String,Object> rxlBmz) {
         this.rxlBmz = rxlBmz;
     }
 
-    public Map<String, String> getRxlBmy() {
+    public Map<String,Object> getRxlBmy() {
         return rxlBmy;
     }
 
-    public void setRxlBmy(Map<String, String> rxlBmy) {
+    public void setRxlBmy(Map<String,Object> rxlBmy) {
         this.rxlBmy = rxlBmy;
     }
 
-    public Map<String, String> getRxlHddz() {
+    public Map<String,Object> getRxlHddz() {
         return rxlHddz;
     }
 
-    public void setRxlHddz(Map<String, String> rxlHddz) {
+    public void setRxlHddz(Map<String,Object> rxlHddz) {
         this.rxlHddz = rxlHddz;
     }
 
-    public Map<String, String> getRxlHddy() {
+    public Map<String,Object> getRxlHddy() {
         return rxlHddy;
     }
 
-    public void setRxlHddy(Map<String, String> rxlHddy) {
+    public void setRxlHddy(Map<String,Object> rxlHddy) {
         this.rxlHddy = rxlHddy;
     }
 
@@ -614,43 +614,43 @@ public class CancerScreeningModel extends BaseModel {
         this.rxlFr = rxlFr;
     }
 
-    public Map<String, String> getRxlYlbz() {
+    public Map<String,Object> getRxlYlbz() {
         return rxlYlbz;
     }
 
-    public void setRxlYlbz(Map<String, String> rxlYlbz) {
+    public void setRxlYlbz(Map<String,Object> rxlYlbz) {
         this.rxlYlbz = rxlYlbz;
     }
 
-    public Map<String, String> getRxlYlby() {
+    public Map<String,Object> getRxlYlby() {
         return rxlYlby;
     }
 
-    public void setRxlYlby(Map<String, String> rxlYlby) {
+    public void setRxlYlby(Map<String,Object> rxlYlby) {
         this.rxlYlby = rxlYlby;
     }
 
-    public Map<String, String> getRxlSglbz() {
+    public Map<String,Object> getRxlSglbz() {
         return rxlSglbz;
     }
 
-    public void setRxlSglbz(Map<String, String> rxlSglbz) {
+    public void setRxlSglbz(Map<String,Object> rxlSglbz) {
         this.rxlSglbz = rxlSglbz;
     }
 
-    public Map<String, String> getRxlSglby() {
+    public Map<String,Object> getRxlSglby() {
         return rxlSglby;
     }
 
-    public void setRxlSglby(Map<String, String> rxlSglby) {
+    public void setRxlSglby(Map<String,Object> rxlSglby) {
         this.rxlSglby = rxlSglby;
     }
 
-    public Map<String, String> getRxlJcjg() {
+    public Map<String,Object> getRxlJcjg() {
         return rxlJcjg;
     }
 
-    public void setRxlJcjg(Map<String, String> rxlJcjg) {
+    public void setRxlJcjg(Map<String,Object> rxlJcjg) {
         this.rxlJcjg = rxlJcjg;
     }
 
@@ -662,19 +662,19 @@ public class CancerScreeningModel extends BaseModel {
         this.rxCssj = rxCssj;
     }
 
-    public Map<String, String> getRxFlz() {
+    public Map<String,Object> getRxFlz() {
         return rxFlz;
     }
 
-    public void setRxFlz(Map<String, String> rxFlz) {
+    public void setRxFlz(Map<String,Object> rxFlz) {
         this.rxFlz = rxFlz;
     }
 
-    public Map<String, String> getRxlFly() {
+    public Map<String,Object> getRxlFly() {
         return rxlFly;
     }
 
-    public void setRxlFly(Map<String, String> rxlFly) {
+    public void setRxlFly(Map<String,Object> rxlFly) {
         this.rxlFly = rxlFly;
     }
 
@@ -694,35 +694,35 @@ public class CancerScreeningModel extends BaseModel {
         this.rxlJcry = rxlJcry;
     }
 
-    public Map<String, String> getRxPgz() {
+    public Map<String,Object> getRxPgz() {
         return rxPgz;
     }
 
-    public void setRxPgz(Map<String, String> rxPgz) {
+    public void setRxPgz(Map<String,Object> rxPgz) {
         this.rxPgz = rxPgz;
     }
 
-    public Map<String, String> getRxlPgy() {
+    public Map<String,Object> getRxlPgy() {
         return rxlPgy;
     }
 
-    public void setRxlPgy(Map<String, String> rxlPgy) {
+    public void setRxlPgy(Map<String,Object> rxlPgy) {
         this.rxlPgy = rxlPgy;
     }
 
-    public Map<String, String> getRxlJy() {
+    public Map<String,Object> getRxlJy() {
         return rxlJy;
     }
 
-    public void setRxlJy(Map<String, String> rxlJy) {
+    public void setRxlJy(Map<String,Object> rxlJy) {
         this.rxlJy = rxlJy;
     }
 
-    public Map<String, String> getRxJy() {
+    public Map<String,Object> getRxJy() {
         return rxJy;
     }
 
-    public void setRxJy(Map<String, String> rxJy) {
+    public void setRxJy(Map<String,Object> rxJy) {
         this.rxJy = rxJy;
     }
 
@@ -758,19 +758,19 @@ public class CancerScreeningModel extends BaseModel {
         this.sfBlzd = sfBlzd;
     }
 
-    public Map<String, String> getSfZhzd() {
+    public Map<String,Object> getSfZhzd() {
         return sfZhzd;
     }
 
-    public void setSfZhzd(Map<String, String> sfZhzd) {
+    public void setSfZhzd(Map<String,Object> sfZhzd) {
         this.sfZhzd = sfZhzd;
     }
 
-    public Map<String, String> getSfTnm() {
+    public Map<String,Object> getSfTnm() {
         return sfTnm;
     }
 
-    public void setSfTnm(Map<String, String> sfTnm) {
+    public void setSfTnm(Map<String,Object> sfTnm) {
         this.sfTnm = sfTnm;
     }