jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 724e4b35ad5cf60bcb42c32642555ce880b227f2

Authored by wangshiming
1 parent ddcf2e0c92
Exists in luanping

滦平 高危儿五色管理查询新增查询条件；页面反显高危儿因素颜色

Showing 3 changed files with 39 additions and 3 deletions

platform-dal/src/main/java/com/lyms/platform/query/BasicConfigQuery.java View file @ 724e4b3
... ... @@ -35,6 +35,8 @@
35 35  
36 36 private String pId;
37 37  
  38 + private Boolean existPId;
  39 +
38 40 public String getpId() {
39 41 return pId;
40 42 }
... ... @@ -43,6 +45,14 @@
43 45 this.pId = pId;
44 46 }
45 47  
  48 + public Boolean getExistPId() {
  49 + return existPId;
  50 + }
  51 +
  52 + public void setExistPId(Boolean existPId) {
  53 + this.existPId = existPId;
  54 + }
  55 +
46 56 public Boolean getExistweight() {
47 57 return existweight;
48 58 }
... ... @@ -79,6 +89,9 @@
79 89 }
80 90 if (null != pId) {
81 91 condition = condition.and("pId", pId, MongoOper.IS);
  92 + }
  93 + if(null != existPId){
  94 + condition = condition.and("pId", existPId, MongoOper.EXISTS);
82 95 }
83 96 if (null != orName) {
84 97 MongoCondition con1= MongoCondition.newInstance("alias", orName, MongoOper.LIKE);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java View file @ 724e4b3
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import com.lyms.hospitalapi.qhdfy.QhdfyHisService;
4 4 import com.lyms.platform.beans.MsgRequest;
  5 +import com.lyms.platform.biz.dal.IBabyCheckDao;
5 6 import com.lyms.platform.biz.service.*;
6 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
7 8 import com.lyms.platform.common.dao.BaseQuery;
... ... @@ -11,7 +12,6 @@
11 12 import com.lyms.platform.common.enums.*;
12 13 import com.lyms.platform.common.result.*;
13 14 import com.lyms.platform.common.utils.*;
14   -import com.lyms.platform.common.utils.StringUtils;
15 15 import com.lyms.platform.operate.web.request.*;
16 16 import com.lyms.platform.operate.web.result.*;
17 17 import com.lyms.platform.operate.web.service.BabyAfterVisitService;
... ... @@ -149,6 +149,8 @@
149 149 private LhBabyEyeCheckService lhBabyEyeCheckService;
150 150 @Autowired
151 151 private BabyBuildClassifyService babyBuildClassifyService;
  152 + @Autowired
  153 + private IBabyCheckDao iBabyCheckDao;
152 154 private static Map<Integer,String> guids = new HashMap<>();
153 155 static {
154 156 guids.put(2,"1、新生儿视力发育需要良好的环境亮度，白天要保证室内光线明亮，夜间睡眠时应关灯。\n2、日常养育照护注意保持眼部清洁卫生。\n3、保证新生儿充足睡眠和营养。\n4、从出生就要有近视防控意识。\n5、定期带新生儿做眼保健。\n6、告知家长注意观察新生儿眼病有无异常，若发现异常及时就医。");
... ... @@ -2036,8 +2038,14 @@
2036 2038  
2037 2039 if(CollectionUtils.isNotEmpty(model.getHighRiskInfo())){
2038 2040 List <Map> highRiskInfos = basicConfigFacade.queryBaseInfoByMap(model.getHighRiskInfo());
2039   - for (Map h : highRiskInfos) {
2040   - h.put("color", "risk_yellow");
  2041 + if("2100001377".equals(model.getHospitalId())){
  2042 + for (Map h : highRiskInfos) {
  2043 + h.put("color", HosptialHighRiskFacade.colorMap.get(h.get("parentId")));
  2044 + }
  2045 + }else{
  2046 + for (Map h : highRiskInfos) {
  2047 + h.put("color", "risk_yellow");
  2048 + }
2041 2049 }
2042 2050 base.setHighRiskInfo(highRiskInfos);//儿童高危详情
2043 2051 }
2044 2052  
... ... @@ -2937,7 +2945,13 @@
2937 2945  
2938 2946 model.setHighRisk(checkModel.getHighRisk());
2939 2947 List <Map> highRiskInfos = basicConfigFacade.queryBaseInfoByMap(checkModel.getHighRiskInfo());
  2948 + if("2100001377".equals(checkModel.getHospitalId())){
  2949 + for (Map h : highRiskInfos) {
  2950 + h.put("color", HosptialHighRiskFacade.colorMap.get(h.get("parentId")));
  2951 + }
  2952 + }
2940 2953 model.setHighRiskInfo(highRiskInfos);
  2954 +
2941 2955 if (CollectionUtils.isEmpty(highRiskInfos)) {
2942 2956 model.setHighRiskInfo(checkModel.getHighRiskInfo());//秦皇岛，高危诊断是手动输入，通过basicConfig获取不到，直接将结果存储起来
2943 2957 }
... ... @@ -5791,6 +5805,14 @@
5791 5805 .and("articleTypes").in(Arrays.asList(1,2,3,4,5)).and("yn")
5792 5806 .is(YnEnums.YES.getId()).and("checkDate").gte(DateUtil.getDayFirstSecond(start)).lte(DateUtil.getDayLastSecond(end))),BabyCheckModel.class);
5793 5807 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setData(count).setErrormsg("成功");
  5808 + }
  5809 +
  5810 + public BabyCheckModel queryByBuildId(String id) {
  5811 + BabyCheckModelQuery babyCheckModelQuery = new BabyCheckModelQuery();
  5812 + babyCheckModelQuery.setBuildId(id);
  5813 + MongoQuery query = babyCheckModelQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created");
  5814 + List<BabyCheckModel> list = iBabyCheckDao.queryByBuildId(query);
  5815 + return CollectionUtils.isNotEmpty(list) ? list.get(0) : null;
5794 5816 }
5795 5817 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BasicConfigFacade.java View file @ 724e4b3
... ... @@ -546,6 +546,7 @@
546 546 Map<String, String> map = new HashMap<>();
547 547 map.put("id", datas.get(0).getId());
548 548 map.put("name", datas.get(0).getName());
  549 + map.put("parentId", datas.get(0).getParentId());
549 550 baseMaps.add(map);
550 551 }
551 552 }