liquanyu / regional-platform

Download as
Browse Code ยป

Commit 6040cdfdcdd6542cbd67b71e3c782adee85f7084

Authored by yangfei
2 parents f7f4305bbe 3a46d828aa
Exists in master and in 1 other branch dev

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java View file @ 6040cdf
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.common.annotation.TokenRequired;
4 4 import com.lyms.platform.common.base.BaseController;
5 5 import com.lyms.platform.common.result.BaseResponse;
  6 +import com.lyms.platform.common.result.RespBuilder;
6 7 import com.lyms.platform.operate.web.service.IBloodPressureService;
7 8 import com.lyms.platform.pojo.BloodPressure;
8 9 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -32,6 +33,12 @@
32 33 }
33 34  
34 35 @ResponseBody
  36 + @RequestMapping(value = "/wx", method = RequestMethod.POST)
  37 + public BaseResponse wxAdd(BloodPressure bloodPressure) {
  38 + return bloodPressureService.wxAdd(bloodPressure);
  39 + }
  40 +
  41 + @ResponseBody
35 42 @RequestMapping(method = RequestMethod.GET)
36 43 @TokenRequired
37 44 public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
... ... @@ -48,7 +55,7 @@
48 55 @ResponseBody
49 56 @RequestMapping(value = "/app/{parentId}", method = RequestMethod.GET)
50 57 public BaseResponse getAppInfo(@PathVariable String parentId) {
51   - return bloodPressureService.getAppInfo(parentId);
  58 + return RespBuilder.buildSuccess(bloodPressureService.getAppInfo(parentId));
52 59 }
53 60  
54 61 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java View file @ 6040cdf
... ... @@ -38,6 +38,13 @@
38 38 }
39 39  
40 40 @ResponseBody
  41 + @RequestMapping(value = "/wx", method = RequestMethod.POST)
  42 + public BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType) {
  43 + return bloodSugarService.wxAdd(parentId, bloodSugar, bloodSugarType);
  44 + }
  45 +
  46 +
  47 + @ResponseBody
41 48 @RequestMapping(method = RequestMethod.GET)
42 49 @TokenRequired
43 50 public BaseResponse list(String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) {
... ... @@ -49,6 +56,13 @@
49 56 @TokenRequired
50 57 public BaseResponse info(@PathVariable String parentId, @PathVariable Integer type) {
51 58 return bloodSugarService.info(parentId, type);
  59 + }
  60 +
  61 +
  62 + @ResponseBody
  63 + @RequestMapping(value = "/wx/{parentId}/{type}", method = RequestMethod.GET)
  64 + public BaseResponse wxInfo(@PathVariable String parentId, @PathVariable Integer type) {
  65 + return bloodSugarService.wxInfo(parentId, type);
52 66 }
53 67  
54 68 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java View file @ 6040cdf
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.common.result.BaseResponse;
4 4 import com.lyms.platform.pojo.BloodPressure;
5 5  
  6 +import java.util.List;
6 7 import java.util.Map;
7 8  
8 9 public interface IBloodPressureService extends IBaseService {
9 10  
... ... @@ -13,8 +14,10 @@
13 14  
14 15 BaseResponse info(String id);
15 16  
16   - BaseResponse getAppInfo(String parentId);
  17 + List<Map<String, Object>> getAppInfo(String parentId);
17 18  
18 19 BaseResponse initBloodPressure(Map<String, String> param);
  20 +
  21 + BaseResponse wxAdd(BloodPressure bloodPressure);
19 22 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java View file @ 6040cdf
... ... @@ -18,5 +18,9 @@
18 18 BaseResponse initBloodSugar(Map<String, String> param);
19 19  
20 20 BaseResponse init();
  21 +
  22 + BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType);
  23 +
  24 + BaseResponse wxInfo(String parentId, Integer type);
21 25 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ 6040cdf
... ... @@ -167,7 +167,7 @@
167 167 }
168 168  
169 169 @Override
170   - public BaseResponse getAppInfo(String parentId) {
  170 + public List<Map<String, Object>> getAppInfo(String parentId) {
171 171 BloodPressure bloodPressure = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId)), BloodPressure.class);
172 172 List<Map<String, Object>> restList = new ArrayList<>();
173 173 if(bloodPressure != null) {
... ... @@ -184,7 +184,7 @@
184 184 restList.add(temp);
185 185 }
186 186 }
187   - return RespBuilder.buildSuccess(restList);
  187 + return restList;
