jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 9652b8abd0fd97ec854a44b6df4a1e0104e4996b

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

update

Showing 10 changed files with 136 additions and 259 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryBloodSugar.java View file @ 9652b8a
... ... @@ -13,18 +13,7 @@
13 13 private static final long serialVersionUID = SerialIdEnum.TemporaryBloodSugarModel.getCid();
14 14 private String id;
15 15  
16   - private String userName;
17   -
18   - private Integer age;
19   -
20   - private String phone;
21   -
22   - private Date lastMenses;
23   - // 孕前体重
24   - private String beforeWeight;
25   - // 孕前身高
26   - private String beforeHeight;
27   - // 当前体重
  16 + //当前体重
28 17 private String nowWeight;
29 18  
30 19 private String cardID;
... ... @@ -32,9 +21,8 @@
32 21 private Date created;
33 22  
34 23 private Date modified;
35   - private List riskFactorId;
36   - // 其他高危
37   - private String highriskDesc;
  24 +
  25 +
38 26 //高危补充说明
39 27 private List otherRisk;
40 28 //监测状态 1 非药物治疗，监测不足 2 非药物治疗，监测次数达标，血糖控制不理想
... ... @@ -68,6 +56,16 @@
68 56 private Integer status;
69 57 private Integer yn;
70 58  
  59 + private String temporaryUserId;
  60 +
  61 + public String getTemporaryUserId() {
  62 + return temporaryUserId;
  63 + }
  64 +
  65 + public void setTemporaryUserId(String temporaryUserId) {
  66 + this.temporaryUserId = temporaryUserId;
  67 + }
  68 +
71 69 public String getHospitalId() {
72 70 return hospitalId;
73 71 }
74 72  
... ... @@ -133,54 +131,7 @@
133 131 this.id = id;
134 132 }
135 133  
136   - public String getUserName() {
137   - return userName;
138   - }
139 134  
140   - public void setUserName(String userName) {
141   - this.userName = userName;
142   - }
143   -
144   - public Integer getAge() {
145   - return age;
146   - }
147   -
148   - public void setAge(Integer age) {
149   - this.age = age;
150   - }
151   -
152   - public String getPhone() {
153   - return phone;
154   - }
155   -
156   - public void setPhone(String phone) {
157   - this.phone = phone;
158   - }
159   -
160   - public Date getLastMenses() {
161   - return lastMenses;
162   - }
163   -
164   - public void setLastMenses(Date lastMenses) {
165   - this.lastMenses = lastMenses;
166   - }
167   -
168   - public String getBeforeWeight() {
169   - return beforeWeight;
170   - }
171   -
172   - public void setBeforeWeight(String beforeWeight) {
173   - this.beforeWeight = beforeWeight;
174   - }
175   -
176   - public String getBeforeHeight() {
177   - return beforeHeight;
178   - }
179   -
180   - public void setBeforeHeight(String beforeHeight) {
181   - this.beforeHeight = beforeHeight;
182   - }
183   -
184 135 public String getNowWeight() {
185 136 return nowWeight;
186 137 }
... ... @@ -213,21 +164,6 @@
213 164 this.modified = modified;
214 165 }
215 166  
216   - public List getRiskFactorId() {
217   - return riskFactorId;
218   - }
219   -
220   - public void setRiskFactorId(List riskFactorId) {
221   - this.riskFactorId = riskFactorId;
222   - }
223   -
224   - public String getHighriskDesc() {
225   - return highriskDesc;
226   - }
227   -
228   - public void setHighriskDesc(String highriskDesc) {
229   - this.highriskDesc = highriskDesc;
230   - }
231 167  
232 168 public List getOtherRisk() {
233 169 return otherRisk;
platform-dal/src/main/java/com/lyms/platform/pojo/TemporaryUserModel.java View file @ 9652b8a
... ... @@ -35,6 +35,8 @@
35 35 private List<String> riskFactorId;
36 36 // 其他高危
37 37 private String highriskDesc;
  38 +
  39 +
38 40 //高危补充说明
39 41 private List otherRisk;
40 42 // 前囟 单胎/双胎/多胎
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java View file @ 9652b8a
... ... @@ -23,10 +23,10 @@
23 23 @Autowired
24 24 private ITemporaryBloodSugarService bloodSugarService;
25 25  
26   - @RequestMapping(value = "/addAndUpate", method = RequestMethod.POST)
  26 + @RequestMapping(value = "/addAndUpdate", 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 }
33 33  
... ... @@ -39,13 +39,13 @@
39 39 }
40 40  
41 41  
42   - @RequestMapping(value = "/queryOne", method = RequestMethod.GET)
  42 + /* @RequestMapping(value = "/queryOne", method = RequestMethod.GET)
43 43 @TokenRequired
44 44 @ResponseBody
45 45 public BaseResponse queryOne(@RequestParam(value = "id") String id) {
46 46 return bloodSugarService.queryOne(id);
47 47  
48   - }
  48 + }*/
