diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 0f9df8c..3db92cf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -927,8 +927,7 @@ public class AntExRecordFacade { if (CollectionUtils.isNotEmpty(list)) { List placentaList = new ArrayList<>(); for (String l : list) { - if (StringUtils.isEmpty(l)) - { + if (StringUtils.isEmpty(l)) { continue; } Map map = new HashMap(); @@ -982,8 +981,7 @@ public class AntExRecordFacade { if (CollectionUtils.isNotEmpty(list)) { List placentaList = new ArrayList<>(); for (String l : list) { - if (StringUtils.isEmpty(l)) - { + if (StringUtils.isEmpty(l)) { continue; } Map map = new HashMap(); @@ -992,8 +990,12 @@ public class AntExRecordFacade { } antExAddRequest.setTireData(placentaList); antExAddRequest.setTireNumber(list.size() + ""); + antExAddRequest.setNextCheckTime(nextTime); + GuidelinesQuery guidelinesQuery = new GuidelinesQuery(); guidelinesQuery.setType(1); + + Integer start = DateUtil.getWeek(patients.getLastMenses(), new Date()); if (start <= 5) { start = 5; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index a4e93e1..1975678 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -127,6 +127,7 @@ public class ViewFacade { @Autowired private BabyEvaluationCriterionService babyEvaluationCriterionService; + /** * 建档查询 * @@ -6105,7 +6106,7 @@ public class ViewFacade { Object object = baseQuery.getObject(); HashMap hashMap = new HashMap<>(); // 运动智龄、发育商 - String exerciseIA =""; + String exerciseIA = ""; String exerciseDQ = ""; // 动作 String movementIA = ""; @@ -6170,8 +6171,11 @@ public class ViewFacade { if (antenatalExaminationModel != null) { //检查日期 map.put("checkDate", DateUtil.getyyyy_MM_dd(antenatalExaminationModel.getCheckDate())); - //孕周 - map.put("week", DateUtil.getWeekDesc(antenatalExaminationModel.getLastMenses(), new Date())); + Patients patients = patientsService.findOnePatientById(antenatalExaminationModel.getParentId()); + if (null != patients) { + //孕周 + map.put("week", DateUtil.getWeekDesc(patients.getLastMenses(), new Date())); + } //血压 map.put("bloodPressure", antenatalExaminationModel.getBp()); //体重 @@ -6180,58 +6184,6 @@ public class ViewFacade { map.put("fuh", antenatalExaminationModel.getGongGao()); //腹围 map.put("abdominalCircumference", antenatalExaminationModel.getAbdominalCircumference()); - /*//默认值 - List list = new ArrayList(); - List list1 = new ArrayList(); - List list2 = new ArrayList(); - List list3 = new ArrayList(); - if (CollectionUtils.isNotEmpty(antenatalExaminationModel.getTireData())) { - // String heartRateVal = "", fetalPositionVal = "", fetalPresentationVal = "", joinVal = ""; - for (int j = 0; j < antenatalExaminationModel.getTireData().size(); j++) { - LinkedHashMap maps = (LinkedHashMap) antenatalExaminationModel.getTireData().get(j); - if (null != maps) { - - //胎先露、胎方位、胎心率和衔接 - String heartRate = String.valueOf(maps.get("heartRate")); - System.out.println("========>" + heartRate); - String fetalPosition = String.valueOf(maps.get("fetalPosition")); - String fetalPresentation = String.valueOf(maps.get("fetalPresentation")); - String join = String.valueOf(maps.get("join")); - if (!"null".equals(heartRate) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(heartRate)) { - //胎心率 - // map.put("heartRate", heartRate); - list.add(heartRate); - // heartRateVal += heartRate + "次/分" + ","; - } - if (!"null".equals(fetalPosition) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(fetalPosition)) { - //胎方位 - // map.put("fetalPosition", fetalPosition); - - list1.add(fetalPosition); - // fetalPositionVal += FetalPositionEnums.getTitle(fetalPosition) + ","; - } - if (!"null".equals(fetalPresentation) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(fetalPresentation)) { - //胎先露 - // map.put("fetalPresentation", fetalPresentation); - list2.add(fetalPresentation); - } - // fetalPresentationVal += FetalEnums.getTitle(fetalPresentation) + ","; - - if (!"null".equals(join) && com.lyms.platform.common.utils.StringUtils.isNotEmpty(join)) { - // joinVal += JoinEnums.getTitle(join) + ","; - //衔接 - // map.put("join", join); - list3.add(join); - } - } - } - } - map.put("heartRate", list); - map.put("fetalPosition", list1); - map.put("fetalPresentation", list2); - map.put("join", list3);*/ - //胎儿情况 - List tireList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(antenatalExaminationModel.getTireData())) { for (Object temp : antenatalExaminationModel.getTireData()) { 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 cf8d41a..3d3519a 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 @@ -107,87 +107,6 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC babyEyeCheck.setDoctorJudgement("2"); } - /* if ("yang".equals(babyEyeCheck.getEyePositionId2())) { - //positive.append("眼位(医生判定)"); - babyEyeCheck.setEyePositionId2Yang("2"); - } - if ("yang".equals(babyEyeCheck.getRedLeft2())) { - //positive.append("红光反射（医生判定）"); - babyEyeCheck.setRedLeft2Yang("2"); - } - if ("yang".equals(babyEyeCheck.getVision2())) { - //positive.append("视力（医生判定）"); - babyEyeCheck.setVision2Yang("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"); - } -*/ - babyEyeCheck.setCreated(new Date()); babyEyeCheck.setYn("1"); babyEyeCheck.setOperaterId(userId + ""); @@ -454,7 +373,6 @@ 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)) { 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);