From 279367c043dafc067f86a131ada3e0e863e4e96f Mon Sep 17 00:00:00 2001 From: wtt Date: Sat, 15 Aug 2020 16:42:00 +0800 Subject: [PATCH] update --- .../platform/pojo/BabyNutritionSpecialtyModel.java | 18 +++++++ .../lyms/platform/pojo/BabyPsychologistModel.java | 20 ++++++++ .../web/facade/BabyNutritionSpecialtyFacade.java | 13 ++++- .../operate/web/facade/BabyPsychologistFacade.java | 11 ++++- .../web/request/BabyNutritionSpecialtyRequest.java | 1 - .../web/result/BabyNutritionSpecialtyResult.java | 45 ++++++++++++++++- .../operate/web/result/BabyPsychologistResult.java | 56 +++++++++++++++++++++- 7 files changed, 158 insertions(+), 6 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionSpecialtyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionSpecialtyModel.java index 37013bf..fe5b787 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionSpecialtyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionSpecialtyModel.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.List; import java.util.Map; /** @@ -25,6 +26,11 @@ public class BabyNutritionSpecialtyModel extends BaseModel { private Date createDate; private Date modifyDate; private String hospitalId; + //备注 + private String mremark; + // 母亲高危因素 + List mHighRiskReason; + /*母亲信息*/ //母亲姓名 @@ -577,9 +583,21 @@ public class BabyNutritionSpecialtyModel extends BaseModel { } + public String getMremark() { + return mremark; + } + public void setMremark(String mremark) { + this.mremark = mremark; + } + public List getmHighRiskReason() { + return mHighRiskReason; + } + public void setmHighRiskReason(List mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java index dc23e56..fe0c674 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyPsychologistModel.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.List; /** * 心理专科检查 实体类 @@ -24,6 +25,11 @@ public class BabyPsychologistModel extends BaseModel { private Date createDate; private Date modifyDate; private String hospitalId; + //备注 + private String mremark; + // 母亲高危因素 + List mHighRiskReason; + /*母亲信息*/ //母亲姓名 @@ -170,7 +176,21 @@ public class BabyPsychologistModel extends BaseModel { //处理意见 private String handlingOpinions; + public String getMremark() { + return mremark; + } + + public void setMremark(String mremark) { + this.mremark = mremark; + } + public List getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } public String getId() { return id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java index a2fde15..b813163 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java @@ -13,7 +13,9 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.BabyNutritionSpecialtyRequest; import com.lyms.platform.operate.web.result.BabyNutritionSpecialtyResult; import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; +import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; @@ -39,7 +41,8 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { @Autowired private BabyBabyNutritionSpecialtyService babyBabyNSService; - + @Autowired + private MongoUtil mongoUtil; @Autowired private BabyBookbuildingService babyBookbuildingService; @Autowired @@ -86,6 +89,9 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { model.setsINCard(babyModel.getsINCard()); model.setBirthday(babyModel.getBirth()); model.setModifyDate(new Date()); + model.setMremark(babyModel.getMremark()); + model.setmHighRiskReason(babyModel.getmHighRiskReason()); + //createDate,hospitalId调用外添加赋值 } /*新增页面，公共内容*/ @@ -218,7 +224,10 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { if(StringUtils.isNotEmpty(id)){ BabyNutritionSpecialtyModel babyNutritionSpecialtyModel = babyBabyNSService.queryById(id); BabyNutritionSpecialtyResult babyNutritionSpecialtyResult = new BabyNutritionSpecialtyResult(); - babyNutritionSpecialtyResult.convertToResult(babyNutritionSpecialtyModel); + babyNutritionSpecialtyResult.convertToShowResult(babyNutritionSpecialtyModel); + if(CollectionUtils.isNotEmpty(babyNutritionSpecialtyModel.getmHighRiskReason())){ + babyNutritionSpecialtyResult.setmHighRiskReason(mongoUtil.findColor(babyNutritionSpecialtyModel.getmHighRiskReason())); + } if(StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getCheckDoctor())){ Users users = usersService.getUsers(NumberUtils.toInt(babyNutritionSpecialtyModel.getCheckDoctor())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java index 7ac3a21..eaaff47 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java @@ -14,7 +14,9 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.BabyPsychologistRequest; import com.lyms.platform.operate.web.result.BabyPsychologistResult; import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; +import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.operate.web.utils.MongoUtil; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.OrganizationService; import com.lyms.platform.permission.service.UsersService; @@ -41,7 +43,8 @@ public class BabyPsychologistFacade extends BaseServiceImpl { @Autowired private BabyPsychologistService babyPsychologistService; - + @Autowired + private MongoUtil mongoUtil; @Autowired private BabyBookbuildingService babyBookbuildingService; @Autowired @@ -94,6 +97,9 @@ public class BabyPsychologistFacade extends BaseServiceImpl { model.setsINCard(babyModel.getsINCard()); model.setBirthday(babyModel.getBirth()); model.setModifyDate(new Date()); + model.setMremark(babyModel.getMremark()); + model.setmHighRiskReason(babyModel.getmHighRiskReason()); + //createDate,hospitalId调用外添加赋值 } /*新增页面，公共内容*/ @@ -246,6 +252,9 @@ public class BabyPsychologistFacade extends BaseServiceImpl { BabyPsychologistModel babyPsychologistModel = babyPsychologistService.queryBabyPsychologistById(id); BabyPsychologistResult babyPsychologistResult = new BabyPsychologistResult(); babyPsychologistResult.convertToResult(babyPsychologistModel); + if(CollectionUtils.isNotEmpty(babyPsychologistModel.getmHighRiskReason())){ + babyPsychologistResult.setmHighRiskReason(mongoUtil.findColor(babyPsychologistModel.getmHighRiskReason())); + } if(StringUtils.isNotEmpty(babyPsychologistModel.getCheckDoctor())){ Users users = usersService.getUsers(NumberUtils.toInt(babyPsychologistModel.getCheckDoctor())); if(users!=null && StringUtils.isNotEmpty(users.getName())){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSpecialtyRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSpecialtyRequest.java index b997e0b..5f679db 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSpecialtyRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSpecialtyRequest.java @@ -3,7 +3,6 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.FormParam; import org.hibernate.validator.constraints.NotEmpty; -import java.util.Date; import java.util.Map; /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java index b1c7379..4ab6c0a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java @@ -3,10 +3,12 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.common.base.IBasicResultConvert; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.pojo.BabyNutritionSpecialtyModel; import java.util.Date; +import java.util.List; import java.util.Map; public class BabyNutritionSpecialtyResult implements IBasicResultConvert { @@ -21,7 +23,10 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert> mHighRiskReason; /*母亲信息*/ //母亲姓名 private String mname; @@ -48,6 +53,7 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert> getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List> mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } /*新增页面 4个页面内容*/ @@ -712,6 +741,8 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert { @@ -21,6 +22,10 @@ public class BabyPsychologistResult implements IBasicResultConvert> mHighRiskReason; /*母亲信息*/ //母亲姓名 @@ -48,6 +53,7 @@ public class BabyPsychologistResult implements IBasicResultConvert> getmHighRiskReason() { + return mHighRiskReason; + } + + public void setmHighRiskReason(List> mHighRiskReason) { + this.mHighRiskReason = mHighRiskReason; + } + @Override public BabyPsychologistResult convertToResult(BabyPsychologistModel destModel) { @@ -741,6 +771,8 @@ public class BabyPsychologistResult implements IBasicResultConvert