49 49  
50 50 @RequestMapping(value = "/queryAll", method = RequestMethod.GET)
51 51 @TokenRequired
52 52  
... ... @@ -61,10 +61,11 @@
61 61 return bloodSugarService.info(id, type, time);
62 62 }
63 63  
  64 +
64 65 /**
65 66 * 院内系统血糖报告
66 67 *
67   - * @param id
  68 + * @param
68 69 * @return
69 70 */
70 71 @ResponseBody
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryUserController.java View file @ 9652b8a
... ... @@ -24,8 +24,7 @@
24 24 @ResponseBody
25 25 @RequestMapping(value = "/addAndUpdate", method = RequestMethod.POST)
26 26 @TokenRequired
27   -
28   - public BaseResponse addAndUpdate(@Valid @RequestBody TemporaryUserModel temporaryUser, HttpServletRequest request) {
  27 + public BaseResponse addAndUpdate(TemporaryUserModel temporaryUser, HttpServletRequest request) {
29 28 return temporaryUserService.addAndUpdate(temporaryUser, getUserId(request));
30 29  
31 30 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java View file @ 9652b8a
... ... @@ -44,7 +44,7 @@
44 44 return temporaryWeightService.deleteTemporaryWeight(id);
45 45 }
46 46  
47   - @RequestMapping(value = "/queryOne", method = RequestMethod.GET)
  47 + /*@RequestMapping(value = "/queryOne", method = RequestMethod.GET)
48 48 @TokenRequired
49 49 @ResponseBody
50 50 public BaseResponse queryOne(String id) {
51 51  
... ... @@ -66,12 +66,12 @@
66 66 }
67 67  
68 68  
69   - /**
  69 + *//**
70 70 * 体重营养管理报表
71 71 *
72 72 * @param id
73 73 * @return
74   - */
  74 + *//*
75 75 @ResponseBody
76 76 @RequestMapping(value = "/getWeightsReport/{id}", method = RequestMethod.GET)
77 77 @TokenRequired
78 78  
... ... @@ -85,12 +85,12 @@
85 85 }
86 86  
87 87  
88   - /**
  88 + *//**
89 89 * 体重标准报告
90 90 *
91 91 * @param id
92 92 * @return
93   - */
  93 + *//*
94 94 @ResponseBody
95 95 @RequestMapping(value = "report/{id}", method = RequestMethod.GET)
96 96 @TokenRequired
... ... @@ -98,7 +98,7 @@
98 98 HttpServletRequest request,
99 99 @RequestParam(value = "rid", required = false) String rid) {
100 100 return temporaryWeightService.report(id, getUserId(request), rid);
101   - }
  101 + }*/
