diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java index c9be5e3..d13ba64 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/NewbornVisit.java @@ -88,6 +88,7 @@ public class NewbornVisit { // 未闭合尺寸 private String unclosedSize; + private String unclosedSize2; // 眼外观 private String eye; @@ -521,4 +522,12 @@ public class NewbornVisit { public void setNextVisitTimeDesc(String nextVisitTimeDesc) { this.nextVisitTimeDesc = nextVisitTimeDesc; } + + public String getUnclosedSize2() { + return unclosedSize2; + } + + public void setUnclosedSize2(String unclosedSize2) { + this.unclosedSize2 = unclosedSize2; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java index 6214c76..7a5b361 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/NewbornServiceImpl.java @@ -258,20 +258,51 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit NewbornVisit newbornVisit = mongoTemplate.findById(id, NewbornVisit.class); if(newbornVisit != null) { Map restMap = new HashMap<>(); + /** 访视信息 */ restMap.put("checkTimeDesc", newbornVisit.getCheckTimeDesc()); /** 产后天数 */ restMap.put("visitHospitalId", mapper.getHospitalName(newbornVisit.getVisitHospitalId())); /** 访视机构 */ restMap.put("doctor", mapper.getUserName(newbornVisit.getDoctor())); /** 访视医生 */ restMap.put("checkTime", DateUtil.getYyyyMmDd(newbornVisit.getCheckTime())); /** 访视时间 */ - + restMap.put("visitLocation", newbornVisit.getVisitLocation()); /** 访视地点 */ + restMap.put("nextVisitTime", DateUtil.getYyyyMmDd(newbornVisit.getNextVisitTime())); /** 预约下次访视时间 */ + /** 问诊 */ + restMap.put("feedType", newbornVisit.getFeedType()); /** 喂养方式 */ + restMap.put("feedNumber", newbornVisit.getFeedNumber()); /** 喂奶量 */ + restMap.put("nurseNumber", newbornVisit.getNurseNumber()); /** 吃奶次数 */ + restMap.put("weight", newbornVisit.getWeight()); /** 新生儿体重 */ + restMap.put("height", newbornVisit.getHeight()); /** 出生身长 */ + restMap.put("vomit", newbornVisit.getVomit()); /** 呕吐 */ + restMap.put("shit", newbornVisit.getShit()); /** 大便 */ + restMap.put("shitNumber", newbornVisit.getShitNumber()); /** 大便次数 */ + /** 体格测量 */ + restMap.put("temperature", newbornVisit.getTemperature()); /** 体温 */ + restMap.put("weightNow", newbornVisit.getWeightNow()); /** 目前体重 */ + /** 体格检查 */ + restMap.put("heartRate", newbornVisit.getHeartRate()); /** 心率 */ + restMap.put("respiratoryRate", newbornVisit.getRespiratoryRate()); /** 呼吸频率 */ + restMap.put("skin", newbornVisit.getSkin()); /** 皮肤 */ + restMap.put("complexion", newbornVisit.getComplexion()); /** 面色 */ + restMap.put("ictericPart", newbornVisit.getIctericPart()); /** 黄染部位 */ + restMap.put("bregmatic", newbornVisit.getBregmatic()); /** 前囟 */ + restMap.put("eye", newbornVisit.getEye()); /** 眼外观 */ + restMap.put("limb", newbornVisit.getLimb()); /** 四肢活动 */ + restMap.put("ear", newbornVisit.getEar()); /** 耳外观 */ + restMap.put("neck", newbornVisit.getNeck()); /** 颈部包块 */ + restMap.put("nose", newbornVisit.getNose()); /** 鼻 */ + restMap.put("mouth", newbornVisit.getMouth()); /** 口腔 */ + restMap.put("gangmen", newbornVisit.getGangmen()); /** 肛门 */ + restMap.put("heartLung", newbornVisit.getHeartLung()); /** 心肺听诊 */ + restMap.put("umbilicalCord", newbornVisit.getUmbilicalCord()); /** 脐带 */ + restMap.put("abdomen", newbornVisit.getAbdomen()); /** 腹部 */ + restMap.put("spine", newbornVisit.getSpine()); /** 脊柱 */ + restMap.put("extGenitalia", newbornVisit.getExtGenitalia()); /** 外生殖器 */ + /** 指导诊断 */ + restMap.put("diagnosis", newbornVisit.getDiagnosis()); /** 诊断 */ + restMap.put("handleOpinions", newbornVisit.getHandleOpinions()); /** 处理意见 */ + restMap.put("guidanceOpinion", newbornVisit.getGuidanceOpinion()); /** 指导意见 */ + return RespBuilder.buildSuccess(restMap); } - - // Users users = usersMapper.getUsers(Integer.parseInt(newbornVisit.getVisitHospitalId())); -// if(users != null) { -// newbornVisit.setVisitHospitalId(users.getName()); -// } else { -// newbornVisit.setVisitHospitalId(""); -// } - return null; + return RespBuilder.buildSuccess(); } }