Commit af63d6959810a0d8c6c0640a0437e61b29cd7cfb
1 parent
3542bf0c3a
Exists in
master
and in
6 other branches
自测bug提交
Showing 11 changed files with 182 additions and 40 deletions
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryBloodDao.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryBloodSugarDao.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryBloodSugarDaoImpl.java
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporayBloodDaoImpl.java
- platform-common/src/main/java/com/lyms/platform/common/enums/HisptialRiskTypeEnum.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryBloodDao.java
View file @
af63d69
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ITemporaryBloodSugarDao.java
View file @
af63d69
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporaryBloodSugarDaoImpl.java
View file @
af63d69
... | ... | @@ -11,6 +11,11 @@ |
11 | 11 | |
12 | 12 | |
13 | 13 | @Override |
14 | + public TemporaryBloodSugar addTemporaryBloodSugar(TemporaryBloodSugar bloodSugar) { | |
15 | + return save(bloodSugar); | |
16 | + } | |
17 | + | |
18 | + @Override | |
14 | 19 | public void updateTemporaryBloodSugar(Query query, TemporaryBloodSugar bloodSugarModel) { |
15 | 20 | update(query, bloodSugarModel); |
16 | 21 | } |
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/TemporayBloodDaoImpl.java
View file @
af63d69
... | ... | @@ -8,7 +8,12 @@ |
8 | 8 | |
9 | 9 | @Repository("temporayBloodDao") |
10 | 10 | public class TemporayBloodDaoImpl extends BaseMongoDAOImpl<TemporaryBloodModel> implements ITemporaryBloodDao { |
11 | - | |
11 | + | |
12 | + @Override | |
13 | + public TemporaryBloodModel addTemporaryBlood(TemporaryBloodModel bloodModel) { | |
14 | + return save(bloodModel); | |
15 | + } | |
16 | + | |
12 | 17 | @Override |
13 | 18 | public void updateTemporaryBlood(Query query, TemporaryBloodModel bloodModel) { |
14 | 19 | update(query, bloodModel); |
platform-common/src/main/java/com/lyms/platform/common/enums/HisptialRiskTypeEnum.java
View file @
af63d69
... | ... | @@ -11,10 +11,11 @@ |
11 | 11 | * @discription |
12 | 12 | */ |
13 | 13 | public enum HisptialRiskTypeEnum { |
14 | - YBFX("315107bd-91fe-42a1-9237-752f3c046a40", "一般风险","risk_yellow"), | |
15 | - JGFX("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2", "较高风险","risk_orange"), | |
16 | - GFX("eb146c03-b19f-4e28-b85f-fda574b2283b", "高风险","risk_red"), | |
17 | - CRB("224b2329-cb82-4da3-a071-8527f8283aab", "传染病","risk_purple"); | |
14 | + YBFX("315107bd-91fe-42a1-9237-752f3c046a40", "一般风险", "risk_yellow"), | |
15 | + JGFX("49a36aea-c5b6-4162-87d2-9eb3c6ec00c2", "较高风险", "risk_orange"), | |
16 | + GFX("eb146c03-b19f-4e28-b85f-fda574b2283b", "高风险", "risk_red"), | |
17 | + CRB("224b2329-cb82-4da3-a071-8527f8283aab", "传染病", "risk_purple"), | |
18 | + JK("d42eec03-aa86-45b8-a4e0-78a0ff365fb6", "健康", "risk_green"); | |
18 | 19 | private String id; |
19 | 20 | private String name; |
20 | 21 | private String color; |
... | ... | @@ -27,6 +28,7 @@ |
27 | 28 | } |
28 | 29 | return ""; |
29 | 30 | } |
31 | + | |
30 | 32 | public static List<Map> getHandlingSuggestionEnums() { |
31 | 33 | List<Map> list = new ArrayList<>(); |
32 | 34 | for (HisptialRiskTypeEnum e : HisptialRiskTypeEnum.values()) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryBloodSugarController.java
View file @
af63d69
... | ... | @@ -49,8 +49,8 @@ |
49 | 49 | @RequestMapping(value = "/queryAll", method = RequestMethod.GET) |
50 | 50 | @TokenRequired |
51 | 51 | @ResponseBody |
52 | - public BaseResponse queryAll(Integer page, Integer limit) { | |
53 | - return bloodSugarService.queryAll(page, limit); | |
52 | + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { | |
53 | + return bloodSugarService.queryAll(key, bregmatic, stateWeek, endWeek, page, limit); | |
54 | 54 | } |
55 | 55 | |
56 | 56 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TemporaryWeightController.java
View file @
af63d69
... | ... | @@ -27,7 +27,7 @@ |
27 | 27 | @RequestMapping(value = "/addOrUpdate", method = RequestMethod.POST) |
28 | 28 | @TokenRequired |
29 | 29 | @ResponseBody |
30 | - public BaseResponse addTemporaryWeight(@Valid @RequestBody TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) { | |
30 | + public BaseResponse addTemporaryWeight(TemporaryWeightModel temporaryWeightModel, HttpServletRequest request) { | |
31 | 31 | return temporaryWeightService.addTemporaryWeight(temporaryWeightModel, getUserId(request)); |
32 | 32 | } |
33 | 33 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ITemporaryBloodSugarService.java
View file @
af63d69
... | ... | @@ -13,7 +13,7 @@ |
13 | 13 | |
14 | 14 | BaseResponse queryOne(String id); |
15 | 15 | |
16 | - BaseResponse queryAll(Integer page, Integer limit); | |
16 | + BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit); | |
17 | 17 | |
18 | 18 | BaseResponse info(String parentId, Integer type, Date time); |
19 | 19 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java
View file @
af63d69
1 | 1 | package com.lyms.platform.operate.web.service.impl; |
2 | 2 | |
3 | 3 | import com.lyms.platform.biz.dal.ITemporaryBloodDao; |
4 | +import com.lyms.platform.biz.service.BasicConfigService; | |
5 | +import com.lyms.platform.biz.service.CommonService; | |
4 | 6 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
5 | 7 | import com.lyms.platform.common.result.BaseObjectResponse; |
6 | 8 | import com.lyms.platform.common.result.BaseResponse; |
... | ... | @@ -34,6 +36,10 @@ |
34 | 36 | |
35 | 37 | @Autowired |
36 | 38 | private PatientWeightService patientWeightService; |
39 | + @Autowired | |
40 | + private CommonService commonService; | |
41 | + @Autowired | |
42 | + private BasicConfigService basicConfigService; | |
37 | 43 | |
38 | 44 | @Override |
39 | 45 | public BaseResponse addTemporaryBlood(TemporaryBloodModel bloodModel) { |
... | ... | @@ -53,8 +59,8 @@ |
53 | 59 | Map<String, Map<String, Object>> infos = new LinkedHashMap<>(); |
54 | 60 | infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); |
55 | 61 | bloodModel.setInfos(infos); |
56 | - mongoTemplate.insert(bloodModel); | |
57 | - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功"); | |
62 | + TemporaryBloodModel temporaryBloodModel = temporaryBloodDao.addTemporaryBlood(bloodModel); | |
63 | + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId()); | |
58 | 64 | } else { |
59 | 65 | bloodModel.setModified(new Date()); |
60 | 66 | temporaryBloodDao.updateTemporaryBlood(Query.query(Criteria.where("_id").is(bloodModel.getId())), bloodModel); |
... | ... | @@ -73,8 +79,8 @@ |
73 | 79 | Map<String, Map<String, Object>> infos = new LinkedHashMap<>(); |
74 | 80 | infos.put(DateUtil.getyyyy_MM_dd(new Date()), temp); |
75 | 81 | bloodModel.setInfos(infos); |
76 | - mongoTemplate.insert(bloodModel); | |
77 | - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功"); | |
82 | + TemporaryBloodModel temporaryBloodModel = temporaryBloodDao.addTemporaryBlood(bloodModel); | |
83 | + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(temporaryBloodModel.getId()); | |
78 | 84 | } |
79 | 85 | |
80 | 86 | } |
81 | 87 | |
82 | 88 | |
83 | 89 | |
84 | 90 | |
85 | 91 | |
86 | 92 | |
87 | 93 | |
88 | 94 | |
... | ... | @@ -127,40 +133,55 @@ |
127 | 133 | Map<String, Object> temp = new HashMap<>(); |
128 | 134 | //Patients p = mongoTemplate.findById(bloodPressure.getParentId(), Patients.class); |
129 | 135 | temp.put("id", bloodPressure.getId()); |
130 | - /* if (bloodPressure != null) { | |
136 | + if (bloodPressure != null) { | |
131 | 137 | temp.put("username", bloodPressure.getUserName()); |
132 | 138 | temp.put("time", DateUtil.getyyyy_MM_dd(bloodPressure.getModified())); |
133 | 139 | temp.put("age", bloodPressure.getAge()); |
134 | 140 | temp.put("week", DateUtil.getWeekDesc(bloodPressure.getLastMenses(), new Date())); |
135 | - temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级(颜色) | |
136 | 141 | |
137 | - String rFactor = commonService.resloveFactor(p.getRiskFactorId()); | |
138 | - if (p.getoRiskFactor() != null && !"null".equals(p.getoRiskFactor())) { | |
142 | + // temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级(颜色) | |
143 | + | |
144 | + String rFactor = commonService.resloveFactor(bloodPressure.getRiskFactorId()); | |
145 | + if (bloodPressure.getHighriskDesc() != null && !"null".equals(bloodPressure.getHighriskDesc())) { | |
139 | 146 | if (StringUtils.isNotEmpty(rFactor)) { |
140 | - rFactor += "," + p.getoRiskFactor(); | |
147 | + rFactor += "," + bloodPressure.getHighriskDesc(); | |
141 | 148 | } else { |
142 | - rFactor = p.getoRiskFactor(); | |
149 | + rFactor = bloodPressure.getHighriskDesc(); | |
143 | 150 | } |
144 | 151 | } |
145 | 152 | temp.put("riskFactor", rFactor); // 高危因素 |
146 | 153 | |
147 | - temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); | |
154 | + // temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); | |
148 | 155 | temp.put("bloodPressure", bloodPressure.getSsy() + "/" + bloodPressure.getSzy() + "mmHg"); |
149 | 156 | temp.put("pulse", bloodPressure.getPulse()); |
150 | 157 | temp.put("status", getPulseStatus(bloodPressure.getSsy(), bloodPressure.getSzy())); |
151 | - temp.put("vcCardNo", p.getVcCardNo()); | |
152 | - temp.put("pcerteTypeId", p.getPcerteTypeId()); | |
153 | - temp.put("cardNo", p.getCardNo()); | |
154 | - temp.put("beforWeight", bloodPressure.getBeforWeight() == null ? "" : bloodPressure.getBeforWeight()); | |
155 | - temp.put("weight", bloodPressure.getWeight() == null ? "" : bloodPressure.getWeight()); | |
156 | - temp.put("height", bloodPressure.getHeight() == null ? "" : bloodPressure.getHeight()); | |
157 | - temp.put("tireNumber", bloodPressure.getTireNumber() == null ? "" : bloodPressure.getTireNumber()); | |
158 | + //temp.put("vcCardNo", p.getVcCardNo()); | |
159 | + //temp.put("pcerteTypeId", p.getPcerteTypeId()); | |
160 | + temp.put("cardID", bloodPressure.getCardID()); | |
161 | + temp.put("beforWeight", bloodPressure.getBeforeWeight() == null ? "" : bloodPressure.getBeforeWeight()); | |
162 | + temp.put("weight", bloodPressure.getNowWeight() == null ? "" : bloodPressure.getNowWeight()); | |
163 | + temp.put("height", bloodPressure.getBeforeHeight() == null ? "" : bloodPressure.getBeforeHeight()); | |
164 | + temp.put("bregmatic", bloodPressure.getBregmatic() == null ? "" : bloodPressure.getBregmatic()); | |
158 | 165 | |
159 | - }*/ | |
166 | + } | |
160 | 167 | restList.add(temp); |
161 | 168 | } |
162 | 169 | pageResult.setGrid(restList); |
163 | 170 | return RespBuilder.buildSuccess(pageResult); |
171 | + } | |
172 | + | |
173 | + private String getPulseStatus(String ssy, String szy) { | |
174 | + String status = ""; | |
175 | + if (StringUtils.isNotEmpty(ssy)) { | |
176 | + if (Double.parseDouble(ssy) < 90) { | |
177 | + status = "低血压"; | |
178 | + } else if (Double.parseDouble(ssy) > 140) { | |
179 | + status = "高血压"; | |
180 | + } else { | |
181 | + status = "正常"; | |
182 | + } | |
183 | + } | |
184 | + return status; | |
164 | 185 | } |
165 | 186 | |
166 | 187 | @Override |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodSugarServiceImpl.java
View file @
af63d69
... | ... | @@ -2,6 +2,7 @@ |
2 | 2 | |
3 | 3 | import com.lyms.platform.biz.dal.ITemporaryBloodSugarDao; |
4 | 4 | import com.lyms.platform.biz.service.BasicConfigService; |
5 | +import com.lyms.platform.biz.service.CommonService; | |
5 | 6 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
6 | 7 | import com.lyms.platform.common.enums.BloodSugarEnums; |
7 | 8 | import com.lyms.platform.common.enums.BloodSugarEnums2; |
... | ... | @@ -50,6 +51,8 @@ |
50 | 51 | |
51 | 52 | @Autowired |
52 | 53 | private PatientWeightService patientWeightService; |
54 | + @Autowired | |
55 | + private CommonService commonService; | |
53 | 56 | |
54 | 57 | @Override |
55 | 58 | public BaseResponse addAndUpdate(TemporaryBloodSugar bloodSugar) { |
56 | 59 | |
... | ... | @@ -64,15 +67,15 @@ |
64 | 67 | bloodSugar.setModified(new Date()); |
65 | 68 | bloodSugar.setCreated(new Date()); |
66 | 69 | bloodSugar.setYn(1); |
67 | - mongoTemplate.insert(bloodSugar); | |
68 | - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功"); | |
70 | + TemporaryBloodSugar bloodSugar1 = temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar); | |
71 | + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(bloodSugar1.getId()); | |
69 | 72 | } |
70 | 73 | } else { |
71 | 74 | bloodSugar.setModified(new Date()); |
72 | 75 | bloodSugar.setCreated(new Date()); |
73 | 76 | bloodSugar.setYn(1); |
74 | - mongoTemplate.insert(bloodSugar); | |
75 | - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功"); | |
77 | + TemporaryBloodSugar bloodSugar1 = temporaryBloodSugarDao.addTemporaryBloodSugar(bloodSugar); | |
78 | + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("添加成功").setData(bloodSugar1.getId()); | |
76 | 79 | } |
77 | 80 | } |
78 | 81 | |
79 | 82 | |
80 | 83 | |
81 | 84 | |
... | ... | @@ -89,11 +92,86 @@ |
89 | 92 | } |
90 | 93 | |
91 | 94 | @Override |
92 | - public BaseResponse queryAll(Integer page, Integer limit) { | |
95 | + public BaseResponse queryAll(String key, Integer bregmatic, Integer stateWeek, Integer endWeek, Integer page, Integer limit) { | |
96 | + boolean flag = false; | |
97 | + Criteria pCriteria = Criteria.where("yn").ne(0); | |
93 | 98 | Criteria criteria = Criteria.where("yn").ne(0); |
99 | + if (org.apache.commons.lang.StringUtils.isNotBlank(key)) { | |
100 | + pCriteria.orOperator(Criteria.where("phone").regex(key), Criteria.where("userName").regex(key)); | |
101 | + flag = true; | |
102 | + } | |
103 | + if (stateWeek != null && endWeek != null) { | |
104 | + Date start = DateUtil.getWeekStart(stateWeek); | |
105 | + Date end = DateUtil.getWeekEnd(endWeek); | |
106 | + pCriteria.and("lastMenses").gt(start).lte(end); | |
107 | + flag = true; | |
108 | + } | |
109 | + if (bregmatic != null) { | |
110 | + pCriteria.and("bregmatic").is(bregmatic); | |
111 | + flag = true; | |
112 | + } | |
113 | + if (flag) { | |
114 | + List<TemporaryBloodSugar> patients = mongoTemplate.find(Query.query(pCriteria), TemporaryBloodSugar.class); | |
115 | + List<String> ids = new ArrayList<>(); | |
116 | + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(patients)) { | |
117 | + for (TemporaryBloodSugar patient : patients) { | |
118 | + ids.add(patient.getId()); | |
119 | + } | |
120 | + } | |
121 | + criteria.and("_id").in(ids); | |
122 | + } | |
94 | 123 | PageResult pageResult = findMongoPage(TemporaryBloodSugar.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); |
95 | - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(pageResult); | |
124 | + List<TemporaryBloodSugar> bloodSugars = (List<TemporaryBloodSugar>) pageResult.getGrid(); | |
125 | + List<Map<String, Object>> restList = new ArrayList<>(); | |
126 | + for (TemporaryBloodSugar bloodSugar : bloodSugars) { | |
127 | + Map<String, Object> temp = new HashMap<>(); | |
128 | + //Patients p = mongoTemplate.findById(bloodSugar.getParentId(), Patients.class); | |
129 | + temp.put("id", bloodSugar.getId()); | |
130 | + if (bloodSugars != null) { | |
131 | + temp.put("username", bloodSugar.getUserName()); | |
132 | + temp.put("time", DateUtil.getyyyy_MM_dd(bloodSugar.getModified())); | |
133 | + temp.put("age", bloodSugar.getAge()); | |
134 | + temp.put("week", DateUtil.getWeekDesc(bloodSugar.getLastMenses(), new Date())); | |
96 | 135 | |
136 | + | |
137 | + //temp.put("riskLevel", commonService.findRiskLevel(p.getRiskLevelId())); //高危等级(颜色) | |
138 | + | |
139 | + | |
140 | + String rFactor = commonService.resloveFactor(bloodSugar.getRiskFactorId()); | |
141 | + if (bloodSugar.getHighriskDesc() != null && !"null".equals(bloodSugar.getHighriskDesc())) { | |
142 | + if (StringUtils.isNotEmpty(rFactor)) { | |
143 | + rFactor += "," + bloodSugar.getHighriskDesc(); | |
144 | + } else { | |
145 | + rFactor = bloodSugar.getHighriskDesc(); | |
146 | + } | |
147 | + } | |
148 | + temp.put("riskFactor", rFactor); // 高危因素 | |
149 | + //temp.put("dueDate", DateUtil.getyyyy_MM_dd(p.getDueDate())); | |
150 | + temp.put("bloodSugar", bloodSugar.getBloodSugar() + "mmol/L"); | |
151 | + temp.put("bloodSugarType", BloodSugarEnums.getName(bloodSugar.getBloodSugarType())); | |
152 | + temp.put("bloodSugarId", bloodSugar.getBloodSugarType()); | |
153 | + temp.put("status", getBloodSugarStatus(bloodSugar.getBloodSugarType(), bloodSugar.getBloodSugar())); | |
154 | + //temp.put("vcCardNo", p.getVcCardNo()); | |
155 | + // temp.put("pcerteTypeId", p.getPcerteTypeId()); | |
156 | + temp.put("cardNo", bloodSugar.getCardID()); | |
157 | + } | |
158 | + restList.add(temp); | |
159 | + } | |
160 | + pageResult.setGrid(restList); | |
161 | + return RespBuilder.buildSuccess(pageResult); | |
162 | + | |
163 | + } | |
164 | + | |
165 | + private String getBloodSugarStatus(Integer type, String bloodSugar) { | |
166 | + if (type == BloodSugarEnums.A.getId()) { | |
167 | + return Double.parseDouble(bloodSugar) > 5.6D ? "高血糖" : Double.parseDouble(bloodSugar) < 3.3D ? "低血糖" : "正常"; | |
168 | + } else if (type == BloodSugarEnums.B.getId() || type == BloodSugarEnums.D.getId() || type == BloodSugarEnums.F.getId()) { | |
169 | + return Double.parseDouble(bloodSugar) > 5.8D ? "高血糖" : Double.parseDouble(bloodSugar) < 3.3D ? "低血糖" : "正常"; | |
170 | + } else if (type == BloodSugarEnums.I.getId()) { | |
171 | + return Double.parseDouble(bloodSugar) > 7.8D ? "高血糖" : Double.parseDouble(bloodSugar) < 6.1D ? "低血糖" : "正常"; | |
172 | + } else { | |
173 | + return Double.parseDouble(bloodSugar) > 6.7D ? "高血糖" : Double.parseDouble(bloodSugar) < 4.4D ? "低血糖" : "正常"; | |
174 | + } | |
97 | 175 | } |
98 | 176 | |
99 | 177 | @Override |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryWeightServiceImpl.java
View file @
af63d69
... | ... | @@ -4,6 +4,7 @@ |
4 | 4 | import com.lyms.platform.biz.service.BasicConfigService; |
5 | 5 | import com.lyms.platform.common.constants.ErrorCodeConstants; |
6 | 6 | import com.lyms.platform.common.enums.BregmaticEnums2; |
7 | +import com.lyms.platform.common.enums.HisptialRiskTypeEnum; | |
7 | 8 | import com.lyms.platform.common.result.BaseObjectResponse; |
8 | 9 | import com.lyms.platform.common.result.BaseResponse; |
9 | 10 | import com.lyms.platform.common.result.PageResult; |
10 | 11 | |
11 | 12 | |
12 | 13 | |
13 | 14 | |
14 | 15 | |
15 | 16 | |
16 | 17 | |
... | ... | @@ -128,18 +129,46 @@ |
128 | 129 | public BaseResponse queryOne(String id) { |
129 | 130 | if (StringUtils.isNotEmpty(id)) { |
130 | 131 | TemporaryWeightModel temporaryWeightModel = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(id)), TemporaryWeightModel.class); |
131 | - temporaryWeightModel.setWeeks(DateUtil.getWeekDesc(temporaryWeightModel.getLastMenses(), new Date())); | |
132 | 132 | if (temporaryWeightModel != null) { |
133 | + Map<String, Object> requestMap = new HashMap<>(); | |
133 | 134 | List<String> rists = temporaryWeightModel.getRiskFactorId(); |
135 | + List<Map> listMap = new ArrayList<>(); | |
136 | + Integer riskScore = 0; | |
134 | 137 | if (CollectionUtils.isNotEmpty(rists)) { |
135 | 138 | for (String rist : rists) { |
139 | + Map<String, Object> map = new HashMap(); | |
136 | 140 | BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(rist); |
137 | - | |
141 | + riskScore += Integer.valueOf(basicConfig.getCode()); | |
142 | + map.put("code", basicConfig.getCode()); | |
143 | + BasicConfig basicConfig1 = basicConfigService.getOneBasicConfigById(basicConfig.getParentId()); | |
144 | + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.YBFX.getId())) { | |
145 | + map.put("color", HisptialRiskTypeEnum.YBFX.getColor()); | |
146 | + } | |
147 | + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.JGFX.getId())) { | |
148 | + map.put("color", HisptialRiskTypeEnum.JGFX.getColor()); | |
149 | + } | |
150 | + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.GFX.getId())) { | |
151 | + map.put("color", HisptialRiskTypeEnum.GFX.getColor()); | |
152 | + } | |
153 | + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.CRB.getId())) { | |
154 | + map.put("color", HisptialRiskTypeEnum.CRB.getColor()); | |
155 | + } | |
156 | + if (basicConfig1.getId().equals(HisptialRiskTypeEnum.JK.getId())) { | |
157 | + map.put("color", HisptialRiskTypeEnum.JK.getColor()); | |
158 | + } | |
159 | + map.put("name", basicConfig.getName()); | |
160 | + map.put("id", basicConfig.getId()); | |
161 | + listMap.add(map); | |
138 | 162 | } |
139 | - | |
140 | 163 | } |
164 | + requestMap.put("riskScore", riskScore); | |
165 | + requestMap.put("riskFactor", listMap); | |
166 | + requestMap.put("userName", temporaryWeightModel.getUserName()); | |
167 | + requestMap.put("age", temporaryWeightModel.getAge()); | |
168 | + requestMap.put("weeks", DateUtil.getWeekDesc(temporaryWeightModel.getLastMenses(), new Date())); | |
169 | + requestMap.put("phone", temporaryWeightModel.getPhone()); | |
170 | + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(requestMap); | |
141 | 171 | } |
142 | - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(temporaryWeightModel); | |
143 | 172 | } |
144 | 173 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("请选择一条记录"); |
145 | 174 | } |
... | ... | @@ -174,8 +203,6 @@ |
174 | 203 | criteria.and("_id").in(ids); |
175 | 204 | } |
176 | 205 | Users users = usersService.getUsers(userId); |
177 | - System.out.println("=========>" + users.getAccount()); | |
178 | - | |
179 | 206 | PageResult pageResult = findMongoPage(TemporaryWeightModel.class, new Query(criteria).with(new Sort(Sort.Direction.DESC, "modified")), page, limit); |
180 | 207 | List<TemporaryWeightModel> patientWeights = (List<TemporaryWeightModel>) pageResult.getGrid(); |
181 | 208 | List<Map<String, Object>> restMap = new ArrayList<>(); |