102 102  
103 103 protected Integer getUserId(HttpServletRequest request) {
104 104 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java View file @ 9652b8a
... ... @@ -175,7 +175,8 @@
175 175 getTemporaryWeightInfo(map, model.getForeignId(), model.getCreated());
176 176 break;
177 177 case 2:
178   - getTemporaryBloodSugarInfo(map, model.getForeignId(), model.getCreated());
  178 + //全俞
  179 + //getTemporaryBloodSugarInfo(map, model.getForeignId(), model.getCreated());
179 180 break;
180 181 case 3:
181 182 //全俞
182 183  
... ... @@ -214,13 +215,14 @@
214 215 * @param id
215 216 * @param created
216 217 */
217   - private void getTemporaryBloodSugarInfo(Map map, String id, Date created) {
  218 + //全俞
  219 + /* private void getTemporaryBloodSugarInfo(Map map, String id, Date created) {
218 220 TemporaryBloodSugar temporaryBloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id).and("yn").is(YnEnums.YES.getId())),
219 221 TemporaryBloodSugar.class);
220 222 if (temporaryBloodSugar != null) {
221 223 setMap(map, temporaryBloodSugar.getUserName(), temporaryBloodSugar.getAge(), temporaryBloodSugar.getLastMenses(), created);
222 224 }
223   - }
  225 + }*/
224 226  
225 227 /**
226 228 * 临时血压信息
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java View file @ 9652b8a
... ... @@ -11,8 +11,8 @@
11 11  
12 12 BaseResponse deleteBloodSugar(String id);
13 13  
14   - BaseResponse queryOne(String id);
15   -
  14 + /*BaseResponse queryOne(String id);
  15 + */
16 16 BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId);
17 17  
18 18 BaseResponse info(String parentId, Integer type, Date time);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/TemporaryWeightService.java View file @ 9652b8a
... ... @@ -12,7 +12,7 @@
12 12  
13 13 BaseResponse deleteTemporaryWeight(String Phone);
14 14  
15   - BaseResponse queryOne(String id);
  15 + /*BaseResponse queryOne(String id);
16 16  
17 17 BaseResponse queryAll(String key, Integer stateWeek, Integer endWeek, Integer age, Integer page, Integer limit, Integer userId);
18 18  
... ... @@ -20,7 +20,7 @@
20 20  
21 21 BaseResponse getWeightsReport(String phone, Integer userId, String rid);
22 22  
23   - BaseResponse report(String id, Integer userId, String rid);
  23 + BaseResponse report(String id, Integer userId, String rid);*/
24 24  
25 25 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java View file @ 9652b8a
... ... @@ -7,6 +7,7 @@
7 7 import com.lyms.platform.common.enums.BloodSugarEnums;
8 8 import com.lyms.platform.common.enums.BloodSugarEnums2;
9 9 import com.lyms.platform.common.enums.HisptialRiskTypeEnum;
  10 +import com.lyms.platform.common.enums.YnEnums;
10 11 import com.lyms.platform.common.result.*;
11 12 import com.lyms.platform.common.utils.DateUtil;
12 13 import com.lyms.platform.common.utils.JsonUtil;
13 14  
... ... @@ -65,89 +66,24 @@
65 66  
66 67 @Override
67 68 public BaseResponse addAndUpdate(TemporaryBloodSugar bloodSugar, Integer userId) {
68   - List<TemporaryBloodSugar> bloodSugars = mongoTemplate.findAll(TemporaryBloodSugar.class);
69   - if (CollectionUtils.isNotEmpty(bloodSugars)) {
70   - TemporaryBloodSugar temporaryBloodSugar = mongoTemplate.findOne(Query.query(Criteria.where("phone").is(bloodSugar.getPhone()).and("bloodSugarType").is(bloodSugar.getBloodSugarType()).and("yn").is(1)), TemporaryBloodSugar.class);
71   - if (temporaryBloodSugar != null) {
72   - bloodSugar.setModified(new Date());
73   - Map<String, String> dayWeights = new LinkedHashMap<>();
74   - dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), bloodSugar.getNowWeight());
75   - bloodSugar.setDayWeights(dayWeights);
76   - temporaryBloodSugarDao.updateTemporaryBloodSugar(Query.query(Criteria.where("_id").is(bloodSugar.getId()).and("bloodSugarType").is(bloodSugar.getBloodSugarType()).and("yn").is(1)), bloodSugar);
77   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("修改成功");
78   - } else if (null != bloodSugar.getId() && null == temporaryBloodSugar) {
79   - TemporaryBloodSugar sugar = new TemporaryBloodSugar();
80   - for (TemporaryBloodSugar sugarList : bloodSugars) {
81   - if (bloodSugar.getId().equals(sugarList.getId())) {
82   - sugar.setModified(new Date());
83   - sugar.setCreated(new Date());
84   - sugar.setYn(1);
85   - sugar.setUserName(sugarList.getUserName());
86   - sugar.setPhone(sugarList.getPhone());
87   - sugar.setAge(sugarList.getAge());
88   - sugar.setBeforeHeight(sugarList.getBeforeHeight());
89   - sugar.setNowWeight(bloodSugar.getNowWeight());
90   - sugar.setBloodSugar(bloodSugar.getBloodSugar());
91   - sugar.setBloodSugarType(bloodSugar.getBloodSugarType());
92   - sugar.setLastMenses(sugarList.getLastMenses());
93   - sugar.setBeforeWeight(sugarList.getBeforeWeight());
94   - sugar.setBregmatic(sugarList.getBregmatic());
95   - sugar.setCardID(sugarList.getCardID());
96   - Map<String, String> dayWeights = new LinkedHashMap<>();
97   - dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), bloodSugar.getNowWeight());
98   - sugar.setDayWeights(dayWeights);
99   - sugar.setRiskFactorId(sugarList.getRiskFactorId());
100   - sugar.setRiskLevelId(sugarList.getRiskLevelId());
101   - sugar.setHospitalId(sugarList.getHospitalId());
102   - sugar.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date()));
103   - temporaryBloodSugarDao.addTemporaryBloodSugar(sugar);
104   - }
105   - }
106   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("增加成功");
107   - } else {
108   - bloodSugar.setModified(new Date());
109   - bloodSugar.setCreated(new Date());
110   - bloodSugar.setYn(1);
111   - Map<String, String> dayWeights = new LinkedHashMap<>();
112   - dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), bloodSugar.getNowWeight());
113   - bloodSugar.setDayWeights(dayWeights);
114   - List<String> riskLevelIdList = new ArrayList<>();
115   - if (CollectionUtils.isNotEmpty(bloodSugar.getRiskFactorId())) {
116   - List<String> riskFactor = bloodSugar.getRiskFactorId();
117   - for (String risk : riskFactor) {
118   - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(risk);
119   - riskLevelIdList.add(basicConfig.getParentId());
120   - }
121   - }
122   - bloodSugar.setRiskLevelId(JsonUtil.array2JsonString(riskLevelIdList));
123   - String hospitalId = autoMatchFacade.getHospitalId(userId);
124   - bloodSugar.setHospitalId(hospitalId);
125   - bloodSugar.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date()));
126   - TemporaryBloodSugar bloodSugar1 = temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar);
127   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(bloodSugar1.getId());
128   - }
129   - } else {
130   - bloodSugar.setModified(new Date());
131   - bloodSugar.setCreated(new Date());
132   - bloodSugar.setYn(1);
133   - Map<String, String> dayWeights = new LinkedHashMap<>();
134   - dayWeights.put(DateUtil.getyyyy_MM_dd(new Date()), bloodSugar.getNowWeight());
135   - bloodSugar.setDayWeights(dayWeights);
136   - List<String> riskLevelIdList = new ArrayList<>();
137   - if (CollectionUtils.isNotEmpty(bloodSugar.getRiskFactorId())) {
138   - List<String> riskFactor = bloodSugar.getRiskFactorId();
139   - for (String risk : riskFactor) {
140   - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(risk);
141   - riskLevelIdList.add(basicConfig.getParentId());
142   - }
143   - }
144   - bloodSugar.setRiskLevelId(JsonUtil.array2JsonString(riskLevelIdList));
145   - bloodSugar.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date()));
146   - String hospitalId = autoMatchFacade.getHospitalId(userId);
147   - bloodSugar.setHospitalId(hospitalId);
148   - TemporaryBloodSugar bloodSugar1 = temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar);
149   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(bloodSugar1.getId());
  69 + TemporaryBloodSugar one = mongoTemplate.findOne(Query.query(Criteria.where("temporaryUserId").is(bloodSugar.getTemporaryUserId()).and("created").gt(DateUtil.getYMDTime()).and("bloodSugarType").is(bloodSugar.getBloodSugarType())), TemporaryBloodSugar.class);
  70 + if (one != null) {
  71 + one.setModified(new Date());
  72 + one.setBloodSugar(bloodSugar.getBloodSugar());
  73 + temporaryBloodSugarDao.updateTemporaryBloodSugar(Query.query(Criteria.where("_id").is(one.getId())), one);
  74 + return RespBuilder.buildSuccess(one.getId());
150 75 }
  76 + bloodSugar.setHospitalId(autoMatchFacade.getHospitalId(userId));
  77 + bloodSugar.setCreated(new Date());
  78 + bloodSugar.setYn(YnEnums.YES.getId());
  79 + bloodSugar.setModified(new Date());
  80 + bloodSugar.setCreatYmdDate(DateUtil.getyyyy_MM_dd(new Date()));
  81 + temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar);
  82 +
  83 + Update up = new Update();
  84 + up.set("exceptionSend", 0);
  85 + mongoTemplate.updateMulti(Query.query(Criteria.where("temporaryUserId").is(bloodSugar.getTemporaryUserId())), up, TemporaryBloodSugar.class);
  86 + return RespBuilder.buildSuccess(bloodSugar.getId());
