diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index 3c94a6c..c08ea1c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -5,6 +5,7 @@ import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; +import java.util.Map; /** * 产筛申请单 @@ -64,7 +65,7 @@ public class SieveApplyOrderModel extends BaseModel { private Date bcCheckDate; //生育史 - private String historyBirth; + private Map historyBirth; //既往史 private String pastHistory; @@ -166,11 +167,11 @@ public class SieveApplyOrderModel extends BaseModel { this.bcCheckDate = bcCheckDate; } - public String getHistoryBirth() { + public Map getHistoryBirth() { return historyBirth; } - public void setHistoryBirth(String historyBirth) { + public void setHistoryBirth(Map historyBirth) { this.historyBirth = historyBirth; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java index fc3d9df..f2d04d5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java @@ -716,7 +716,7 @@ public class SieveFacade { result.put("collectionDate",DateUtil.getyyyy_MM_dd(sieveApply.getCollectionDate())); result.put("crl",sieveApply.getCrl()); result.put("bcCheckDate",DateUtil.getyyyy_MM_dd(sieveApply.getBcCheckDate())); - result.put("historyBirth",StringUtils.isNotEmpty(sieveApply.getHistoryBirth()) ? JsonUtil.getMap(sieveApply.getHistoryBirth()) : new HashMap<>()); + result.put("historyBirth",sieveApply.getHistoryBirth()); result.put("pastHistory",sieveApply.getPastHistory()); result.put("applyHospitalId",sieveApply.getApplyHospitalId()); result.put("sendDoctor",sieveApply.getSendDoctor()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java index 56fbbd6..3603e94 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/SieveApplyOrderAddRequest.java @@ -100,7 +100,7 @@ public class SieveApplyOrderAddRequest implements IBasicRequestConvert