diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryWeightDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryWeightDao.java index f1b8301..0372a75 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryWeightDao.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryWeightDao.java @@ -4,7 +4,7 @@ import com.lyms.platform.pojo.TemporaryWeightModel; import org.springframework.data.mongodb.core.query.Query; public interface ITemporaryWeightDao { - public void addTemporaryWeight(TemporaryWeightModel weightModel); + public TemporaryWeightModel addTemporaryWeight(TemporaryWeightModel weightModel); void updateTemporaryWeight(Query query, TemporaryWeightModel weightModel); diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryWeightDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryWeightDaoImpl.java index a4f2e38..dc9fb31 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryWeightDaoImpl.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryWeightDaoImpl.java @@ -10,8 +10,8 @@ import org.springframework.stereotype.Repository; @Repository("temporaryWeightDao") public class TemporaryWeightDaoImpl extends BaseMongoDAOImpl implements ITemporaryWeightDao { @Override - public void addTemporaryWeight(TemporaryWeightModel weightModel) { - save(weightModel); + public TemporaryWeightModel addTemporaryWeight(TemporaryWeightModel weightModel) { + return save(weightModel); } @Override 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 e2ed35d..935ae87 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 @@ -53,8 +53,8 @@ public class TemporaryBloodController extends BaseController { @RequestMapping(value = "/queryAll", method = RequestMethod.GET) @TokenRequired @ResponseBody - public BaseResponse queryAll(Integer page, Integer limit) { - return temporaryBloodService.queryAll(page, limit); + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { + return temporaryBloodService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit); } @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 f57d840..cb26ce0 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(Integer page, Integer limit); + BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit); BaseResponse info(String id, Date startDate); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java index 6008db6..beaca17 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java @@ -677,7 +677,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } @Override - public BaseResponse getXyPresentation(String bloodId,Integer userId) { + public BaseResponse getXyPresentation(String bloodId, Integer userId) { //1.通过血压ID 查询到pnationId Map datas = new HashMap<>(); Map> series = new HashMap<>(); @@ -689,8 +689,8 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP //2.通过pnationId ID获取到相应的信息例如：末次月经 if (StringUtils.isNotEmpty(bloodPressure.getParentId()) && StringUtils.isNotEmpty(weight) && StringUtils.isNotEmpty(height) && StringUtils.isNotEmpty(bregmatic)) { Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodPressure.getParentId())), Patients.class); - Integer weeks = DateUtil.getWeek(patients.getLastMenses(), bloodPressure.getModified()) ; - System.out.println("孕周："+weeks); + Integer weeks = DateUtil.getWeek(patients.getLastMenses(), bloodPressure.getModified()); + System.out.println("孕周：" + weeks); Map paMap = new HashMap(); paMap.put("vcCardNo", patients.getVcCardNo()); paMap.put("username", patients.getUsername()); @@ -754,7 +754,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } else if (weeks >= 13 && weeks <= 28) { mapxy.put("proposal", "建议（孕中期）"); mapxy.put("proposalInfo", xy.getMiddleSuggests()); - } else if (weeks>=29 && weeks <= 40) { + } else if (weeks >= 29 && weeks <= 40) { mapxy.put("proposal", "建议（孕晚期）"); mapxy.put("proposalInfo", xy.getLaterSuggests()); } @@ -791,7 +791,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP datas.put("motion", motionList); } - healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(),3,bloodPressure.getParentId(),1,1,userId); + healthChargeFacade.addHealthCharge(bloodPressure.getHospitalId(), 3, bloodPressure.getParentId(), 1, 1, userId); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas); } else { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("失败").setData("请检查数据是否填写完整！"); 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 c58a5f9..bbbe0d7 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 @@ -11,8 +11,7 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.service.ITemporaryBloodService; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.utils.ReportConfig; -import com.lyms.platform.pojo.TemporaryBloodModel; -import com.lyms.platform.pojo.XyPresentationModel; +import com.lyms.platform.pojo.*; import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Sort; @@ -79,6 +78,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } } + @Override public BaseResponse deleteTemporaryBlood(String id) { mongoTemplate.updateFirst(Query.query(Criteria.where("_id").is(id)), Update.update("yn", 1), TemporaryBloodModel.class); @@ -92,10 +92,75 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } @Override - public BaseResponse queryAll(Integer page, Integer limit) { + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { + boolean flag = false; + Criteria pCriteria = Criteria.where("yn").ne(0); Criteria criteria = Criteria.where("yn").ne(0); + 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); + pCriteria.and("lastMenses").gt(start).lte(end); + flag = true; + } + if (bregmatic != null) { + pCriteria.and("bregmatic").is(bregmatic); + flag = true; + } + if (flag) { + List patients = mongoTemplate.find(Query.query(pCriteria), TemporaryBloodModel.class); + List ids = new ArrayList<>(); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patients)) { + for (TemporaryBloodModel patient : patients) { + ids.add(patient.getId()); + } + } + criteria.and("_id").in(ids); + } PageResult pageResult = findMongoPage(TemporaryBloodModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(pageResult); + List bloodPressures = (List) pageResult.getGrid(); + List> restList = new ArrayList<>(); + for (TemporaryBloodModel bloodPressure : bloodPressures) { + Map temp = new HashMap<>(); + //Patients p = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class); + temp.put("id", bloodPressure.getId()); + /* if (bloodPressure != null) { + temp.put("username", bloodPressure.getUserName()); + temp.put("time", DateUtil.getyyyy_MM_dd(bloodPressure.getModified())); + temp.put("age", bloodPressure.getAge()); + temp.put("week", DateUtil.getWeekDesc(bloodPressure.getLastMenses(), new Date())); + temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级（颜色） + + String rFactor = commonService.resloveFactor(p.getRiskFactorId()); + if (p.getoRiskFactor() != null && !"null".equals(p.getoRiskFactor())) { + if (StringUtils.isNotEmpty(rFactor)) { + rFactor += "," + p.getoRiskFactor(); + } else { + rFactor = p.getoRiskFactor(); + } + } + temp.put("riskFactor", rFactor); // 高危因素 + + temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); + temp.put("bloodPressure", bloodPressure.getSsy() + "/" + bloodPressure.getSzy() + "mmHg"); + temp.put("pulse", bloodPressure.getPulse()); + temp.put("status", getPulseStatus(bloodPressure.getSsy(), bloodPressure.getSzy())); + temp.put("vcCardNo", p.getVcCardNo()); + temp.put("pcerteTypeId", p.getPcerteTypeId()); + temp.put("cardNo", p.getCardNo()); + temp.put("beforWeight", bloodPressure.getBeforWeight() == null ? "" : bloodPressure.getBeforWeight()); + temp.put("weight", bloodPressure.getWeight() == null ? "" : bloodPressure.getWeight()); + temp.put("height", bloodPressure.getHeight() == null ? "" : bloodPressure.getHeight()); + temp.put("tireNumber", bloodPressure.getTireNumber() == null ? "" : bloodPressure.getTireNumber()); + + }*/ + restList.add(temp); + } + pageResult.setGrid(restList); + return RespBuilder.buildSuccess(pageResult); } @Override 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 0ed42e2..ae9fa3a 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 @@ -63,34 +63,51 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo @Override public BaseResponse addTemporaryWeight(TemporaryWeightModel weightModel, Integer userId) { - if (StringUtils.isNotEmpty(weightModel.getPhone())) { - TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(weightModel.getPhone())), TemporaryWeightModel.class); - if (temporaryWeightModel != null) { - if (StringUtils.isNotEmpty(temporaryWeightModel.getPhone())) { + List weightModel1 = mongoTemplate.findAll(TemporaryWeightModel.class); + if (CollectionUtils.isNotEmpty(weightModel1)) { + if (StringUtils.isNotEmpty(weightModel.getPhone())) { + TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(weightModel.getPhone())), TemporaryWeightModel.class); + if (temporaryWeightModel != null) { + if (StringUtils.isNotEmpty(temporaryWeightModel.getPhone())) { + weightModel.setModified(new Date()); + temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("_id").is(temporaryWeightModel.getId())), weightModel); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); + } + } else { + weightModel.setYn(1); weightModel.setModified(new Date()); - temporaryWeightDao.updateTemporaryWeight(Query.query(Criteria.where("_id").is(temporaryWeightModel.getId())), weightModel); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); - } - } else { - weightModel.setYn(1); - weightModel.setModified(new Date()); - weightModel.setCreated(new Date()); - Users users = usersService.getUsers(userId); - weightModel.setDoctorName(users.getAccount()); - Map dayWeights = new LinkedHashMap<>(); - List> dayWeights2 = new ArrayList<>(); + weightModel.setCreated(new Date()); + Users users = usersService.getUsers(userId); + weightModel.setDoctorName(users.getAccount()); + Map dayWeights = new LinkedHashMap<>(); + List> dayWeights2 = new ArrayList<>(); /* if (MapUtils.isNotEmpty(temporaryWeightModel.getDayWeights())) { dayWeights = temporaryWeightModel.getDayWeights(); }*/ - dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), weightModel.getNowWeight()); - weightModel.setDayWeights(dayWeights); - weightModel.setBmi(patientWeightService.getBmi(weightModel.getBeforeWeight(), weightModel.getBeforeHeight())); - temporaryWeightDao.addTemporaryWeight(weightModel); - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功"); - + dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), weightModel.getNowWeight()); + weightModel.setDayWeights(dayWeights); + weightModel.setBmi(patientWeightService.getBmi(weightModel.getBeforeWeight(), weightModel.getBeforeHeight())); + TemporaryWeightModel temporaryBloodModel = temporaryWeightDao.addTemporaryWeight(weightModel); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId()); + } } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请填写电话号码"); } - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请填写电话号码"); + weightModel.setYn(1); + weightModel.setModified(new Date()); + weightModel.setCreated(new Date()); + Users users = usersService.getUsers(userId); + weightModel.setDoctorName(users.getAccount()); + Map dayWeights = new LinkedHashMap<>(); + List> dayWeights2 = new ArrayList<>(); + /* if (MapUtils.isNotEmpty(temporaryWeightModel.getDayWeights())) { + dayWeights = temporaryWeightModel.getDayWeights(); + }*/ + dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), weightModel.getNowWeight()); + weightModel.setDayWeights(dayWeights); + weightModel.setBmi(patientWeightService.getBmi(weightModel.getBeforeWeight(), weightModel.getBeforeHeight())); + TemporaryWeightModel temporaryBloodModel = temporaryWeightDao.addTemporaryWeight(weightModel); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId()); } @Override @@ -112,6 +129,16 @@ public class TemporaryWeightServiceImpl extends BaseServiceImpl implements Tempo if (StringUtils.isNotEmpty(id)) { TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class); temporaryWeightModel.setWeeks(DateUtil.getWeekDesc(temporaryWeightModel.getLastMenses(), new Date())); + if (temporaryWeightModel != null) { + List rists = temporaryWeightModel.getRiskFactorId(); + if (CollectionUtils.isNotEmpty(rists)) { + for (String rist : rists) { + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist); + + } + + } + } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(temporaryWeightModel); } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录");