151 87 }
152 88  
153 89 @Override
154 90  
155 91  
... ... @@ -159,59 +95,59 @@
159 95 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录");
160 96 }
161 97  
162   - @Override
163   - public BaseResponse queryOne(String id) {
164   - if (StringUtils.isNotEmpty(id)) {
165   - TemporaryBloodSugar bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodSugar.class);
166   - if (bloodModel != null) {
167   - Map<String, Object> requestMap = new HashMap<>();
168   - List<String> rists = bloodModel.getRiskFactorId();
169   - List<Map> listMap = new ArrayList<>();
170   - Integer riskScore = 0;
171   - if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(rists)) {
172   - for (String rist : rists) {
173   - Map<String, Object> map = new HashMap();
174   - BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist);
175   - if (basicConfig != null) {
176   - riskScore += Integer.valueOf(basicConfig.getCode());
177   - if (StringUtils.isNotEmpty(basicConfig.getParentId())) {
178   - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.YBFX.getId())) {
179   - map.put("color", HisptialRiskTypeEnum.YBFX.getColor());
180   - }
181   - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JGFX.getId())) {
182   - map.put("color", HisptialRiskTypeEnum.JGFX.getColor());
183   - }
184   - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.GFX.getId())) {
185   - map.put("color", HisptialRiskTypeEnum.GFX.getColor());
186   - }
187   - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.CRB.getId())) {
188   - map.put("color", HisptialRiskTypeEnum.CRB.getColor());
189   - }
190   - if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JK.getId())) {
191   - map.put("color", HisptialRiskTypeEnum.JK.getColor());
192   - }
193   - map.put("name", basicConfig.getName());
194   - map.put("id", basicConfig.getId());
195   - listMap.add(map);
196   - }
197   - }
198   - }
199   - }
200   - requestMap.put("riskScore", riskScore);
201   - requestMap.put("riskFactor", listMap);
202   - requestMap.put("userName", bloodModel.getUserName());
203   - requestMap.put("age", bloodModel.getAge());
204   - requestMap.put("weeks", DateUtil.getWeekDesc(bloodModel.getLastMenses(), new Date()));
205   - requestMap.put("phone", bloodModel.getPhone());
206   - requestMap.put("id", bloodModel.getId());
207   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap);
  98 + /* @Override
  99 + public BaseResponse queryOne(String id) {
  100 + if (StringUtils.isNotEmpty(id)) {
  101 + TemporaryBloodSugar bloodModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryBloodSugar.class);
  102 + if (bloodModel != null) {
  103 + Map<String, Object> requestMap = new HashMap<>();
  104 + List<String> rists = bloodModel.getRiskFactorId();
  105 + List<Map> listMap = new ArrayList<>();
  106 + Integer riskScore = 0;
  107 + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(rists)) {
  108 + for (String rist : rists) {
  109 + Map<String, Object> map = new HashMap();
  110 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist);
  111 + if (basicConfig != null) {
  112 + riskScore += Integer.valueOf(basicConfig.getCode());
  113 + if (StringUtils.isNotEmpty(basicConfig.getParentId())) {
  114 + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.YBFX.getId())) {
  115 + map.put("color", HisptialRiskTypeEnum.YBFX.getColor());
  116 + }
  117 + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JGFX.getId())) {
  118 + map.put("color", HisptialRiskTypeEnum.JGFX.getColor());
  119 + }
  120 + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.GFX.getId())) {
  121 + map.put("color", HisptialRiskTypeEnum.GFX.getColor());
  122 + }
  123 + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.CRB.getId())) {
  124 + map.put("color", HisptialRiskTypeEnum.CRB.getColor());
  125 + }
  126 + if (basicConfig.getParentId().equals(HisptialRiskTypeEnum.JK.getId())) {
  127 + map.put("color", HisptialRiskTypeEnum.JK.getColor());
  128 + }
  129 + map.put("name", basicConfig.getName());
  130 + map.put("id", basicConfig.getId());
  131 + listMap.add(map);
  132 + }
  133 + }
  134 + }
  135 + }
  136 + requestMap.put("riskScore", riskScore);
  137 + requestMap.put("riskFactor", listMap);
  138 + requestMap.put("userName", bloodModel.getUserName());
  139 + requestMap.put("age", bloodModel.getAge());
  140 + requestMap.put("weeks", DateUtil.getWeekDesc(bloodModel.getLastMenses(), new Date()));
  141 + requestMap.put("phone", bloodModel.getPhone());
  142 + requestMap.put("id", bloodModel.getId());
  143 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap);
208 144  
209   - }
210   - }
211   - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("请选择一条记录");
  145 + }
  146 + }
  147 + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("请选择一条记录");
212 148  
213   - }
214   -
  149 + }
  150 +*/
