diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodPressure.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodPressure.java index 7763dab..15b8a52 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BloodPressure.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BloodPressure.java @@ -19,6 +19,8 @@ public class BloodPressure extends BaseModel { private String parentId; + private String pid; + private Date created; private Date modified; @@ -36,6 +38,14 @@ public class BloodPressure extends BaseModel { // 脉搏 private Integer pulse; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + private Map> infos; public String getSzy() { 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 9ec5ba2..c4c5086 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 @@ -18,6 +18,8 @@ public class BloodSugar extends BaseModel { private String parentId; + private String pid; + private Date created; private String creatYmdDate; @@ -37,6 +39,14 @@ public class BloodSugar extends BaseModel { private Integer bloodSugarType; + public String getPid() { + return pid; + } + + public void setPid(String pid) { + this.pid = pid; + } + public Date getModified() { return modified; } 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 454cd06..9da3e18 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 @@ -60,6 +60,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP BloodPressure bp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(bloodPressure.getParentId()).and("yn").ne(0)), BloodPressure.class); if(bp == null) { String parentId = mongoUtil.doHidePatient(bloodPressure.getParentId(), hospitalId); + bloodPressure.setPid(mongoUtil.getPid(parentId)); bloodPressure.setParentId(parentId); bloodPressure.setYn(YnEnums.YES.getId()); bloodPressure.setCreated(new Date()); @@ -74,6 +75,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); bloodPressure.setInfos(infos); bloodPressure.setId(bp.getId()); + bloodPressure.setPid(bp.getPid()); bloodPressureService.update(bloodPressure); } return RespBuilder.buildSuccess(); @@ -219,6 +221,7 @@ public class BloodPressureServiceImpl extends BaseServiceImpl implements IBloodP infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); bloodPressure.setInfos(infos); // bloodPressureService.add(bloodPressure); + bloodPressure.setPid(mongoUtil.getPid(parentId)); mongoTemplate.save(bloodPressure); } else { Map> infos = bp.getInfos(); 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 6d8a7eb..8550f8c 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 @@ -59,6 +59,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga bloodSugar.setYn(YnEnums.YES.getId()); bloodSugar.setModified(new Date()); bloodSugar.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date())); + bloodSugar.setPid(mongoUtil.getPid(bloodSugar.getParentId())); bloodSugarService.add(bloodSugar); return RespBuilder.buildSuccess(bloodSugar.getId()); } @@ -210,6 +211,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga return RespBuilder.buildSuccess(one.getId()); } one = new BloodSugar(); + one.setPid(mongoUtil.getPid(parentId)); one.setParentId(parentId); one.setHospitalId(mongoUtil.getHidByParentId(parentId)); one.setBloodSugar(bloodSugar); @@ -227,7 +229,7 @@ public class BloodSugarServiceImpl extends BaseServiceImpl implements IBloodSuga @Override public BaseResponse wxInfo(String parentId, Integer type) { List> restList = new ArrayList<>(); - List bloodSugars = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class); + List bloodSugars = mongoTemplate.find(Query.query(Criteria.where("pid").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class); Set dayCountSet = new HashSet<>(); Set monthCountSet = new HashSet<>(); for (BloodSugar bloodSugar : bloodSugars) { 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 dd72adc..fa7ddc5 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 @@ -638,4 +638,10 @@ public class MongoUtil { Patients patients = mongoTemplate.findById(parentId, Patients.class); return patients == null ? null : patients.getHospitalId(); } + + + public String getPid(String parentId) { + Patients patients = mongoTemplate.findById(parentId, Patients.class); + return patients == null ? null : patients.getPid(); + } }