Commit 9397c55bbe6de82d9ac4421af83e7f76b1729672
1 parent
7fd8617853
Exists in
master
and in
6 other branches
//秦皇岛-高危儿专科-查询单人高危儿专科 复诊记录即检查记录,打印选中及之前limit条检查记录
Showing 3 changed files with 75 additions and 4 deletions
platform-dal/src/main/java/com/lyms/platform/query/BabyHighRiskBabyModelQuery.java
View file @
9397c55
... | ... | @@ -82,7 +82,29 @@ |
82 | 82 | private Integer classify; |
83 | 83 | //秦皇岛高危儿专科归档 4个类别条件 早产儿 颅内出血 脑损伤 足月小样儿 |
84 | 84 | private List<Object> cyzd; |
85 | + //秦皇岛高危儿专科打印检查 打印参数 多少条 | |
86 | + private Integer limit; | |
87 | + //检查日期 | |
88 | + private Date checkDate; | |
85 | 89 | |
90 | + public Date getCheckDate() { | |
91 | + return checkDate; | |
92 | + } | |
93 | + | |
94 | + public void setCheckDate(Date checkDate) { | |
95 | + this.checkDate = checkDate; | |
96 | + } | |
97 | + | |
98 | + @Override | |
99 | + public Integer getLimit() { | |
100 | + return limit; | |
101 | + } | |
102 | + | |
103 | + @Override | |
104 | + public void setLimit(Integer limit) { | |
105 | + this.limit = limit; | |
106 | + } | |
107 | + | |
86 | 108 | public Integer getClassify() { |
87 | 109 | return classify; |
88 | 110 | } |
... | ... | @@ -382,6 +404,9 @@ |
382 | 404 | } |
383 | 405 | if (StringUtils.isNotEmpty(number)) { |
384 | 406 | condition = condition.and("number", number, MongoOper.IS); |
407 | + } | |
408 | + if (null!=checkDate) { | |
409 | + condition = condition.and("checkDate", checkDate, MongoOper.LTE); | |
385 | 410 | } |
386 | 411 | //秦皇岛新模块区分参数(0:不包含4个类别,1:只查4个类别) |
387 | 412 | // if(CollectionUtils.isNotEmpty(cyzd)){ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyHighRiskBabyController.java
View file @
9397c55
... | ... | @@ -13,6 +13,7 @@ |
13 | 13 | import org.springframework.beans.factory.annotation.Autowired; |
14 | 14 | import org.springframework.stereotype.Controller; |
15 | 15 | import org.springframework.web.bind.annotation.*; |
16 | +import scala.util.parsing.combinator.testing.Str; | |
16 | 17 | |
17 | 18 | import javax.servlet.http.HttpServletRequest; |
18 | 19 | import javax.validation.Valid; |
... | ... | @@ -131,6 +132,18 @@ |
131 | 132 | @TokenRequired |
132 | 133 | public BaseResponse queryOne(BabyHighRiskBabyModelQuery babyHighRiskBabyModelQuery, HttpServletRequest request) { |
133 | 134 | return babyHighRiskBabyFacade.queryOne(babyHighRiskBabyModelQuery,getUserId(request)); |
135 | + } | |
136 | + /** | |
137 | + * 秦皇岛打印需求 | |
138 | + * 查询单人高危儿专科 复诊记录即检查记录,打印选中及之前limit条检查记录 | |
139 | + * | |
140 | + * @param id,limit | |
141 | + */ | |
142 | + @RequestMapping(value = "/queryPrint", method = RequestMethod.GET) | |
143 | + @ResponseBody | |
144 | + @TokenRequired | |
145 | + public BaseResponse queryPrint(String id,Integer limit, HttpServletRequest request) { | |
146 | + return babyHighRiskBabyFacade.queryPrint(id,limit); | |
134 | 147 | } |
135 | 148 | |
136 | 149 | /** |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyHighRiskBabyFacade.java
View file @
9397c55
... | ... | @@ -10,10 +10,7 @@ |
10 | 10 | import com.lyms.platform.common.enums.YnEnums; |
11 | 11 | import com.lyms.platform.common.result.BaseObjectResponse; |
12 | 12 | import com.lyms.platform.common.result.BaseResponse; |
13 | -import com.lyms.platform.common.utils.DateUtil; | |
14 | -import com.lyms.platform.common.utils.JsonUtil; | |
15 | -import com.lyms.platform.common.utils.StringUtils; | |
16 | -import com.lyms.platform.common.utils.SystemConfig; | |
13 | +import com.lyms.platform.common.utils.*; | |
17 | 14 | import com.lyms.platform.operate.web.request.BabyHighRiskBabyRequest; |
18 | 15 | import com.lyms.platform.operate.web.result.BabyHighRiskBabyResult; |
19 | 16 | import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; |
... | ... | @@ -37,6 +34,7 @@ |
37 | 34 | import org.springframework.data.mongodb.core.query.Query; |
38 | 35 | import org.springframework.data.mongodb.core.query.Update; |
39 | 36 | import org.springframework.stereotype.Component; |
37 | +import scala.collection.parallel.ParIterableLike; | |
40 | 38 | |
41 | 39 | import java.util.*; |
42 | 40 | import java.util.regex.Pattern; |
... | ... | @@ -1000,5 +998,40 @@ |
1000 | 998 | } |
1001 | 999 | } |
1002 | 1000 | |
1001 | + //秦皇岛高危儿打印检查记录 | |
1002 | + public BaseObjectResponse queryPrint(String id,Integer limit) { | |
1003 | + BaseObjectResponse br = new BaseObjectResponse(); | |
1004 | + Map map = new HashMap(); | |
1005 | + String number = ""; | |
1006 | + //查询选中的人 | |
1007 | + BabyHighRiskBabyModel riskBabyModel=mongoTemplate.findById(id,BabyHighRiskBabyModel.class); | |
1008 | + BabyHighRiskBabyModelQuery babyQuery= new BabyHighRiskBabyModelQuery(); | |
1009 | + List <BabyHighRiskBabyResult> babyHighRiskBabyResultList = new ArrayList <>(); | |
1010 | + //个人所有复诊即检查记录 | |
1011 | + List <BabyHighRiskBabyModel> babyHighRiskBabyModelList = new ArrayList <>(); | |
1012 | + if (StringUtils.isNotEmpty(riskBabyModel.getBuildId())) { | |
1013 | + babyQuery.setYn(YnEnums.YES.getId()); | |
1014 | + babyQuery.setBuildId(riskBabyModel.getBuildId()); | |
1015 | + babyQuery.setSort("checkDate");//排序 | |
1016 | + babyQuery.setCheckDate(riskBabyModel.getCheckDate()); | |
1017 | + babyQuery.setNeed("yse");//是否分页 | |
1018 | + babyQuery.setLimit(limit); | |
1019 | + babyQuery.setCzOrfzProject("fz");//只查fz即检查的 | |
1020 | + babyHighRiskBabyModelList = babyHighRiskBabyService.queryAll(babyQuery); | |
1021 | + } | |
1022 | + if(CollectionUtils.isNotEmpty(babyHighRiskBabyModelList)) { | |
1023 | + for (int i = babyHighRiskBabyModelList.size()-1; i >= 0; i--) {//为了展示数据为ASC,因为要从选种的档案往前排序结果 | |
1024 | + BabyHighRiskBabyResult babyHighRiskBabyResult = new BabyHighRiskBabyResult(); | |
1025 | + //放入结果集 | |
1026 | + babyHighRiskBabyResultList.add(babyHighRiskBabyResult.convertToResult(babyHighRiskBabyModelList.get(i))); | |
1027 | + } | |
1028 | + } | |
1029 | + map.put("babyHighRiskBabyResultList", babyHighRiskBabyResultList);//个人时间轴和历史记录 | |
1030 | + br.setData(map); | |
1031 | + br.setPageInfo(babyQuery.getPageInfo());//分页数据返回 | |
1032 | + br.setErrorcode(ErrorCodeConstants.SUCCESS); | |
1033 | + br.setErrormsg("成功"); | |
1034 | + return br; | |
1035 | + } | |
1003 | 1036 | } |