215 151 @Override
216 152 public BaseResponse queryAll(String key, Integer age, Integer stateWeek, Integer endWeek, Integer page, Integer limit, Integer userId) {
217 153 boolean flag = false;
218 154  
219 155  
220 156  
221 157  
222 158  
223 159  
224 160  
225 161  
226 162  
227 163  
... ... @@ -233,47 +169,45 @@
233 169 flag = true;
234 170 }
235 171 if (flag) {
236   - List<TemporaryBloodSugar> patients = mongoTemplate.find(Query.query(pCriteria), TemporaryBloodSugar.class);
  172 + List<TemporaryUserModel> patients = mongoTemplate.find(Query.query(pCriteria), TemporaryUserModel.class);
237 173 List<String> ids = new ArrayList<>();
238 174 if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patients)) {
239   - for (TemporaryBloodSugar patient : patients) {
  175 + for (TemporaryUserModel patient : patients) {
240 176 ids.add(patient.getId());
241 177 }
242 178 }
243   - criteria.and("_id").in(ids);
  179 + criteria.and("temporaryUserId").in(ids);
244 180 }
245 181 PageResult pageResult = findMongoPage(TemporaryBloodSugar.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit);
246 182 List<TemporaryBloodSugar> bloodSugars = (List<TemporaryBloodSugar>) pageResult.getGrid();
247 183 List<Map<String, Object>> restList = new ArrayList<>();
248 184 for (TemporaryBloodSugar bloodSugar : bloodSugars) {
249 185 Map<String, Object> temp = new HashMap<>();
250   - //Patients p = mongoTemplate.findById(bloodSugar.getParentId(), Patients.class);
  186 + TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodSugar.getTemporaryUserId())), TemporaryUserModel.class);
