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 fdc0f91..fd225e9 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 @@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; /** * 血压 @@ -32,6 +34,12 @@ public class BloodPressureController extends BaseController { } @ResponseBody + @RequestMapping(value = "/wx", method = RequestMethod.POST) + public BaseResponse wxAdd(BloodPressure bloodPressure) { + return bloodPressureService.wxAdd(bloodPressure); + } + + @ResponseBody @RequestMapping(method = RequestMethod.GET) @TokenRequired public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { @@ -47,7 +55,7 @@ public class BloodPressureController extends BaseController { @ResponseBody @RequestMapping(value = "/app/{parentId}", method = RequestMethod.GET) - public BaseResponse getAppInfo(@PathVariable String parentId) { + public List> getAppInfo(@PathVariable String parentId) { return bloodPressureService.getAppInfo(parentId); } 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 75129b0..e92bb16 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 @@ -38,6 +38,13 @@ 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); + } + + + @ResponseBody @RequestMapping(method = RequestMethod.GET) @TokenRequired public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { 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 3b73588..2b3256c 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 @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.service; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.pojo.BloodPressure; +import java.util.List; import java.util.Map; public interface IBloodPressureService extends IBaseService { @@ -13,7 +14,9 @@ public interface IBloodPressureService extends IBaseService { BaseResponse info(String id); - BaseResponse getAppInfo(String parentId); + List> getAppInfo(String parentId); BaseResponse initBloodPressure(Map param); + + BaseResponse wxAdd(BloodPressure bloodPressure); } 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 68693f5..ffb0a74 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 @@ -18,4 +18,6 @@ public interface IBloodSugarService extends IBaseService { BaseResponse initBloodSugar(Map param); BaseResponse init(); + + BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType); } 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 552b4a0..b8db39a 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 @@ -167,7 +167,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP } @Override - public BaseResponse getAppInfo(String parentId) { + public List> getAppInfo(String parentId) { BloodPressure bloodPressure = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)), BloodPressure.class); List> restList = new ArrayList<>(); if(bloodPressure != null) { @@ -184,7 +184,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP restList.add(temp); } } - return RespBuilder.buildSuccess(restList); + return restList; } @Override @@ -197,6 +197,38 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP return RespBuilder.buildSuccess(); } + @Override + public BaseResponse wxAdd(BloodPressure bloodPressure) { + String hospitalId = mongoUtil.getHidByParentId(bloodPressure.getParentId()); + Map temp = new LinkedHashMap<>(); + temp.put("szy", bloodPressure.getSzy()); + temp.put("ssy", bloodPressure.getSsy()); + temp.put("pulse", bloodPressure.getPulse()); + temp.put("timestamp", DateUtil.getyyyy_MM_dd_hms(new Date())); + temp.put("hospitalId", hospitalId); + BloodPressure bp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(bloodPressure.getParentId()).and("yn").ne(0)), BloodPressure.class); + bloodPressure.setModified(new Date()); + if(bp == null) { + String parentId = mongoUtil.doHidePatient(bloodPressure.getParentId(), hospitalId); + bloodPressure.setParentId(parentId); + bloodPressure.setYn(YnEnums.YES.getId()); + bloodPressure.setCreated(new Date()); + bloodPressure.setHospitalId(hospitalId); +// bloodPressure.setOperaterId(userId); + Map> infos = new LinkedHashMap<>(); + infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); + bloodPressure.setInfos(infos); + bloodPressureService.add(bloodPressure); + } else { + Map> infos = bp.getInfos(); + infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); + bloodPressure.setInfos(infos); + bloodPressure.setId(bp.getId()); + bloodPressureService.update(bloodPressure); + } + return RespBuilder.buildSuccess(); + } + private String getPulseStatus(String ssy, String szy) { String status = ""; if(StringUtils.isNotEmpty(ssy) && StringUtils.isNotEmpty(szy)) { 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 eed85a0..3f220a7 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 @@ -198,4 +198,26 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga return RespBuilder.buildSuccess(EnumUtil.toJson(BloodSugarEnums.class)); } + @Override + public BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType) { + 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); + bloodSugarService.update(one); + return RespBuilder.buildSuccess(one.getId()); + } + one = new BloodSugar(); + one.setParentId(parentId); + one.setHospitalId(mongoUtil.getHidByParentId(parentId)); + 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); + return RespBuilder.buildSuccess(one.getId()); + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java index 1cc8de8..cfaa462 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java @@ -633,4 +633,9 @@ public class MongoUtil { } return ids; } + + public String getHidByParentId(String parentId) { + Patients patients = mongoTemplate.findById(parentId, Patients.class); + return patients == null ? null : patients.getHospitalId(); + } }