diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java index 42b6bdd..23dbb24 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java @@ -34,8 +34,8 @@ public class BloodPressureController extends BaseController { @ResponseBody @RequestMapping(value = "/wx", method = RequestMethod.POST) - public BaseResponse wxAdd(BloodPressure bloodPressure) { - return bloodPressureService.wxAdd(bloodPressure); + public BaseResponse wxAdd(BloodPressure bloodPressure, boolean flag) { + return bloodPressureService.wxAdd(bloodPressure, flag); } @ResponseBody diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java index 34b8d53..a35a9dc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java @@ -39,11 +39,10 @@ public class BloodSugarController extends BaseController { @ResponseBody @RequestMapping(value = "/wx", method = RequestMethod.POST) - public BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType) { - return bloodSugarService.wxAdd(parentId, bloodSugar, bloodSugarType); + public BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType, boolean flag) { + return bloodSugarService.wxAdd(parentId, bloodSugar, bloodSugarType, flag); } - @ResponseBody @RequestMapping(method = RequestMethod.GET) @TokenRequired diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java index 45b05ed..522d66c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java @@ -18,7 +18,7 @@ public interface IBloodPressureService extends IBaseService { BaseResponse initBloodPressure(Map param); - BaseResponse wxAdd(BloodPressure bloodPressure); + BaseResponse wxAdd(BloodPressure bloodPressure, boolean flag); BaseResponse initPatientWeight(); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java index 86e86c6..f127248 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java @@ -19,7 +19,7 @@ public interface IBloodSugarService extends IBaseService { BaseResponse init(); - BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType); + BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType, boolean flag); BaseResponse wxInfo(String parentId, Integer type); } 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 bcd5d34..2f7123a 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 @@ -216,7 +216,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } @Override - public BaseResponse wxAdd(BloodPressure bloodPressure) { + public BaseResponse wxAdd(BloodPressure bloodPressure, boolean flag) { String hospitalId = mongoUtil.getHidByParentId(bloodPressure.getParentId()); Map temp = new LinkedHashMap<>(); temp.put("szy", bloodPressure.getSzy()); @@ -241,9 +241,12 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP Map> infos = new LinkedHashMap<>(); infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); bloodPressure.setInfos(infos); -// bloodPressureService.add(bloodPressure); bloodPressure.setPid(mongoUtil.getPid(parentId)); - mongoTemplate.save(bloodPressure); + if(flag) { + bloodPressureService.add(bloodPressure); + } else { + mongoTemplate.save(bloodPressure); + } } else { Map> infos = bp.getInfos(); infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java index 35099fe..41a1c31 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java @@ -204,9 +204,8 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga } @Override - public BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType) { + public BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType, boolean flag) { BloodSugar one = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(mongoUtil.getPid(parentId)).and("created").gt(DateUtil.getYMDTime()).and("bloodSugarType").is(bloodSugarType)), BloodSugar.class); -// BloodSugar one = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("created").gt(DateUtil.getYMDTime()).and("bloodSugarType").is(bloodSugarType)), BloodSugar.class); if(one != null) { one.setModified(new Date()); one.setBloodSugar(bloodSugar); @@ -220,12 +219,14 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga one.setBloodSugar(bloodSugar); one.setBloodSugarType(bloodSugarType); one.setCreated(new Date()); -// one.setCreateUser(userId); one.setYn(YnEnums.YES.getId()); one.setModified(new Date()); one.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date())); -// bloodSugarService.add(one); - mongoTemplate.save(one); + if(flag) { + bloodSugarService.add(one); + } else { + mongoTemplate.save(one); + } return RespBuilder.buildSuccess(one.getId()); }