Commit 10603d30ee9c1c0f63d082e8a494f900753ab4be
Exists in
master
and in
6 other branches
Merge remote-tracking branch 'origin/master'
Showing 3 changed files
platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java
View file @
10603d3
... | ... | @@ -154,7 +154,7 @@ |
154 | 154 | } |
155 | 155 | |
156 | 156 | public static void main(String[] args) { |
157 | - Map<String,List<MessageContent>> list = getMessageTemplateMap("199", | |
157 | + Map<String,List<MessageContent>> list = getMessageTemplateMap("1000000115", | |
158 | 158 | AmsServiceTypeEnum.YUN_GUIDE); |
159 | 159 | List<MessageContent> msgs = list.get("年龄≥35岁"); |
160 | 160 | System.out.println(list); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
View file @
10603d3
... | ... | @@ -13,6 +13,7 @@ |
13 | 13 | |
14 | 14 | import javax.servlet.http.HttpServletRequest; |
15 | 15 | import java.util.Date; |
16 | +import java.util.Map; | |
16 | 17 | |
17 | 18 | /** |
18 | 19 | * 测量血糖和脉搏、身高和体重的值 |
... | ... | @@ -26,7 +27,7 @@ |
26 | 27 | private MeasureInfoFacade measureInfoFacade; |
27 | 28 | /** |
28 | 29 | * 血糖和脉搏 身高和体重的值列表 |
29 | - * valueType 值类型: 1 体重和身高 2 血压和脉搏 | |
30 | + * valueType 值类型: 1 体重和身高 2 血压和脉搏 3 体温 | |
30 | 31 | * @return |
31 | 32 | */ |
32 | 33 | @RequestMapping(method = RequestMethod.GET, value = "/queryMeasureInfoList") |
33 | 34 | |
... | ... | @@ -146,7 +147,50 @@ |
146 | 147 | } |
147 | 148 | |
148 | 149 | |
150 | + | |
149 | 151 | /** |
152 | + * value_type: 1体重、身高 2,血压和脉搏,3,体温 | |
153 | + * 添加体温 | |
154 | + * @param request | |
155 | + * @return | |
156 | + */ | |
157 | + @RequestMapping(method = RequestMethod.GET, value = "/addTemperature") | |
158 | + @ResponseBody | |
159 | + public Object addTzSgInfo( | |
160 | + @RequestParam(value = "userName", required = false) String userName, | |
161 | + @RequestParam(value = "certType", required = false) String certType, | |
162 | + @RequestParam(value = "certNo", required = false) String certNo, | |
163 | + @RequestParam(value = "sex", required = false) Integer sex, | |
164 | + @RequestParam(value = "vcCardNo", required = false) String vcCardNo, | |
165 | + @RequestParam(value = "valueOne", required = false) String valueOne, | |
166 | + @RequestParam(value = "wxCode", required = false) String wxCode, | |
167 | + @RequestParam(value = "hospitalId", required = false) String hospitalId, | |
168 | + @RequestParam(value = "age", required = false) Integer age, | |
169 | + @RequestParam(value = "phone", required = false) String phone, | |
170 | + @RequestParam(value = "zyNo", required = false) String zyNo, | |
171 | + @RequestParam(value = "visitId", required = false) String visitId, | |
172 | + HttpServletRequest request) { | |
173 | + MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest(); | |
174 | + measureInfoRequest.setUserName(userName); | |
175 | + measureInfoRequest.setCertType(certType); | |
176 | + measureInfoRequest.setCertNo(certNo); | |
177 | + measureInfoRequest.setHospitalId(hospitalId); | |
178 | + measureInfoRequest.setVcCardNo(vcCardNo); | |
179 | + measureInfoRequest.setValueOne(valueOne); | |
180 | + measureInfoRequest.setWxCode(wxCode); | |
181 | + measureInfoRequest.setAge(age); | |
182 | + measureInfoRequest.setPhone(phone); | |
183 | + measureInfoRequest.setSex(sex); | |
184 | + measureInfoRequest.setRecordTime(new Date().getTime()); | |
185 | + measureInfoRequest.setRecordCount(1); | |
186 | + measureInfoRequest.setValueType(3); | |
187 | + measureInfoRequest.setZyNo(zyNo); | |
188 | + measureInfoRequest.setVisitId(visitId); | |
189 | + System.out.println("添加体温请求参数:"+measureInfoRequest.toString()); | |
190 | + return measureInfoFacade.addMeasureInfo(measureInfoRequest); | |
191 | + } | |
192 | + | |
193 | + /** | |
150 | 194 | * 更新数据 |
151 | 195 | * @param measureInfoRequest |
152 | 196 | * @param request |
... | ... | @@ -156,6 +200,22 @@ |
156 | 200 | @ResponseBody |
157 | 201 | public BaseResponse updateMeasureInfo(@RequestBody MeasureInfoRequest measureInfoRequest, HttpServletRequest request) { |
158 | 202 | return measureInfoFacade.updateMeasureInfo(measureInfoRequest); |
203 | + } | |
204 | + | |
205 | + | |
206 | + /** | |
207 | + * 查询测量基本信息 | |
208 | + * valueType 值类型: 1 体重和身高 2 血压和脉搏 3 体温 | |
209 | + * @return | |
210 | + */ | |
211 | + @RequestMapping(method = RequestMethod.GET, value = "/queryClBaseInfo") | |
212 | + @ResponseBody | |
213 | + public Map queryClBaseInfo(@RequestParam(value = "certType", required = true) String certType, | |
214 | + @RequestParam(value = "certNo", required = true) String certNo, | |
215 | + @RequestParam(value = "hospitalId", required = true) String hospitalId, | |
216 | + HttpServletRequest request | |
217 | + ) { | |
218 | + return measureInfoFacade.queryClBaseInfo(certType, certNo, hospitalId); | |
159 | 219 | } |
160 | 220 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
View file @
10603d3
... | ... | @@ -191,8 +191,20 @@ |
191 | 191 | } |
192 | 192 | Integer count = MAX_TODAY_COUNT - todayCount; |
193 | 193 | map.put("errorcode", String.valueOf(ErrorCodeConstants.SUCCESS)); |
194 | - map.put("errormsg", measureInfoRequest.getValueType() == 1 | |
195 | - ? "信息记录成功,今天您还可以测量"+count+"次体重和身高" : "信息记录成功,今天您还可以测量"+count+"次血压和脉搏"); | |
194 | + String message = ""; | |
195 | + if (measureInfoRequest.getValueType() == 1) | |
196 | + { | |
197 | + message = "信息记录成功,今天您还可以测量"+count+"次体重和身高"; | |
198 | + } | |
199 | + else if (measureInfoRequest.getValueType() == 2) | |
200 | + { | |
201 | + message = "信息记录成功,今天您还可以测量"+count+"次血压和脉搏"; | |
202 | + } | |
203 | + else if (measureInfoRequest.getValueType() == 3) | |
204 | + { | |
205 | + message = "信息记录成功,今天您还可以测量"+count+"次体温"; | |
206 | + } | |
207 | + map.put("errormsg", message); | |
196 | 208 | return map; |
197 | 209 | } |
198 | 210 | |
... | ... | @@ -244,6 +256,31 @@ |
244 | 256 | model.setZyNo(measureInfoRequest.getZyNo()); |
245 | 257 | model.setVisitId(measureInfoRequest.getVisitId()); |
246 | 258 | return model; |
259 | + } | |
260 | + | |
261 | + public Map queryClBaseInfo(String certType, String certNo,String hospitalId) { | |
262 | + Map<String,String> map = new HashMap<>(); | |
263 | + MeasureInfoQuery query = new MeasureInfoQuery(); | |
264 | + query.setHospitalId(hospitalId); | |
265 | + query.setCertType(certType); | |
266 | + query.setCertNo(certNo); | |
267 | + query.setSort(" record_time desc "); | |
268 | + query.setNeed("true"); | |
269 | + List<MeasureInfoModel> list = mysqlMeasureInfoService.queryMeasureInfoList(query); | |
270 | + if (CollectionUtils.isNotEmpty(list)) | |
271 | + { | |
272 | + MeasureInfoModel model = list.get(0); | |
273 | + map.put("userName",model.getUserName() == null ? "" : model.getUserName()); | |
274 | + map.put("certType",model.getCertType() == null ? "" : model.getCertType()); | |
275 | + map.put("certNo",model.getCertNo() == null ? "" : model.getCertNo()); | |
276 | + map.put("sex",String.valueOf(model.getSex())); | |
277 | + map.put("age",model.getAge() == null ? "" : String.valueOf(model.getAge())); | |
278 | + map.put("vcCardNo",model.getVcCardNo() == null ? "" : model.getVcCardNo()); | |
279 | + map.put("phone",model.getPhone() == null ? "" : model.getPhone()); | |
280 | + map.put("zyNo",model.getZyNo() == null ? "" : model.getZyNo()); | |
281 | + map.put("visitId",model.getVisitId() == null ? "" : model.getVisitId()); | |
282 | + } | |
283 | + return map; | |
247 | 284 | } |
248 | 285 | } |