diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java index 5dd4a1b..6a43689 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodController.java @@ -55,8 +55,8 @@ public class TemporaryBloodController extends BaseController { @RequestMapping(value = "/queryAll", method = RequestMethod.GET) @TokenRequired @ResponseBody - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, HttpServletRequest request) { - return temporaryBloodService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit, getUserId(request)); + public BaseResponse queryAll(String key, Integer age, Integer currentWeekEnd, Integer currentWeekStart, Integer page, Integer limit, HttpServletRequest request) { + return temporaryBloodService.queryAll(key, age, currentWeekEnd, currentWeekStart, page, limit, getUserId(request)); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java index cce43ba..bd29ba3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java @@ -50,8 +50,8 @@ public class TemporaryBloodSugarController extends BaseController { @RequestMapping(value = "/queryAll", method = RequestMethod.GET) @TokenRequired @ResponseBody - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, HttpServletRequest request) { - return bloodSugarService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit, getUserId(request)); + public BaseResponse queryAll(String key, Integer age, Integer currentWeekStart, Integer currentWeekEnd, Integer page, Integer limit, HttpServletRequest request) { + return bloodSugarService.queryAll(key, age, currentWeekStart, currentWeekEnd, page, limit, getUserId(request)); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java index 6023f89..80f4ba5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java @@ -54,8 +54,8 @@ public class TemporaryWeightController extends BaseController { @RequestMapping(value = "/queryAll", method = RequestMethod.GET) @TokenRequired @ResponseBody - public BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit, HttpServletRequest request) { - return temporaryWeightService.queryAll(key, stateWeek, endWeek, age, page, limit, getUserId(request)); + public BaseResponse queryAll(String key, Integer currentWeekStart, Integer currentWeekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { + return temporaryWeightService.queryAll(key, currentWeekStart, currentWeekEnd, age, page, limit, getUserId(request)); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java index 1819f2a..842a2f0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodService.java @@ -13,7 +13,7 @@ public interface ITemporaryBloodService extends IBaseService { BaseResponse queryOne(String id); - BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId); + BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId); BaseResponse info(String id, Date startDate); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java index f270f08..b6b839c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java @@ -13,7 +13,7 @@ public interface ITemporaryBloodSugarService extends IBaseService { BaseResponse queryOne(String id); - BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId); + BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId); BaseResponse info(String parentId, Integer type, Date time); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index f7e4ae0..ddbd422 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -317,7 +317,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient return df.format(tzzs); } return ""; -} + } @Override public BaseResponse info(String id) { @@ -664,7 +664,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient CollectionUtils.removeNullValue(map); - healthChargeFacade.addHealthCharge(hospitalId,1,patientWeight.getPatientId(),1,1,userId); + healthChargeFacade.addHealthCharge(hospitalId, 1, patientWeight.getPatientId(), 1, 1, userId); return RespBuilder.buildSuccess(map); } return RespBuilder.buildSuccess(); @@ -2103,7 +2103,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient datas.put("2", datas.get("8")); } - healthChargeFacade.addHealthCharge(patientWeight.getHospitalId(),1,patientWeight.getPatientId(),2,1,userId); + healthChargeFacade.addHealthCharge(patientWeight.getHospitalId(), 1, patientWeight.getPatientId(), 2, 1, userId); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(this.getFirstOrNull(datas)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java index 9397c19..b80ed6a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java @@ -176,23 +176,23 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } @Override - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) { + public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, 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); + 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(key)) { pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key)); flag = true; } if (stateWeek != null && endWeek != null) { - Date start = DateUtil.getWeekStart(stateWeek); - Date end = DateUtil.getWeekEnd(endWeek); + Date start = DateUtil.getWeekStart(endWeek); + Date end = DateUtil.getWeekEnd(stateWeek); pCriteria.and("lastMenses").gt(start).lte(end); flag = true; } - if (bregmatic != null) { - pCriteria.and("bregmatic").is(bregmatic); + if (age != null) { + pCriteria.and("age").is(age); flag = true; } if (flag) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java index 399dd70..aac23f8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java @@ -78,7 +78,6 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I Map dayWeights = new LinkedHashMap<>(); dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), bloodSugar.getNowWeight()); bloodSugar.setDayWeights(dayWeights); - List riskLevelIdList = new ArrayList<>(); if (CollectionUtils.isNotEmpty(bloodSugar.getRiskFactorId())) { List riskFactor = bloodSugar.getRiskFactorId(); @@ -126,40 +125,41 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I @Override public BaseResponse queryOne(String id) { - TemporaryBloodSugar bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodSugar.class); - if (bloodModel != null) { - Map requestMap = new HashMap<>(); - List rists = bloodModel.getRiskFactorId(); - List listMap = new ArrayList<>(); - Integer riskScore = 0; - if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(rists)) { - for (String rist : rists) { - Map map = new HashMap(); - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist); - if (basicConfig != null) { - riskScore += Integer.valueOf(basicConfig.getCode()); - if (StringUtils.isNotEmpty(basicConfig.getParentId())) { - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.YBFX.getId())) { - map.put("color", HisptialRiskTypeEnum.YBFX.getColor()); - } - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JGFX.getId())) { - map.put("color", HisptialRiskTypeEnum.JGFX.getColor()); - } - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.GFX.getId())) { - map.put("color", HisptialRiskTypeEnum.GFX.getColor()); - } - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.CRB.getId())) { - map.put("color", HisptialRiskTypeEnum.CRB.getColor()); + if (StringUtils.isNotEmpty(id)) { + TemporaryBloodSugar bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodSugar.class); + if (bloodModel != null) { + Map requestMap = new HashMap<>(); + List rists = bloodModel.getRiskFactorId(); + List listMap = new ArrayList<>(); + Integer riskScore = 0; + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(rists)) { + for (String rist : rists) { + Map map = new HashMap(); + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist); + if (basicConfig != null) { + riskScore += Integer.valueOf(basicConfig.getCode()); + if (StringUtils.isNotEmpty(basicConfig.getParentId())) { + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.YBFX.getId())) { + map.put("color", HisptialRiskTypeEnum.YBFX.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JGFX.getId())) { + map.put("color", HisptialRiskTypeEnum.JGFX.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.GFX.getId())) { + map.put("color", HisptialRiskTypeEnum.GFX.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.CRB.getId())) { + map.put("color", HisptialRiskTypeEnum.CRB.getColor()); + } + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JK.getId())) { + map.put("color", HisptialRiskTypeEnum.JK.getColor()); + } + map.put("name", basicConfig.getName()); + map.put("id", basicConfig.getId()); + listMap.add(map); } - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JK.getId())) { - map.put("color", HisptialRiskTypeEnum.JK.getColor()); - } - map.put("name", basicConfig.getName()); - map.put("id", basicConfig.getId()); - listMap.add(map); } } - } requestMap.put("riskScore", riskScore); requestMap.put("riskFactor", listMap); @@ -169,6 +169,7 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I requestMap.put("phone", bloodModel.getPhone()); requestMap.put("id", bloodModel.getId()); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap); + } } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("请选择一条记录"); @@ -176,23 +177,23 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I } @Override - public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) { + public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, 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); + 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(key)) { pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key)); flag = true; } if (stateWeek != null && endWeek != null) { - Date start = DateUtil.getWeekStart(stateWeek); - Date end = DateUtil.getWeekEnd(endWeek); + Date start = DateUtil.getWeekStart(endWeek); + Date end = DateUtil.getWeekEnd(stateWeek); pCriteria.and("lastMenses").gt(start).lte(end); flag = true; } - if (bregmatic != null) { - pCriteria.and("bregmatic").is(bregmatic); + if (age != null) { + pCriteria.and("age").is(age); flag = true; } if (flag) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java index e8adc80..872bb54 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java @@ -192,15 +192,15 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo public BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, 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); + 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(key)) { pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key)); flag = true; } if (stateWeek != null && endWeek != null) { - Date start = DateUtil.getWeekStart(stateWeek); - Date end = DateUtil.getWeekEnd(endWeek); + Date start = DateUtil.getWeekStart(endWeek); + Date end = DateUtil.getWeekEnd(stateWeek); pCriteria.and("lastMenses").gt(start).lte(end); flag = true; } @@ -218,7 +218,6 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo } criteria.and("_id").in(ids); } - Users users = usersService.getUsers(userId); PageResult pageResult = findMongoPage(TemporaryWeightModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); List patientWeights = (List) pageResult.getGrid(); List> restMap = new ArrayList<>();