From ab9d4219341597c9d23560c974b9e7ffa9787410 Mon Sep 17 00:00:00 2001 From: Administrator <184677810@qq.com> Date: Tue, 17 Sep 2019 10:15:57 +0800 Subject: [PATCH] update --- .../web/controller/BabyEyeCheckController.java | 8 +- .../operate/web/service/BabyEyeCheckService.java | 6 +- .../web/service/impl/BabyEyeCheckServiceImpl.java | 125 +++++++-------------- 3 files changed, 46 insertions(+), 93 deletions(-) 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 9dcca6d..2f099ea 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 @@ -90,15 +90,15 @@ public class BabyEyeCheckController extends BaseController { @TokenRequired @RequestMapping(method = RequestMethod.GET) public BaseResponse list(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request, - Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive) { - return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, bookStartDate, bookEndDate, apparatusPositive, doctorPositive); + Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin) { + return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin); } @ResponseBody @TokenRequired @RequestMapping(value = "/export", method = RequestMethod.GET) - public void export(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive) { - babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response, bookStartDate, bookEndDate, apparatusPositive, doctorPositive); + public void export(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletRequest request, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin) { + babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin); } @ResponseBody 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 1629d91..3b6e3f4 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 @@ -19,13 +19,13 @@ public interface BabyEyeCheckService extends IBaseService { BaseResponse edit(String id); - BaseResponse delete(String id,Integer userId); + BaseResponse delete(String id, Integer userId); - 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); + 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); BaseResponse query(Integer userId, String babyId); BaseResponse listInit(); - void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate,String apparatusPositive, String doctorPositive); + void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin); } 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 e67004d..cf8d41a 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 @@ -425,7 +425,7 @@ 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) { + 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) { @@ -451,90 +451,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (StringUtils.isNotEmpty(doctorPositive)) { criteria.and("doctorJudgement").is(doctorPositive); } - /* List positives = CollectionUtils.asList(positiveIds, String.class); - if (CollectionUtils.isNotEmpty(positives)) { - if (positives.contains("eyePosition2")) { - //positive.append("眼位(医生判定)"); - criteria.and("eyePosition2Yang").is("2"); - } - if (positives.contains("redLeft2")) { - //positive.append("红光反射（医生判定）"); - criteria.and("redLeft2Yang").is("2"); - } - if (positives.contains("vision2")) { - //positive.append("视力（医生判定）"); - //babyEyeCheck.setVision2Yang("2"); - criteria.and("vision2Yang").is("2"); - } - if ("yang".equals(babyEyeCheck.getY2())) { - //positive.append("手持眼光仪（医生判定）"); - babyEyeCheck.setOptometryYnag("2"); - } - if ("yang".equals(babyEyeCheck.getRedLeft2())) { - //positive.append("屈光（医生判定）"); - babyEyeCheck.setRedLeft2Yang("2"); - } - - - if ("yang".equals(babyEyeCheck.getExtRightEyelook())) { - // babyEyeCheck.setEXtr("外眼观察(右) "); - babyEyeCheck.setExtRightEyelookYang("2"); - } - if ("yang".equals(babyEyeCheck.getExtLeftEyelook())) { - //positive.append("外眼观察(左) "); - babyEyeCheck.setExtLeftEyelookYang("2"); - } - if ("yang".equals(babyEyeCheck.getBlinkRightReflex())) { - //positive.append("瞬目反射(右) "); - babyEyeCheck.setBlinkRightReflexYang("2"); - } - if ("yang".equals(babyEyeCheck.getBlinkLefttReflex())) { - //positive.append("瞬目反射(左) "); - babyEyeCheck.setBlinkLefttReflexYang("2"); - } - if ("yang".equals(babyEyeCheck.getPupillaryRightReflex())) { - //positive.append("瞳孔对光反射(右) "); - babyEyeCheck.setPupillaryRightReflexYang("2"); - } - if ("yang".equals(babyEyeCheck.getPupillaryLeftReflex())) { - //positive.append("瞳孔对光反射(左) "); - babyEyeCheck.setPupillaryLeftReflexYang("2"); - } - if ("yang".equals(babyEyeCheck.getRedRightReflex())) { - // positive.append("瞳孔红光反射(右) "); - babyEyeCheck.setRedRightReflexYang("2"); - } - if ("yang".equals(babyEyeCheck.getRedLeftReflex())) { - //positive.append("瞳孔红光反射(左) "); - babyEyeCheck.setRedLeftReflexYang("2"); - } - if ("yang".equals(babyEyeCheck.getRedReflex())) { - //positive.append("红光反射 "); - babyEyeCheck.setRedReflexYang("2"); - } - if ("yang".equals(babyEyeCheck.getConjunctiva())) { - //positive.append("结膜 "); - babyEyeCheck.setConjunctivaYang("2"); - } - if ("yang".equals(babyEyeCheck.getCorneal())) { - //positive.append("角膜 "); - babyEyeCheck.setCornealYang("2"); - } - if ("yang".equals(babyEyeCheck.getLacrimalApparatus())) { - // positive.append("泪器 "); - babyEyeCheck.setLacrimalApparatusYang("2"); - } - - if ("yang".equals(babyEyeCheck.getNystagmus())) { - // positive.append("视动性眼震 "); - babyEyeCheck.setNystagmusYang("2"); - } - if ("yang".equals(babyEyeCheck.getExtEyelook())) { - // positive.append("外眼观察 "); - babyEyeCheck.setExtEyelookYang("2"); - } + if (StringUtils.isNotEmpty(yin)) { + criteria.and("apparatus").nin("2").and("doctorJudgement").nin("2"); } -*/ if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { Criteria c = new Criteria(); @@ -708,6 +627,40 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } } + private List doFilterYin(List babyEyeChecks) { + List babyEyeCheckList = new ArrayList<>(); + Iterator iterator = babyEyeChecks.iterator(); + while (iterator.hasNext()) { + BabyEyeCheck babyEyeCheck = iterator.next(); + 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()) + && !"yang".equals(babyEyeCheck.getConjunctiva()) + && !"yang".equals(babyEyeCheck.getCorneal()) + && !"yang".equals(babyEyeCheck.getExtEyelook()) + && !"yang".equals(babyEyeCheck.getNystagmus()) + && !"yang".equals(babyEyeCheck.getLacrimalApparatus()) + && !"yang".equals(babyEyeCheck.getEyePositionId()) + && !"yang".equals(babyEyeCheck.getEyePositionId2()) + && !"yang".equals(babyEyeCheck.getRedLeft2()) + && !"yang".equals(babyEyeCheck.getVision2()) + && !"yang".equals(babyEyeCheck.getY2()) + && !"yang".equals(babyEyeCheck.getRefraction2()) + ) { + babyEyeCheckList.add(iterator.next()); + } + } + + return babyEyeCheckList; + + } + @Override public BaseResponse query(Integer userId, String babyId) { List hospitalIds = organizationGroupsFacade.findGroupHospital(userId, false); @@ -843,8 +796,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } @Override - public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive) { - BaseResponse rest = list(userId, startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive); + public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin) { + BaseResponse rest = list(userId, startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin); PageResult pageResult = (PageResult) rest.getObject(); List> datas = (List>) pageResult.getGrid(); Map cnames = new LinkedHashMap<>(); -- 1.8.3.1