diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java index 43e50f1..607dc19 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java @@ -35,6 +35,8 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery private String pId; + private Boolean existPId; + public String getpId() { return pId; } @@ -43,6 +45,14 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery this.pId = pId; } + public Boolean getExistPId() { + return existPId; + } + + public void setExistPId(Boolean existPId) { + this.existPId = existPId; + } + public Boolean getExistweight() { return existweight; } @@ -80,6 +90,9 @@ public class BasicConfigQuery extends BaseQuery implements IConvertToNativeQuery if (null != pId) { condition = condition.and("pId", pId, MongoOper.IS); } + if(null != existPId){ + condition = condition.and("pId", existPId, MongoOper.EXISTS); + } if (null != orName) { MongoCondition con1= MongoCondition.newInstance("alias", orName, MongoOper.LIKE); MongoCondition con = MongoCondition.newInstance("name", orName, MongoOper.IS); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 7c98be9..cf0ba9f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.platform.beans.MsgRequest; +import com.lyms.platform.biz.dal.IBabyCheckDao; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.dao.BaseQuery; @@ -11,7 +12,6 @@ import com.lyms.platform.common.dao.operator.MongoQuery; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.*; import com.lyms.platform.common.utils.*; -import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.BabyAfterVisitService; @@ -149,6 +149,8 @@ public class BabyCheckFacade extends BaseServiceImpl { private LhBabyEyeCheckService lhBabyEyeCheckService; @Autowired private BabyBuildClassifyService babyBuildClassifyService; + @Autowired + private IBabyCheckDao iBabyCheckDao; private static Map guids = new HashMap<>(); static { guids.put(2,"1、新生儿视力发育需要良好的环境亮度,白天要保证室内光线明亮,夜间睡眠时应关灯。\n2、日常养育照护注意保持眼部清洁卫生。\n3、保证新生儿充足睡眠和营养。\n4、从出生就要有近视防控意识。\n5、定期带新生儿做眼保健。\n6、告知家长注意观察新生儿眼病有无异常,若发现异常及时就医。"); @@ -2036,8 +2038,14 @@ public class BabyCheckFacade extends BaseServiceImpl { if(CollectionUtils.isNotEmpty(model.getHighRiskInfo())){ List highRiskInfos = basicConfigFacade.queryBaseInfoByMap(model.getHighRiskInfo()); - for (Map h : highRiskInfos) { - h.put("color", "risk_yellow"); + if("2100001377".equals(model.getHospitalId())){ + for (Map h : highRiskInfos) { + h.put("color", HosptialHighRiskFacade.colorMap.get(h.get("parentId"))); + } + }else{ + for (Map h : highRiskInfos) { + h.put("color", "risk_yellow"); + } } base.setHighRiskInfo(highRiskInfos);//儿童高危详情 } @@ -2937,7 +2945,13 @@ public class BabyCheckFacade extends BaseServiceImpl { model.setHighRisk(checkModel.getHighRisk()); List highRiskInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getHighRiskInfo()); + if("2100001377".equals(checkModel.getHospitalId())){ + for (Map h : highRiskInfos) { + h.put("color", HosptialHighRiskFacade.colorMap.get(h.get("parentId"))); + } + } model.setHighRiskInfo(highRiskInfos); + if (CollectionUtils.isEmpty(highRiskInfos)) { model.setHighRiskInfo(checkModel.getHighRiskInfo());//秦皇岛,高危诊断是手动输入,通过basicConfig获取不到,直接将结果存储起来 } @@ -5792,4 +5806,12 @@ public class BabyCheckFacade extends BaseServiceImpl { .is(YnEnums.YES.getId()).and("checkDate").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))),BabyCheckModel.class); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setData(count).setErrormsg("成功"); } + + public BabyCheckModel queryByBuildId(String id) { + BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery(); + babyCheckModelQuery.setBuildId(id); + MongoQuery query = babyCheckModelQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created"); + List list = iBabyCheckDao.queryByBuildId(query); + return CollectionUtils.isNotEmpty(list) ? list.get(0) : null; + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java index 0f8cd6a..8401be0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java @@ -546,6 +546,7 @@ public class BasicConfigFacade { Map map = new HashMap<>(); map.put("id", datas.get(0).getId()); map.put("name", datas.get(0).getName()); + map.put("parentId", datas.get(0).getParentId()); baseMaps.add(map); } }