From 21caa5ad07f4e0333fdb53ee717e8b283d4ca87a Mon Sep 17 00:00:00 2001 From: wtt Date: Sat, 15 Aug 2020 13:57:19 +0800 Subject: [PATCH] update --- .../platform/pojo/BabyNutritionSpecialtyModel.java | 41 +++ .../web/facade/BabyNutritionSpecialtyFacade.java | 5 + .../web/request/BabyNutritionSpecialtyRequest.java | 46 +++- .../web/result/BabyNutritionSpecialtyResult.java | 302 ++++++++++++++++++++- 4 files changed, 389 insertions(+), 5 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionSpecialtyModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionSpecialtyModel.java index ffda81c..37013bf 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionSpecialtyModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionSpecialtyModel.java @@ -124,6 +124,47 @@ public class BabyNutritionSpecialtyModel extends BaseModel { //VitD治疗(品名、剂量) private String vitdzl; + //血钙 + private String xgCheck; + //血磷 + private String xlCheck; + //血AKP + private String xlakpCheck; + //血25-(OH)D + private String xlohdCheck; + + + public String getXgCheck() { + return xgCheck; + } + + public void setXgCheck(String xgCheck) { + this.xgCheck = xgCheck; + } + + public String getXlCheck() { + return xlCheck; + } + + public void setXlCheck(String xlCheck) { + this.xlCheck = xlCheck; + } + + public String getXlakpCheck() { + return xlakpCheck; + } + + public void setXlakpCheck(String xlakpCheck) { + this.xlakpCheck = xlakpCheck; + } + + public String getXlohdCheck() { + return xlohdCheck; + } + + public void setXlohdCheck(String xlohdCheck) { + this.xlohdCheck = xlohdCheck; + } public String getCaseClosed() { return caseClosed; 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 c29b1eb..a2fde15 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 @@ -125,6 +125,11 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { model.setHwhdDate(request.getHwhdDate()); model.setVitdzl(request.getVitdzl()); + model.setXgCheck(request.getXgCheck()); + model.setXlCheck(request.getXlCheck()); + model.setXlakpCheck(request.getXlakpCheck()); + model.setXlohdCheck(request.getXlohdCheck()); + return model; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSpecialtyRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSpecialtyRequest.java index 133773f..b997e0b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSpecialtyRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSpecialtyRequest.java @@ -75,7 +75,7 @@ public class BabyNutritionSpecialtyRequest { //开始管理日期 private String startMdate; - //出生史true是选中 默认是false。 zc:true 早产 dcstz:true 低出生体重 dt:true多胎 jdy:true 巨大婴 + //出生史 true是选中 默认是false。 zc:true 早产 dcstz:true 低出生体重 dt:true多胎 jdy:true 巨大婴 private Map birthHistory; //6个月内喂养史 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□ private Map feedingHistory6; @@ -99,7 +99,7 @@ public class BabyNutritionSpecialtyRequest { private String myqpxWeek; //母孕期贫血情况:Hb private String myqpxHb; - //铁剂治疗 wu:true 无 you:true 有 yw:药物 jl:剂量 lc:疗程 + //铁剂治疗 "yesOrNo": "yes" no无 yes 有 yw:药物 jl:剂量 lc:疗程 private Map tjzl; //母乳喂养情况 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□ private Map mrwyHistory; @@ -113,7 +113,7 @@ public class BabyNutritionSpecialtyRequest { private String treatment; //母孕期和哺乳期 wbc:true rzbz:true xzjl:true private Map myqbrq; - //儿童服用VitD wu:true 无 you:true 有 month:月 day:天 pm:品名 jl:剂量 + //儿童服用VitD "yesOrNo": "yes" no无 yes 有 , month:月 day:天 pm:品名 jl:剂量 private Map vitd; //体征 fl:true 方颅□ lgcz:true 肋骨串珠□ lrggk:true 肋软骨沟□ jxk:true 鸡胸□ szk:true 手(足)镯□ xxt:true X型腿□ oxtk:true O型腿□ private Map tiz; @@ -126,6 +126,46 @@ public class BabyNutritionSpecialtyRequest { //VitD治疗(品名、剂量) private String vitdzl; + //血钙 + private String xgCheck; + //血磷 + private String xlCheck; + //血AKP + private String xlakpCheck; + //血25-(OH)D + private String xlohdCheck; + + public String getXgCheck() { + return xgCheck; + } + + public String getXlCheck() { + return xlCheck; + } + + public String getXlakpCheck() { + return xlakpCheck; + } + + public String getXlohdCheck() { + return xlohdCheck; + } + + public void setXgCheck(String xgCheck) { + this.xgCheck = xgCheck; + } + + public void setXlCheck(String xlCheck) { + this.xlCheck = xlCheck; + } + + public void setXlakpCheck(String xlakpCheck) { + this.xlakpCheck = xlakpCheck; + } + + public void setXlohdCheck(String xlohdCheck) { + this.xlohdCheck = xlohdCheck; + } public String getCaseClosed() { return caseClosed; 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 4c34114..b1c7379 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 @@ -3,8 +3,8 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.common.base.IBasicResultConvert; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.pojo.BabyNutritionSpecialtyModel; -import com.lyms.platform.pojo.BabyPsychologistModel; import java.util.Date; import java.util.Map; @@ -69,8 +69,10 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert birthHistory; + private String birthHistoryStr; //6个月内喂养史 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□ private Map feedingHistory6; + private String feedingHistory6Str; //开始食物转换年龄 private String foodToAge; //既往患病情况 @@ -91,10 +93,12 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert tjzl; + private String tjzlStr; //母乳喂养情况 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□ private Map mrwyHistory; + private String mrwyHistoryStr; //儿童开始添加含铁食物年龄 private String kstjhtswage; //儿童既往患病情况 @@ -105,12 +109,24 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert myqbrq; + private String myqbrqStr; //儿童服用VitD wu:true 无 you:true 有 month:月 day:天 pm:品名 jl:剂量 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 String tizStr; //血液检查 private String bloodCheck; + //血钙 + private String xgCheck; + //血磷 + private String xlCheck; + //血AKP + private String xlakpCheck; + //血25-(OH)D + private String xlohdCheck; + //X线检查 private String xxCheck; //户外活动时间(小时/日) @@ -118,6 +134,93 @@ 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); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + setBirthHistoryStr(getBirthHistory); + setBirthHistory(destModel.getBirthHistory()); + //6个月内喂养史 + String getFeedingHistory6 = ""; + try { + if (destModel.getFeedingHistory6()!=null ) { + Map map = destModel.getFeedingHistory6(); + + 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"); + if (bfmr) { + getFeedingHistory6 += " 部分母乳,"; + } + boolean pfn = map.get("pfn") == null ? false : (boolean)map.get("pfn"); + if (pfn) { + getFeedingHistory6 += " 配方奶,"; + } + getFeedingHistory6 = FunvCommonUtil.spitd(getFeedingHistory6); + } + } catch (Exception e) { + e.printStackTrace(); + } + setFeedingHistory6Str(getFeedingHistory6); + setFeedingHistory6(destModel.getFeedingHistory6()); + + setFoodToAge(destModel.getFoodToAge()); + setSituation(destModel.getSituation()); + setHeight(destModel.getHeight()); + setWeight(destModel.getWeight()); + setAssess(destModel.getAssess()); + setProblem(destModel.getProblem()); + setGuidance(destModel.getGuidance()); + setCheckId(destModel.getCheckId()); + setMyqpxWeek(destModel.getMyqpxWeek()); + setMyqpxHb(destModel.getMyqpxHb()); + + //铁剂治疗 + setTjzl(destModel.getTjzl()); + //母乳喂养情况 + String getMrwyHistory = ""; + try { + if (destModel.getMrwyHistory()!=null ) { + Map map = destModel.getMrwyHistory(); + + 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"); + if (bfmr) { + getMrwyHistory += " 部分母乳,"; + } + boolean pfn = map.get("pfn") == null ? false : (boolean)map.get("pfn"); + if (pfn) { + getMrwyHistory += " 配方奶,"; + } + getMrwyHistory = FunvCommonUtil.spitd(getMrwyHistory); + + } + } catch (Exception e) { + e.printStackTrace(); + } + setMrwyHistory(destModel.getMrwyHistory()); + setMrwyHistoryStr(getMrwyHistory); + + setKstjhtswage(destModel.getKstjhtswage()); + setJwhbqk(destModel.getJwhbqk()); + setHb(destModel.getHb()); + setTreatment(destModel.getTreatment()); + setMyqbrq(destModel.getMyqbrq()); + + + setVitd(destModel.getVitd()); + //体征 + String getTiz = ""; + try { + if (destModel.getTiz()!=null ) { + Map map = destModel.getTiz(); + + 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"); + if (lgcz) { + getTiz += " 肋骨串珠,"; + } + 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"); + if (jxk) { + getTiz += " 鸡胸,"; + } + 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"); + if (xxt) { + getTiz += " X型腿,"; + } + boolean oxtk = map.get("oxtk") == null ? false : (boolean)map.get("oxtk"); + if (oxtk) { + getTiz += " O型腿,"; + } + getTiz = FunvCommonUtil.spitd(getTiz); + + } + } catch (Exception e) { + e.printStackTrace(); + } + setTiz(destModel.getTiz()); + setTizStr(getTiz); + + setBloodCheck(destModel.getBloodCheck()); + setXxCheck(destModel.getXxCheck()); + setHwhdDate(destModel.getHwhdDate()); + setVitdzl(destModel.getVitdzl()); + + setXgCheck(destModel.getXgCheck()); + setXlCheck(destModel.getXlCheck()); + setXlakpCheck(destModel.getXlakpCheck()); + setXlohdCheck(destModel.getXlohdCheck()); + + return this; + } } -- 1.8.3.1