diff --git a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java index d80d0a0..f00318c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java +++ b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java @@ -83,6 +83,8 @@ public enum SerialIdEnum { HealthChargeModel("HealthChargeModel", 97221049991L), ChargeRecordModel("ChargeRecordModel", 98221049991L), TemporaryWeightModel("TemporaryWeightModel", 97531049591L), + TemporaryBloodModel("TemporaryBloodModel", 97541049591L), + TemporaryBloodSugarModel("TemporaryWeightModel", 97551049591L), BabyEyeCheck("BabyEyeCheck", 97521039591L); private String cname; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java index 3f5304b..149a332 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java @@ -1,5 +1,6 @@ package com.lyms.platform.pojo; +import com.lyms.platform.beans.SerialIdEnum; import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; @@ -9,6 +10,7 @@ import java.util.Map; @Document(collection = "lyms_temporary_blood") public class TemporaryBloodModel extends BaseModel { + private static final long serialVersionUID = SerialIdEnum.TemporaryBloodModel.getCid(); private String id; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java index ac46cab..baa03a4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java @@ -1,5 +1,6 @@ package com.lyms.platform.pojo; +import com.lyms.platform.beans.SerialIdEnum; import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; @@ -9,6 +10,7 @@ import java.util.Map; @Document(collection = "lyms_temporary_bloodSugar") public class TemporaryBloodSugar extends BaseModel { + private static final long serialVersionUID = SerialIdEnum.TemporaryBloodSugarModel.getCid(); private String id; private String userName; @@ -62,6 +64,9 @@ public class TemporaryBloodSugar extends BaseModel { private String riskLevelId; private String hospitalId; + //报告状态 1未查看 2查看 + private Integer status; + private Integer yn; public String getHospitalId() { return hospitalId; @@ -119,9 +124,6 @@ public class TemporaryBloodSugar extends BaseModel { this.bloodSugarType = bloodSugarType; } - //报告状态 1未查看 2查看 - private Integer status; - private Integer yn; public String getId() { return id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java index bd29ba3..a8c7778 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java @@ -26,7 +26,7 @@ public class TemporaryBloodSugarController extends BaseController { @RequestMapping(value = "/addAndUpate", method = RequestMethod.POST) @TokenRequired @ResponseBody - public BaseResponse addTempraryBloodSugar(@Valid @RequestBody TemporaryBloodSugar bloodSugar, HttpServletRequest request) { + public BaseResponse addTempraryBloodSugar(TemporaryBloodSugar bloodSugar, HttpServletRequest request) { return bloodSugarService.addAndUpdate(bloodSugar, getUserId(request)); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java index e805299..ecc41ba 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java @@ -132,7 +132,7 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo } return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录"); } - + @Override public BaseResponse queryOne(String id) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java index f737c18..100ac73 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java @@ -72,6 +72,34 @@ public class TemporaryBloodSugarServiceImpl extends BaseServiceImpl implements I bloodSugar.setModified(new Date()); temporaryBloodSugarDao.updateTemporaryBloodSugar(Query.query(Criteria.where("_id").is(bloodSugar.getId()).and("bloodSugarType").is(bloodSugar.getBloodSugarType())), bloodSugar); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功"); + } else if (null != bloodSugar.getId() && null == temporaryBloodSugar) { + TemporaryBloodSugar sugar = new TemporaryBloodSugar(); + for (TemporaryBloodSugar sugarList : bloodSugars) { + if (bloodSugar.getId().equals(sugarList.getId())) { + sugar.setModified(new Date()); + sugar.setCreated(new Date()); + sugar.setYn(1); + sugar.setUserName(sugarList.getUserName()); + sugar.setPhone(sugarList.getPhone()); + sugar.setAge(sugarList.getAge()); + sugar.setBeforeHeight(sugarList.getBeforeHeight()); + sugar.setNowWeight(bloodSugar.getNowWeight()); + sugar.setBloodSugar(bloodSugar.getBloodSugar()); + sugar.setBloodSugarType(bloodSugar.getBloodSugarType()); + sugar.setLastMenses(sugarList.getLastMenses()); + sugar.setBeforeWeight(sugarList.getBeforeWeight()); + sugar.setBregmatic(sugarList.getBregmatic()); + sugar.setCardID(sugarList.getCardID()); + Map dayWeights = new LinkedHashMap<>(); + dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), bloodSugar.getNowWeight()); + sugar.setDayWeights(dayWeights); + sugar.setRiskLevelId(sugarList.getRiskLevelId()); + sugar.setHospitalId(sugarList.getHospitalId()); + sugar.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date())); + temporaryBloodSugarDao.addTemporaryBloodSugar(sugar); + } + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("增加成功"); } else { bloodSugar.setModified(new Date()); bloodSugar.setCreated(new Date());