diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java index 54da8b6..76424af 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java @@ -149,14 +149,14 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { public BaseResponse add(BabyNutritionSpecialtyRequest request, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); - //表示区域的 + /*//表示区域的 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1); if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) { //打印日志 } request.setBuildId(parentId); - } + }*/ BabyNutritionSpecialtyModel model = getBabyNutritionSpecialtyModel(request); model.setCreateDate(new Date()); model.setHospitalId(hospitalId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java index eaaff47..20e7ac0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyPsychologistFacade.java @@ -176,14 +176,14 @@ public class BabyPsychologistFacade extends BaseServiceImpl { public BaseResponse addBabyPsychologist(BabyPsychologistRequest request, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); - //表示区域的 + /* //表示区域的 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1); if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) { //打印日志 } request.setBuildId(parentId); - } + }*/ BabyPsychologistModel model = getBabyPsychologistModel(request); model.setCreateDate(new Date()); model.setHospitalId(hospitalId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStuntingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStuntingFacade.java index c34859c..31cec96 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStuntingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStuntingFacade.java @@ -184,14 +184,14 @@ public class BabyStuntingFacade extends BaseServiceImpl { public BaseResponse add(BabyStuntingRequest request, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); - //表示区域的 + /* //表示区域的 if (org.apache.commons.lang.StringUtils.isNotEmpty(groupsFacade.findByCurrentUserId(hospitalId))) { String parentId = babyBookbuildingFacade.handHideBuild(request.getPid(), request.getBuildId(), userId, 1); if (org.apache.commons.lang.StringUtils.isEmpty(parentId)) { //打印日志 } request.setBuildId(parentId); - } + }*/ BabyStuntingModel model = getBabyStuntingModel(request); model.setCreateDate(new Date()); model.setHospitalId(hospitalId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java index 4ab6c0a..836d890 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java @@ -11,7 +11,7 @@ import java.util.Date; import java.util.List; import java.util.Map; -public class BabyNutritionSpecialtyResult implements IBasicResultConvert { +public class BabyNutritionSpecialtyResult implements IBasicResultConvert { /*基础信息*/ @@ -26,10 +26,10 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert> mHighRiskReason; + List > mHighRiskReason; /*母亲信息*/ //母亲姓名 - private String mname; + private String mname; //母亲证件号 private String mcertNo; //母亲手机号码 @@ -37,15 +37,15 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert birthHistory; + private Map birthHistory; private String birthHistoryStr; //6个月内喂养史 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□ - private Map feedingHistory6; + private Map feedingHistory6; private String feedingHistory6Str; //开始食物转换年龄 private String foodToAge; @@ -100,10 +100,10 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert tjzl; + private Map tjzl; private String tjzlStr; //母乳喂养情况 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□ - private Map mrwyHistory; + private Map mrwyHistory; private String mrwyHistoryStr; //儿童开始添加含铁食物年龄 private String kstjhtswage; @@ -114,13 +114,13 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert myqbrq; + private Map myqbrq; private String myqbrqStr; //儿童服用VitD wu:true 无 you:true 有 month:月 day:天 pm:品名 jl:剂量 - private Map vitd; + private Map vitd; private String vitdStr; //体征 fl:true 方颅□ lgcz:true 肋骨串珠□ lrggk:true 肋软骨沟□ jxk:true 鸡胸□ szk:true 手(足)镯□ xxt:true X型腿□ oxtk:true O型腿□ - private Map tiz; + private Map tiz; private String tizStr; //血液检查 private String bloodCheck; @@ -268,19 +268,19 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert getBirthHistory() { + public Map getBirthHistory() { return birthHistory; } - public void setBirthHistory(Map birthHistory) { + public void setBirthHistory(Map birthHistory) { this.birthHistory = birthHistory; } - public Map getFeedingHistory6() { + public Map getFeedingHistory6() { return feedingHistory6; } - public void setFeedingHistory6(Map feedingHistory6) { + public void setFeedingHistory6(Map feedingHistory6) { this.feedingHistory6 = feedingHistory6; } @@ -364,19 +364,19 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert getTjzl() { + public Map getTjzl() { return tjzl; } - public void setTjzl(Map tjzl) { + public void setTjzl(Map tjzl) { this.tjzl = tjzl; } - public Map getMrwyHistory() { + public Map getMrwyHistory() { return mrwyHistory; } - public void setMrwyHistory(Map mrwyHistory) { + public void setMrwyHistory(Map mrwyHistory) { this.mrwyHistory = mrwyHistory; } @@ -412,27 +412,27 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert getMyqbrq() { + public Map getMyqbrq() { return myqbrq; } - public void setMyqbrq(Map myqbrq) { + public void setMyqbrq(Map myqbrq) { this.myqbrq = myqbrq; } - public Map getVitd() { + public Map getVitd() { return vitd; } - public void setVitd(Map vitd) { + public void setVitd(Map vitd) { this.vitd = vitd; } - public Map getTiz() { + public Map getTiz() { return tiz; } - public void setTiz(Map tiz) { + public void setTiz(Map tiz) { this.tiz = tiz; } @@ -660,11 +660,11 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert> getmHighRiskReason() { + public List > getmHighRiskReason() { return mHighRiskReason; } - public void setmHighRiskReason(List> mHighRiskReason) { + public void setmHighRiskReason(List > mHighRiskReason) { this.mHighRiskReason = mHighRiskReason; } /*新增页面 4个页面内容*/ @@ -684,11 +684,11 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert map = destModel.getBirthHistory(); - String yesOrNo = map.get("yesOrNo") == null ? "" : map.get("yesOrNo").toString(); - if ("no".equals(yesOrNo)) { - getBirthHistory = "无"; - } else if ("yes".equals(yesOrNo)) { - boolean zc = map.get("zc") == null ? false : (boolean)map.get("zc"); - if (zc) { - getBirthHistory += " 早产,"; - } - boolean dcstz = map.get("dcstz") == null ? false : (boolean)map.get("dcstz"); - if (dcstz) { - getBirthHistory += " 低出生体重,"; - } - boolean dt = map.get("dt") == null ? false : (boolean)map.get("dt"); - if (dt) { - getBirthHistory += " 多胎,"; - } - boolean jdy = map.get("jdy") == null ? false : (boolean)map.get("jdy"); - if (jdy) { - getBirthHistory += " 巨大婴,"; - } - getBirthHistory = FunvCommonUtil.spitd(getBirthHistory); + if (destModel.getBirthHistory() != null) { + Map map = destModel.getBirthHistory(); + boolean zc = map.get("zc") == null ? false : (boolean) map.get("zc"); + if (zc) { + getBirthHistory += " 早产,"; + } + boolean dcstz = map.get("dcstz") == null ? false : (boolean) map.get("dcstz"); + if (dcstz) { + getBirthHistory += " 低出生体重,"; } + boolean dt = map.get("dt") == null ? false : (boolean) map.get("dt"); + if (dt) { + getBirthHistory += " 多胎,"; + } + boolean jdy = map.get("jdy") == null ? false : (boolean) map.get("jdy"); + if (jdy) { + getBirthHistory += " 巨大婴,"; + } + getBirthHistory = FunvCommonUtil.spitd(getBirthHistory); + } } catch (Exception e) { e.printStackTrace(); @@ -817,18 +813,18 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert map = destModel.getFeedingHistory6(); + if (destModel.getFeedingHistory6() != null) { + Map map = destModel.getFeedingHistory6(); - boolean cmr = map.get("cmr") == null ? false : (boolean)map.get("cmr"); + boolean cmr = map.get("cmr") == null ? false : (boolean) map.get("cmr"); if (cmr) { getFeedingHistory6 += " 纯母乳,"; } - boolean bfmr = map.get("bfmr") == null ? false : (boolean)map.get("bfmr"); + boolean bfmr = map.get("bfmr") == null ? false : (boolean) map.get("bfmr"); if (bfmr) { getFeedingHistory6 += " 部分母乳,"; } - boolean pfn = map.get("pfn") == null ? false : (boolean)map.get("pfn"); + boolean pfn = map.get("pfn") == null ? false : (boolean) map.get("pfn"); if (pfn) { getFeedingHistory6 += " 配方奶,"; } @@ -856,18 +852,18 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert map = destModel.getMrwyHistory(); + if (destModel.getMrwyHistory() != null) { + Map map = destModel.getMrwyHistory(); - boolean cmr = map.get("cmr") == null ? false : (boolean)map.get("cmr"); + boolean cmr = map.get("cmr") == null ? false : (boolean) map.get("cmr"); if (cmr) { getMrwyHistory += " 纯母乳,"; } - boolean bfmr = map.get("bfmr") == null ? false : (boolean)map.get("bfmr"); + boolean bfmr = map.get("bfmr") == null ? false : (boolean) map.get("bfmr"); if (bfmr) { getMrwyHistory += " 部分母乳,"; } - boolean pfn = map.get("pfn") == null ? false : (boolean)map.get("pfn"); + boolean pfn = map.get("pfn") == null ? false : (boolean) map.get("pfn"); if (pfn) { getMrwyHistory += " 配方奶,"; } @@ -891,34 +887,34 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert map = destModel.getTiz(); + if (destModel.getTiz() != null) { + Map map = destModel.getTiz(); - boolean fl = map.get("fl") == null ? false : (boolean)map.get("fl"); + boolean fl = map.get("fl") == null ? false : (boolean) map.get("fl"); if (fl) { getTiz += " 方颅,"; } - boolean lgcz = map.get("lgcz") == null ? false : (boolean)map.get("lgcz"); + boolean lgcz = map.get("lgcz") == null ? false : (boolean) map.get("lgcz"); if (lgcz) { getTiz += " 肋骨串珠,"; } - boolean lrggk = map.get("lrggk") == null ? false : (boolean)map.get("lrggk"); + boolean lrggk = map.get("lrggk") == null ? false : (boolean) map.get("lrggk"); if (lrggk) { getTiz += " 肋软骨沟,"; } - boolean jxk = map.get("jxk") == null ? false : (boolean)map.get("jxk"); + boolean jxk = map.get("jxk") == null ? false : (boolean) map.get("jxk"); if (jxk) { getTiz += " 鸡胸,"; } - boolean szk = map.get("szk") == null ? false : (boolean)map.get("szk"); + boolean szk = map.get("szk") == null ? false : (boolean) map.get("szk"); if (szk) { getTiz += " 手(足)镯,"; } - boolean xxt = map.get("xxt") == null ? false : (boolean)map.get("xxt"); + boolean xxt = map.get("xxt") == null ? false : (boolean) map.get("xxt"); if (xxt) { getTiz += " X型腿,"; } - boolean oxtk = map.get("oxtk") == null ? false : (boolean)map.get("oxtk"); + boolean oxtk = map.get("oxtk") == null ? false : (boolean) map.get("oxtk"); if (oxtk) { getTiz += " O型腿,"; }