liquanyu / regional-platform

Download as
Browse Code »

Commit fcb7ea8b688ba0926e460cf0ccdefe4496ee0703

Authored by Administrator
1 parent c58508002a
Exists in master and in 1 other branch dev

update

Showing 5 changed files with 39 additions and 42 deletions

platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml View file @ fcb7ea8
... ... @@ -72,15 +72,11 @@
72 72 </select>
73 73  
74 74 <sql id="whereSql">
75   - 1=1
76 75 <where>
77   - <if test="folviteId != null">
78   - and folviteId=#{folviteId}
  76 + 1=1
  77 + <if test="folviteId != null and folviteId != ''">
  78 + and folvite_id=#{folviteId}
79 79 </if>
80   - <if test="">
81   - and id=#{id}
82   - </if>
83   -
84 80 </where>
85 81  
86 82  
platform-dal/src/main/java/com/lyms/platform/pojo/FolviteRecordModel.java View file @ fcb7ea8
... ... @@ -2,7 +2,6 @@
2 2  
3 3  
4 4 import com.fasterxml.jackson.annotation.JsonFormat;
5   -import org.apache.commons.lang.time.DateUtils;
6 5  
7 6 import java.util.Date;
8 7  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java View file @ fcb7ea8
... ... @@ -7,12 +7,14 @@
7 7 import com.lyms.platform.permission.model.FolviteQuery;
8 8 import com.lyms.platform.pojo.FolviteReceiveRecordModel;
9 9 import com.lyms.platform.pojo.FolviteRecordModel;
  10 +import org.apache.ibatis.annotations.Param;
10 11 import org.springframework.beans.factory.annotation.Autowired;
11 12 import org.springframework.stereotype.Controller;
12 13 import org.springframework.web.bind.annotation.*;
13 14  
14 15 import javax.servlet.http.HttpServletRequest;
15 16 import javax.validation.Valid;
  17 +import java.util.List;
16 18  
17 19 /**
18 20 * 叶酸接口
19 21  
... ... @@ -94,10 +96,17 @@
94 96 @RequestMapping(value = "queyrFolviteList", method = RequestMethod.GET)
95 97 @ResponseBody
96 98 @TokenRequired
97   - public BaseResponse queryFolviteList(@Valid @RequestBody FolviteQuery query) {
  99 + public BaseResponse queryFolviteList(@Param("cardNo") String cardNo,
  100 + @Param("womanId") String womanId) {
98 101  
99   -
100   - return null;
  102 + FolviteQuery query = new FolviteQuery();
  103 + query.setCardNo(cardNo);
  104 + query.setWomanId(womanId);
  105 + query.setSort("created asc");
  106 + List<FolviteRecordModel> recordModels = folviteService.queryFolviteList(query);
  107 + BaseResponse baseResponse = new BaseResponse();
  108 + baseResponse.setObject(recordModels);
  109 + return baseResponse;
101 110 }
102 111  
103 112  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/FolviteService.java View file @ fcb7ea8
... ... @@ -57,5 +57,7 @@
57 57 List<FolviteReceiveRecordModel> queryFolviteReceiveList(FolviteRecordQuery query);
58 58  
59 59 List<FolviteRecordModel> list(FolviteQuery folviteQuery);
  60 +
  61 +
60 62 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/FolviteServiceImpl.java View file @ fcb7ea8
... ... @@ -76,7 +76,7 @@
76 76 folviteQuery.setHospitalId(hospitalId);
77 77 List<FolviteRecordModel> recordModels = folviteMapper.queryOne(folviteQuery);
78 78 Map<String, Object> data = new HashMap<>();
79   - String womanId = null;
  79 + String folviteId = null;
80 80 if (CollectionUtils.isNotEmpty(recordModels)) {
81 81 FolviteRecordModel queryOne = recordModels.get(0);
82 82 if (null != queryOne) {
83 83  
84 84  
85 85  
86 86  
... ... @@ -89,39 +89,30 @@
89 89 data.put("address", CommonsHelper.getResidence(queryOne.getDomicileProvince(), queryOne.getDomicileCity(),
90 90 queryOne.getDomicileArea(), queryOne.getDomicileCountry(), queryOne.getDomicileAddress(), basicConfigService));
91 91 flag = false;
92   - womanId = queryOne.getWomanId();
  92 + folviteId = queryOne.getId();
93 93 }
94 94 }
95   - /* FolviteQuery queryFolvite = new FolviteQuery();
96   - queryFolvite.setWomanId(womanId);
97   - queryFolvite.setCardNo(cardNo);
98   - List<FolviteRecordModel> recordModel = queryFolviteList(queryFolvite);
99   - List<List<Map<String, Object>>> list = new ArrayList();
100   - if (CollectionUtils.isNotEmpty(recordModel)) {
101   - FolviteRecordQuery recordQuery = new FolviteRecordQuery();
102   - for (FolviteRecordModel folviteModel : recordModel) {
103   - List<Map<String, Object>> listMap = new ArrayList<>();
104   - recordQuery.setFolviteId(folviteModel.getId());
105   - List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
106   - if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
107   - for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
108   - Map<String, Object> recordMap = new HashMap<>();
109   - recordMap.put("drawCount", folviteRecordModel.getReceiveNumber());
110   - recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate()));
111   - recordMap.put("id", folviteRecordModel.getId());
112   - recordMap.put("other", folviteRecordModel.getIsconceive());
113   - if (folviteRecordModel.getIsconceive() == 0) {
114   - recordMap.put("pregnancyType", "孕前");
115   - } else {
116   - recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
117   - }
118   - listMap.add(recordMap);
119   - }
  95 + FolviteRecordQuery recordQuery = new FolviteRecordQuery();
  96 + recordQuery.setFolviteId(folviteId);
  97 + List<Map<String, Object>> listMap = new ArrayList<>();
  98 + List<FolviteReceiveRecordModel> folviteRecordModels = queryFolviteReceiveList(recordQuery);
  99 + if (CollectionUtils.isNotEmpty(folviteRecordModels)) {
  100 + for (FolviteReceiveRecordModel folviteRecordModel : folviteRecordModels) {
  101 + Map<String, Object> recordMap = new HashMap<>();
  102 + recordMap.put("drawCount", folviteRecordModel.getReceiveNumber());
  103 + recordMap.put("drawTime", DateUtil.getyyyy_MM_dd(folviteRecordModel.getReceiveDate()));
  104 + recordMap.put("id", folviteRecordModel.getId());
  105 + recordMap.put("other", folviteRecordModel.getIsconceive());
  106 + if (folviteRecordModel.getIsconceive() == 0) {
  107 + recordMap.put("pregnancyType", "孕前");
  108 + } else {
  109 + recordMap.put("pregnancyType", "孕" + folviteRecordModel.getReceiveWeek() + "周");
120 110 }
121   - list.add(listMap);
  111 + listMap.add(recordMap);
122 112 }
123   - }*/
  113 + }
124 114  
  115 +
125 116 FolviteResult result = null;
126 117 if (flag) {
127 118 //如果为空查询孕妇档案 进行叶酸档案建档 回显孕妇档案数据回去
... ... @@ -139,7 +130,7 @@
139 130  
140 131 BaseResponse responses = new BaseResponse();
141 132 response.put("baseInfo", data);
142   - response.put("history", "历史记录");
  133 + response.put("history", listMap);
143 134 response.put("womanRecord", result);
144 135 responses.setObject(response);
145 136 return responses;