Commit b23b6bbcb8f22cb0afd479c126b2f358e4ff0322
1 parent
cb12bae73b
Exists in
master
and in
6 other branches
秦皇岛-高危儿专科归档4个类别
高危儿-原列表复诊查询。
Showing 2 changed files with 45 additions and 2 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java
View file @
b23b6bb
... | ... | @@ -75,7 +75,30 @@ |
75 | 75 | |
76 | 76 | //高危儿编号 |
77 | 77 | private String number; |
78 | + /** | |
79 | + * 秦皇岛高危儿新模块 | |
80 | + */ | |
81 | + //秦皇岛新模块区分参数(0:不包含4个类别,1:只查4个类别) | |
82 | + private Integer classify; | |
83 | + //秦皇岛高危儿专科归档 4个类别条件 早产儿 颅内出血 脑损伤 足月小样儿 | |
84 | + private List<Object> cyzd; | |
78 | 85 | |
86 | + public Integer getClassify() { | |
87 | + return classify; | |
88 | + } | |
89 | + | |
90 | + public void setClassify(Integer classify) { | |
91 | + this.classify = classify; | |
92 | + } | |
93 | + | |
94 | + public List<Object> getCyzd() { | |
95 | + return cyzd; | |
96 | + } | |
97 | + | |
98 | + public void setCyzd(List<Object> cyzd) { | |
99 | + this.cyzd = cyzd; | |
100 | + } | |
101 | + | |
79 | 102 | public String getRiskCode() { |
80 | 103 | return riskCode; |
81 | 104 | } |
... | ... | @@ -354,6 +377,14 @@ |
354 | 377 | } |
355 | 378 | if (StringUtils.isNotEmpty(number)) { |
356 | 379 | condition = condition.and("number", number, MongoOper.IS); |
380 | + } | |
381 | + //秦皇岛新模块区分参数(0:不包含4个类别,1:只查4个类别) | |
382 | + if(CollectionUtils.isNotEmpty(cyzd)){ | |
383 | + if(classify==1){ | |
384 | + condition=condition.and("cyzd", cyzd, MongoOper.IN); | |
385 | + }else { | |
386 | + condition=condition.and("cyzd", cyzd, MongoOper.NIN); | |
387 | + } | |
357 | 388 | } |
358 | 389 | Criteria c = null; |
359 | 390 | //月龄 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
View file @
b23b6bb
... | ... | @@ -645,9 +645,21 @@ |
645 | 645 | babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd())); |
646 | 646 | } |
647 | 647 | |
648 | - //秦皇岛高危儿-只查询复诊 | |
648 | + //秦皇岛高危儿-2021-10-14需求 | |
649 | 649 | if(StringUtils.isNotEmpty(hospitalId)&&"216".equals(hospitalId)){ |
650 | - babyQuery.setCzOrfzProject("fz"); | |
650 | + //查询初诊(建档)-这里前端需要传classify 0和1 | |
651 | + if(null!=babyQuery.getClassify()){ | |
652 | + babyQuery.setCzOrfzProject("cz"); | |
653 | + List<Object> list = new ArrayList<>(); | |
654 | + //Pattern封装正则模糊查询表达式 查4个类别 | |
655 | + list.add(Pattern.compile("^.*"+"早产儿"+".*$")); | |
656 | + list.add(Pattern.compile("^.*"+"颅内出血"+".*$")); | |
657 | + list.add(Pattern.compile("^.*"+"脑损伤"+".*$")); | |
658 | + list.add(Pattern.compile("^.*"+"足月小样儿"+".*$")); | |
659 | + babyQuery.setCyzd(list); | |
660 | + }else {//查询复诊(检查) | |
661 | + babyQuery.setCzOrfzProject("fz"); | |
662 | + } | |
651 | 663 | } |
652 | 664 | babyHighRiskBabyModelList = babyHighRiskBabyService.queryAll(babyQuery); |
653 | 665 | System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); |