diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java b/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java index 60885a7..0e1c5bc 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java +++ b/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java @@ -32,6 +32,7 @@ public enum ResponseCode { COUPON_IS_NOT_SELF(1007, "当前优惠劵不属于本人"), NEED_ADD_PATIENT_WEIGHT(4001, "该用户还未开通体重管理服务,请先开通!"), + PATIENT_WEIGHT_IS_EXIST(4002, "该用户已开通体重管理服务!"), NEED_BUILD(1101, "未找到建档信息"); 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 9da92d1..6a57ee2 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 @@ -94,9 +94,9 @@ public class PatientWeightController extends BaseController { * 体重报告(小程序和app使用) */ @ResponseBody - @RequestMapping(value = "/report/wx/{patientId}/{hospitalId}", method = RequestMethod.GET) - public BaseResponse wxReport(@PathVariable String patientId, @PathVariable String hospitalId) { - return patientWeightService.wxReport(patientId, hospitalId); + @RequestMapping(value = "/report/wx/{patientId}", method = RequestMethod.GET) + public BaseResponse wxReport(@PathVariable String patientId) { + return patientWeightService.wxReport(patientId); } /** 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 830a310..bcee834 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 @@ -21,7 +21,7 @@ public interface PatientWeightService extends IBaseService { BaseResponse report(String id); - BaseResponse wxReport(String patientId, String hospitalId); + BaseResponse wxReport(String patientId); BaseResponse wxAddOrUpdate(PatientWeight patientWeight); } 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 3ba4025..d112207 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 @@ -245,8 +245,8 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } @Override - public BaseResponse wxReport(String patientId, String hospitalId) { - PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patientId).and("hospitalId").is(hospitalId)), PatientWeight.class); + public BaseResponse wxReport(String patientId) { + PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patientId).and("yn").ne("0")), PatientWeight.class); if(patientWeight != null) { Map map = new HashMap<>(); map.put("beforeWeight", patientWeight.getBeforeWeight()); @@ -262,6 +262,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); PatientWeight pw = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patientWeight.getPatientId())), PatientWeight.class); Map weights = new HashMap<>(); + if(pw == null && StringUtils.isEmpty(patientWeight.getBeforeWeight())) { + return RespBuilder.buildErro(ResponseCode.NEED_ADD_PATIENT_WEIGHT); + } + if(pw != null && StringUtils.isNotEmpty(patientWeight.getBeforeWeight())) { + return RespBuilder.buildErro(ResponseCode.PATIENT_WEIGHT_IS_EXIST); + } if(pw != null) { if(MapUtils.isNotEmpty(pw.getWeights())) { weights = pw.getWeights();