From fc6f81e0959a9c384c3eed68fe1517ee39d47c9b Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 26 Sep 2017 20:59:47 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/PatientWeightController.java | 6 +++--- .../platform/operate/web/service/PatientWeightService.java | 2 +- .../operate/web/service/impl/PatientWeightServiceImpl.java | 13 +++---------- 3 files changed, 7 insertions(+), 14 deletions(-) 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 6a57ee2..eff94b5 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}", method = RequestMethod.GET) - public BaseResponse wxReport(@PathVariable String patientId) { - return patientWeightService.wxReport(patientId); + @RequestMapping(value = "/report/wx/{pid}", method = RequestMethod.GET) + public BaseResponse wxReport(@PathVariable String pid) { + return patientWeightService.wxReport(pid); } /** 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 bcee834..cdcf71c 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); + BaseResponse wxReport(String pid); 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 76f4e4c..0f2884c 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 @@ -283,12 +283,12 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } @Override - public BaseResponse wxReport(String patientId) { - PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patientId).and("yn").ne("0")), PatientWeight.class); + public BaseResponse wxReport(String pid) { + PatientWeight patientWeight = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(pid).and("yn").ne("0")), PatientWeight.class); if(patientWeight != null) { Map map = new HashMap<>(); map.put("beforeWeight", patientWeight.getBeforeWeight()); - Patients patients = mongoTemplate.findById(patientId, Patients.class); + Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class); Map dayWeights = patientWeight.getDayWeights(); Map weights = new HashMap<>(); if (MapUtils.isNotEmpty(dayWeights)) { @@ -310,12 +310,6 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient PatientWeight pw = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patientWeight.getPatientId())), PatientWeight.class); Map dayWeights = new HashMap<>(); if(pw == null && StringUtils.isEmpty(patientWeight.getBeforeWeight())) { - /* patients = mongoTemplate.findOne(Query.query(Criteria.where("source").is(patientWeight.getPatientId()).and("hospitalId").is(hospitalId).and("enable").is("2")), Patients.class); - if(patients == null) { - return RespBuilder.buildErro(ResponseCode.NEED_ADD_PATIENT_WEIGHT); - } - patientWeight.setPatientId(patients.getId()); - pw = mongoTemplate.findOne(Query.query(Criteria.where("patientId").is(patients.getId()).and("hospitalId").is(hospitalId)), PatientWeight.class);*/ return RespBuilder.buildErro(ResponseCode.NEED_ADD_PATIENT_WEIGHT); } if(pw != null && StringUtils.isNotEmpty(patientWeight.getBeforeWeight())) { @@ -328,7 +322,6 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), nowWeight); pw.setNowWeight(nowWeight); pw.setDayWeights(dayWeights); -// pw.setBmi(getBmi(patientWeight.getNowWeight(), pw.getBeforeHeight())); Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(pw)); mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(pw.getId())), update, PatientWeight.class); return RespBuilder.buildSuccess(pw.getId()); -- 1.8.3.1