251 187 temp.put("id", bloodSugar.getId());
252 188 if (bloodSugars != null) {
253   - temp.put("username", bloodSugar.getUserName());
  189 + temp.put("username", temporaryUser.getUserName());
254 190 temp.put("time", DateUtil.getyyyy_MM_dd(bloodSugar.getModified()));
255   - temp.put("age", bloodSugar.getAge());
256   - temp.put("week", DateUtil.getWeekDesc(bloodSugar.getLastMenses(), new Date()));
  191 + temp.put("age", DateUtil.getAge(temporaryUser.getBirth()));
  192 + temp.put("week", DateUtil.getWeekDesc(temporaryUser.getLastMenses(), new Date()));
257 193 temp.put("riskLevel", commonService.findRiskLevel(bloodSugar.getRiskLevelId())); //高危等级（颜色）
258   - String rFactor = commonService.resloveFactor(bloodSugar.getRiskFactorId());
259   - if (bloodSugar.getHighriskDesc() != null && !"null".equals(bloodSugar.getHighriskDesc())) {
  194 + String rFactor = commonService.resloveFactor(temporaryUser.getRiskFactorId());
  195 + if (temporaryUser.getHighriskDesc() != null && !"null".equals(temporaryUser.getHighriskDesc())) {
260 196 if (StringUtils.isNotEmpty(rFactor)) {
261   - rFactor += "," + bloodSugar.getHighriskDesc();
  197 + rFactor += "," + temporaryUser.getHighriskDesc();
262 198 } else {
263   - rFactor = bloodSugar.getHighriskDesc();
  199 + rFactor = temporaryUser.getHighriskDesc();
264 200 }
265 201 }
266 202 temp.put("riskFactor", rFactor); // 高危因素
267 203 Calendar rightNow = Calendar.getInstance();
268   - rightNow.setTime(bloodSugar.getLastMenses());
  204 + rightNow.setTime(temporaryUser.getLastMenses());
269 205 rightNow.add(Calendar.DAY_OF_YEAR, 280);
270 206 temp.put("dueDate", DateUtil.getyyyy_MM_dd(rightNow.getTime()));
271 207 temp.put("bloodSugar", bloodSugar.getBloodSugar() + "mmol/L");
272 208 temp.put("bloodSugarType", BloodSugarEnums.getName(bloodSugar.getBloodSugarType()));
273 209 temp.put("bloodSugarId", bloodSugar.getBloodSugarType());
274 210 temp.put("status", getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar()));
275   - //temp.put("vcCardNo", p.getVcCardNo());
276   - // temp.put("pcerteTypeId", p.getPcerteTypeId());
277 211 temp.put("bregmatic", bloodSugar.getBregmatic());
278 212 temp.put("cardNo", bloodSugar.getCardID());
279 213 }
... ... @@ -352,6 +286,7 @@
352 286  
353 287 }
354 288  
  289 +
