diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthEnums.java new file mode 100644 index 0000000..312fcb7 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthEnums.java @@ -0,0 +1,70 @@ +package com.lyms.platform.common.enums; + +import com.lyms.platform.common.utils.StringUtils; + +/** + * 检查月龄 + */ +public enum CheckMonthEnums { + ONE(1, "0月龄"), + TWO(2, "30-42天"), + THREE(3, "3个月"), + FOUR(4, "6个月"), + FIVE(5, "9个月"), + SIX(6, "1岁"), + SEVEN(7, "1岁半"), + EIGHT(8, "2岁"), + NIGHT(9, "3岁"), + TEN(10, "4岁"), + ELEVEN(11, "5岁"), + TWELVE(12, "6岁"); + + private Integer id; + private String name; + + public static CheckMonthEnums get(Integer id) { + CheckMonthEnums[] values = CheckMonthEnums.values(); + for (CheckMonthEnums 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); + CheckMonthEnums[] values = CheckMonthEnums.values(); + for (CheckMonthEnums value : values) { + if (value.id == i) { + return value.name; + } + } + return null; + } + + CheckMonthEnums(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 cb38435..b28e326 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 @@ -26,11 +26,11 @@ public class BabyEyeCheck { private String pid; - /** =========== 表单属性 ========= */ + /** =========== table1 start ========= */ /** - * 眼保健时间 + * 检查月龄 */ - private String eyeCheckDay; + private String checkMonthId; /** * 检查单位 @@ -43,57 +43,71 @@ public class BabyEyeCheck { private Date checkTime; /** + * 眼保健时间 + */ +// private String eyeCheckDay; + + /** * 眼病高危因素 */ private List riskFactorId; + /**================ 检查结果(左/右眼) ================*/ + /**============== 右眼 ===============*/ /** - * 外眼观察 + * 外眼观察(右) */ - private String extEyelook; + private String extRightEyelook; /** - * 外眼观察其他的结果 + * 瞬目反射(右) */ - private String extEyelookOther; + private String blinkRightReflex; /** - * 视动性眼震 + * 瞳孔对光反射(右) */ - private String nystagmus; + private String pupillaryRightReflex; /** - * 红光反射 + * 瞳孔红光反射(右) */ - private String redReflex; + private String redRightReflex; + /**================= 左眼 ===============*/ /** - * 结膜 + * 外眼观察(左) */ - private String conjunctiva; + private String extLeftEyelook; /** - * 角膜 + * 瞬目反射(左) */ - private String corneal; + private String blinkLefttReflex; /** - * 泪器 + * 瞳孔对光反射(左) */ - private String lacrimalApparatus; + private String pupillaryLeftReflex; /** - * 其他 + * 瞳孔红光反射(左) */ - private String other; + private String redLeftReflex; + /** - * 处理意见 + * 眼底检查结果 */ - private String handleOpinions; + private String fundusResult; /** - * 指导意见 + * 指导意见(下拉列表) + */ + private List guidanceOpinionIds; + + /** + * 指导意见(输入) */ private String guidanceOpinions; @@ -111,6 +125,45 @@ public class BabyEyeCheck { * 预约下次检查描述 */ private Date nextCheckTimeDesc; + /** ================================== table1 end ==================================== */ + + + /** ================================== table2 start ==================================== */ + + /** + * 外眼观察其他的结果 + */ + private String extEyelookOther; + + /** + * 视动性眼震 + */ + private String nystagmus; + + /** + * 结膜 + */ + private String conjunctiva; + + /** + * 角膜 + */ + private String corneal; + + /** + * 泪器 + */ + private String lacrimalApparatus; + + /** + * 其他 + */ + private String other; + + /** + * 处理意见 + */ + private String handleOpinions; public String getId() { return id; @@ -168,12 +221,12 @@ public class BabyEyeCheck { this.pid = pid; } - public String getEyeCheckDay() { - return eyeCheckDay; + public String getCheckMonthId() { + return checkMonthId; } - public void setEyeCheckDay(String eyeCheckDay) { - this.eyeCheckDay = eyeCheckDay; + public void setCheckMonthId(String checkMonthId) { + this.checkMonthId = checkMonthId; } public String getCheckHospital() { @@ -200,76 +253,84 @@ public class BabyEyeCheck { this.riskFactorId = riskFactorId; } - public String getExtEyelook() { - return extEyelook; + public String getExtRightEyelook() { + return extRightEyelook; } - public void setExtEyelook(String extEyelook) { - this.extEyelook = extEyelook; + public void setExtRightEyelook(String extRightEyelook) { + this.extRightEyelook = extRightEyelook; } - public String getExtEyelookOther() { - return extEyelookOther; + public String getBlinkRightReflex() { + return blinkRightReflex; } - public void setExtEyelookOther(String extEyelookOther) { - this.extEyelookOther = extEyelookOther; + public void setBlinkRightReflex(String blinkRightReflex) { + this.blinkRightReflex = blinkRightReflex; } - public String getNystagmus() { - return nystagmus; + public String getPupillaryRightReflex() { + return pupillaryRightReflex; } - public void setNystagmus(String nystagmus) { - this.nystagmus = nystagmus; + public void setPupillaryRightReflex(String pupillaryRightReflex) { + this.pupillaryRightReflex = pupillaryRightReflex; } - public String getRedReflex() { - return redReflex; + public String getRedRightReflex() { + return redRightReflex; } - public void setRedReflex(String redReflex) { - this.redReflex = redReflex; + public void setRedRightReflex(String redRightReflex) { + this.redRightReflex = redRightReflex; } - public String getConjunctiva() { - return conjunctiva; + public String getExtLeftEyelook() { + return extLeftEyelook; } - public void setConjunctiva(String conjunctiva) { - this.conjunctiva = conjunctiva; + public void setExtLeftEyelook(String extLeftEyelook) { + this.extLeftEyelook = extLeftEyelook; } - public String getCorneal() { - return corneal; + public String getBlinkLefttReflex() { + return blinkLefttReflex; } - public void setCorneal(String corneal) { - this.corneal = corneal; + public void setBlinkLefttReflex(String blinkLefttReflex) { + this.blinkLefttReflex = blinkLefttReflex; } - public String getLacrimalApparatus() { - return lacrimalApparatus; + public String getPupillaryLeftReflex() { + return pupillaryLeftReflex; } - public void setLacrimalApparatus(String lacrimalApparatus) { - this.lacrimalApparatus = lacrimalApparatus; + public void setPupillaryLeftReflex(String pupillaryLeftReflex) { + this.pupillaryLeftReflex = pupillaryLeftReflex; } - public String getOther() { - return other; + public String getRedLeftReflex() { + return redLeftReflex; } - public void setOther(String other) { - this.other = other; + public void setRedLeftReflex(String redLeftReflex) { + this.redLeftReflex = redLeftReflex; } - public String getHandleOpinions() { - return handleOpinions; + public String getFundusResult() { + return fundusResult; } - public void setHandleOpinions(String handleOpinions) { - this.handleOpinions = handleOpinions; + public void setFundusResult(String fundusResult) { + this.fundusResult = fundusResult; + } + + public List getGuidanceOpinionIds() { + return guidanceOpinionIds; + } + + public void setGuidanceOpinionIds(List guidanceOpinionIds) { + this.guidanceOpinionIds = guidanceOpinionIds; } public String getGuidanceOpinions() { @@ -303,6 +364,62 @@ public class BabyEyeCheck { public void setNextCheckTimeDesc(Date nextCheckTimeDesc) { this.nextCheckTimeDesc = nextCheckTimeDesc; } + + public String getExtEyelookOther() { + return extEyelookOther; + } + + public void setExtEyelookOther(String extEyelookOther) { + this.extEyelookOther = extEyelookOther; + } + + public String getNystagmus() { + return nystagmus; + } + + public void setNystagmus(String nystagmus) { + this.nystagmus = nystagmus; + } + + public String getConjunctiva() { + return conjunctiva; + } + + public void setConjunctiva(String conjunctiva) { + this.conjunctiva = conjunctiva; + } + + public String getCorneal() { + return corneal; + } + + public void setCorneal(String corneal) { + this.corneal = corneal; + } + + public String getLacrimalApparatus() { + return lacrimalApparatus; + } + + public void setLacrimalApparatus(String lacrimalApparatus) { + this.lacrimalApparatus = lacrimalApparatus; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + + public String getHandleOpinions() { + return handleOpinions; + } + + public void setHandleOpinions(String handleOpinions) { + this.handleOpinions = handleOpinions; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyePatientController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyePatientController.java index 1f2e255..cda5add 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyePatientController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyePatientController.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.controller; +import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.service.BabyEyePatientService; @@ -27,6 +28,7 @@ public class BabyEyePatientController extends BaseController { @ResponseBody @RequestMapping(method = RequestMethod.POST) + @TokenRequired public BaseResponse addOrUpdate(@RequestBody BabyEyePatient babyEyePatient, HttpServletRequest request) { return babyEyePatientService.addOrUpdate(getUserId(request), babyEyePatient); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyePatientServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyePatientServiceImpl.java index 2c95db8..ae85fcd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyePatientServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyePatientServiceImpl.java @@ -33,6 +33,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.Date; import java.util.List; import java.util.Map; @@ -76,8 +77,9 @@ public class BabyEyePatientServiceImpl implements BabyEyePatientService { List serviceStatus = ServiceStatusEnums.getServiceStatusList(); /** 服务状态 */ List> nation = basicConfigService.getEnumByParentId(SystemConfig.NATION_TYPE_ID); /** 民族 */ List fmType = FmTypeEnums.getFmTypeEnums(); /** 分娩方式 */ + List diagnosis = new ArrayList<>(); return RespBuilder.buildSuccess("sex", sex, "cardType", pcerteTypeResult, "plevelType", plevelType, "profession", professionTypeResults, "serviceType", serviceType, - "serviceStatus", serviceStatus, "nation", nation, "fmType", fmType); + "serviceStatus", serviceStatus, "nation", nation, "fmType", fmType, "diagnosis", diagnosis); } @Override