diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java index 774054d..3eda86d 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java @@ -47,5 +47,5 @@ public interface CouponService{ int updateCouponStatus(Map param); - boolean validateUser(String userId, String code); + boolean validateUser(String userId); } 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 aa14222..92b36e0 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 @@ -96,7 +96,6 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit /** 使用优惠券 */ if(StringUtils.isNotBlank(newbornVisit.getCouponCode())) { couponService.use(autoMatchFacade.getHospitalId(userId), newbornVisit.getCouponCode(), userId, newbornVisit.getId()); - newbornVisit.setCouponCode(null); /** 去除掉优惠券信息 不保存到数据库 */ } newbornVisit.setOperationId(userId.toString()); @@ -325,14 +324,14 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit restMap.put("unclosedSize", newbornVisit.getUnclosedSize() + "cm X " + newbornVisit.getUnclosedSize2()); } - restMap.put("couponCode", newbornVisit.getCouponCode()); + restMap.put("couponCode", newbornVisit.getCouponCode() == null ? "" : newbornVisit.getCouponCode()); /** 访视信息 */ - restMap.put("checkTimeDesc", newbornVisit.getCheckTimeDesc()); /** 产后天数 */ + restMap.put("checkTimeDesc", newbornVisit.getCheckTimeDesc() == null ? "" : 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("visitLocation", newbornVisit.getVisitLocation() == null ? "" : newbornVisit.getVisitLocation()); /** 访视地点 */ if(newbornVisit.getNextVisitTime() != null) { restMap.put("nextVisitTime", NextVisitTimeEnums.getName(newbornVisit.getNextVisitTime())); /** 预约下次访视时间 */ } @@ -340,46 +339,111 @@ public class NewbornServiceImpl extends BaseServiceImpl implements INewbornVisit restMap.put("nextVisitTimeDesc", DateUtil.getYyyyMmDd(newbornVisit.getNextVisitTimeDesc())); /** 预约下次访视时间 */ } /** 问诊 */ - restMap.put("feedType", FeedTypeEnums.getName(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", VomitEnums.getName(newbornVisit.getVomit())); /** 呕吐 */ - restMap.put("shit", newbornVisit.getShit()); /** 大便 */ - restMap.put("shitNumber", newbornVisit.getShitNumber()); /** 大便次数 */ + if(StringUtils.isNotBlank(newbornVisit.getFeedType())) { + restMap.put("feedType", FeedTypeEnums.getName(newbornVisit.getFeedType())); /** 喂养方式 */ + } + if(StringUtils.isNotBlank(newbornVisit.getFeedNumber())) { + restMap.put("feedNumber", newbornVisit.getFeedNumber()); /** 喂奶量 */ + } + if(newbornVisit.getNurseNumber() != null) { + restMap.put("nurseNumber", newbornVisit.getNurseNumber()); /** 吃奶次数 */ + } + if(StringUtils.isNotBlank(newbornVisit.getWeight())) { + restMap.put("weight", newbornVisit.getWeight()); /** 新生儿体重 */ + } + if(StringUtils.isNotBlank(newbornVisit.getHeight())) { + restMap.put("height", newbornVisit.getHeight()); /** 出生身长 */ + } + if(StringUtils.isNotBlank(newbornVisit.getVomit())) { + restMap.put("vomit", VomitEnums.getName(newbornVisit.getVomit())); /** 呕吐 */ + } + if(StringUtils.isNotBlank(newbornVisit.getShit())) { + restMap.put("shit", newbornVisit.getShit()); /** 大便 */ + } + if(newbornVisit.getShitNumber() != null) { + restMap.put("shitNumber", newbornVisit.getShitNumber()); /** 大便次数 */ + } /** 体格测量 */ - restMap.put("temperature", newbornVisit.getTemperature()); /** 体温 */ - restMap.put("weightNow", newbornVisit.getWeightNow()); /** 目前体重 */ + if(StringUtils.isNotBlank(newbornVisit.getTemperature())) { + restMap.put("temperature", newbornVisit.getTemperature()); /** 体温 */ + } + if(StringUtils.isNotBlank(newbornVisit.getWeightNow())) { + restMap.put("weightNow", newbornVisit.getWeightNow()); /** 目前体重 */ + } + /** 体格检查 */ - restMap.put("heartRate", newbornVisit.getHeartRate()); /** 心率 */ - restMap.put("respiratoryRate", newbornVisit.getRespiratoryRate()); /** 呼吸频率 */ - restMap.put("skin", SkinEnums.getName(newbornVisit.getSkin())); /** 皮肤 */ - restMap.put("complexion", ComplexionEnums.getName(newbornVisit.getComplexion())); /** 面色 */ - restMap.put("ictericPart", newbornVisit.getIctericPart()); /** 黄染部位 */ - restMap.put("bregmatic", BregmaticEnums.getName(newbornVisit.getBregmatic())); /** 前囟 */ - restMap.put("bregmaticOther", newbornVisit.getBregmaticOther()); /** 前囟 */ - 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", UmbilicalCordEnums.getName(newbornVisit.getUmbilicalCord())); /** 脐带 */ - restMap.put("abdomen", newbornVisit.getAbdomen()); /** 腹部 */ - restMap.put("spine", newbornVisit.getSpine()); /** 脊柱 */ - restMap.put("extGenitalia", newbornVisit.getExtGenitalia()); /** 外生殖器 */ + if(StringUtils.isNotBlank(newbornVisit.getHeartRate())) { + restMap.put("heartRate", newbornVisit.getHeartRate()); /** 心率 */ + } + if(StringUtils.isNotBlank(newbornVisit.getRespiratoryRate())) { + restMap.put("respiratoryRate", newbornVisit.getRespiratoryRate()); /** 呼吸频率 */ + } + if(StringUtils.isNotBlank(newbornVisit.getSkin())) { + restMap.put("skin", SkinEnums.getName(newbornVisit.getSkin())); /** 皮肤 */ + } + if(StringUtils.isNotBlank(newbornVisit.getComplexion())) { + restMap.put("complexion", ComplexionEnums.getName(newbornVisit.getComplexion())); /** 面色 */ + } + if(StringUtils.isNotBlank(newbornVisit.getIctericPart())) { + restMap.put("ictericPart", newbornVisit.getIctericPart()); /** 黄染部位 */ + } + if(StringUtils.isNotBlank(newbornVisit.getBregmatic())) { + restMap.put("bregmatic", BregmaticEnums.getName(newbornVisit.getBregmatic())); /** 前囟 */ + } + if(StringUtils.isNotBlank(newbornVisit.getBregmaticOther())) { + restMap.put("bregmaticOther", newbornVisit.getBregmaticOther()); /** 前囟 */ + } + if(StringUtils.isNotBlank(newbornVisit.getEye())) { + restMap.put("eye", newbornVisit.getEye()); /** 眼外观 */ + } + if(StringUtils.isNotBlank(newbornVisit.getLimb())) { + restMap.put("limb", newbornVisit.getLimb()); /** 四肢活动 */ + } + if(StringUtils.isNotBlank(newbornVisit.getEar())) { + restMap.put("ear", newbornVisit.getEar()); /** 耳外观 */ + } + if(StringUtils.isNotBlank(newbornVisit.getNeck())) { + restMap.put("neck", newbornVisit.getNeck()); /** 颈部包块 */ + } + if(StringUtils.isNotBlank(newbornVisit.getNose())) { + restMap.put("nose", newbornVisit.getNose()); /** 鼻 */ + } + if(StringUtils.isNotBlank(newbornVisit.getMouth())) { + restMap.put("mouth", newbornVisit.getMouth()); /** 口腔 */ + } + if(StringUtils.isNotBlank(newbornVisit.getGangmen())) { + restMap.put("gangmen", newbornVisit.getGangmen()); /** 肛门 */ + } + if(StringUtils.isNotBlank(newbornVisit.getHeartLung())) { + restMap.put("heartLung", newbornVisit.getHeartLung()); /** 心肺听诊 */ + } + if(StringUtils.isNotBlank(newbornVisit.getUmbilicalCord())) { + restMap.put("umbilicalCord", UmbilicalCordEnums.getName(newbornVisit.getUmbilicalCord())); /** 脐带 */ + } + if(StringUtils.isNotBlank(newbornVisit.getAbdomen())) { + restMap.put("abdomen", newbornVisit.getAbdomen()); /** 腹部 */ + } + if(StringUtils.isNotBlank(newbornVisit.getSpine())) { + restMap.put("spine", newbornVisit.getSpine()); /** 脊柱 */ + } + if(StringUtils.isNotBlank(newbornVisit.getExtGenitalia())) { + restMap.put("extGenitalia", newbornVisit.getExtGenitalia()); /** 外生殖器 */ + } /** 指导诊断 */ - restMap.put("diagnosis", mongoUtil.findNames(newbornVisit.getDiagnosis())); /** 诊断 */ - restMap.put("handleOpinions", newbornVisit.getHandleOpinions()); /** 处理意见 */ - restMap.put("guidanceOpinion", newbornVisit.getGuidanceOpinion()); /** 指导意见 */ + if(CollectionUtils.isNotEmpty(newbornVisit.getDiagnosis())) { + restMap.put("diagnosis", mongoUtil.findNames(newbornVisit.getDiagnosis())); /** 诊断 */ + } + if(StringUtils.isNotBlank(newbornVisit.getHandleOpinions())) { + restMap.put("handleOpinions", newbornVisit.getHandleOpinions()); /** 处理意见 */ + } + if(StringUtils.isNotBlank(newbornVisit.getGuidanceOpinion())) { + restMap.put("guidanceOpinion", newbornVisit.getGuidanceOpinion()); /** 指导意见 */ + } /** 其他 */ - restMap.put("skinOther", newbornVisit.getSkinOther()); - restMap.put("complexionOther", newbornVisit.getComplexionOther()); - restMap.put("umbilicalCordOther", newbornVisit.getUmbilicalCordOther()); + restMap.put("skinOther", newbornVisit.getSkinOther() == null ? "" : newbornVisit.getSkinOther()); + restMap.put("complexionOther", newbornVisit.getComplexionOther() == null ? "" : newbornVisit.getComplexionOther()); + restMap.put("umbilicalCordOther", newbornVisit.getUmbilicalCordOther() == null ? "" : newbornVisit.getUmbilicalCordOther()); return RespBuilder.buildSuccess(restMap); } return RespBuilder.buildSuccess();