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 new file mode 100644 index 0000000..56a1b61 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HandleOpinionsQhdEnums.java @@ -0,0 +1,66 @@ +package com.lyms.platform.common.enums; + +import com.lyms.platform.common.utils.StringUtils; + +/** + * 处理意见 + */ +public enum HandleOpinionsQhdEnums { + ONE(1, "请于1周后复查"), + TWO(2, "请于2周后复查"), + THREE(3, "请于1月后复查"), + FOUR(4, "请于2月后复查"), + FIVE(5, "请于3月后复查"), + SIX(6, "请于6月后复查"), + SEVEN(7, "请于1年后复查"); + + + private Integer id; + private String name; + + public static HandleOpinionsQhdEnums get(Integer id) { + HandleOpinionsQhdEnums[] values = HandleOpinionsQhdEnums.values(); + for (HandleOpinionsQhdEnums value : values) { + if (value.getId() == id) { + return value; + } + } + return null; + } + + public static String getName(String id) { + if(StringUtils.isEmpty(id)) { + return null; + } + int i = Integer.parseInt(id); + HandleOpinionsQhdEnums[] values = HandleOpinionsQhdEnums.values(); + for (HandleOpinionsQhdEnums value : values) { + if (value.id == i) { + return value.name; + } + } + return null; + } + + HandleOpinionsQhdEnums(Integer id, String name){ + this.id = id; + this.name = name; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} 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 8e0fb76..b1b8f24 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 @@ -143,6 +143,11 @@ public class BabyEyeCheck extends BaseModel { */ private String handleOpinionsId; + /* + 秦皇岛处理意见定制 + */ + private List handleOpinionsIdList; + /** * 指导意见 */ @@ -325,6 +330,14 @@ public class BabyEyeCheck extends BaseModel { //合作 0欠合作 1不合作 private String cooperation; + public List getHandleOpinionsIdList() { + return handleOpinionsIdList; + } + + public void setHandleOpinionsIdList(List handleOpinionsIdList) { + this.handleOpinionsIdList = handleOpinionsIdList; + } + public Integer getVisionJudgment1() { return visionJudgment1; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java index cd78f35..583d025 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java @@ -593,7 +593,7 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { } } - if (StringUtils.isNotEmpty(sieveType)) { + /* if (StringUtils.isNotEmpty(sieveType)) { // sieveType = null/1 血清学筛查 if ("1".equals(sieveType)) { MongoCondition c = MongoCondition.newInstance(); @@ -609,9 +609,11 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery { else { condition = condition.and("sieveType", sieveType, MongoOper.IS); } + }*/ + if (null != sieveType) { + condition = condition.and("sieveType", sieveType, MongoOper.IS); } - if (StringUtils.isNotEmpty(costType)) { // costType = null/1 免费 if ("1".equals(costType)) { 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 0c82d20..22dc76d 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 @@ -78,9 +78,10 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC List> addSubtract = EnumUtil.toJson(AddSubtractEnums.class); /** (+) (一) 其他 */ List> checkMonth = EnumUtil.toJson(CheckMonthEnums.class); /** (检查时间 */ List> highRisk = EnumUtil.toJson(EyeHighRiskEnums.class); /** 眼保健高危因素 */ + List> highRiskQhd = EnumUtil.toJson(HandleOpinionsQhdEnums.class); /** 眼保健高危因素 */ List> handleOpinions = EnumUtil.toJson(HandleOpinionsEnums.class); /** 处理意见 */ List> eyePosition = EnumUtil.toJson(EyePositionEnums.class); /** 处理意见 */ - return RespBuilder.buildSuccess("eyePosition", eyePosition, "addSubtract", addSubtract, "checkMonth", checkMonth, "highRisk", highRisk, "handleOpinions", handleOpinions); + return RespBuilder.buildSuccess("eyePosition", eyePosition, "addSubtract", addSubtract, "checkMonth", checkMonth, "highRisk", highRisk, "highRiskQhd", highRiskQhd,"handleOpinions", handleOpinions); } @Override @@ -237,6 +238,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC map.put("doctor", couponMapper.getUserName(doctor)); } map.put("handleOpinionsId", HandleOpinionsEnums.getName(babyEyeCheck.getHandleOpinionsId())); + map.put("handleOpinionsIdList", babyEyeCheck.getHandleOpinionsIdList());//秦皇岛眼保健新增的,保存是id,返回也是id List riskFactorNames = EyeHighRiskEnums.getName(babyEyeCheck.getRiskFactorId()); if (CollectionUtils.isNotEmpty(riskFactorNames)) { for (int i = 0; i < riskFactorNames.size(); i++) {