diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java index 4361245..9d7eeed 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyCheckController.java @@ -163,7 +163,7 @@ public class BabyCheckController extends BaseController { @RequestParam(value = "highRisk", required = false) String highRisk, @RequestParam(value = "waskSon", required = false) String waskSon, Integer page, Integer limit, HttpServletRequest request) { - return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, limit, page, getUserId(request)); + return babyCheckFacade.babyCheckList(checkTime, queryNo, startCheckMonthAge, endCheckMonthAge, nextDate, highRisk, waskSon, page, limit, getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 40112a5..41830fe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -755,14 +755,14 @@ public class BabyCheckFacade extends BaseServiceImpl { return br; } - public BaseResponse babyCheckList(String checkTime, String queryNo, Integer checkMonthAge, Integer endCheckMonthAge, String nextDate, String highRisk, String waskSon, Integer page, Integer limit, Integer userId) { boolean flag = false; List hospital = groupsFacade.findGroupHospital(userId, false); Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); if (org.apache.commons.lang.StringUtils.isNotBlank(queryNo)) { - pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), Criteria.where("fphone").regex(queryNo)); + pCriteria.orOperator(Criteria.where("mcertNo").regex(queryNo), Criteria.where("name").regex(queryNo), + Criteria.where("fphone").regex(queryNo), Criteria.where("vcCardNo").regex(queryNo)); flag = true; } if (flag) { @@ -805,23 +805,42 @@ public class BabyCheckFacade extends BaseServiceImpl { if (StringUtils.isNotEmpty(babyCheckModel.getBuildId())) { BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(babyCheckModel.getBuildId())), BabyModel.class); map.put("babyName", babyModel.getName()); - map.put("sex", babyModel.getSex()); + map.put("sex", babyModel.getSex() != 0 ? "男" : "女"); map.put("mName", babyModel.getMname()); map.put("mCardNo", babyModel.getCardNo()); map.put("checkMonthAge", DateUtil.getBabyMonthAge(babyModel.getBirth(), babyCheckModel.getCheckDate())); + map.put("monthAge", DateUtil.getMonth(babyModel.getBirth(), babyCheckModel.getCheckDate())); } map.put("checkTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getCheckDate())); map.put("nextCheckTime", DateUtil.getyyyy_MM_dd(babyCheckModel.getNextDate())); - map.put("highRisk", babyCheckModel.getHighRisk() == 1 ? "高危儿" : "-"); - map.put("waskSon", babyCheckModel.getWaskSon() == 1 ? "低弱儿" : "-"); + if (null != babyCheckModel.getHighRisk()) { + map.put("highRisk", babyCheckModel.getHighRisk() == 1 ? "高危儿" : "-"); + } else { + map.put("highRisk", "-"); + } + if (null != babyCheckModel.getWaskSon()) { + map.put("waskSon", babyCheckModel.getWaskSon() == 1 ? "低弱儿" : "-"); + } else { + map.put("waskSon", "-"); + } map.put("height", babyCheckModel.getHeight()); map.put("weight", babyCheckModel.getWeight()); list.add(map); } - pageResult.setGrid(list); - return RespBuilder.buildSuccess(pageResult); - } + if (null != checkMonthAge && null != endCheckMonthAge) { + for (Map mapList : list) { + if ((int) mapList.get("monthAge") >= checkMonthAge && (int) mapList.get("monthAge") <= endCheckMonthAge) { + list.add(mapList); + } + } + pageResult.setGrid(list); + return RespBuilder.buildSuccess(pageResult); + } else { + pageResult.setGrid(list); + return RespBuilder.buildSuccess(pageResult); + } + } public void getBabyCheckList(String[] ids, PersonModel personModel, List> list) { List checkModels; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java index 7be235f..49ff383 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DischargeAbstractFacade.java @@ -13,12 +13,10 @@ import com.lyms.platform.operate.web.request.DischargeAbstractQueryRequest; import com.lyms.platform.operate.web.request.DischargeAbstractSaveRequest; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; +import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.UsersService; -import com.lyms.platform.pojo.BabyModel; -import com.lyms.platform.pojo.DischargeAbstractBabyModel; -import com.lyms.platform.pojo.DischargeAbstractMotherModel; -import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.*; import com.lyms.platform.query.BabyModelQuery; import com.lyms.platform.query.DischargeAbstractBabyQuery; import com.lyms.platform.query.DischargeAbstractMotherQuery; @@ -404,9 +402,9 @@ public class DischargeAbstractFacade extends BaseServiceImpl { Criteria pCriteria = Criteria.where("yn").ne("0").and("hospitalId").in(hospital); boolean flag = false; if (StringUtils.isNotEmpty(queryNo)) { - pCriteria.orOperator(Criteria.where("cardNo").is(queryNo), - Criteria.where("username").is(queryNo), Criteria.where("phone").is(queryNo) - , Criteria.where("vcCardNo").is(queryNo)); + pCriteria.orOperator(Criteria.where("cardNo").regex(queryNo), + Criteria.where("username").regex(queryNo), Criteria.where("phone").regex(queryNo) + , Criteria.where("vcCardNo").regex(queryNo)); flag = true; } if (StringUtils.isNotEmpty(fmDate)) { @@ -452,6 +450,9 @@ public class DischargeAbstractFacade extends BaseServiceImpl { map.put("phoen", patients.getPhone()); map.put("age", patients.getAge() + "岁"); map.put("fmDate", DateUtil.getyyyy_MM_dd(patients.getFmDate())); + + MaternalDeliverModel maternalDeliverModel = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(patients.getId())), MaternalDeliverModel.class); + map.put("tireNumber", maternalDeliverModel.getTireNumber()); String rFactor = commonService.resloveFactor(patients.getRiskFactorId()); if (patients.getoRiskFactor() != null && !"null".equals(patients.getoRiskFactor())) { if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(rFactor)) { @@ -462,11 +463,20 @@ public class DischargeAbstractFacade extends BaseServiceImpl { } map.put("highRisk", rFactor); } + map.put("id", dischargeAbstract.getId()); map.put("leaveHospitalDate", DateUtil.getyyyy_MM_dd(dischargeAbstract.getLeaveHospitalDate())); map.put("description", dischargeAbstract.getDescription()); map.put("afterMakeBabyDays", dischargeAbstract.getAfterMakeBabyDays()); - map.put("litterIndex", ""); - map.put("inputPerson", dischargeAbstract.getInputMan()); + String bookbuildingDoctor = ""; + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(dischargeAbstract.getInputMan())) { + Users user = usersService.getUsers(Integer.valueOf(dischargeAbstract.getInputMan())); + if (user != null) { + bookbuildingDoctor = user.getName(); + } else { + System.out.println(dischargeAbstract.getId() + ";no user inputMan" + dischargeAbstract.getInputMan()); + } + } + map.put("inputPerson", bookbuildingDoctor); map.put("inputdate", DateUtil.getyyyy_MM_dd(dischargeAbstract.getCreateDate())); data.add(map);