diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java index cbc4399..9181d79 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionFacade.java @@ -282,11 +282,11 @@ public class BabyNutritionFacade { private Map getMapData(BabyNutritionModel model, Integer currentSettleStatus) { Map map = new HashMap(); - map.put("id",model.getId()); - map.put("babyId",model.getBabyId()); + map.put("id", model.getId()); + map.put("babyId", model.getBabyId()); BabyModel baby = babyBookbuildingService.queryBabyBuildById(model.getBabyId()); - map.put("babyName",baby.getName()); + map.put("babyName", baby.getName()); map.put("babySex", SexEnum.getTextById(baby.getSex())); map.put("monthAge", StringUtils.emptyDeal(DateUtil.getBabyMonthAge(baby.getBirth(), new Date()))); map.put("motherName", baby.getMname()); @@ -294,7 +294,7 @@ public class BabyNutritionFacade { map.put("vcCardNo", baby.getVcCardNo()); String highRiskInfos = basicConfigFacade.queryBaseInfoByStr(baby.getHighRiskInfo()); - map.put("highRiskInfos",highRiskInfos); + map.put("highRiskInfos", highRiskInfos); String diagnose = ""; if (StringUtils.isNotEmpty(baby.getPid())) { @@ -318,14 +318,14 @@ public class BabyNutritionFacade { // 新增报表解读人和结算状态 String currInterpretDoctorId = model.getInterpretDoctorId(); String interpretDoctorName = ""; - if (StringUtils.isNotEmpty(currInterpretDoctorId)){ + if (StringUtils.isNotEmpty(currInterpretDoctorId)) { Users users = usersService.getUsers(Integer.parseInt(currInterpretDoctorId)); - if (users != null){ + if (users != null) { interpretDoctorName = users.getName(); } } String settleStatusName = ""; - if (currentSettleStatus != null){ + if (currentSettleStatus != null) { settleStatusName = currentSettleStatus == 1 ? "未结算" : "已结算"; } map.put("interpretDoctorName", interpretDoctorName); @@ -919,7 +919,7 @@ public class BabyNutritionFacade { */ public BaseResponse unSettleList(BabyNutritionSettleRequest request, Integer userId) { - HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); + HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); healthChargeQuery.setPage(request.getPage()); healthChargeQuery.setLimit(request.getLimit()); healthChargeQuery.setNeed("true"); @@ -931,43 +931,44 @@ public class BabyNutritionFacade { Date startDate = areaCountFacade.getStartDate(); healthChargeQuery.setCreatedStart(startDate); healthChargeQuery.setCreatedEnd(new Date()); - if (request.getStartTime() != null){ + if (request.getStartTime() != null) { healthChargeQuery.setCreatedStart(request.getStartTime()); healthChargeQuery.setCreatedEnd(request.getEndTime()); } String findNo = request.getNumber(); String keyword = request.getKeyword(); - List arrayList = new ArrayList() {}; + List arrayList = new ArrayList() { + }; BaseListResponse objectResponse = new BaseListResponse(); - if (StringUtils.isNotEmpty(findNo) && StringUtils.isNotEmpty(keyword)){ + if (StringUtils.isNotEmpty(findNo) && StringUtils.isNotEmpty(keyword)) { List babyModels = getBabyModels(findNo, null); - if (CollectionUtils.isNotEmpty(babyModels)){ - for (BabyModel model: babyModels){ + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel model : babyModels) { String name = model.getName(); - if (name.contains(keyword)){ + if (name.contains(keyword)) { String modelId = model.getId(); arrayList.add(modelId); } } } - }else if (StringUtils.isNotEmpty(findNo)){ + } else if (StringUtils.isNotEmpty(findNo)) { List babyModels = getBabyModels(findNo, null); - if (CollectionUtils.isNotEmpty(babyModels)){ - for (BabyModel model: babyModels){ + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel model : babyModels) { String modelId = model.getId(); arrayList.add(modelId); } } - }else if (StringUtils.isNotEmpty(keyword)){ + } else if (StringUtils.isNotEmpty(keyword)) { List babyModels = mongoTemplate.find(Query.query(Criteria.where("name").regex(keyword)), BabyModel.class); - if (CollectionUtils.isNotEmpty(babyModels)){ - for (BabyModel babyModel : babyModels){ + if (CollectionUtils.isNotEmpty(babyModels)) { + for (BabyModel babyModel : babyModels) { arrayList.add(babyModel.getId()); } } } - if (arrayList.size() > 0){ + if (arrayList.size() > 0) { healthChargeQuery.setIds(arrayList); } List> healthChargeModels = getHealthChargeModels(healthChargeQuery); @@ -988,7 +989,7 @@ public class BabyNutritionFacade { private List> getHealthChargeModels(HealthChargeQuery healthChargeQuery) { List> list = new LinkedList<>(); List healthChargeModels = healthChargeService.queryHealthChargeList(healthChargeQuery); - for (HealthChargeModel healthChargeModel : healthChargeModels){ + for (HealthChargeModel healthChargeModel : healthChargeModels) { String foreignId = healthChargeModel.getBabyForeignId(); BabyModel mongoTemplateOne = mongoTemplate.findOne(Query.query(Criteria.where("id").is(foreignId)), BabyModel.class); @@ -997,16 +998,16 @@ public class BabyNutritionFacade { String babyNutritionId = healthChargeModel.getBabyNutritionId(); Date createTime = null; - if (babyNutritionId != null){ + if (babyNutritionId != null) { BabyNutritionModel nutritionModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyNutritionId)), BabyNutritionModel.class); createTime = nutritionModel.getCreated(); } String doctorId = healthChargeModel.getDoctorId(); String doctorName = ""; - if (doctorId != null){ + if (doctorId != null) { Users users = mongoTemplate.findOne(Query.query(Criteria.where("id")), Users.class); - if (users != null){ + if (users != null) { doctorName = users.getName(); } } @@ -1040,7 +1041,7 @@ public class BabyNutritionFacade { BabyModelQuery babyQuery = new BabyModelQuery(); babyQuery.setQueryNo(findNo); babyQuery.setYn(YnEnums.YES.getId()); - if (babyForeignId != null){ + if (babyForeignId != null) { babyQuery.setId(babyForeignId); } return babyBookbuildingService.queryBabyBuildByCond(babyQuery); @@ -1055,14 +1056,14 @@ public class BabyNutritionFacade { * @return */ public BaseResponse settleStatus(BabyNutritionSettleRequest request, Integer userId) { - HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); + HealthChargeQuery healthChargeQuery = new HealthChargeQuery(); healthChargeQuery.setHealthType(5); healthChargeQuery.setYn(YnEnums.YES.getId()); healthChargeQuery.setHospitalId(request.getHospitalId()); healthChargeQuery.setStatus(1); Date startTime = request.getStartTime(); Date endTime = request.getEndTime(); - if (startTime == null || endTime == null){ + if (startTime == null || endTime == null) { return new BaseResponse("请填写起始时间", ErrorCodeConstants.PARAMETER_ERROR); } healthChargeQuery.setCreatedStart(startTime); @@ -1085,7 +1086,7 @@ public class BabyNutritionFacade { HealthChargeModel model = new HealthChargeModel(); model.setChargeRecordId(recordModel.getId()); model.setStatus(2); - healthChargeService.updateHealthCharges(healthChargeQuery,model); + healthChargeService.updateHealthCharges(healthChargeQuery, model); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -1099,7 +1100,7 @@ public class BabyNutritionFacade { */ public BaseResponse settleHistoryList(BabyNutritionSettleRequest request, Integer userId) { List listData = new ArrayList<>(); - ChargeRecordQuery chargeRecordQuery = new ChargeRecordQuery(); + ChargeRecordQuery chargeRecordQuery = new ChargeRecordQuery(); chargeRecordQuery.setHealthType(5); chargeRecordQuery.setHospitalId(request.getHospitalId()); chargeRecordQuery.setOperateUserId(userId.toString()); @@ -1108,28 +1109,28 @@ public class BabyNutritionFacade { chargeRecordQuery.setNeed("true"); Date startTime = request.getStartTime(); Date endTime = request.getEndTime(); - if (startTime == null || endTime == null){ + if (startTime == null || endTime == null) { startTime = areaCountFacade.getStartDate(); endTime = new Date(); } chargeRecordQuery.setCreatedStart(startTime); chargeRecordQuery.setCreatedEnd(endTime); - List list = chargeRecordService.queryChargeRecordList(chargeRecordQuery); + List list = chargeRecordService.queryChargeRecordList(chargeRecordQuery); if (CollectionUtils.isNotEmpty(list)) { - for (ChargeRecordModel model : list){ + for (ChargeRecordModel model : list) { Map map = new LinkedHashMap(); - map.put("id",model.getId()); - map.put("startDate",DateUtil.getyyyy_MM_dd(model.getStartDate())); - map.put("endDate",DateUtil.getyyyy_MM_dd(model.getEndDate())); - map.put("chargeCount",model.getChargeCount()); + map.put("id", model.getId()); + map.put("startDate", DateUtil.getyyyy_MM_dd(model.getStartDate())); + map.put("endDate", DateUtil.getyyyy_MM_dd(model.getEndDate())); + map.put("chargeCount", model.getChargeCount()); Users users = usersService.getUsers(Integer.parseInt(model.getOperateUserId())); String doctorName = ""; - if (users != null){ + if (users != null) { doctorName = users.getName(); } - map.put("doctorName",doctorName); - map.put("created",DateUtil.getyyyy_MM_dd(model.getCreated())); + map.put("doctorName", doctorName); + map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated())); listData.add(map); } } @@ -1146,31 +1147,31 @@ public class BabyNutritionFacade { try { LinkedList> objects = new LinkedList<>(); String recordId = request.getKeyword(); - if (StringUtils.isNotEmpty(recordId)){ + if (StringUtils.isNotEmpty(recordId)) { return; } - ChargeRecordQuery chargeRecordQuery = new ChargeRecordQuery(); + ChargeRecordQuery chargeRecordQuery = new ChargeRecordQuery(); chargeRecordQuery.setId(recordId); ChargeRecordModel chargeRecordModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(recordId)), ChargeRecordModel.class); String date = ""; - if (chargeRecordModel != null){ + if (chargeRecordModel != null) { date = DateUtil.getyyyy_MM_dd(chargeRecordModel.getCreated()); } List healthChargeModels = mongoTemplate.find(Query.query(Criteria.where("chargeRecordId").is(recordId)), HealthChargeModel.class); - if (CollectionUtils.isNotEmpty(healthChargeModels)){ - for (HealthChargeModel model: healthChargeModels){ + if (CollectionUtils.isNotEmpty(healthChargeModels)) { + for (HealthChargeModel model : healthChargeModels) { Map map = new LinkedHashMap<>(); BabyModel babyModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(model.getBabyForeignId())), BabyModel.class); map.put("userName", babyModel.getName()); String birthStr = DateUtil.getyyyy_MM_dd(babyModel.getBirth()); map.put("age", getAge(birthStr)); // 新国说的，以下几个写死 2019/05/28 - map.put("week",""); - map.put("type","儿童膳食报告"); - map.put("status","已结算"); - map.put("source","院内"); + map.put("week", ""); + map.put("type", "儿童膳食报告"); + map.put("status", "已结算"); + map.put("source", "院内"); map.put("time", date); objects.add(map); } @@ -1188,7 +1189,7 @@ public class BabyNutritionFacade { response.setCharacterEncoding("UTF-8"); response.setHeader("Content-Disposition", "attachment;fileName=data.xls"); ExcelUtil.toExcel(out, objects, cnames); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } } @@ -1199,49 +1200,49 @@ public class BabyNutritionFacade { * @param date * @return */ - public static String getAge(String date) { + public static String getAge(String date) { String[] data = date.split("-"); - if (data.length <3){ + if (data.length < 3) { return ""; } - Calendar birthday =new GregorianCalendar(Integer.valueOf(data[0]), Integer.valueOf(data[1]), Integer.valueOf(data[2])); + Calendar birthday = new GregorianCalendar(Integer.valueOf(data[0]), Integer.valueOf(data[1]), Integer.valueOf(data[2])); Calendar now = Calendar.getInstance(); int day = now.get(Calendar.DAY_OF_MONTH) - birthday.get(Calendar.DAY_OF_MONTH); // 月份从0开始计算，所以需要+1 - int month = now.get(Calendar.MONTH) +1 - birthday.get(Calendar.MONTH); + int month = now.get(Calendar.MONTH) + 1 - birthday.get(Calendar.MONTH); int year = now.get(Calendar.YEAR) - birthday.get(Calendar.YEAR); // 按照减法原理，先day相减，不够向month借；然后month相减，不够向year借；最后year相减。 - if (day <0) { - month -=1; + if (day < 0) { + month -= 1; // 得到上一个月，用来得到上个月的天数。 now.add(Calendar.MONTH, -1); day = day + now.getActualMaximum(Calendar.DAY_OF_MONTH); } - if (month <0) { - month = (month +12) %12; + if (month < 0) { + month = (month + 12) % 12; year--; } - StringBuffer tag =new StringBuffer(); + StringBuffer tag = new StringBuffer(); - if (year >0) { - tag.append(year +"岁"); + if (year > 0) { + tag.append(year + "岁"); } - if (month >0) { - tag.append(month +"个月"); + if (month > 0) { + tag.append(month + "个月"); } - if (day >0) { - tag.append(day +"天"); + if (day > 0) { + tag.append(day + "天"); } - if (year ==0 && month ==0 && day ==0) { + if (year == 0 && month == 0 && day == 0) { tag.append("今日出生"); } return String.valueOf(tag); @@ -1290,7 +1291,7 @@ public class BabyNutritionFacade { if (kaupEvaluate.equals("正常") && month >= 0 && month <= 5) { if (StringUtils.isNotEmpty(model.getFeedType())) { BabyDietReportModel babyDietReport = mongoTemplate.findOne(Query.query(Criteria.where("monthAge").is(month).and("feedingPattern").is(Integer.valueOf(model.getFeedType())).and("shape").is(1)), BabyDietReportModel.class); - data.put("feedingPattern", babyDietReport.getFeedingGuide()); + data.put("feedingGuide", babyDietReport.getFeedingGuide()); } } else if (kaupEvaluate.equals("正常") && month >= 6 && month <= 11) { List babyDietReportList = mongoTemplate.find(Query.query(Criteria.where("monthAge").is(month).and("shape").is(1)), BabyDietReportModel.class); @@ -1298,14 +1299,14 @@ public class BabyNutritionFacade { if (month == 6) { if (StringUtils.isNotEmpty(model.getFeedType())) { if (Integer.valueOf(model.getFeedType()) == month) { - data.put("feedingPattern", babyDiet.getFeedingPattern()); + data.put("feedingGuide", babyDiet.getFeedingGuide()); } } else { //直接返回空 - data.put("feedingPattern", ""); + data.put("feedingGuide", ""); } } else { - data.put("feedingPattern", babyDiet.getFeedingPattern()); + data.put("feedingGuide", babyDiet.getFeedingGuide()); } //膳食结构 data.put("dietStructure", babyDiet.getDietStructure());