From 7e1e2bc011c83fcd3ba0f9636657bdd956d05551 Mon Sep 17 00:00:00 2001 From: Administrator <184677810@qq.com> Date: Mon, 9 Sep 2019 16:06:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=9A=E5=AE=81=E7=9C=BC=E4=BF=9D=E5=81=A5?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=B8=AA=E6=80=A7=E5=AE=9A=E5=88=B6=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/pojo/BabyEyeCheck.java | 53 +++++- .../web/service/impl/BabyEyeCheckServiceImpl.java | 196 +++++++++++---------- 2 files changed, 153 insertions(+), 96 deletions(-) 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 e0cbacf..3899682 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 @@ -10,7 +10,7 @@ import java.util.List; /** * 儿童眼保健检查 */ -@Document(collection="lyms_baby_eye_check") +@Document(collection = "lyms_baby_eye_check") public class BabyEyeCheck extends BaseModel { @@ -110,7 +110,10 @@ public class BabyEyeCheck extends BaseModel { * 瞳孔红光反射(左) */ private String redLeftReflex; - + /** + * 红光反射医生判定阳性 + */ + private String redLeft2; /** * 眼底检查结果 @@ -164,6 +167,7 @@ public class BabyEyeCheck extends BaseModel { private String r2; private String l1; private String l2; + private String y2; /** * 验光 @@ -198,6 +202,8 @@ public class BabyEyeCheck extends BaseModel { */ private String eyePositionId; private String eyePositionOther; + //医生判定判断阳性 + private String eyePosition2; /** * 双眼视觉 @@ -216,6 +222,8 @@ public class BabyEyeCheck extends BaseModel { */ private String lVision; private String rVision; + //视力医生判定阳性 + private String vision2; /** * 屈光 @@ -224,6 +232,7 @@ public class BabyEyeCheck extends BaseModel { private String refractionL2; private String refractionR1; private String refractionR2; + private String refraction2; /** * 视动性眼震 @@ -235,6 +244,46 @@ public class BabyEyeCheck extends BaseModel { */ private String fixationCard; + public String getRedLeft2() { + return redLeft2; + } + + public void setRedLeft2(String redLeft2) { + this.redLeft2 = redLeft2; + } + + public String getY2() { + return y2; + } + + public void setY2(String y2) { + this.y2 = y2; + } + + public String getEyePosition2() { + return eyePosition2; + } + + public void setEyePosition2(String eyePosition2) { + this.eyePosition2 = eyePosition2; + } + + public String getVision2() { + return vision2; + } + + public void setVision2(String vision2) { + this.vision2 = vision2; + } + + public String getRefraction2() { + return refraction2; + } + + public void setRefraction2(String refraction2) { + this.refraction2 = refraction2; + } + public String getErrormsg() { return errormsg; } 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 4345270..427aa26 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 @@ -39,7 +39,7 @@ import static com.lyms.platform.operate.web.service.BabyAfterVisitService.*; * Created by lt on 2017/8/5 0005 */ @Service -public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeCheckService { +public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeCheckService { @Autowired private BabyEyeCheckMapper babyEyeCheckMapper; @@ -86,8 +86,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye public BaseResponse addOrUpdate(Integer userId, BabyEyeCheck babyEyeCheck) { String hospitalId = autoMatchFacade.getHospitalId(userId); - if(StringUtils.isEmpty(babyEyeCheck.getId())) { - if(!mongoUtil.buildArchive(userId, babyEyeCheck.getBabyId())) { + if (StringUtils.isEmpty(babyEyeCheck.getId())) { + if (!mongoUtil.buildArchive(userId, babyEyeCheck.getBabyId())) { return RespBuilder.buildSuccess(ResponseCode.NEED_BUILD); } babyEyeCheck.setCreated(new Date()); @@ -95,13 +95,13 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye babyEyeCheck.setOperaterId(userId + ""); babyEyeCheck.setHospitalId(autoMatchFacade.getHospitalId(userId)); BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); - if(babyModel != null) { + if (babyModel != null) { babyEyeCheck.setPid(babyModel.getPid()); babyEyeCheck.setBirth(babyModel.getBirth()); } syncData("ADD", babyEyeCheck, ""); mongoTemplate.save(babyEyeCheck); - + // 添加追访眼保检查 Date nextCheckTime = babyEyeCheck.getNextCheckTime(); if (null != nextCheckTime) { @@ -113,7 +113,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye model.setId(babyEyeCheck.getBabyId()); babyAfterVisitService.addOrUpdateAfterVisitData(model, TYPE_STATISTICS, STATUS_TYPE_EYE_CHECK); - if(CollectionUtils.isNotEmpty(babyEyeCheck.getRiskFactorId())) { + if (CollectionUtils.isNotEmpty(babyEyeCheck.getRiskFactorId())) { String riskFactor = org.apache.commons.lang3.StringUtils.join(babyEyeCheck.getRiskFactorId().toArray(), ","); babyEyeCheck.setRiskFactor(riskFactor); } @@ -123,24 +123,23 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye } else { babyEyeCheck.setOperaterId(userId.toString()); - List before = mongoTemplate.find(Query.query(Criteria.where("id").is(babyEyeCheck.getId())), BabyEyeCheck.class); + List before = mongoTemplate.find(Query.query(Criteria.where("id").is(babyEyeCheck.getId())), BabyEyeCheck.class); Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyEyeCheck)); mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyEyeCheck.getId())), update, BabyEyeCheck.class); syncData("UPDATE", babyEyeCheck, babyEyeCheck.getId()); - if(CollectionUtils.isNotEmpty(babyEyeCheck.getRiskFactorId())) { + if (CollectionUtils.isNotEmpty(babyEyeCheck.getRiskFactorId())) { String riskFactor = org.apache.commons.lang3.StringUtils.join(babyEyeCheck.getRiskFactorId().toArray(), ","); babyEyeCheck.setRiskFactor(riskFactor); } babyEyeCheckMapper.update(babyEyeCheck); - List after = mongoTemplate.find(Query.query(Criteria.where("id").is(babyEyeCheck.getId())), BabyEyeCheck.class); + List after = mongoTemplate.find(Query.query(Criteria.where("id").is(babyEyeCheck.getId())), BabyEyeCheck.class); - if (CollectionUtils.isNotEmpty(before) && CollectionUtils.isNotEmpty(after)) - { - operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before.get(0),after.get(0), OptActionEnums.UPDATE.getId(), "修改儿童眼保检查"); + if (CollectionUtils.isNotEmpty(before) && CollectionUtils.isNotEmpty(after)) { + operateLogFacade.addModifyOptLog(userId, Integer.valueOf(hospitalId), before.get(0), after.get(0), OptActionEnums.UPDATE.getId(), "修改儿童眼保检查"); } // 添加追访眼保检查 @@ -158,7 +157,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye @Override public BaseResponse info(String id) { BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class); - if(babyEyeCheck == null) { + if (babyEyeCheck == null) { return RespBuilder.buildSuccess(); } Map map = ReflectionUtils.beanToMap(babyEyeCheck); @@ -167,72 +166,72 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime())); String doctor = babyEyeCheck.getDoctor(); - if(StringUtils.isNotEmpty(doctor)) { + if (StringUtils.isNotEmpty(doctor)) { map.put("doctor", couponMapper.getUserName(doctor)); } map.put("handleOpinionsId", HandleOpinionsEnums.getName(babyEyeCheck.getHandleOpinionsId())); List riskFactorNames = EyeHighRiskEnums.getName(babyEyeCheck.getRiskFactorId()); - if(CollectionUtils.isNotEmpty(riskFactorNames)) { + if (CollectionUtils.isNotEmpty(riskFactorNames)) { for (int i = 0; i < riskFactorNames.size(); i++) { - if("其他".equals(riskFactorNames.get(i))) { + if ("其他".equals(riskFactorNames.get(i))) { riskFactorNames.set(i, "其他：" + (babyEyeCheck.getRiskFactorIdOther() == null ? "" : map.get("riskFactorIdOther").toString())); } } } StringBuilder refractometer = new StringBuilder(); - if(StringUtils.isNotEmpty(babyEyeCheck.getR1())) { - refractometer.append("R:S( ").append(babyEyeCheck.getR1()).append( " )"); + if (StringUtils.isNotEmpty(babyEyeCheck.getR1())) { + refractometer.append("R:S( ").append(babyEyeCheck.getR1()).append(" )"); } - if(StringUtils.isNotEmpty(babyEyeCheck.getR2())) { - if(refractometer.length() != 0) { + if (StringUtils.isNotEmpty(babyEyeCheck.getR2())) { + if (refractometer.length() != 0) { refractometer.append(" "); } - refractometer.append("R:DC( ").append(babyEyeCheck.getR2()).append( " ) D"); + refractometer.append("R:DC( ").append(babyEyeCheck.getR2()).append(" ) D"); } boolean flag = false; - if(StringUtils.isNotEmpty(babyEyeCheck.getL1())) { - if(refractometer.length() != 0) { + if (StringUtils.isNotEmpty(babyEyeCheck.getL1())) { + if (refractometer.length() != 0) { refractometer.append(", "); flag = true; } - refractometer.append("L:S( ").append(babyEyeCheck.getL1()).append( " ) "); + refractometer.append("L:S( ").append(babyEyeCheck.getL1()).append(" ) "); } - if(StringUtils.isNotEmpty(babyEyeCheck.getL2())) { - if(!flag) { - if(StringUtils.isNotEmpty(babyEyeCheck.getR1()) || StringUtils.isNotEmpty(babyEyeCheck.getR2())) { + if (StringUtils.isNotEmpty(babyEyeCheck.getL2())) { + if (!flag) { + if (StringUtils.isNotEmpty(babyEyeCheck.getR1()) || StringUtils.isNotEmpty(babyEyeCheck.getR2())) { refractometer.append(", "); } } - refractometer.append("L:DC( ").append(babyEyeCheck.getL2()).append( " ) D"); + refractometer.append("L:DC( ").append(babyEyeCheck.getL2()).append(" ) D"); } map.put("refractometer", refractometer.toString()); StringBuilder refraction = new StringBuilder(); - if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionR1())) { - refraction.append("R:S( ").append(babyEyeCheck.getRefractionR1()).append( " )"); + if (StringUtils.isNotEmpty(babyEyeCheck.getRefractionR1())) { + refraction.append("R:S( ").append(babyEyeCheck.getRefractionR1()).append(" )"); } - if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionR2())) { - if(refraction.length() != 0) { + if (StringUtils.isNotEmpty(babyEyeCheck.getRefractionR2())) { + if (refraction.length() != 0) { refraction.append(" "); } - refraction.append("R:DC( ").append(babyEyeCheck.getRefractionR2()).append( " ) D"); + refraction.append("R:DC( ").append(babyEyeCheck.getRefractionR2()).append(" ) D"); } boolean flag2 = false; - if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionL1())) { - if(refraction.length() != 0) { + if (StringUtils.isNotEmpty(babyEyeCheck.getRefractionL1())) { + if (refraction.length() != 0) { refraction.append(", "); flag2 = true; } - refraction.append("L:S( ").append(babyEyeCheck.getRefractionL1()).append( " ) "); + refraction.append("L:S( ").append(babyEyeCheck.getRefractionL1()).append(" ) "); } - if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionL2())) { - if(!flag2) { - if(StringUtils.isNotEmpty(babyEyeCheck.getRefractionR1()) || StringUtils.isNotEmpty(babyEyeCheck.getRefractionR2())) { + if (StringUtils.isNotEmpty(babyEyeCheck.getRefractionL2())) { + if (!flag2) { + if (StringUtils.isNotEmpty(babyEyeCheck.getRefractionR1()) || StringUtils.isNotEmpty(babyEyeCheck.getRefractionR2())) { refraction.append(", "); } } - refraction.append("L:DC( ").append(babyEyeCheck.getRefractionL2()).append( " ) D"); + refraction.append("L:DC( ").append(babyEyeCheck.getRefractionL2()).append(" ) D"); } map.put("refraction", refraction.toString()); @@ -254,6 +253,12 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye map.put("conjunctiva", parseYinYang(babyEyeCheck.getConjunctiva(), babyEyeCheck.getConjunctivaOther())); map.put("corneal", parseYinYang(babyEyeCheck.getCorneal(), babyEyeCheck.getCornealOther())); map.put("lacrimalApparatus", parseYinYang(babyEyeCheck.getLacrimalApparatus(), babyEyeCheck.getLacrimalApparatusOther())); + //一下都是医生选定阳性 + map.put("eyePosition2", babyEyeCheck.getEyePosition2()); + map.put("redLeft2", babyEyeCheck.getRedLeft2()); + map.put("vision2", babyEyeCheck.getVision2()); + map.put("y2", babyEyeCheck.getY2()); + map.put("refraction2", babyEyeCheck.getRefraction2()); // CollectionUtils.removeNullValue(map); return RespBuilder.buildSuccess(map); @@ -264,17 +269,17 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye } private String parseYinYang(String s, String other) { - if(StringUtils.isNotEmpty(s)) { - if(StringUtils.isNotEmpty(other)) { - if("yin".equals(s)) { + if (StringUtils.isNotEmpty(s)) { + if (StringUtils.isNotEmpty(other)) { + if ("yin".equals(s)) { return "- （" + other + "）"; - } else if("yang".equals(s)) { + } else if ("yang".equals(s)) { return "+ （" + other + "）"; } } else { - if("yin".equals(s)) { + if ("yin".equals(s)) { return "-"; - } else if("yang".equals(s)) { + } else if ("yang".equals(s)) { return "+"; } } @@ -287,11 +292,11 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class); Map map = ReflectionUtils.beanToMap(babyEyeCheck); map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); - if(StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) { + if (StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) { map.put("checkMonthId", babyEyeCheck.getCheckMonthId() + ""); } map.put("nextCheckTime", DateUtil.getYyyyMmDd(babyEyeCheck.getNextCheckTime())); - if(babyEyeCheck.getRiskFactorId() != null) { + if (babyEyeCheck.getRiskFactorId() != null) { List riskFactorId = babyEyeCheck.getRiskFactorId(); List> rest = new ArrayList<>(); for (String s : riskFactorId) { @@ -307,15 +312,14 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye } @Override - public BaseResponse delete(String id,Integer userId) { + public BaseResponse delete(String id, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), Update.update("yn", "0"), BabyEyeCheck.class); babyEyeCheckMapper.deleteById(id); - List list = mongoTemplate.find(Query.query(Criteria.where("id").is(id)),BabyEyeCheck.class); - if (CollectionUtils.isNotEmpty(list)) - { + List list = mongoTemplate.find(Query.query(Criteria.where("id").is(id)), BabyEyeCheck.class); + if (CollectionUtils.isNotEmpty(list)) { operateLogFacade.addDeleteOptLog(userId, Integer.parseInt(hospitalId), list.get(0), OptActionEnums.DELETE.getId(), "删除眼保健检查"); } @@ -326,40 +330,40 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate) { String hospitalId = autoMatchFacade.getHospitalId(userId); Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); - if(startDate != null && endDate != null) { + if (startDate != null && endDate != null) { criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1)); } - if(bookStartDate != null && bookEndDate != null) { + if (bookStartDate != null && bookEndDate != null) { criteria.and("nextCheckTime").gte(bookStartDate).lt(DateUtil.addDay(bookEndDate, 1)); } - if(org.apache.commons.lang.StringUtils.isNotBlank(doctor)) { + if (org.apache.commons.lang.StringUtils.isNotBlank(doctor)) { criteria.and("doctor").is(doctor); } - if(StringUtils.isNotEmpty(chechMonth)) { + if (StringUtils.isNotEmpty(chechMonth)) { criteria.and("checkMonthId").is(chechMonth); } - if(currentMonthStart != null && currentMonthEnd != null) { + if (currentMonthStart != null && currentMonthEnd != null) { Date start = DateUtil.getBirthStart(currentMonthEnd); Date end = DateUtil.getBirthEnd(currentMonthStart); criteria.and("birth").gte(start).lt(end); } - if(org.apache.commons.lang.StringUtils.isNotBlank(key)) { + if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { Criteria c = new Criteria(); c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0); List babyModels = mongoUtil.findField(BabyModel.class, c, "id"); List babyIds = CollectionUtils.getId(babyModels, "id", String.class); criteria.and("babyId").in(babyIds); } - if(positive) { + if (positive) { Query query = new Query(criteria); query.with(new Sort(Sort.Direction.DESC, "checkTime")); List babyEyeChecks = mongoTemplate.find(query, BabyEyeCheck.class); doFilter(babyEyeChecks); - if(StringUtils.isNotEmpty(positiveIds)) { + if (StringUtils.isNotEmpty(positiveIds)) { List ids = CollectionUtils.asList(positiveIds, String.class); - if(CollectionUtils.isNotEmpty(ids)) { + if (CollectionUtils.isNotEmpty(ids)) { doFilter(babyEyeChecks, ids); } } @@ -381,7 +385,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { for (String id : ids) { String value = (String) ReflectUtil.invoke(babyEyeCheck, "get" + StringUtils.captureName(id)); - if(!"yang".equals(value)) { + if (!"yang".equals(value)) { deleteList.add(babyEyeCheck); } } @@ -397,69 +401,69 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye temp.put("babyId", babyEyeCheck.getBabyId()); temp.put("pid", babyEyeCheck.getPid()); BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); - if(babyModel != null) { + if (babyModel != null) { temp.put("mCardNo", babyModel.getMcertNo()); /** 母亲证件号 */ temp.put("vcCardNo", babyModel.getVcCardNo()); /** 就诊卡号 */ temp.put("pcerteTypeId", babyModel.getMcertTypeId()); /** 证件类型 */ temp.put("name", babyModel.getName()); - if(babyModel.getSex() != null) { + if (babyModel.getSex() != null) { temp.put("sex", SexEnum.getTextById(babyModel.getSex())); } String parentId = babyModel.getParentId(); - if(StringUtils.isNotEmpty(parentId)) { + if (StringUtils.isNotEmpty(parentId)) { Patients patients = mongoTemplate.findById(parentId, Patients.class); - if(patients != null) { + if (patients != null) { temp.put("mname", patients.getUsername()); } } - temp.put("birth", DateUtil.getYyyyMmDd( babyModel.getBirth())); + temp.put("birth", DateUtil.getYyyyMmDd(babyModel.getBirth())); } - if(StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) { + if (StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) { temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); /** 检查月龄 */; } StringBuilder positive = new StringBuilder(); /** 阳性项目 */ - if("yang".equals(babyEyeCheck.getExtRightEyelook())) { + if ("yang".equals(babyEyeCheck.getExtRightEyelook())) { positive.append("外眼观察(右) "); } - if("yang".equals(babyEyeCheck.getExtLeftEyelook())) { + if ("yang".equals(babyEyeCheck.getExtLeftEyelook())) { positive.append("外眼观察(左) "); } - if("yang".equals(babyEyeCheck.getBlinkRightReflex())) { + if ("yang".equals(babyEyeCheck.getBlinkRightReflex())) { positive.append("瞬目反射(右) "); } - if("yang".equals(babyEyeCheck.getBlinkLefttReflex())) { + if ("yang".equals(babyEyeCheck.getBlinkLefttReflex())) { positive.append("瞬目反射(左) "); } - if("yang".equals(babyEyeCheck.getPupillaryRightReflex())) { + if ("yang".equals(babyEyeCheck.getPupillaryRightReflex())) { positive.append("瞳孔对光反射(右) "); } - if("yang".equals(babyEyeCheck.getPupillaryLeftReflex())) { + if ("yang".equals(babyEyeCheck.getPupillaryLeftReflex())) { positive.append("瞳孔对光反射(左) "); } - if("yang".equals(babyEyeCheck.getRedRightReflex())) { + if ("yang".equals(babyEyeCheck.getRedRightReflex())) { positive.append("瞳孔红光反射(右) "); } - if("yang".equals(babyEyeCheck.getRedLeftReflex())) { + if ("yang".equals(babyEyeCheck.getRedLeftReflex())) { positive.append("瞳孔红光反射(左) "); } - if("yang".equals(babyEyeCheck.getRedReflex())) { + if ("yang".equals(babyEyeCheck.getRedReflex())) { positive.append("红光反射 "); } - if("yang".equals(babyEyeCheck.getConjunctiva())) { + if ("yang".equals(babyEyeCheck.getConjunctiva())) { positive.append("结膜 "); } - if("yang".equals(babyEyeCheck.getCorneal())) { + if ("yang".equals(babyEyeCheck.getCorneal())) { positive.append("角膜 "); } - if("yang".equals(babyEyeCheck.getLacrimalApparatus())) { + if ("yang".equals(babyEyeCheck.getLacrimalApparatus())) { positive.append("泪器 "); } - if("yang".equals(babyEyeCheck.getNystagmus())) { + if ("yang".equals(babyEyeCheck.getNystagmus())) { positive.append("视动性眼震 "); } - if("yang".equals(babyEyeCheck.getExtEyelook())) { + if ("yang".equals(babyEyeCheck.getExtEyelook())) { positive.append("外眼观察 "); } @@ -476,7 +480,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye Iterator iterator = babyEyeChecks.iterator(); while (iterator.hasNext()) { BabyEyeCheck babyEyeCheck = iterator.next(); - if(!"yang".equals(babyEyeCheck.getExtRightEyelook()) + if (!"yang".equals(babyEyeCheck.getExtRightEyelook()) && !"yang".equals(babyEyeCheck.getExtLeftEyelook()) && !"yang".equals(babyEyeCheck.getBlinkRightReflex()) && !"yang".equals(babyEyeCheck.getBlinkLefttReflex()) @@ -489,7 +493,13 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye && !"yang".equals(babyEyeCheck.getCorneal()) && !"yang".equals(babyEyeCheck.getExtEyelook()) && !"yang".equals(babyEyeCheck.getNystagmus()) - && !"yang".equals(babyEyeCheck.getLacrimalApparatus())) { + && !"yang".equals(babyEyeCheck.getLacrimalApparatus()) + && !"yang".equals(babyEyeCheck.getEyePosition2()) + && !"yang".equals(babyEyeCheck.getRedLeft2()) + && !"yang".equals(babyEyeCheck.getVision2()) + && !"yang".equals(babyEyeCheck.getY2()) + && !"yang".equals(babyEyeCheck.getRefraction2()) + ) { iterator.remove(); } } @@ -498,7 +508,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye @Override public BaseResponse query(Integer userId, String babyId) { List hospitalIds = organizationGroupsFacade.findGroupHospital(userId, false); - if(CollectionUtils.isEmpty(hospitalIds)) { + if (CollectionUtils.isEmpty(hospitalIds)) { return RespBuilder.buildSuccess(); } List babyEyeChecks = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").in(hospitalIds).and("yn").ne("0")) @@ -511,9 +521,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye temp.put("pid", babyEyeCheck.getPid()); temp.put("checkMonth", CheckMonthEnums.getName(babyEyeCheck.getCheckMonthId())); BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); - if(babyModel != null) { + if (babyModel != null) { temp.put("name", babyModel.getName()); - if(babyModel.getSex() != null) { + if (babyModel.getSex() != null) { temp.put("sex", SexEnum.getTextById(babyModel.getSex())); } } @@ -619,8 +629,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye cnames.put("doctor", "检查医生"); cnames.put("checkTime", "检查日期"); - List> results = new ArrayList<>(); - if(org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) { + List> results = new ArrayList<>(); + if (org.apache.commons.collections.CollectionUtils.isNotEmpty(datas)) { int i = 0; for (Map data : datas) { Map result = new LinkedHashMap<>(); @@ -640,8 +650,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye ResponseUtil.responseExcel(cnames, results, response); } - private void syncData(String action,Object data,String id) - { + private void syncData(String action, Object data, String id) { try { SyncDataModel model = new SyncDataModel(); model.setAction(action); @@ -657,9 +666,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye } model.setStatus(1); mongoTemplate.insert(model); - }catch (Exception e) - { - ExceptionUtils.catchException(e,"眼保健数据同步"); + } catch (Exception e) { + ExceptionUtils.catchException(e, "眼保健数据同步"); } } } -- 1.8.3.1