jiangjiazhi / regional-platform

Download as
Browse Code »

Commit a56ce847f6ec89119c902b9ac303e23178344ada

Authored by wangbo
1 parent 5ba3c56339
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

自测bug提交

Showing 6 changed files with 39 additions and 5 deletions

platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java View file @ a56ce84
... ... @@ -83,6 +83,8 @@
83 83 HealthChargeModel("HealthChargeModel", 97221049991L),
84 84 ChargeRecordModel("ChargeRecordModel", 98221049991L),
85 85 TemporaryWeightModel("TemporaryWeightModel", 97531049591L),
  86 + TemporaryBloodModel("TemporaryBloodModel", 97541049591L),
  87 + TemporaryBloodSugarModel("TemporaryWeightModel", 97551049591L),
86 88 BabyEyeCheck("BabyEyeCheck", 97521039591L);
87 89  
88 90 private String cname;
platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodModel.java View file @ a56ce84
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import com.lyms.platform.beans.SerialIdEnum;
3 4 import com.lyms.platform.common.result.BaseModel;
4 5 import org.springframework.data.mongodb.core.mapping.Document;
5 6  
... ... @@ -9,6 +10,7 @@
9 10  
10 11 @Document(collection = "lyms_temporary_blood")
11 12 public class TemporaryBloodModel extends BaseModel {
  13 + private static final long serialVersionUID = SerialIdEnum.TemporaryBloodModel.getCid();
12 14  
13 15 private String id;
14 16  
platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java View file @ a56ce84
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import com.lyms.platform.beans.SerialIdEnum;
3 4 import com.lyms.platform.common.result.BaseModel;
4 5 import org.springframework.data.mongodb.core.mapping.Document;
5 6  
... ... @@ -9,6 +10,7 @@
9 10  
10 11 @Document(collection = "lyms_temporary_bloodSugar")
11 12 public class TemporaryBloodSugar extends BaseModel {
  13 + private static final long serialVersionUID = SerialIdEnum.TemporaryBloodSugarModel.getCid();
12 14 private String id;
13 15  
14 16 private String userName;
... ... @@ -62,6 +64,9 @@
62 64 private String riskLevelId;
63 65  
64 66 private String hospitalId;
  67 + //报告状态 1未查看 2查看
  68 + private Integer status;
  69 + private Integer yn;
65 70  
66 71 public String getHospitalId() {
67 72 return hospitalId;
... ... @@ -119,9 +124,6 @@
119 124 this.bloodSugarType = bloodSugarType;
120 125 }
121 126  
122   - //报告状态 1未查看 2查看
123   - private Integer status;
124   - private Integer yn;
125 127  
126 128 public String getId() {
127 129 return id;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java View file @ a56ce84
... ... @@ -26,7 +26,7 @@
26 26 @RequestMapping(value = "/addAndUpate", method = RequestMethod.POST)
27 27 @TokenRequired
28 28 @ResponseBody
29   - public BaseResponse addTempraryBloodSugar(@Valid @RequestBody TemporaryBloodSugar bloodSugar, HttpServletRequest request) {
  29 + public BaseResponse addTempraryBloodSugar(TemporaryBloodSugar bloodSugar, HttpServletRequest request) {
30 30  
31 31 return bloodSugarService.addAndUpdate(bloodSugar, getUserId(request));
32 32 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java View file @ a56ce84
... ... @@ -132,7 +132,7 @@
132 132 }
133 133 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录");
134 134 }
135   -
  135 +
136 136  
137 137 @Override
138 138 public BaseResponse queryOne(String id) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java View file @ a56ce84
... ... @@ -72,6 +72,34 @@
72 72 bloodSugar.setModified(new Date());
73 73 temporaryBloodSugarDao.updateTemporaryBloodSugar(Query.query(Criteria.where("_id").is(bloodSugar.getId()).and("bloodSugarType").is(bloodSugar.getBloodSugarType())), bloodSugar);
74 74 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功");
  75 + } else if (null != bloodSugar.getId() && null == temporaryBloodSugar) {
  76 + TemporaryBloodSugar sugar = new TemporaryBloodSugar();
  77 + for (TemporaryBloodSugar sugarList : bloodSugars) {
  78 + if (bloodSugar.getId().equals(sugarList.getId())) {
  79 + sugar.setModified(new Date());
  80 + sugar.setCreated(new Date());
  81 + sugar.setYn(1);
  82 + sugar.setUserName(sugarList.getUserName());
  83 + sugar.setPhone(sugarList.getPhone());
  84 + sugar.setAge(sugarList.getAge());
  85 + sugar.setBeforeHeight(sugarList.getBeforeHeight());
  86 + sugar.setNowWeight(bloodSugar.getNowWeight());
  87 + sugar.setBloodSugar(bloodSugar.getBloodSugar());
  88 + sugar.setBloodSugarType(bloodSugar.getBloodSugarType());
  89 + sugar.setLastMenses(sugarList.getLastMenses());
  90 + sugar.setBeforeWeight(sugarList.getBeforeWeight());
  91 + sugar.setBregmatic(sugarList.getBregmatic());
  92 + sugar.setCardID(sugarList.getCardID());
  93 + Map<String, String> dayWeights = new LinkedHashMap<>();
  94 + dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), bloodSugar.getNowWeight());
  95 + sugar.setDayWeights(dayWeights);
  96 + sugar.setRiskLevelId(sugarList.getRiskLevelId());
  97 + sugar.setHospitalId(sugarList.getHospitalId());
  98 + sugar.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date()));
  99 + temporaryBloodSugarDao.addTemporaryBloodSugar(sugar);
  100 + }
  101 + }
  102 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("增加成功");
75 103 } else {
76 104 bloodSugar.setModified(new Date());
77 105 bloodSugar.setCreated(new Date());