355 290 @Override
356 291 public BaseResponse getSysBloodSugarReport(String id, Integer userId) {
357 292 BaseObjectResponse resp = new BaseObjectResponse();
... ... @@ -360,7 +295,9 @@
360 295  
361 296 //Patients patients = patientsService.findOnePatientById(patientId);
362 297  
363   - List<String> risks = bloodSugar.getRiskFactorId(); //妊娠期糖尿病（无需药物治疗） //糖尿病合并妊娠（无需药物治疗）
  298 + TemporaryUserModel temporaryUser = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(bloodSugar.getTemporaryUserId())), TemporaryUserModel.class);
  299 +
  300 + List<String> risks = temporaryUser.getRiskFactorId(); //妊娠期糖尿病（无需药物治疗） //糖尿病合并妊娠（无需药物治疗）
364 301 if (!(com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(risks) && (risks.contains("5aab6d3d422b03d4ad2bf83e") || risks.contains("5aab6d3e422b03d4ad2bf83f")
365 302 //需药物治疗的糖尿病
366 303 || risks.contains("de7468e6-1bb5-4fab-ae84-78857868409a")))) {
... ... @@ -388,7 +325,7 @@
388 325  
389 326 String rid = "";
390 327  
391   - int week = DateUtil.getWeek(bloodSugar.getLastMenses(), new Date());
  328 + int week = DateUtil.getWeek(temporaryUser.getLastMenses(), new Date());
392 329  
393 330 if (week < 6) {
394 331 resp.setErrorcode(ResponseCode.DATA_ERROR.getCode());
395 332  
... ... @@ -414,11 +351,11 @@
414 351  
415 352 //算出bmi值
416 353  
417   - String bmiStr = patientWeightService.getBmi(bloodSugar.getBeforeWeight(), bloodSugar.getBeforeHeight());
  354 + String bmiStr = patientWeightService.getBmi(temporaryUser.getBeforeWeight(), temporaryUser.getBeforeHeight());
418 355 double bmi = Double.parseDouble(bmiStr);
419 356 //根据高危获取不同的卡路里计算公式
420   - Map<String, String> kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(bloodSugar.getBeforeWeight()),
421   - Double.parseDouble(bloodSugar.getNowWeight()), week, bmi, bloodSugar.getBregmatic(), bloodSugar.getBeforeHeight());
  357 + Map<String, String> kmap = computeKulServiceManager.getComputeKulByRisk(rid).getComputeKul(Double.parseDouble(temporaryUser.getBeforeWeight()),
  358 + Double.parseDouble(bloodSugar.getNowWeight()), week, bmi, bloodSugar.getBregmatic(), temporaryUser.getBeforeHeight());
422 359  
423 360  
424 361 String weekYyzl = "";
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java View file @ 9652b8a
... ... @@ -137,7 +137,7 @@
137 137 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录");
138 138 }
139 139  
140   - @Override
  140 + /* @Override
141 141 public BaseResponse queryOne(String id) {
142 142 if (StringUtils.isNotEmpty(id)) {
143 143 TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class);
144 144  
... ... @@ -249,10 +249,10 @@
249 249 public BaseResponse info(String id) {
250 250 TemporaryWeightModel template = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class);
251 251 if (template != null) {
252   - /* Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class);
  252 + *//* Patients patients = mongoTemplate.findById(patientWeight.getPatientId(), Patients.class);
253 253 if (patients == null) {
254 254 return RespBuilder.buildSuccess("建档数据未找到");
255   - }*/
  255 + }*//*
