From 280157da91c20511d2f2345b4db7938694f1520a Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 22 Apr 2020 09:42:28 +0800 Subject: [PATCH] update --- .../platform/common/enums/EyeHighRiskEnums.java | 2 + .../platform/common/enums/HandleOpinionsEnums.java | 4 +- .../java/com/lyms/platform/pojo/BabyEyeCheck.java | 8 ++-- .../web/service/impl/BabyEyeCheckServiceImpl.java | 48 ++++++++++++++++------ 4 files changed, 45 insertions(+), 17 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/EyeHighRiskEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/EyeHighRiskEnums.java index dba75d2..afa8146 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/EyeHighRiskEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/EyeHighRiskEnums.java @@ -21,6 +21,8 @@ public enum EyeHighRiskEnums { BDX(10, "巨细胞病毒、风疹病毒、疱疹病毒、梅毒或毒浆体原虫（弓形体）等引起的宫内感染"), LMX(11, "颅面形态畸形、大面积颜面血管瘤，或者哭闹时眼球外凸"), FMW(12, "眼部持续流泪、有大量分泌物"), + G(13, "早产儿"), + D(14, "出生低体重儿"), SIX(6, "其他"); private Integer id; diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/HandleOpinionsEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/HandleOpinionsEnums.java index 7a28db3..2817c39 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/HandleOpinionsEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/HandleOpinionsEnums.java @@ -17,7 +17,9 @@ public enum HandleOpinionsEnums { NIGHT(9, "请于3岁回院进行下次保健"), TEN(10, "请于4岁回院进行下次保健"), ELEVEN(11, "请于5岁回院进行下次保健"), - TWELVE(12, "请于6岁回院进行下次保健"); + TWELVE(12, "请于6岁回院进行下次保健"), + A(13, "到上级医院进一步检查"), + B(14, "约专家门诊"); private Integer id; private String 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 be610bc..8e0fb76 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 @@ -322,8 +322,8 @@ public class BabyEyeCheck extends BaseModel { //三棱镜右 private String prismRight; - //合作 0合作 1签合作 - private Integer cooperation; + //合作 0欠合作 1不合作 + private String cooperation; public Integer getVisionJudgment1() { return visionJudgment1; @@ -365,11 +365,11 @@ public class BabyEyeCheck extends BaseModel { this.prismRight = prismRight; } - public Integer getCooperation() { + public String getCooperation() { return cooperation; } - public void setCooperation(Integer cooperation) { + public void setCooperation(String cooperation) { this.cooperation = cooperation; } 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 522e11a..e30a58b 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 @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.service.impl; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.biz.service.YunBookbuildingService; +import com.lyms.platform.common.dao.BaseQuery; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.pojo.SyncDataModel; import com.lyms.platform.common.result.*; @@ -19,10 +20,7 @@ import com.lyms.platform.operate.web.utils.ReflectUtil; import com.lyms.platform.operate.web.utils.ResponseUtil; import com.lyms.platform.permission.dao.master.BabyEyeCheckMapper; import com.lyms.platform.permission.dao.master.CouponMapper; -import com.lyms.platform.pojo.BabyEyeCheck; -import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.pojo.FilePathModel; -import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.*; import org.apache.commons.collections.map.HashedMap; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -96,11 +94,11 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if ("yang".equals(babyEyeCheck.getExtRightEyelook()) || "yang".equals(babyEyeCheck.getExtLeftEyelook()) || "yang".equals(babyEyeCheck.getBlinkRightReflex()) || "yang".equals(babyEyeCheck.getBlinkLefttReflex()) || "yang".equals(babyEyeCheck.getPupillaryRightReflex()) || "yang".equals(babyEyeCheck.getPupillaryLeftReflex()) - || "yang".equals(babyEyeCheck.getRedRightReflex()) || "yang".equals(babyEyeCheck.getRedLeftReflex()) || "yang".equals(babyEyeCheck.getRedReflex()) || "ruoyang".equals(babyEyeCheck.getRedReflex()) + || "yang".equals(babyEyeCheck.getRedRightReflex()) || "yang".equals(babyEyeCheck.getRedLeftReflex()) || "yang".equals(babyEyeCheck.getRedReflex()) || "yang".equals(babyEyeCheck.getConjunctiva()) || "yang".equals(babyEyeCheck.getCorneal()) || "yang".equals(babyEyeCheck.getLacrimalApparatus()) || "yang".equals(babyEyeCheck.getNystagmus()) || "yang".equals(babyEyeCheck.getExtEyelook()) || "ruoyang".equals(babyEyeCheck.getRedRightReflex()) || "ruoyang".equals(babyEyeCheck.getRedLeftReflex()) - + || "ruoyang".equals(babyEyeCheck.getRedReflex()) ) { //器械判定阳性 @@ -323,7 +321,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC map.put("prismLeft", babyEyeCheck.getPrismLeft()); map.put("prismRight", babyEyeCheck.getPrismRight()); - map.put("cooperation", babyEyeCheck.getCooperation() == null ? "" : babyEyeCheck.getCooperation() == 0 ? "合作" : "欠合作"); + map.put("cooperation", !StringUtils.isNotEmpty(babyEyeCheck.getCooperation()) ? "" : "0".equals(babyEyeCheck.getCooperation()) ? "欠合作" : "不合作"); FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getId()); map.put("filePath", filePath); @@ -407,7 +405,10 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } @Override - 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 apparatusPositive, String doctorPositive, String yin) { + 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 apparatusPositive, String doctorPositive, String yin) { String hospitalId = autoMatchFacade.getHospitalId(userId); Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId); if (startDate != null && endDate != null) { @@ -444,10 +445,20 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC criteria.and("babyId").in(babyIds); } if (positive) { + Query query = new Query(criteria); query.with(new Sort(Sort.Direction.DESC, "checkTime")); + query.addCriteria(new Criteria().orOperator(Criteria.where("apparatus").is("2"), Criteria.where("doctorJudgement").is("2"))); + System.out.println(query.toString()); + + int count = (int)mongoTemplate.count(query, BabyEyeCheck.class); + + BaseQuery param = new BaseQuery(); + param.mysqlBuild( count); + query.skip(param.getOffset()).limit(param.getLimit()); + List babyEyeChecks = mongoTemplate.find(query, BabyEyeCheck.class); - doFilter(babyEyeChecks); + // doFilter(babyEyeChecks); if (StringUtils.isNotEmpty(positiveIds)) { List ids = CollectionUtils.asList(positiveIds, String.class); @@ -455,10 +466,10 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC doFilter(babyEyeChecks, ids); } } - Integer count = babyEyeChecks.size(); + //Integer count = babyEyeChecks.size(); - List datas = CollectionUtils.getPageIds(babyEyeChecks, page, limit); - List> maps = setDatas(datas); + // List datas = CollectionUtils.getPageIds(babyEyeChecks, page, limit); + List> maps = setDatas(babyEyeChecks); return RespBuilder.buildSuccess(new PageResult(count, page, limit, maps)); } PageResult pageResult = findMongoPage(BabyEyeCheck.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "checkTime")), page, limit); @@ -569,6 +580,19 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC positive.append("屈光（医生判定）"); } + if ("ruoyang".equals(babyEyeCheck.getRedRightReflex())) + { + positive.append("瞳孔红光反射(右)（稍减弱）"); + } + if ("ruoyang".equals(babyEyeCheck.getRedLeftReflex())) + { + positive.append("瞳孔红光反射(左)（稍减弱）"); + } + if ("ruoyang".equals(babyEyeCheck.getRedReflex())) + { + positive.append("红光反射（稍减弱）"); + } + temp.put("positive", positive.toString()); temp.put("doctor", couponMapper.getUserName(babyEyeCheck.getDoctor())); temp.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); -- 1.8.3.1