diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HandleOpinionsQhdEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HandleOpinionsQhdEnums.java index df6cec4..d60d36a 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/HandleOpinionsQhdEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HandleOpinionsQhdEnums.java @@ -6,13 +6,14 @@ import com.lyms.platform.common.utils.StringUtils; * 处理意见 */ public enum HandleOpinionsQhdEnums { - ONE(7, "请于1周后复查"), - TWO(14, "请于2周后复查"), - THREE(1, "请于1月后复查"), - FOUR(2, "请于2月后复查"), - FIVE(3, "请于3月后复查"), - SIX(6, "请于6月后复查"), - SEVEN(12, "请于1年后复查"); + //避免历史数据重复导致会显混乱才加的0 70 + ONE(70, "请于1周后复查"), + TWO(140, "请于2周后复查"), + THREE(10, "请于1月后复查"), + FOUR(20, "请于2月后复查"), + FIVE(30, "请于3月后复查"), + SIX(60, "请于6月后复查"), + SEVEN(120, "请于1年后复查"); private Integer id; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java index 3bfc10f..fa86c99 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java @@ -6,6 +6,7 @@ import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; import java.util.List; +import java.util.Map; /** * 儿童眼保健检查 @@ -81,7 +82,7 @@ public class BabyEyeCheck extends BaseModel { */ private String other; //秦皇岛处理医生自定义处理意见 - private List handleOpinionsIdList; + private List handleOpinionsIdList; /* end 秦皇岛新增的眼保健字段 */ @@ -392,11 +393,11 @@ public class BabyEyeCheck extends BaseModel { //合作 0欠合作 1不合作 private String cooperation; - public List getHandleOpinionsIdList() { + public List getHandleOpinionsIdList() { return handleOpinionsIdList; } - public void setHandleOpinionsIdList(List handleOpinionsIdList) { + public void setHandleOpinionsIdList(List handleOpinionsIdList) { this.handleOpinionsIdList = handleOpinionsIdList; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index 0ee7ba3..15cdfcf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -431,14 +431,13 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (StringUtils.isNotEmpty(doctor)) { map.put("doctor", couponMapper.getUserName(doctor)); } - map.put("handleOpinionsId", HandleOpinionsEnums.getName(babyEyeCheck.getHandleOpinionsId())); /** * start 秦皇岛眼保健新增的 * @Author: 武涛涛 * @Date: 2020/7/20 13:40 */ map.put("handleOpinionsIdList", babyEyeCheck.getHandleOpinionsIdList());//医生自定义处理意见 id - map.put("handleOpinionsId", babyEyeCheck.getHandleOpinionsId());//处理意见 id + map.put("handleOpinionsId", HandleOpinionsQhdEnums.getName(babyEyeCheck.getHandleOpinionsId()));//处理意见 id,历史数据不做匹配 map.put("eyeAppearance", babyEyeCheck.getEyeAppearance());//眼外观 1通过 2不通过 map.put("redReflexQhd", babyEyeCheck.getRedReflexQhd());//红光反射 map.put("redReflexQhdOther", babyEyeCheck.getRedReflexQhdOther());