From f207d9dd84f64550dc7a4a55fc9cc236fe06b37f Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Wed, 18 Oct 2017 17:14:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/PatientWeightController.java | 4 ++-- .../platform/operate/web/service/PatientWeightService.java | 2 +- .../operate/web/service/impl/PatientWeightServiceImpl.java | 13 +++++++++---- 3 files changed, 12 insertions(+), 7 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 50204fa..b9117e4 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 @@ -122,8 +122,8 @@ public class PatientWeightController extends BaseController { @ResponseBody @RequestMapping(value = "/update", method = RequestMethod.POST) @TokenRequired - public BaseResponse update(String id, String beforeWeight, String beforeHeight, String date, String nowWeight, HttpServletRequest request) { - return patientWeightService.update(getUserId(request), id, beforeWeight, beforeHeight, date, nowWeight); + public BaseResponse update(String id, String beforeWeight, String beforeHeight, String date, String nowWeight, HttpServletRequest request, String bregmatic, String bregmaticOther) { + return patientWeightService.update(getUserId(request), id, beforeWeight, beforeHeight, date, nowWeight, 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 9c1126e..4861ba4 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 @@ -27,5 +27,5 @@ public interface PatientWeightService extends IBaseService { BaseResponse wxAddOrUpdateSync(PatientWeight patientWeight); - BaseResponse update(Integer userId, String id, String beforeWeight, String beforeHeight, String date, String nowWeight); + BaseResponse update(Integer userId, String id, String beforeWeight, String beforeHeight, String date, String nowWeight, String bregmatic, String bregmaticOther); } 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 baac7f4..86da78c 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 @@ -8,7 +8,6 @@ import com.lyms.platform.common.result.PageResult; import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.result.ResponseCode; import com.lyms.platform.common.utils.*; -import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.service.PatientWeightService; import com.lyms.platform.operate.web.utils.CollectionUtils; @@ -110,7 +109,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient dayWeights2 = pw.getDayWeights2(); } for (Map map : dayWeights2) { - if(map.containsKey(ymdDate)) { + if(map.get("date").equals(ymdDate)) { flag = false; map.put("hospitalId", hospitalId); map.put("hospitalName", couponMapper.getHospitalName(hospitalId)); @@ -439,7 +438,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient } @Override - public BaseResponse update(Integer userId, String id, String beforeWeight, String beforeHeight, String date, String nowWeight) { + public BaseResponse update(Integer userId, String id, String beforeWeight, String beforeHeight, String date, String nowWeight, String bregmatic, String bregmaticOther) { PatientWeight patientWeight = mongoTemplate.findById(id, PatientWeight.class); if(patientWeight == null) { return RespBuilder.buildSuccess("该体重未找到"); @@ -454,10 +453,16 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient if(StringUtils.isNotEmpty(nowWeight)) { patientWeight.setNowWeight(nowWeight); } + if(StringUtils.isNotEmpty(bregmatic)) { + patientWeight.setBregmatic(bregmatic); + } + if(StringUtils.isNotEmpty(bregmaticOther)) { + patientWeight.setBregmaticOther(bregmaticOther); + } if(StringUtils.isNotEmpty(date)) { List> dayWeights2 = patientWeight.getDayWeights2(); for (Map map : dayWeights2) { - if(date.equals(map.get("date") + "")) { + if(date.equals(map.get("date"))) { map.put("hospitalId", hospitalId); map.put("hospitalName", couponMapper.getHospitalName(hospitalId)); map.put("nowWeight", nowWeight); -- 1.8.3.1