diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java index a2b9dd5..5d7864a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java @@ -15,6 +15,8 @@ public class BabyEyeCheck { // 异常的备注 private String errorRemark; + private Date birth; + private String id; private Date created; @@ -225,6 +227,14 @@ public class BabyEyeCheck { */ private String fixationCard; + public Date getBirth() { + return birth; + } + + public void setBirth(Date birth) { + this.birth = birth; + } + public String getErrorRemark() { return errorRemark; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index d7bf92b..382fa9b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -81,6 +81,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); if(babyModel != null) { babyEyeCheck.setPid(babyModel.getPid()); + babyEyeCheck.setBirth(babyModel.getBirth()); } mongoTemplate.save(babyEyeCheck); if(CollectionUtils.isNotEmpty(babyEyeCheck.getRiskFactorId())) { @@ -203,6 +204,12 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEye if(StringUtils.isNotEmpty(chechMonth)) { criteria.and("checkMonthId").is(chechMonth); } + if(StringUtils.isNotEmpty(currentMonth)) { +// Date start = DateUtil.getBeforMonth() + +// criteria.and("checkTime").gte(startDate).lt(DateUtil.addDay(endDate, 1)); + } + if(org.apache.commons.lang.StringUtils.isNotBlank(key)) { Criteria c = new Criteria(); c.orOperator(Criteria.where("mphone").is(key), Criteria.where("name").regex(key), Criteria.where("mcertNo").is(key)).and("yn").ne(0); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java index 1950501..7ce4f1d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PlantformConfigServiceImpl.java @@ -36,6 +36,9 @@ public class PlantformConfigServiceImpl extends BaseServiceImpl implements Plant @Autowired private MongoTemplate mongoTemplate; + @Autowired + MongoUtil mongoUtil; + @Override public BaseResponse listCustomType(String key, Integer page, Integer limit, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); @@ -112,9 +115,12 @@ public class PlantformConfigServiceImpl extends BaseServiceImpl implements Plant List configModels = (List) pageResult.getGrid(); List> restList = new ArrayList<>(); for (PlantformConfigModel configModel : configModels) { - Map map = ReflectionUtils.beanToMap(configModel); + Map map = new HashMap<>(); map.put("id", configModel.getId().toString()); - map.put("date", DateUtil.getyyyy_MM_dd_hms(configModel.getCreateDate())); + map.put("typeName", mongoUtil.getPlatformValue(configModel.getParentId())); + map.put("serchKey", configModel.getSerchKey()); + map.put("content", configModel.getValue()); + map.put("createDate", DateUtil.getyyyy_MM_dd_hms(configModel.getCreateDate())); restList.add(map); } pageResult.setGrid(restList); 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 775f832..096abed 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 @@ -7,6 +7,7 @@ import com.lyms.platform.operate.web.facade.OrganizationGroupsFacade; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.Patients; +import com.lyms.platform.pojo.PlantformConfigModel; import com.mongodb.BasicDBObject; import com.mongodb.DBObject; import org.apache.commons.collections.map.HashedMap; @@ -36,6 +37,15 @@ public class MongoUtil { @Autowired private OrganizationGroupsFacade organizationGroupsFacade; + public PlantformConfigModel getPlatformConfig(String id) { + return mongoTemplate.findById(id, PlantformConfigModel.class); + } + + public String getPlatformValue(String id) { + PlantformConfigModel platformConfig = getPlatformConfig(id); + return platformConfig == null ? null : platformConfig.getValue(); + } + /** * 隐藏建档 * @param userId