Commit cb377e03619e278d518dae5a43032cb372d849a8
1 parent
b9272e7244
Exists in
master
and in
6 other branches
诊断字段格式化
Showing 1 changed file with 12 additions and 11 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java
View file @
cb377e0
... | ... | @@ -73,10 +73,10 @@ |
73 | 73 | |
74 | 74 | @Override |
75 | 75 | public BaseObjectResponse addOrUpdate(Integer userId, NewbornVisit newbornVisit) { |
76 | - newbornVisit.setFeedType(newbornVisit.getFeedType() == null ? null : FeedTypeEnums.get(Integer.parseInt(newbornVisit.getFeedType())).getName()); | |
77 | - newbornVisit.setSkin(newbornVisit.getSkin() == null ? null : SkinEnums.get(Integer.parseInt(newbornVisit.getSkin())).getName()); | |
78 | - newbornVisit.setComplexion(newbornVisit.getComplexion() == null ? null : ComplexionEnums.get(Integer.parseInt(newbornVisit.getComplexion())).getName()); | |
79 | - newbornVisit.setUmbilicalCord(newbornVisit.getUmbilicalCord() == null ? null : UmbilicalCordEnums.get(Integer.parseInt(newbornVisit.getUmbilicalCord())).getName()); | |
76 | +// newbornVisit.setFeedType(newbornVisit.getFeedType() == null ? null : FeedTypeEnums.get(Integer.parseInt(newbornVisit.getFeedType())).getName()); | |
77 | +// newbornVisit.setSkin(newbornVisit.getSkin() == null ? null : SkinEnums.get(Integer.parseInt(newbornVisit.getSkin())).getName()); | |
78 | +// newbornVisit.setComplexion(newbornVisit.getComplexion() == null ? null : ComplexionEnums.get(Integer.parseInt(newbornVisit.getComplexion())).getName()); | |
79 | +// newbornVisit.setUmbilicalCord(newbornVisit.getUmbilicalCord() == null ? null : UmbilicalCordEnums.get(Integer.parseInt(newbornVisit.getUmbilicalCord())).getName()); | |
80 | 80 | newbornVisit.setHospitalId(autoMatchFacade.getHospitalId(userId)); |
81 | 81 | // newbornVisit.setNextVisitTime(newbornVisit.getUmbilicalCord() == null ? null : UmbilicalCordEnums.get(Integer.parseInt(newbornVisit.getUmbilicalCord())).getName()); |
82 | 82 | if(StringUtils.isEmpty(newbornVisit.getId())) { |
... | ... | @@ -245,7 +245,8 @@ |
245 | 245 | |
246 | 246 | @Override |
247 | 247 | public BaseObjectResponse get(String id) { |
248 | - return RespBuilder.buildSuccess(mongoTemplate.findById(id, NewbornVisit.class)); | |
248 | + NewbornVisit newbornVisit = mongoTemplate.findById(id, NewbornVisit.class); | |
249 | + return RespBuilder.buildSuccess(); | |
249 | 250 | } |
250 | 251 | |
251 | 252 | @Override |
252 | 253 | |
... | ... | @@ -268,12 +269,12 @@ |
268 | 269 | restMap.put("visitLocation", newbornVisit.getVisitLocation()); /** 访视地点 */ |
269 | 270 | restMap.put("nextVisitTime", DateUtil.getYyyyMmDd(newbornVisit.getNextVisitTime())); /** 预约下次访视时间 */ |
270 | 271 | /** 问诊 */ |
271 | - restMap.put("feedType", newbornVisit.getFeedType()); /** 喂养方式 */ | |
272 | + restMap.put("feedType", FeedTypeEnums.getName(newbornVisit.getFeedType())); /** 喂养方式 */ | |
272 | 273 | restMap.put("feedNumber", newbornVisit.getFeedNumber()); /** 喂奶量 */ |
273 | 274 | restMap.put("nurseNumber", newbornVisit.getNurseNumber()); /** 吃奶次数 */ |
274 | 275 | restMap.put("weight", newbornVisit.getWeight()); /** 新生儿体重 */ |
275 | 276 | restMap.put("height", newbornVisit.getHeight()); /** 出生身长 */ |
276 | - restMap.put("vomit", newbornVisit.getVomit()); /** 呕吐 */ | |
277 | + restMap.put("vomit", VomitEnums.getName(newbornVisit.getVomit())); /** 呕吐 */ | |
277 | 278 | restMap.put("shit", newbornVisit.getShit()); /** 大便 */ |
278 | 279 | restMap.put("shitNumber", newbornVisit.getShitNumber()); /** 大便次数 */ |
279 | 280 | /** 体格测量 */ |
280 | 281 | |
... | ... | @@ -282,10 +283,10 @@ |
282 | 283 | /** 体格检查 */ |
283 | 284 | restMap.put("heartRate", newbornVisit.getHeartRate()); /** 心率 */ |
284 | 285 | restMap.put("respiratoryRate", newbornVisit.getRespiratoryRate()); /** 呼吸频率 */ |
285 | - restMap.put("skin", newbornVisit.getSkin()); /** 皮肤 */ | |
286 | - restMap.put("complexion", newbornVisit.getComplexion()); /** 面色 */ | |
286 | + restMap.put("skin", SkinEnums.getName(newbornVisit.getSkin())); /** 皮肤 */ | |
287 | + restMap.put("complexion", ComplexionEnums.getName(newbornVisit.getComplexion())); /** 面色 */ | |
287 | 288 | restMap.put("ictericPart", newbornVisit.getIctericPart()); /** 黄染部位 */ |
288 | - restMap.put("bregmatic", newbornVisit.getBregmatic()); /** 前囟 */ | |
289 | + restMap.put("bregmatic", BregmaticEnums.getName(newbornVisit.getBregmatic())); /** 前囟 */ | |
289 | 290 | restMap.put("eye", newbornVisit.getEye()); /** 眼外观 */ |
290 | 291 | restMap.put("limb", newbornVisit.getLimb()); /** 四肢活动 */ |
291 | 292 | restMap.put("ear", newbornVisit.getEar()); /** 耳外观 */ |
... | ... | @@ -294,7 +295,7 @@ |
294 | 295 | restMap.put("mouth", newbornVisit.getMouth()); /** 口腔 */ |
295 | 296 | restMap.put("gangmen", newbornVisit.getGangmen()); /** 肛门 */ |
296 | 297 | restMap.put("heartLung", newbornVisit.getHeartLung()); /** 心肺听诊 */ |
297 | - restMap.put("umbilicalCord", newbornVisit.getUmbilicalCord()); /** 脐带 */ | |
298 | + restMap.put("umbilicalCord", UmbilicalCordEnums.getName(newbornVisit.getUmbilicalCord())); /** 脐带 */ | |
298 | 299 | restMap.put("abdomen", newbornVisit.getAbdomen()); /** 腹部 */ |
299 | 300 | restMap.put("spine", newbornVisit.getSpine()); /** 脊柱 */ |
300 | 301 | restMap.put("extGenitalia", newbornVisit.getExtGenitalia()); /** 外生殖器 */ |