Commit 47340b9858c1b79b0466d191e53acaf1a8aaf43d

Authored by yangfei

Merge remote-tracking branch 'origin/master'

Showing 2 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 47340b9
... ... @@ -9,6 +9,7 @@
9 9 import com.lyms.platform.common.utils.*;
10 10 import com.lyms.platform.operate.web.request.BabyCheckRequest;
11 11 import com.lyms.platform.operate.web.result.*;
  12 +import com.lyms.platform.operate.web.utils.MongoUtil;
12 13 import com.lyms.platform.permission.dao.master.CouponMapper;
13 14 import com.lyms.platform.permission.model.Organization;
14 15 import com.lyms.platform.permission.model.Users;
... ... @@ -72,6 +73,9 @@
72 73 @Autowired
73 74 private CouponMapper couponMapper;
74 75  
  76 + @Autowired
  77 + private MongoUtil mongoUtil;
  78 +
75 79 public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
76 80  
77 81 /**
... ... @@ -639,6 +643,7 @@
639 643 List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
640 644 if (models != null && models.size() > 0) {
641 645 model = models.get(0);
  646 + base.setmHighRiskReason(mongoUtil.findColor(model.getmHighRiskReason()));
642 647 base.setBabyLastHighRisk(getBabyLastHighRisk(model.getPid()));
643 648 base.setId(id);
644 649 base.setSex(model.getSex());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java View file @ 47340b9
... ... @@ -7,6 +7,17 @@
7 7 * Created by Administrator on 2016/6/20.
8 8 */
9 9 public class BabyBasicResult {
  10 +
  11 + private List<Map<String,Object>> mHighRiskReason;
  12 +
  13 + public List<Map<String,Object>> getmHighRiskReason() {
  14 + return mHighRiskReason;
  15 + }
  16 +
  17 + public void setmHighRiskReason(List<Map<String,Object>> mHighRiskReason) {
  18 + this.mHighRiskReason = mHighRiskReason;
  19 + }
  20 +
10 21 private String id;
11 22  
12 23 private String sourceId;