jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit fb991e753078a2d0eb07bee208c410a51b71b839

Authored by litao@lymsh.com
1 parent 6a0558f7c7
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

gai tong bu

Showing 6 changed files with 18 additions and 15 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodPressureController.java View file @ fb991e7
... ... @@ -34,8 +34,8 @@
34 34  
35 35 @ResponseBody
36 36 @RequestMapping(value = "/wx", method = RequestMethod.POST)
37   - public BaseResponse wxAdd(BloodPressure bloodPressure) {
38   - return bloodPressureService.wxAdd(bloodPressure);
  37 + public BaseResponse wxAdd(BloodPressure bloodPressure, boolean flag) {
  38 + return bloodPressureService.wxAdd(bloodPressure, flag);
39 39 }
40 40  
41 41 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BloodSugarController.java View file @ fb991e7
... ... @@ -39,10 +39,9 @@
39 39  
40 40 @ResponseBody
41 41 @RequestMapping(value = "/wx", method = RequestMethod.POST)
42   - public BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType) {
43   - return bloodSugarService.wxAdd(parentId, bloodSugar, bloodSugarType);
  42 + public BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType, boolean flag) {
  43 + return bloodSugarService.wxAdd(parentId, bloodSugar, bloodSugarType, flag);
44 44 }
45   -
46 45  
47 46 @ResponseBody
48 47 @RequestMapping(method = RequestMethod.GET)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodPressureService.java View file @ fb991e7
... ... @@ -18,7 +18,7 @@
18 18  
19 19 BaseResponse initBloodPressure(Map<String, String> param);
20 20  
21   - BaseResponse wxAdd(BloodPressure bloodPressure);
  21 + BaseResponse wxAdd(BloodPressure bloodPressure, boolean flag);
22 22  
23 23 BaseResponse initPatientWeight();
24 24 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/IBloodSugarService.java View file @ fb991e7
... ... @@ -19,7 +19,7 @@
19 19  
20 20 BaseResponse init();
21 21  
22   - BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType);
  22 + BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType, boolean flag);
23 23  
24 24 BaseResponse wxInfo(String parentId, Integer type);
25 25 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodPressureServiceImpl.java View file @ fb991e7
... ... @@ -216,7 +216,7 @@
216 216 }
217 217  
218 218 @Override
219   - public BaseResponse wxAdd(BloodPressure bloodPressure) {
  219 + public BaseResponse wxAdd(BloodPressure bloodPressure, boolean flag) {
220 220 String hospitalId = mongoUtil.getHidByParentId(bloodPressure.getParentId());
221 221 Map<String, Object> temp = new LinkedHashMap<>();
222 222 temp.put("szy", bloodPressure.getSzy());
223 223  
... ... @@ -241,9 +241,12 @@
241 241 Map<String, Map<String, Object>> infos = new LinkedHashMap<>();
242 242 infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp);
243 243 bloodPressure.setInfos(infos);
244   -// bloodPressureService.add(bloodPressure);
245 244 bloodPressure.setPid(mongoUtil.getPid(parentId));
246   - mongoTemplate.save(bloodPressure);
  245 + if(flag) {
  246 + bloodPressureService.add(bloodPressure);
  247 + } else {
  248 + mongoTemplate.save(bloodPressure);
  249 + }
247 250 } else {
248 251 Map<String, Map<String, Object>> infos = bp.getInfos();
249 252 infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BloodSugarServiceImpl.java View file @ fb991e7
... ... @@ -204,9 +204,8 @@
204 204 }
205 205  
206 206 @Override
207   - public BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType) {
  207 + public BaseResponse wxAdd(String parentId, String bloodSugar, Integer bloodSugarType, boolean flag) {
208 208 BloodSugar one = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(mongoUtil.getPid(parentId)).and("created").gt(DateUtil.getYMDTime()).and("bloodSugarType").is(bloodSugarType)), BloodSugar.class);
209   -// BloodSugar one = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(parentId).and("created").gt(DateUtil.getYMDTime()).and("bloodSugarType").is(bloodSugarType)), BloodSugar.class);
210 209 if(one != null) {
211 210 one.setModified(new Date());
212 211 one.setBloodSugar(bloodSugar);
213 212  
... ... @@ -220,12 +219,14 @@
220 219 one.setBloodSugar(bloodSugar);
221 220 one.setBloodSugarType(bloodSugarType);
222 221 one.setCreated(new Date());
223   -// one.setCreateUser(userId);
224 222 one.setYn(YnEnums.YES.getId());
225 223 one.setModified(new Date());
226 224 one.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date()));
227   -// bloodSugarService.add(one);
228   - mongoTemplate.save(one);
  225 + if(flag) {
  226 + bloodSugarService.add(one);
  227 + } else {
  228 + mongoTemplate.save(one);
  229 + }
229 230 return RespBuilder.buildSuccess(one.getId());
230 231 }
231 232