jiangjiazhi / regional-platform

Download as
Browse Code »

Commit bf0df874c0bc3fd76f85d1e0134c2cc1f1fdae14

Authored by cfl
1 parent 85321cfcc3
Exists in master and in 2 other branches dev, luanping

修改产检记录显示

Showing 2 changed files with 14 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/WxMeasureInfoModel.java View file @ bf0df87
... ... @@ -36,6 +36,8 @@
36 36 */
37 37 private String type;
38 38  
  39 + private String riskFactor;
  40 +
39 41 /**
40 42 * 创建时间
41 43 */
... ... @@ -122,6 +124,15 @@
122 124  
123 125 public void setUpdateTime(Date updateTime) {
124 126 this.updateTime = updateTime;
  127 + }
  128 +
  129 +
  130 + public String getRiskFactor() {
  131 + return riskFactor;
  132 + }
  133 +
  134 + public void setRiskFactor(String riskFactor) {
  135 + this.riskFactor = riskFactor;
125 136 }
126 137 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ bf0df87
... ... @@ -1996,6 +1996,7 @@
1996 1996 if (null == wxMeasure) {
1997 1997 listMap.add(yumInfosMap);
1998 1998 wxMeasureInfo.setYumInfos(listMap);
  1999 + wxMeasureInfo.setRiskFactor(riskFactor);
1999 2000 wxMeasureInfo.setType("1");
2000 2001 wxMeasureInfo.setCreateTime(new Date());
2001 2002 wxMeasureInfo.setPid(pid);
... ... @@ -2005,6 +2006,7 @@
2005 2006 mongoTemplate.insert(wxMeasureInfo);
2006 2007 } else {
2007 2008 WxMeasureInfoModel wxMeasureInfoModel = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("type").is("1")), WxMeasureInfoModel.class);
  2009 + wxMeasureInfoModel.setRiskFactor(riskFactor);
2008 2010 boolean exist = false;
2009 2011 if (CollectionUtils.isNotEmpty(wxMeasureInfoModel.getYumInfos())) {
2010 2012 List<Map> historyMap = wxMeasureInfoModel.getYumInfos();
... ... @@ -2234,7 +2236,7 @@
2234 2236 if (StringUtils.isNotEmpty(hospitalId) && StringUtils.isNotEmpty(pid)) {
2235 2237 WxMeasureInfoModel wxMeasureInfo = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("hospitalId").is(hospitalId)), WxMeasureInfoModel.class);
2236 2238 if (null != wxMeasureInfo) {
2237   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setData(wxMeasureInfo.getYumInfos()).setErrormsg("成功");
  2239 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setData(wxMeasureInfo).setErrormsg("成功");
2238 2240 }
2239 2241 }
2240 2242 return null;