diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java index 9fe6f56..fcb84fe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientWeightController.java @@ -96,8 +96,10 @@ public class PatientWeightController extends BaseController { @RequestParam(value = "rid", required = false) String rid, @RequestParam(value = "doctorId") String doctorId, @RequestParam(value = "beforeWeight",required = false) String beforeWeight, + @RequestParam(value = "bregmatic",required = false) String bregmatic, + @RequestParam(value = "bregmaticOther",required = false) String bregmaticOther, String version) { - return patientWeightService.report(id, getUserId(request), rid, version, doctorId,beforeWeight); + return patientWeightService.report(id, getUserId(request), rid, version, doctorId,beforeWeight,bregmatic,bregmaticOther); } @@ -277,11 +279,13 @@ public class PatientWeightController extends BaseController { HttpServletRequest request, @RequestParam(value = "rid", required = false) String rid, String version, @RequestParam(value = "beforeWeight",required = false) String beforeWeight, + @RequestParam(value = "bregmatic",required = false) String bregmatic, + @RequestParam(value = "bregmaticOther",required = false) String bregmaticOther, @RequestParam(value = "doctorId") String doctorId) { if (pid.isEmpty() || "null".equals(pid)) { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!"); } - return patientWeightService.getWeightsReport(pid, getUserId(request), rid, version, doctorId,beforeWeight); + return patientWeightService.getWeightsReport(pid, getUserId(request), rid, version, doctorId,beforeWeight,bregmatic,bregmaticOther); } @@ -298,11 +302,13 @@ public class PatientWeightController extends BaseController { HttpServletRequest request, @RequestParam(value = "rid", required = false) String rid, String version, @RequestParam(value = "beforeWeight",required = false) String beforeWeight, + @RequestParam(value = "bregmatic",required = false) String bregmatic, + @RequestParam(value = "bregmaticOther",required = false) String bregmaticOther, @RequestParam(value = "doctorId") String doctorId) { if (pid.isEmpty() || "null".equals(pid)) { return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.USER_PASSWORD_ERROR).setErrormsg("pid值不能为空!"); } - return patientWeightService.qhdHighRiskReport(pid, getUserId(request), rid, version, doctorId,beforeWeight); + return patientWeightService.qhdHighRiskReport(pid, getUserId(request), rid, version, doctorId,beforeWeight,bregmatic,bregmaticOther); } /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java index 2637f5a..173ec55 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/PatientWeightService.java @@ -35,7 +35,7 @@ public interface PatientWeightService extends IBaseService { BaseResponse delete(String id); - BaseResponse report(String id, Integer userId, String rid, String version, String doctorId,String beforeWeight); + BaseResponse report(String id, Integer userId, String rid, String version, String doctorId,String beforeWeight,String bregmatic,String bregmaticOther); BaseResponse wxReport(String pid); @@ -60,9 +60,9 @@ public interface PatientWeightService extends IBaseService { public void getSeries(Map series, String bmiStr, String bregmatic); - BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version, String doctorId,String beforeWeight); + BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version, String doctorId,String beforeWeight,String bregmatic,String bregmaticOther); - BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version, String doctorId,String beforeWeight); + BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version, String doctorId,String beforeWeight,String bregmatic,String bregmaticOther); public void setReport(Map restMap, Map weights, String beforeWeight, String bmi, Map dayWeights, String bregmatic); 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 d6eeb30..08ff9e0 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 @@ -635,20 +635,39 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } - public void updateWeight(String beforeWeight,PatientWeight patientWeight) + public void updateWeight(String beforeWeight,PatientWeight patientWeight,String bregmatic,String bregmaticOther) { + boolean isUpdate = false; + PatientWeight patientWeightBefore = new PatientWeight(); + if (patientWeight != null && StringUtils.isNotEmpty(beforeWeight) && StringUtils.isNotEmpty(patientWeight.getBeforeHeight())) { - PatientWeight patientWeightBefore = new PatientWeight(); + isUpdate = true; patientWeightBefore.setBeforeWeight(beforeWeight); - patientWeightBefore.setBmi(getBmi(beforeWeight,patientWeight.getBeforeHeight())); + String bmi = getBmi(beforeWeight, patientWeight.getBeforeHeight()); + patientWeightBefore.setBmi(bmi); + patientWeight.setBeforeWeight(beforeWeight); + patientWeight.setBmi(bmi); + } + + if (StringUtils.isNotEmpty(bregmatic)) + { + patientWeightBefore.setBregmatic(bregmatic); + patientWeightBefore.setBregmaticOther(bregmaticOther); + + patientWeight.setBregmatic(bregmatic); + patientWeight.setBregmaticOther(bregmaticOther); + } + + if (isUpdate) + { patientWeightService2.update(Query.query(Criteria.where("_id").is(patientWeight.getId())), patientWeightBefore); } } @Override - public BaseResponse report(String id, Integer userId, String rid, String version, String doctorId,String beforeWeight) { + public BaseResponse report(String id, Integer userId, String rid, String version, String doctorId,String beforeWeight,String bregmatic,String bregmaticOther) { String hospitalId = autoMatchFacade.getHospitalId(userId); Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId)); @@ -658,7 +677,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient PatientWeight patientWeight = mongoTemplate.findById(id, PatientWeight.class); - updateWeight( beforeWeight, patientWeight); + updateWeight(beforeWeight, patientWeight, bregmatic, bregmaticOther); if (patientWeight != null) { Map map = new LinkedHashMap<>(); @@ -2215,12 +2234,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } @Override - public BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version, String doctorId,String beforeWeight) { + public BaseResponse getWeightsReport(String pid, Integer userId, String rid, String version, String doctorId,String beforeWeight,String bregmatic1,String bregmaticOther) { Map> series = new HashMap<>(); Map> datas = new TreeMap<>(); PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(pid)), PatientWeight.class); - updateWeight(beforeWeight,patientWeight); + updateWeight(beforeWeight,patientWeight, bregmatic1, bregmaticOther); //1.获取该孕妇是否有推荐的高危项 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(patientWeight.getPatientId())), Patients.class); @@ -2355,7 +2374,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } if (datas.size() == 0) { - BaseResponse baseResponse = this.report(pid, userId, rid, version, doctorId,beforeWeight); + BaseResponse baseResponse = this.report(pid, userId, rid, version, doctorId,beforeWeight, bregmatic, bregmaticOther); return baseResponse; } //同时出现高血压和肝硬化或肝功能不全则按照肝硬化或肝功能不全 @@ -2375,12 +2394,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient * 秦皇岛高危报告 */ @Override - public BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version, String doctorId,String beforeWeight) { + public BaseResponse qhdHighRiskReport(String pid, Integer userId, String rid, String version, String doctorId,String beforeWeight,String bregmatic1,String bregmaticOther) { Map> series = new HashMap<>(); Map> datas = new TreeMap<>(); PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(pid)), PatientWeight.class); - updateWeight(beforeWeight,patientWeight); + updateWeight(beforeWeight,patientWeight, bregmatic1, bregmaticOther); //1.获取该孕妇是否有推荐的高危项 Patients patients = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(patientWeight.getPatientId())), Patients.class); @@ -2480,7 +2499,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } } if (datas.size() == 0) { - BaseResponse baseResponse = this.report(pid, userId, rid, "1", doctorId,beforeWeight); + BaseResponse baseResponse = this.report(pid, userId, rid, "1", doctorId,beforeWeight,bregmatic1,bregmaticOther); return baseResponse; } /*//同时出现高血压和肝硬化或肝功能不全则按照肝硬化或肝功能不全