diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java index 2decf4b..9ec5ba2 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodSugar.java @@ -28,6 +28,8 @@ public class BloodSugar extends BaseModel { private String hospitalId; + private Date modified; + /** * 血糖 */ @@ -35,6 +37,14 @@ public class BloodSugar extends BaseModel { private Integer bloodSugarType; + public Date getModified() { + return modified; + } + + public void setModified(Date modified) { + this.modified = modified; + } + public String getCreatYmdDate() { return creatYmdDate; } 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 8f3bda0..eed85a0 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 @@ -15,7 +15,6 @@ import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.service.IBloodSugarService; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.MongoUtil; -import com.lyms.platform.pojo.BloodPressure; import com.lyms.platform.pojo.BloodSugar; import com.lyms.platform.pojo.Patients; import org.springframework.beans.factory.annotation.Autowired; @@ -47,10 +46,18 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga public BaseResponse add(Integer userId, BloodSugar bloodSugar) { + BloodSugar one = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(bloodSugar.getParentId()).and("created").gt(DateUtil.getYMDTime()).and("bloodSugarType").is(bloodSugar.getBloodSugarType())), BloodSugar.class); + if(one != null) { + one.setModified(new Date()); + one.setBloodSugar(bloodSugar.getBloodSugar()); + bloodSugarService.update(one); + return RespBuilder.buildSuccess(one.getId()); + } bloodSugar.setHospitalId(autoMatchFacade.getHospitalId(userId)); bloodSugar.setCreated(new Date()); bloodSugar.setCreateUser(userId); bloodSugar.setYn(YnEnums.YES.getId()); + bloodSugar.setModified(new Date()); bloodSugar.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date())); bloodSugarService.add(bloodSugar); return RespBuilder.buildSuccess(bloodSugar.getId()); @@ -78,6 +85,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); temp.put("bloodSugar", bloodSugar.getBloodSugar() + "mmol/L"); temp.put("bloodSugarType", BloodSugarEnums.getName(bloodSugar.getBloodSugarType())); + temp.put("bloodSugarId", bloodSugar.getBloodSugarType()); temp.put("status", getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar())); temp.put("vcCardNo", p.getVcCardNo()); temp.put("pcerteTypeId", p.getPcerteTypeId());