From 345ff26097a5701a38e23bad28d3d7124244c276 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 8 Aug 2017 16:40:18 +0800 Subject: [PATCH] =?UTF-8?q?=E8=80=B3=E5=A1=9E=E7=9B=B8=E5=85=B3=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/common/enums/AddSubtractEnums.java | 62 ++++ .../platform/common/enums/EyeMovementsEnums.java | 60 ++++ .../platform/common/enums/EyePositionEnums.java | 63 ++++ .../java/com/lyms/platform/pojo/BabyEyeCheck.java | 384 ++++++++++++++++----- .../web/controller/BabyEyeCheckController.java | 5 +- .../web/controller/BabyEyePatientController.java | 7 + .../operate/web/service/BabyEyeCheckService.java | 3 +- .../operate/web/service/BabyEyePatientService.java | 2 + .../web/service/impl/BabyEyeCheckServiceImpl.java | 50 ++- .../service/impl/BabyEyePatientServiceImpl.java | 35 +- 10 files changed, 567 insertions(+), 104 deletions(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/AddSubtractEnums.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/EyeMovementsEnums.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/EyePositionEnums.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/AddSubtractEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/AddSubtractEnums.java new file mode 100644 index 0000000..5a32f72 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/AddSubtractEnums.java @@ -0,0 +1,62 @@ +package com.lyms.platform.common.enums; + +import com.lyms.platform.common.utils.StringUtils; + +/** + * ( + ) (一) 其他 + * Created by lt on 2017/7/18 0018 + */ +public enum AddSubtractEnums { + ADD(1, "( + )"), + SUBTRACT(2, "(一)"), + OTHER(3, "其他"); + + private Integer id; + private String name; + + public static AddSubtractEnums get(Integer id) { + AddSubtractEnums[] values = AddSubtractEnums.values(); + for (AddSubtractEnums value : values) { + if (value.getId() == id) { + return value; + } + } + return null; + } + + AddSubtractEnums(Integer id, String name){ + this.id = id; + this.name = name; + } + + public static String getName(String id) { + if(StringUtils.isEmpty(id)) { + return null; + } + int i = Integer.parseInt(id); + AddSubtractEnums[] values = AddSubtractEnums.values(); + for (AddSubtractEnums value : values) { + if (value.getId() == i) { + return value.getName(); + } + } + return null; + } + + 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-common/src/main/java/com/lyms/platform/common/enums/EyeMovementsEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/EyeMovementsEnums.java new file mode 100644 index 0000000..7714d81 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/EyeMovementsEnums.java @@ -0,0 +1,60 @@ +package com.lyms.platform.common.enums; + +import com.lyms.platform.common.utils.StringUtils; + +/** + * 眼球运动 + */ +public enum EyeMovementsEnums { + COORDINATE(1, "协调"), + LIMIT(2, "限制"); + + private Integer id; + private String name; + + public static EyeMovementsEnums get(Integer id) { + EyeMovementsEnums[] values = EyeMovementsEnums.values(); + for (EyeMovementsEnums value : values) { + if (value.getId() == id) { + return value; + } + } + return null; + } + + EyeMovementsEnums(Integer id, String name){ + this.id = id; + this.name = name; + } + + public static String getName(String id) { + if(StringUtils.isEmpty(id)) { + return null; + } + int i = Integer.parseInt(id); + EyeMovementsEnums[] values = EyeMovementsEnums.values(); + for (EyeMovementsEnums value : values) { + if (value.getId() == i) { + return value.getName(); + } + } + return null; + } + + 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-common/src/main/java/com/lyms/platform/common/enums/EyePositionEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/EyePositionEnums.java new file mode 100644 index 0000000..b82e01f --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/EyePositionEnums.java @@ -0,0 +1,63 @@ +package com.lyms.platform.common.enums; + +import com.lyms.platform.common.utils.StringUtils; + +/** + * 眼位 + */ +public enum EyePositionEnums { + NORMOTOPIA(1, "正位"), + INTERNAL_OBLIQUE(2, "内斜"), + EXTERNAL_OBLIQUE(3, "外斜"), + SUPERIOR_OBLIQUE_MUSCLE(4, "上斜肌肌麻痹"), + OTHER(5, "其他"); + + private Integer id; + private String name; + + public static EyePositionEnums get(Integer id) { + EyePositionEnums[] values = EyePositionEnums.values(); + for (EyePositionEnums value : values) { + if (value.getId() == id) { + return value; + } + } + return null; + } + + EyePositionEnums(Integer id, String name){ + this.id = id; + this.name = name; + } + + public static String getName(String id) { + if(StringUtils.isEmpty(id)) { + return null; + } + int i = Integer.parseInt(id); + EyePositionEnums[] values = EyePositionEnums.values(); + for (EyePositionEnums value : values) { + if (value.getId() == i) { + return value.getName(); + } + } + return null; + } + + 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 b28e326..ef2db6e 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 @@ -43,11 +43,6 @@ public class BabyEyeCheck { private Date checkTime; /** - * 眼保健时间 - */ -// private String eyeCheckDay; - - /** * 眼病高危因素 */ private List riskFactorId; @@ -102,12 +97,12 @@ public class BabyEyeCheck { private String fundusResult; /** - * 指导意见(下拉列表) + * 处理意见 */ - private List guidanceOpinionIds; + private String handleOpinions; /** - * 指导意见(输入) + * 指导意见 */ private String guidanceOpinions; @@ -117,53 +112,198 @@ public class BabyEyeCheck { private String doctor; /** - * 预约下次检查 + * 预约下次检查枚举 */ - private Date nextCheckTime; + private String CheckMonthId; /** - * 预约下次检查描述 + * 预约下次检查时间 */ - private Date nextCheckTimeDesc; + private Date nextCheckTime; /** ================================== table1 end ==================================== */ /** ================================== table2 start ==================================== */ - /** - * 外眼观察其他的结果 + * 外眼观察 */ + private String extEyelook; private String extEyelookOther; /** - * 视动性眼震 + * 红光反射 */ - private String nystagmus; + private String redReflex; + private String redReflexOther; + + /** + * 手持验光仪 + */ + private String r1; + private String r2; + private String l1; + private String l2; /** * 结膜 */ private String conjunctiva; + private String conjunctivaOther; /** * 角膜 */ private String corneal; + private String cornealOther; /** * 泪器 */ private String lacrimalApparatus; + private String lacrimalApparatusOther; + + /** + * 眼球运动 + */ + private String eyeMovementsId; + + /** + * 眼位 + */ + private String eyePositionId; + private String eyePositionOther; + + /** + * 双眼视觉 + */ + private String binocularVision; /** * 其他 */ private String other; + /** ================================== table2 end ==================================== */ + /** ================================== table3 start ==================================== */ /** - * 处理意见 + * 视力 */ - private String handleOpinions; + private String lVision; + private String rVision; + + /** + * 屈光 + */ + private String refractionL1; + private String refractionL2; + private String refractionR1; + private String refractionR2; + + /** + * 视动性眼震 + */ + private String nystagmus; + + /** + * 选择性注视卡检查 + */ + private String fixationCard; + + public String getRefractionL1() { + return refractionL1; + } + + public void setRefractionL1(String refractionL1) { + this.refractionL1 = refractionL1; + } + + public String getRefractionL2() { + return refractionL2; + } + + public void setRefractionL2(String refractionL2) { + this.refractionL2 = refractionL2; + } + + public String getRefractionR1() { + return refractionR1; + } + + public void setRefractionR1(String refractionR1) { + this.refractionR1 = refractionR1; + } + + public String getRefractionR2() { + return refractionR2; + } + + public void setRefractionR2(String refractionR2) { + this.refractionR2 = refractionR2; + } + + public String getNystagmus() { + return nystagmus; + } + + public void setNystagmus(String nystagmus) { + this.nystagmus = nystagmus; + } + + public String getFixationCard() { + return fixationCard; + } + + public void setFixationCard(String fixationCard) { + this.fixationCard = fixationCard; + } + + public String getExtEyelook() { + return extEyelook; + } + + public void setExtEyelook(String extEyelook) { + this.extEyelook = extEyelook; + } + + public String getExtEyelookOther() { + return extEyelookOther; + } + + public void setExtEyelookOther(String extEyelookOther) { + this.extEyelookOther = extEyelookOther; + } + + public String getRedReflexOther() { + return redReflexOther; + } + + public void setRedReflexOther(String redReflexOther) { + this.redReflexOther = redReflexOther; + } + + public String getConjunctivaOther() { + return conjunctivaOther; + } + + public void setConjunctivaOther(String conjunctivaOther) { + this.conjunctivaOther = conjunctivaOther; + } + + public String getCornealOther() { + return cornealOther; + } + + public void setCornealOther(String cornealOther) { + this.cornealOther = cornealOther; + } + + public String getLacrimalApparatusOther() { + return lacrimalApparatusOther; + } + + public void setLacrimalApparatusOther(String lacrimalApparatusOther) { + this.lacrimalApparatusOther = lacrimalApparatusOther; + } public String getId() { return id; @@ -229,6 +369,134 @@ public class BabyEyeCheck { this.checkMonthId = checkMonthId; } + public Date getNextCheckTime() { + return nextCheckTime; + } + + public void setNextCheckTime(Date nextCheckTime) { + this.nextCheckTime = nextCheckTime; + } + + public String getRedReflex() { + return redReflex; + } + + public void setRedReflex(String redReflex) { + this.redReflex = redReflex; + } + + public String getR1() { + return r1; + } + + public void setR1(String r1) { + this.r1 = r1; + } + + public String getR2() { + return r2; + } + + public void setR2(String r2) { + this.r2 = r2; + } + + public String getL1() { + return l1; + } + + public void setL1(String l1) { + this.l1 = l1; + } + + public String getL2() { + return l2; + } + + public void setL2(String l2) { + this.l2 = l2; + } + + 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 getEyeMovementsId() { + return eyeMovementsId; + } + + public void setEyeMovementsId(String eyeMovementsId) { + this.eyeMovementsId = eyeMovementsId; + } + + public String getEyePositionId() { + return eyePositionId; + } + + public void setEyePositionId(String eyePositionId) { + this.eyePositionId = eyePositionId; + } + + public String getEyePositionOther() { + return eyePositionOther; + } + + public void setEyePositionOther(String eyePositionOther) { + this.eyePositionOther = eyePositionOther; + } + + public String getBinocularVision() { + return binocularVision; + } + + public void setBinocularVision(String binocularVision) { + this.binocularVision = binocularVision; + } + + public String getOther() { + return other; + } + + public void setOther(String other) { + this.other = other; + } + + public String getlVision() { + return lVision; + } + + public void setlVision(String lVision) { + this.lVision = lVision; + } + + public String getrVision() { + return rVision; + } + + public void setrVision(String rVision) { + this.rVision = rVision; + } + public String getCheckHospital() { return checkHospital; } @@ -325,12 +593,12 @@ public class BabyEyeCheck { this.fundusResult = fundusResult; } - public List getGuidanceOpinionIds() { - return guidanceOpinionIds; + public String getHandleOpinions() { + return handleOpinions; } - public void setGuidanceOpinionIds(List guidanceOpinionIds) { - this.guidanceOpinionIds = guidanceOpinionIds; + public void setHandleOpinions(String handleOpinions) { + this.handleOpinions = handleOpinions; } public String getGuidanceOpinions() { @@ -348,78 +616,6 @@ public class BabyEyeCheck { public void setDoctor(String doctor) { this.doctor = doctor; } - - public Date getNextCheckTime() { - return nextCheckTime; - } - - public void setNextCheckTime(Date nextCheckTime) { - this.nextCheckTime = nextCheckTime; - } - - public Date getNextCheckTimeDesc() { - return nextCheckTimeDesc; - } - - 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/BabyEyeCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java index 4b7412c..ce270f7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.controller; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.service.BabyEyeCheckService; +import com.lyms.platform.pojo.BabyEyeCheck; import com.lyms.platform.pojo.BabyEyePatient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -28,8 +29,8 @@ public class BabyEyeCheckController extends BaseController { @ResponseBody @RequestMapping(method = RequestMethod.POST) - public BaseResponse addOrUpdate(@RequestBody BabyEyePatient babyEyePatient, HttpServletRequest request) { - return babyEyeCheckService.addOrUpdate(getUserId(request), babyEyePatient); + public BaseResponse addOrUpdate(@RequestBody BabyEyeCheck babyEyeCheck, HttpServletRequest request) { + return babyEyeCheckService.addOrUpdate(getUserId(request), babyEyeCheck); } /** 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 cda5add..dc7d38b 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 @@ -33,6 +33,13 @@ public class BabyEyePatientController extends BaseController { return babyEyePatientService.addOrUpdate(getUserId(request), babyEyePatient); } + @ResponseBody + @RequestMapping(value = "/baby/{id}") + @TokenRequired + public BaseResponse list(@PathVariable String babyId, HttpServletRequest request) { + return babyEyePatientService.list(getUserId(request), babyId); + } + /** * 保存之后查看的数据 * @param id diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java index 6b93e31..a1b333c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.service; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.pojo.BabyEyeCheck; import com.lyms.platform.pojo.BabyEyePatient; import java.util.Date; @@ -12,7 +13,7 @@ import java.util.Date; public interface BabyEyeCheckService { BaseObjectResponse init(); - BaseResponse addOrUpdate(Integer userId, BabyEyePatient babyEyePatient); + BaseResponse addOrUpdate(Integer userId, BabyEyeCheck babyEyeCheck); BaseResponse info(String id); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyePatientService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyePatientService.java index ca9fec4..68d8445 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyePatientService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyePatientService.java @@ -17,4 +17,6 @@ public interface BabyEyePatientService { BaseResponse edit(String id); BaseResponse delete(String id); + + BaseResponse list(Integer userId, String babyId); } 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 1e4ba38..997b2a0 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 @@ -1,15 +1,31 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; +import com.lyms.platform.common.result.RespBuilder; +import com.lyms.platform.common.utils.*; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.facade.BasicConfigFacade; +import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.service.BabyEyeCheckService; import com.lyms.platform.permission.dao.master.BabyEyeCheckMapper; +import com.lyms.platform.pojo.BabyEyeCheck; import com.lyms.platform.pojo.BabyEyePatient; +import com.lyms.platform.pojo.BabyModel; +import com.lyms.platform.pojo.NewbornVisit; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; +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; /** * Created by lt on 2017/8/5 0005 @@ -22,14 +38,42 @@ public class BabyEyeCheckServiceImpl implements BabyEyeCheckService { @Autowired private BasicConfigService basicConfigService; + @Autowired + private BasicConfigFacade basicConfigFacade; + + @Autowired + private AutoMatchFacade autoMatchFacade; + + @Autowired + private MongoTemplate mongoTemplate; + @Override public BaseObjectResponse init() { - return null; + List> addSubtract = EnumUtil.toJson(AddSubtractEnums.class); /** (+) (一) 其他 */ + List> checkMonth = EnumUtil.toJson(CheckMonthEnums.class); /** (检查时间 */ + List highRisk = basicConfigFacade.getBaseicConfigByParentId(SystemConfig.HIGH_RISK_ID); /** 高危因素 */ + + return RespBuilder.buildSuccess("addSubtract", addSubtract, "checkMonth", checkMonth, "highRisk", highRisk); } @Override - public BaseResponse addOrUpdate(Integer userId, BabyEyePatient babyEyePatient) { - return null; + public BaseResponse addOrUpdate(Integer userId, BabyEyeCheck babyEyeCheck) { + if(StringUtils.isEmpty(babyEyeCheck.getId())) { + babyEyeCheck.setCreated(new Date()); + babyEyeCheck.setYn("1"); + babyEyeCheck.setOperaterId(userId + ""); + babyEyeCheck.setHospitalId(autoMatchFacade.getHospitalId(userId)); + BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); + if(babyModel != null) { + babyEyeCheck.setPid(babyModel.getPid()); + } + mongoTemplate.save(babyEyeCheck); + } else { + babyEyeCheck.setOperaterId(userId.toString()); + Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyEyeCheck)); + mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyEyeCheck.getId())), update, NewbornVisit.class); + } + return RespBuilder.buildSuccess(babyEyeCheck.getId()); } @Override 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 ae85fcd..34a9ff3 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 @@ -11,6 +11,7 @@ import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.BasicConfigFacade; +import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; import com.lyms.platform.operate.web.result.BasicConfigResult; import com.lyms.platform.operate.web.service.BabyEyePatientService; import com.lyms.platform.operate.web.utils.CollectionUtils; @@ -27,16 +28,14 @@ import com.lyms.platform.pojo.NewbornVisit; import org.apache.commons.collections.map.HashedMap; import org.apache.struts.config.BaseConfig; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.Criteria; 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; +import java.util.*; /** * Created by lt on 2017/8/5 0005 @@ -67,6 +66,9 @@ public class BabyEyePatientServiceImpl implements BabyEyePatientService { @Autowired private CouponMapper couponMapper; + @Autowired + private OrganizationGroupsFacade organizationGroupsFacade; + @Override public BaseObjectResponse init() { List> sex = EnumUtil.toJson(SexEnum.class, "id", "text"); @@ -177,4 +179,29 @@ public class BabyEyePatientServiceImpl implements BabyEyePatientService { public BaseResponse delete(String id) { return null; } + + @Override + public BaseResponse list(Integer userId, String babyId) { + List hospitalIds = organizationGroupsFacade.findGroupHospital(userId, false); + if(CollectionUtils.isEmpty(hospitalIds)) { + return RespBuilder.buildSuccess(); + } + List babyEyePatients = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").in(hospitalIds).and("yn").ne("0")) + .with(new Sort(Sort.Direction.DESC, "birth")), BabyEyePatient.class); + List> rest = new ArrayList<>(); + for (BabyEyePatient babyEyePatient : babyEyePatients) { + Map temp = new HashMap<>(); + temp.put("id", babyEyePatient.getId()); + temp.put("hospitalId", babyEyePatient.getHospitalId()); + temp.put("pid", babyEyePatient.getPid()); + temp.put("name", babyEyePatient.getName()); + String sex = babyEyePatient.getSex(); + if(StringUtils.isNotEmpty(sex)) { + temp.put("sex", SexEnum.getTextById(Integer.parseInt(sex))); + } + temp.put("age", DateUtil.getBabyMonthAge(babyEyePatient.getBirth(), babyEyePatient.getBookBuildingDate())); + rest.add(temp); + } + return RespBuilder.buildSuccess(rest); + } } -- 1.8.3.1