256 256 Map<String, Object> map = ReflectionUtils.beanToMap(template);
257 257 //http://jira.healthbaby.com.cn/browse/WEB-2744
258 258 String bregmatic = "";
259 259  
260 260  
261 261  
... ... @@ -319,19 +319,19 @@
319 319 }
320 320  
321 321  
322   - /**
  322 + *//**
323 323 * 体重标准报告
324   - */
  324 + *//*
325 325 @Override
326 326 public BaseResponse report(String id, Integer userId, String rid) {
327 327 TemporaryWeightModel template = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class);
328 328 String hospitalId = autoMatchFacade.getHospitalId(userId);
329 329 Organization org = organizationService.getOrganization(Integer.parseInt(hospitalId));
330 330 BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(org.getProvinceId());
331   - /* PatientWeight patientWeight = mongoTemplate.findById(id, PatientWeight.class);*/
  331 + *//* PatientWeight patientWeight = mongoTemplate.findById(id, PatientWeight.class);*//*
332 332 if (template != null) {
333 333 Map<String, Object> map = new LinkedHashMap<>();
334   - /* Patients patients = mongoTemplate.findById(template.getPatientId(), Patients.class);*/
  334 + *//* Patients patients = mongoTemplate.findById(template.getPatientId(), Patients.class);*//*
335 335 Integer week = null;
336 336 //if (patients != null) {
337 337 //map.put("vcCard", patients.getVcCardNo());
... ... @@ -1466,6 +1466,6 @@
1466 1466 }
1467 1467 return 0.0;
1468 1468 }
1469   -
  1469 +*/
1470 1470 }