From 95b61a4042831b68620ba13ffcd926cdfc228c1a Mon Sep 17 00:00:00 2001 From: wtt <1872109740@qq.com> Date: Fri, 29 Jan 2021 17:12:40 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/pojo/BabyEyeCheck.java | 63 +++++++ .../web/controller/BabyEyeCheckController.java | 9 +- .../platform/operate/web/facade/LisFacade.java | 3 + .../operate/web/service/BabyEyeCheckService.java | 4 +- .../web/service/impl/BabyEyeCheckServiceImpl.java | 205 ++++++++++++--------- 5 files changed, 189 insertions(+), 95 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 bfdab46..3b110f4 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 @@ -39,27 +39,34 @@ public class BabyEyeCheck extends BaseModel { // 眼外观 1通过 2不通过 private String eyeAppearance; private String eyeAppearanceOther; + private String eyeAppearanceCoo;//合作状态: 1 欠合作、2 不合作、3 其他 //红光反射，以前数据有相同的 private String redReflexQhd; private String redReflexQhdOther; + private String redReflexQhdCoo; //合作状态: 1 稍不对称、2 稍减弱、3 减弱、4 欠合作、5 不合作、6其他 //瞬目反射 private String blinkReflex; private String blinkReflexOther; + private String blinkReflexCoo; //合作状态: 1 欠合作、2 不合作、3 其他 //红球试验 private String redBallTest; private String redBallTestOther; + private String redBallTestCoo; //合作状态: 1 欠合作、2 不合作、3 其他 //视物行为观察 private String behaviorObservation; private String behaviorObservationOther; + private String behaviorObservationCoo; //合作状态: 1 欠合作、2 不合作、3 其他 //屈光筛查 private String refractiveScreening; private String refractiveScreeningOther; //眼位检查 private String eyePositionExamination; private String eyePositionExaminationOther; + private String eyePositionExaminationCoo; //合作状态: 1 欠合作、2 不合作、3 其他 //眼球运动 private String eyeMovement; private String eyeMovementOther; + private String eyeMovementCoo; //合作状态: 1 欠合作、2 不合作、3 其他 //戴镜类型 1框架眼镜 2隐形眼镜 3角膜塑形镜 4不戴镜 private String typeOfWearingGlasses; /*远视力检查结果*/ @@ -1266,6 +1273,62 @@ public class BabyEyeCheck extends BaseModel { this.eyePositionExaminationOther = eyePositionExaminationOther; } + public String getEyeAppearanceCoo() { + return eyeAppearanceCoo; + } + + public void setEyeAppearanceCoo(String eyeAppearanceCoo) { + this.eyeAppearanceCoo = eyeAppearanceCoo; + } + + public String getRedReflexQhdCoo() { + return redReflexQhdCoo; + } + + public void setRedReflexQhdCoo(String redReflexQhdCoo) { + this.redReflexQhdCoo = redReflexQhdCoo; + } + + public String getBlinkReflexCoo() { + return blinkReflexCoo; + } + + public void setBlinkReflexCoo(String blinkReflexCoo) { + this.blinkReflexCoo = blinkReflexCoo; + } + + public String getRedBallTestCoo() { + return redBallTestCoo; + } + + public void setRedBallTestCoo(String redBallTestCoo) { + this.redBallTestCoo = redBallTestCoo; + } + + public String getBehaviorObservationCoo() { + return behaviorObservationCoo; + } + + public void setBehaviorObservationCoo(String behaviorObservationCoo) { + this.behaviorObservationCoo = behaviorObservationCoo; + } + + public String getEyePositionExaminationCoo() { + return eyePositionExaminationCoo; + } + + public void setEyePositionExaminationCoo(String eyePositionExaminationCoo) { + this.eyePositionExaminationCoo = eyePositionExaminationCoo; + } + + public String getEyeMovementCoo() { + return eyeMovementCoo; + } + + public void setEyeMovementCoo(String eyeMovementCoo) { + this.eyeMovementCoo = eyeMovementCoo; + } + public String getDoctorSign() { return doctorSign; } 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 9e40dc7..ed53609 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 @@ -165,6 +165,7 @@ public class BabyEyeCheckController extends BaseController { * @param endDate * @param doctor * @param key 姓名/联系方式/就诊卡 + * @param yeymcId 幼儿园 * @param currentMonthStart/currentMonthEnd 当前月龄范围 * @param chechMonth 检查月龄 * @param positive 是否是阳性 @@ -179,9 +180,9 @@ public class BabyEyeCheckController extends BaseController { @ResponseBody @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, + public BaseResponse list(Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds) { - return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, + return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key,yeymcId, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, noPassIds); } @@ -204,8 +205,8 @@ public class BabyEyeCheckController extends BaseController { @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, String yin) { - babyEyeCheckService.export(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, response, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin); + public void export(Date startDate, Date endDate, String doctor, String key, String yeymcId,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, yeymcId,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/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java index 410ff8a..1d5aa95 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java @@ -437,6 +437,9 @@ public class LisFacade { //昌黎二院lis数据的就诊卡号字段保存的病人的身份证号 else if("1000000016".equals(model.getHospitalId())){ model.setVcCardNo(cardNo); + }//衡水冀州六院 + else if("2100002324".equals(model.getHospitalId())){ + model.setVcCardNo(cardNo); } // //昌邑市妇幼保健院 lis检查表中存的是病历号 需要用身份证号码转换成病历好查询 // else if("2100001605".equals(model.getHospitalId())){ 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 6bf8f3f..6130bae 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 @@ -26,7 +26,7 @@ public interface BabyEyeCheckService extends IBaseService { BaseResponse delete(String id, Integer userId); - BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, + BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, 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 noPassIds); @@ -44,7 +44,7 @@ public interface BabyEyeCheckService extends IBaseService { BaseResponse listInit(Integer userId); - 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); + void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId,Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin); BaseResponse getBabyEyeCheckInfo(String hospitalId, 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 fef3eff..b2c176a 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 @@ -97,6 +97,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC /** * 处理历史眼保健数据，冗余到儿童档案 + * * @Author: 武涛涛 * @Date: 2020/8/7 15:29 */ @@ -108,19 +109,19 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC List babyIds = new ArrayList<>(); Criteria criteria = Criteria.where("yn").ne("0"); if (startDate != null && endDate != null) { - criteria.and("checkTime").gte( DateUtil.parseYMD(startDate)).lt(DateUtil.addDay(DateUtil.parseYMD(endDate), 1)); + criteria.and("checkTime").gte(DateUtil.parseYMD(startDate)).lt(DateUtil.addDay(DateUtil.parseYMD(endDate), 1)); } List babyEyeChecks = mongoUtil.findField(BabyEyeCheck.class, criteria, "babyId"); babyIds = CollectionUtils.getId(babyEyeChecks, "babyId", String.class); if (CollectionUtils.isNotEmpty(babyIds)) { babyIds = new ArrayList(new LinkedHashSet(babyIds)); } - for (int i = 0; i checkModels = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyIds.get(i)).and("yn").is("1")) .with(new Sort(Sort.Direction.DESC, "created")), BabyEyeCheck.class); - if(CollectionUtils.isNotEmpty(checkModels)){ + if (CollectionUtils.isNotEmpty(checkModels)) { BabyEyeCheck babyEyeCheck = checkModels.get(0); //3 使用最后检查，更新到儿童档案中。 @@ -132,7 +133,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } } } - return RespBuilder.buildSuccess("redundancyBabyCheck",redundancyBabyCheck,"redundancyBabyCheck.seiz",redundancyBabyCheck.size()); + return RespBuilder.buildSuccess("redundancyBabyCheck", redundancyBabyCheck, "redundancyBabyCheck.seiz", redundancyBabyCheck.size()); } @Override @@ -346,22 +347,25 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC return RespBuilder.buildSuccess(babyEyeCheck.getId()); } + /** - 眼保健检查 上传 患者签名 + * 眼保健检查 上传 患者签名 + * * @Author: 武涛涛 * @Date: 2020/12/16 11:09 */ public BaseResponse babyEyeCheckSign(String patientSign, String id) { if (StringUtils.isNotEmpty(id)) { - BabyEyeCheck babyEyeCheck = new BabyEyeCheck(); + BabyEyeCheck babyEyeCheck = new BabyEyeCheck(); babyEyeCheck.setPatientSign(patientSign); Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyEyeCheck)); mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), update, BabyEyeCheck.class); - }else { - return new BaseResponse().setErrormsg("没有id").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); + } else { + return new BaseResponse().setErrormsg("没有id").setErrorcode(ErrorCodeConstants.BUSINESS_ERROR); } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + /** * 检查冗余最后一次检查结果到儿童档案表中 * @@ -370,7 +374,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC * @Author: 武涛涛 * @Date: 2020/8/7 9:55 */ - private void redundancyBabyCheck(BabyEyeCheck babyEyeCheck, BabyModel babyModel,String type) { + private void redundancyBabyCheck(BabyEyeCheck babyEyeCheck, BabyModel babyModel, String type) { /* * 眼保健模块下建档 displayState=1 , 非眼保健模块下建档 displayState=2 ，null不处理历史数据 @@ -385,36 +389,36 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC babyModel.setCheckId(babyEyeCheck.getId()); babyModel.setCheckTime(babyEyeCheck.getCheckTime() == null ? new Date() : babyEyeCheck.getCheckTime()); babyModel.setNextCheckTime(babyEyeCheck.getNextCheckTime()); - babyModel.setDoctor(StringUtils.isEmpty(babyEyeCheck.getDoctor())?"":babyEyeCheck.getDoctor()); - babyModel.setCheckMonthId(StringUtils.isEmpty(babyEyeCheck.getCheckMonthId())?"":babyEyeCheck.getCheckMonthId()); - babyModel.setApparatus(StringUtils.isEmpty(babyEyeCheck.getApparatus())?"":babyEyeCheck.getApparatus()); - babyModel.setDoctorJudgement(StringUtils.isEmpty(babyEyeCheck.getDoctorJudgement())?"":babyEyeCheck.getDoctorJudgement()); - babyModel.setEyeAppearance(StringUtils.isEmpty(babyEyeCheck.getEyeAppearance())?"":babyEyeCheck.getEyeAppearance()); - babyModel.setRedReflexQhd(StringUtils.isEmpty(babyEyeCheck.getRedReflexQhd())?"":babyEyeCheck.getRedReflexQhd()); - babyModel.setRedBallTest(StringUtils.isEmpty(babyEyeCheck.getRedBallTest())?"":babyEyeCheck.getRedBallTest()); - babyModel.setBehaviorObservation(StringUtils.isEmpty(babyEyeCheck.getBehaviorObservation())?"":babyEyeCheck.getBehaviorObservation()); - babyModel.setRefractiveScreening(StringUtils.isEmpty(babyEyeCheck.getRefractiveScreening())?"":babyEyeCheck.getRefractiveScreening()); - babyModel.setEyePositionExamination(StringUtils.isEmpty(babyEyeCheck.getEyePositionExamination())?"":babyEyeCheck.getEyePositionExamination()); - babyModel.setEyeMovement(StringUtils.isEmpty(babyEyeCheck.getEyeMovement())?"":babyEyeCheck.getEyeMovement()); - babyModel.setExtEyelook(StringUtils.isEmpty(babyEyeCheck.getExtEyelook())?"":babyEyeCheck.getExtEyelook()); - babyModel.setNystagmus(StringUtils.isEmpty(babyEyeCheck.getNystagmus())?"":babyEyeCheck.getNystagmus()); - babyModel.setExtRightEyelook(StringUtils.isEmpty(babyEyeCheck.getExtRightEyelook())?"":babyEyeCheck.getExtRightEyelook()); - babyModel.setExtLeftEyelook(StringUtils.isEmpty(babyEyeCheck.getExtLeftEyelook())?"":babyEyeCheck.getExtLeftEyelook()); - babyModel.setBlinkRightReflex(StringUtils.isEmpty(babyEyeCheck.getBlinkRightReflex())?"":babyEyeCheck.getBlinkRightReflex()); - babyModel.setBlinkLefttReflex(StringUtils.isEmpty(babyEyeCheck.getBlinkLefttReflex())?"":babyEyeCheck.getBlinkLefttReflex()); - babyModel.setPupillaryRightReflex(StringUtils.isEmpty(babyEyeCheck.getPupillaryRightReflex())?"":babyEyeCheck.getPupillaryRightReflex()); - babyModel.setPupillaryLeftReflex(StringUtils.isEmpty(babyEyeCheck.getPupillaryLeftReflex())?"":babyEyeCheck.getPupillaryLeftReflex()); - babyModel.setRedRightReflex(StringUtils.isEmpty(babyEyeCheck.getRedRightReflex())?"":babyEyeCheck.getRedRightReflex()); - babyModel.setRedLeftReflex(StringUtils.isEmpty(babyEyeCheck.getRedLeftReflex())?"":babyEyeCheck.getRedLeftReflex()); - babyModel.setRedReflex(StringUtils.isEmpty(babyEyeCheck.getRedReflex())?"":babyEyeCheck.getRedReflex()); - babyModel.setConjunctiva(StringUtils.isEmpty(babyEyeCheck.getConjunctiva())?"":babyEyeCheck.getConjunctiva()); - babyModel.setCorneal(StringUtils.isEmpty(babyEyeCheck.getCorneal())?"":babyEyeCheck.getCorneal()); - babyModel.setLacrimalApparatus(StringUtils.isEmpty(babyEyeCheck.getLacrimalApparatus())?"":babyEyeCheck.getLacrimalApparatus()); - babyModel.setEyePositionId2(StringUtils.isEmpty(babyEyeCheck.getEyePositionId2())?"":babyEyeCheck.getEyePositionId2()); - babyModel.setRedLeft2(StringUtils.isEmpty(babyEyeCheck.getRedLeft2())?"":babyEyeCheck.getRedLeft2()); - babyModel.setVision2(StringUtils.isEmpty(babyEyeCheck.getVision2())?"":babyEyeCheck.getVision2()); - babyModel.setY2(StringUtils.isEmpty(babyEyeCheck.getY2())?"":babyEyeCheck.getY2()); - babyModel.setRefraction2(StringUtils.isEmpty(babyEyeCheck.getRefraction2())?"":babyEyeCheck.getRefraction2()); + babyModel.setDoctor(StringUtils.isEmpty(babyEyeCheck.getDoctor()) ? "" : babyEyeCheck.getDoctor()); + babyModel.setCheckMonthId(StringUtils.isEmpty(babyEyeCheck.getCheckMonthId()) ? "" : babyEyeCheck.getCheckMonthId()); + babyModel.setApparatus(StringUtils.isEmpty(babyEyeCheck.getApparatus()) ? "" : babyEyeCheck.getApparatus()); + babyModel.setDoctorJudgement(StringUtils.isEmpty(babyEyeCheck.getDoctorJudgement()) ? "" : babyEyeCheck.getDoctorJudgement()); + babyModel.setEyeAppearance(StringUtils.isEmpty(babyEyeCheck.getEyeAppearance()) ? "" : babyEyeCheck.getEyeAppearance()); + babyModel.setRedReflexQhd(StringUtils.isEmpty(babyEyeCheck.getRedReflexQhd()) ? "" : babyEyeCheck.getRedReflexQhd()); + babyModel.setRedBallTest(StringUtils.isEmpty(babyEyeCheck.getRedBallTest()) ? "" : babyEyeCheck.getRedBallTest()); + babyModel.setBehaviorObservation(StringUtils.isEmpty(babyEyeCheck.getBehaviorObservation()) ? "" : babyEyeCheck.getBehaviorObservation()); + babyModel.setRefractiveScreening(StringUtils.isEmpty(babyEyeCheck.getRefractiveScreening()) ? "" : babyEyeCheck.getRefractiveScreening()); + babyModel.setEyePositionExamination(StringUtils.isEmpty(babyEyeCheck.getEyePositionExamination()) ? "" : babyEyeCheck.getEyePositionExamination()); + babyModel.setEyeMovement(StringUtils.isEmpty(babyEyeCheck.getEyeMovement()) ? "" : babyEyeCheck.getEyeMovement()); + babyModel.setExtEyelook(StringUtils.isEmpty(babyEyeCheck.getExtEyelook()) ? "" : babyEyeCheck.getExtEyelook()); + babyModel.setNystagmus(StringUtils.isEmpty(babyEyeCheck.getNystagmus()) ? "" : babyEyeCheck.getNystagmus()); + babyModel.setExtRightEyelook(StringUtils.isEmpty(babyEyeCheck.getExtRightEyelook()) ? "" : babyEyeCheck.getExtRightEyelook()); + babyModel.setExtLeftEyelook(StringUtils.isEmpty(babyEyeCheck.getExtLeftEyelook()) ? "" : babyEyeCheck.getExtLeftEyelook()); + babyModel.setBlinkRightReflex(StringUtils.isEmpty(babyEyeCheck.getBlinkRightReflex()) ? "" : babyEyeCheck.getBlinkRightReflex()); + babyModel.setBlinkLefttReflex(StringUtils.isEmpty(babyEyeCheck.getBlinkLefttReflex()) ? "" : babyEyeCheck.getBlinkLefttReflex()); + babyModel.setPupillaryRightReflex(StringUtils.isEmpty(babyEyeCheck.getPupillaryRightReflex()) ? "" : babyEyeCheck.getPupillaryRightReflex()); + babyModel.setPupillaryLeftReflex(StringUtils.isEmpty(babyEyeCheck.getPupillaryLeftReflex()) ? "" : babyEyeCheck.getPupillaryLeftReflex()); + babyModel.setRedRightReflex(StringUtils.isEmpty(babyEyeCheck.getRedRightReflex()) ? "" : babyEyeCheck.getRedRightReflex()); + babyModel.setRedLeftReflex(StringUtils.isEmpty(babyEyeCheck.getRedLeftReflex()) ? "" : babyEyeCheck.getRedLeftReflex()); + babyModel.setRedReflex(StringUtils.isEmpty(babyEyeCheck.getRedReflex()) ? "" : babyEyeCheck.getRedReflex()); + babyModel.setConjunctiva(StringUtils.isEmpty(babyEyeCheck.getConjunctiva()) ? "" : babyEyeCheck.getConjunctiva()); + babyModel.setCorneal(StringUtils.isEmpty(babyEyeCheck.getCorneal()) ? "" : babyEyeCheck.getCorneal()); + babyModel.setLacrimalApparatus(StringUtils.isEmpty(babyEyeCheck.getLacrimalApparatus()) ? "" : babyEyeCheck.getLacrimalApparatus()); + babyModel.setEyePositionId2(StringUtils.isEmpty(babyEyeCheck.getEyePositionId2()) ? "" : babyEyeCheck.getEyePositionId2()); + babyModel.setRedLeft2(StringUtils.isEmpty(babyEyeCheck.getRedLeft2()) ? "" : babyEyeCheck.getRedLeft2()); + babyModel.setVision2(StringUtils.isEmpty(babyEyeCheck.getVision2()) ? "" : babyEyeCheck.getVision2()); + babyModel.setY2(StringUtils.isEmpty(babyEyeCheck.getY2()) ? "" : babyEyeCheck.getY2()); + babyModel.setRefraction2(StringUtils.isEmpty(babyEyeCheck.getRefraction2()) ? "" : babyEyeCheck.getRefraction2()); Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyModel)); mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyModel.getId())), update, BabyModel.class); @@ -441,13 +445,12 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC @Override public BaseResponse info(String id) { - Map map= getEyeCheckView(id); + Map map = getEyeCheckView(id); return RespBuilder.buildSuccess(map); } - private Map getEyeCheckView(String id) - { + private Map getEyeCheckView(String id) { BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class); Map map = ReflectionUtils.beanToMap(babyEyeCheck); @@ -473,12 +476,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (StringUtils.isNotEmpty(babyEyeCheck.getR1())) { //抚宁县妇幼 - if ("197".equals(babyEyeCheck.getHospitalId())) - { + if ("197".equals(babyEyeCheck.getHospitalId())) { refractometer.append("R( ").append(babyEyeCheck.getR1()).append(" )"); - } - else - { + } else { refractometer.append("R:S( ").append(babyEyeCheck.getR1()).append(" )"); } @@ -495,12 +495,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC refractometer.append(", "); flag = true; } //抚宁县妇幼 - if ("197".equals(babyEyeCheck.getHospitalId())) - { + if ("197".equals(babyEyeCheck.getHospitalId())) { refractometer.append("L( ").append(babyEyeCheck.getL1()).append(" ) "); - } - else - { + } else { refractometer.append("L:S( ").append(babyEyeCheck.getL1()).append(" ) "); } @@ -517,12 +514,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC StringBuilder refraction = new StringBuilder(); if (StringUtils.isNotEmpty(babyEyeCheck.getRefractionR1())) { - if ("197".equals(babyEyeCheck.getHospitalId())) - { + if ("197".equals(babyEyeCheck.getHospitalId())) { refraction.append("R( ").append(babyEyeCheck.getRefractionR1()).append(" )"); - } - else - { + } else { refraction.append("R:S( ").append(babyEyeCheck.getRefractionR1()).append(" )"); } @@ -539,12 +533,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC refraction.append(", "); flag2 = true; } - if ("197".equals(babyEyeCheck.getHospitalId())) - { + if ("197".equals(babyEyeCheck.getHospitalId())) { refraction.append("L( ").append(babyEyeCheck.getRefractionL1()).append(" ) "); - } - else - { + } else { refraction.append("L:S( ").append(babyEyeCheck.getRefractionL1()).append(" ) "); } @@ -609,16 +600,43 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC @Override public BaseResponse infoQhd(String id) { - Map map = getBabyEyeCheckViewQhd(id); + Map map = getBabyEyeCheckViewQhd(id); return RespBuilder.buildSuccess(map); } + public String getHz(String coo, String type) { + String s = ""; + if ("1".equals(type)) { + if ("1".equals(coo)) { + s = "欠合作"; + } else if ("2".equals(coo)) { + s = "不合作"; + } else if ("3".equals(coo)) { + s = "其他"; + } + } else if ("2".equals(type)) { + if ("1".equals(coo)) { + s = "稍不对称"; + } else if ("2".equals(coo)) { + s = "稍减弱"; + } else if ("3".equals(coo)) { + s = "减弱"; + } else if ("4".equals(coo)) { + s = "欠合作"; + } else if ("5".equals(coo)) { + s = "不合作"; + } else if ("6".equals(coo)) { + s = "其他"; + } + } + return s; + } - private Map getBabyEyeCheckViewQhd(String id) - { + private Map getBabyEyeCheckViewQhd(String id) { BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class); Map map = ReflectionUtils.beanToMap(babyEyeCheck); + map.put("doctorSign", babyEyeCheck.getDoctorSign()); map.put("patientSign", babyEyeCheck.getPatientSign()); @@ -641,20 +659,27 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC map.put("handleOpinionsIdList", babyEyeCheck.getHandleOpinionsIdList());//医生自定义处理意见 id map.put("handleOpinionsId", HandleOpinionsQhdEnums.getName(babyEyeCheck.getHandleOpinionsId()));//处理意见 id,历史数据不做匹配 map.put("eyeAppearance", babyEyeCheck.getEyeAppearance());//眼外观 1通过 2不通过 + map.put("eyeAppearanceCoo", getHz(babyEyeCheck.getEyeAppearanceCoo(),"1")); map.put("redReflexQhd", babyEyeCheck.getRedReflexQhd());//红光反射 map.put("redReflexQhdOther", babyEyeCheck.getRedReflexQhdOther()); + map.put("redReflexQhdCoo", getHz(babyEyeCheck.getRedReflexQhdCoo(),"2")); map.put("blinkReflex", babyEyeCheck.getBlinkReflex()); //瞬目反射 map.put("blinkReflexOther", babyEyeCheck.getBlinkReflexOther()); + map.put("blinkReflexCoo", getHz(babyEyeCheck.getBlinkReflexCoo(),"1")); map.put("redBallTest", babyEyeCheck.getRedBallTest()); //红球试验 map.put("redBallTestOther", babyEyeCheck.getRedBallTestOther()); + map.put("redBallTestCoo", getHz(babyEyeCheck.getRedBallTestCoo(),"1")); map.put("behaviorObservation", babyEyeCheck.getBehaviorObservation());//视物行为观察 map.put("behaviorObservationOther", babyEyeCheck.getBehaviorObservationOther()); + map.put("behaviorObservationCoo", getHz(babyEyeCheck.getBehaviorObservationCoo(),"1")); map.put("refractiveScreening", babyEyeCheck.getRefractiveScreening());//屈光筛查 map.put("refractiveScreeningOther", babyEyeCheck.getRefractiveScreeningOther()); map.put("eyePositionExamination", babyEyeCheck.getEyePositionExamination()); //眼位检查 map.put("eyePositionExaminationOther", babyEyeCheck.getEyePositionExaminationOther()); + map.put("eyePositionExaminationCoo", getHz(babyEyeCheck.getEyePositionExaminationCoo(),"1")); map.put("eyeMovement", babyEyeCheck.getEyeMovement()); //眼球运动 map.put("eyeMovementOther", babyEyeCheck.getEyeMovementOther()); + map.put("eyeMovementCoo", getHz(babyEyeCheck.getEyeMovementCoo(),"1")); map.put("typeOfWearingGlasses", babyEyeCheck.getTypeOfWearingGlasses());//戴镜类型 1框架眼镜 2隐形眼镜 3角膜塑形镜 4不戴镜 map.put("rightEyeVision", babyEyeCheck.getRightEyeVision()); //右眼:裸眼视力 map.put("rightVision", babyEyeCheck.getRightVision());//右眼:戴镜视力 @@ -902,7 +927,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } @Override - public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, + public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, 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 noPassIds) { @@ -948,9 +973,14 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if (StringUtils.isNotEmpty(yin)) { criteria.and("apparatus").nin("2").and("doctorJudgement").nin("2"); } - if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { + if (org.apache.commons.lang.StringUtils.isNotBlank(key) || org.apache.commons.lang.StringUtils.isNotBlank(yeymcId)) { 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); + if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { + c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0); + } + if (org.apache.commons.lang.StringUtils.isNotBlank(yeymcId)) { + c.and("yeymcId").is(yeymcId); + } List babyModels = mongoUtil.findField(BabyModel.class, c, "id"); List babyIds = CollectionUtils.getId(babyModels, "id", String.class); criteria.and("babyId").in(babyIds); @@ -1034,7 +1064,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC Date startDate, Date endDate, String doctor, String key, - Integer currentMonthStart,Integer currentMonthEnd, + Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, @@ -1052,21 +1082,21 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC babyModelQuery.setHospitalId(hospitalId); babyModelQuery.setDisplayState("1"); - if(startBuildDate!=null && endBuildDate!=null){ + if (startBuildDate != null && endBuildDate != null) { babyModelQuery.setBuildDateNoybjStart(startBuildDate); babyModelQuery.setBuildDateNoybjEnd(DateUtil.addDay(endBuildDate, 1)); } - if(startDate!=null && endDate!=null){ + if (startDate != null && endDate != null) { babyModelQuery.setCheckTimeStart(startDate); babyModelQuery.setCheckTimeEnd(DateUtil.addDay(endDate, 1)); } - if(bookStartDate!=null && bookEndDate!=null){ + if (bookStartDate != null && bookEndDate != null) { babyModelQuery.setNextCheckTimeStart(bookStartDate); babyModelQuery.setNextCheckTimeEnd(DateUtil.addDay(bookEndDate, 1)); } babyModelQuery.setDoctor(doctor); babyModelQuery.setQueryNo(key); - if(currentMonthStart!=null && currentMonthEnd!=null){ + if (currentMonthStart != null && currentMonthEnd != null) { babyModelQuery.setBirthStart(DateUtil.getBirthStart(currentMonthEnd)); babyModelQuery.setBirthEnd(DateUtil.getBirthEnd(currentMonthStart)); } @@ -1169,11 +1199,11 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC Map mapResult = new HashMap(); mapResult.put("babyId", babyModel.getId());//儿童档案id mapResult.put("babyName", babyModel.getName());//儿童姓名 - if(babyModel.getSex()!=null && babyModel.getSex()==0){ + if (babyModel.getSex() != null && babyModel.getSex() == 0) { mapResult.put("sex", "女");//性别 - }else if(babyModel.getSex()!=null && babyModel.getSex()==1){ + } else if (babyModel.getSex() != null && babyModel.getSex() == 1) { mapResult.put("sex", "男"); - }else { + } else { mapResult.put("sex", "_"); } mapResult.put("mname", babyModel.getMname());//母亲姓名 @@ -1386,6 +1416,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } return positive; } + private StringBuilder getYxxmBaby(BabyModel babyModel) { StringBuilder positive = new StringBuilder(); /** 阳性项目 */ if ("yang".equals(babyModel.getExtRightEyelook())) { @@ -1731,7 +1762,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC List babyEyeChecks = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").in(hospitalIds).and("yn").ne("0")) .with(new Sort(Sort.Direction.ASC, "checkTime")), BabyEyeCheck.class); - List checkMonthQhdEnums1 = CheckMonthQhdEnums.getCheckMonthQhdEnums(); + List checkMonthQhdEnums1 = CheckMonthQhdEnums.getCheckMonthQhdEnums(); for (BabyEyeCheck babyEyeCheck : babyEyeChecks) { Map temp = new HashMap<>(); if (StringUtils.isNotEmpty(babyEyeCheck.getEdition())) { @@ -1750,7 +1781,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC try { for (int i = 0; i < checkMonthQhdEnums1.size(); i++) { Map map = checkMonthQhdEnums1.get(i); - if( map.get("name").toString().equals(temp.get("checkMonth").toString())){ + if (map.get("name").toString().equals(temp.get("checkMonth").toString())) { map.put("state", "2"); map.put("id", babyEyeCheck.getId()); map.put("checkTime", babyEyeCheck.getCheckTime() == null ? null : DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); @@ -1988,12 +2019,12 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth, "checkMonthQhdEnums", checkMonthQhdEnums, "checkMonthQhdBTGEnums", - checkMonthQhdBTGEnums,"psychologistEnums",psychologistEnums,"nutritionSpecialtyEnums",nutritionSpecialtyEnums,"departmentReferralEnums",departmentReferralEnums); + checkMonthQhdBTGEnums, "psychologistEnums", psychologistEnums, "nutritionSpecialtyEnums", nutritionSpecialtyEnums, "departmentReferralEnums", departmentReferralEnums); } @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, String yin) { - BaseResponse rest = list(userId, startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, null); + public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, String yeymcId, 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, yeymcId, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin, null); PageResult pageResult = (PageResult) rest.getObject(); List> datas = (List>) pageResult.getGrid(); Map cnames = new LinkedHashMap<>(); @@ -2029,7 +2060,6 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } - private void syncData(String action, Object data, String id) { try { SyncDataModel model = new SyncDataModel(); @@ -2075,16 +2105,13 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC temp.put("checkTime", babyEyeCheck.getCheckTime() == null ? null : DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime())); temp.put("type", "2"); CollectionUtils.removeNullValue(temp); - Map map = null; - if ("216".equals(hospitalId)) - { + Map map = null; + if ("216".equals(hospitalId)) { map = getBabyEyeCheckViewQhd(babyEyeCheck.getId()); - } - else - { + } else { map = getEyeCheckView(babyEyeCheck.getId()); } - temp.put("viewData",map); + temp.put("viewData", map); datas.add(temp); } -- 1.8.3.1