188 188 }
189 189  
190 190 @Override
... ... @@ -193,6 +193,38 @@
193 193 for (Object obj : array) {
194 194 JSONObject jsonObject = (JSONObject) obj;
195 195 System.out.println(jsonObject);
  196 + }
  197 + return RespBuilder.buildSuccess();
  198 + }
  199 +
  200 + @Override
  201 + public BaseResponse wxAdd(BloodPressure bloodPressure) {
  202 + String hospitalId = mongoUtil.getHidByParentId(bloodPressure.getParentId());
  203 + Map<String, Object> temp = new LinkedHashMap<>();
  204 + temp.put("szy", bloodPressure.getSzy());
  205 + temp.put("ssy", bloodPressure.getSsy());
  206 + temp.put("pulse", bloodPressure.getPulse());
  207 + temp.put("timestamp", DateUtil.getyyyy_MM_dd_hms(new Date()));
  208 + temp.put("hospitalId", hospitalId);
  209 + BloodPressure bp = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(bloodPressure.getParentId()).and("yn").ne(0)), BloodPressure.class);
  210 + bloodPressure.setModified(new Date());
  211 + if(bp == null) {
  212 + String parentId = mongoUtil.doHidePatient(bloodPressure.getParentId(), hospitalId);
  213 + bloodPressure.setParentId(parentId);
  214 + bloodPressure.setYn(YnEnums.YES.getId());
  215 + bloodPressure.setCreated(new Date());
  216 + bloodPressure.setHospitalId(hospitalId);
  217 +// bloodPressure.setOperaterId(userId);
  218 + Map<String, Map<String, Object>> infos = new LinkedHashMap<>();
  219 + infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp);
  220 + bloodPressure.setInfos(infos);
  221 + bloodPressureService.add(bloodPressure);
  222 + } else {
  223 + Map<String, Map<String, Object>> infos = bp.getInfos();
  224 + infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp);
  225 + bloodPressure.setInfos(infos);
  226 + bloodPressure.setId(bp.getId());
  227 + bloodPressureService.update(bloodPressure);
196 228 }
197 229 return RespBuilder.buildSuccess();
198 230 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ 6040cdf
... ... @@ -139,10 +139,12 @@
139 139 Map<Object, Object> temp = new HashMap<>();
140 140 for (BloodSugar bloodSugar : bloodSugars) {
141 141 if(day.equals(bloodSugar.getCreatYmdDate())) {
  142 + if(type == bloodSugar.getBloodSugarType()) {
  143 + bloodSugarAxis.add(0, bloodSugar.getBloodSugar());
  144 + }
142 145 for (BloodSugarEnums sugarEnums : BloodSugarEnums.values()) {
143 146 if(sugarEnums.getId() == (bloodSugar.getBloodSugarType())) {
144 147 temp.put(sugarEnums.getId(), bloodSugar.getBloodSugar());
145   - bloodSugarAxis.add(0, bloodSugar.getBloodSugar());
146 148 }
147 149 }
148 150 }
... ... @@ -196,6 +198,43 @@
196 198 @Override
197 199 public BaseResponse init() {
198 200 return RespBuilder.buildSuccess(EnumUtil.toJson(BloodSugarEnums.class));
  201 + }
  202 +
  203 + @Override
  204 + public BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType) {
  205 + BloodSugar one = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("created").gt(DateUtil.getYMDTime()).and("bloodSugarType").is(bloodSugarType)), BloodSugar.class);
  206 + if(one != null) {
  207 + one.setModified(new Date());
  208 + one.setBloodSugar(bloodSugar);
  209 + bloodSugarService.update(one);
  210 + return RespBuilder.buildSuccess(one.getId());
  211 + }
  212 + one = new BloodSugar();
  213 + one.setParentId(parentId);
  214 + one.setHospitalId(mongoUtil.getHidByParentId(parentId));
  215 + one.setBloodSugar(bloodSugar);
  216 + one.setBloodSugarType(bloodSugarType);
  217 + one.setCreated(new Date());
  218 +// one.setCreateUser(userId);
  219 + one.setYn(YnEnums.YES.getId());
  220 + one.setModified(new Date());
  221 + one.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date()));
  222 + bloodSugarService.add(one);
  223 + return RespBuilder.buildSuccess(one.getId());
  224 + }
  225 +
  226 + @Override
  227 + public BaseResponse wxInfo(String parentId, Integer type) {
  228 + List<Map<String, Object>> restList = new ArrayList<>();
  229 + List<BloodSugar> bloodSugars = mongoTemplate.find(Query.query(Criteria.where("parentId").is(parentId)).with(new Sort(Sort.Direction.DESC, "created")), BloodSugar.class);
  230 + for (BloodSugar bloodSugar : bloodSugars) {
  231 + Map<String, Object> temp = new HashMap<>();
  232 + temp.put("bloodSugar", bloodSugar.getBloodSugar());
  233 + temp.put("craeted", bloodSugar.getCreated());
  234 + temp.put("type", bloodSugar.getBloodSugarType());
  235 + restList.add(temp);
  236 + }
  237 + return RespBuilder.buildSuccess(restList);
199 238 }
200 239  
201 240 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MongoUtil.java View file @ 6040cdf
... ... @@ -633,5 +633,10 @@
633 633 }
634 634 return ids;
635 635 }
  636 +
  637 + public String getHidByParentId(String parentId) {
  638 + Patients patients = mongoTemplate.findById(parentId, Patients.class);
  639 + return patients == null ? null : patients.getHospitalId();
  640 + }
636 641 }