diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/NutritionSpecialtyEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/NutritionSpecialtyEnums.java new file mode 100644 index 0000000..ca8bf1c --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/NutritionSpecialtyEnums.java @@ -0,0 +1,63 @@ +package com.lyms.platform.common.enums; + +import com.lyms.platform.common.utils.StringUtils; + +/** + * 营养专科项目 查询条件 + */ +public enum NutritionSpecialtyEnums { + + dbznl("dbznl", "蛋白质-能量营养不良儿童检查"), + pxet("pxet", "贫血儿童检查"), + jlbet("jlbet", "佝偻病儿童检查"), + fpetjc("fpetjc", "肥胖儿童检查"); + + + private String id; + private String name; + + public static NutritionSpecialtyEnums get(String id) { + NutritionSpecialtyEnums[] values = NutritionSpecialtyEnums.values(); + for (NutritionSpecialtyEnums value : values) { + if (value.getId().equals(id)) { + return value; + } + } + return null; + } + + public static String getName(String id) { + if(StringUtils.isEmpty(id)) { + return null; + } + NutritionSpecialtyEnums[] values = NutritionSpecialtyEnums.values(); + for (NutritionSpecialtyEnums value : values) { + if (value.id.equals(id)) { + return value.name; + } + } + return null; + } + + NutritionSpecialtyEnums(String id, String name){ + this.id = id; + this.name = name; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + +} diff --git a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java index ad3cf8f..3f8b016 100644 --- a/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java +++ b/platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java @@ -19,6 +19,7 @@ public enum SerialIdEnum { BabyCheckModel("BabyCheckModel", 97531000070L), BabySpecialDiseaseClinicModel("BabySpecialDiseaseClinicModel", -3921222841669886929L), BabyPsychologistModel("BabyPsychologistModel", -2259889579698922924L), + BabyNutritionSpecialtyModel("BabyNutritionSpecialtyModel", 3787637966909666630L), BabyModel("BabyModel", 97531000080L), Records("records", 97531000081L), Baby("Baby", 97531000081L), 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 7407819..ffda81c 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 @@ -5,6 +5,7 @@ import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; +import java.util.Map; /** * 营养专科检查 实体类 @@ -14,7 +15,7 @@ import java.util.Date; */ @Document(collection = "lyms_baby_nutrition_specialty") public class BabyNutritionSpecialtyModel extends BaseModel { - private static final long serialVersionUID = SerialIdEnum.BabyPsychologistModel.getCid(); + private static final long serialVersionUID = SerialIdEnum.BabyNutritionSpecialtyModel.getCid(); /*基础信息*/ private String id; @@ -62,10 +63,302 @@ public class BabyNutritionSpecialtyModel extends BaseModel { //下次预约 private Date nextDate; - public static long getSerialVersionUID() { - return serialVersionUID; + //1是 2否 结案 + private String caseClosed; + //结案日期 + private Date cCDate; + //结案 转归 1痊愈□ 2好转□ 3转院□ 4失访□ + private String cCOutcome; + + /*新增页面 4个页面内容*/ + //开始管理日期 + private String startMdate; + //出生史true是选中 默认是false。 zc:true 早产 dcstz:true 低出生体重 dt:true多胎 jdy:true 巨大婴 + private Map birthHistory; + //6个月内喂养史 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□ + private Map feedingHistory6; + //开始食物转换年龄 + private String foodToAge; + //既往患病情况 + private String situation; + //身高 + private String height; + //体重 + private String weight; + //评估 + private String assess; + //存在问题 + private String problem; + //指导 + private String guidance; + //检查者(检查医生id) + private String checkId; + //母孕期贫血情况：孕周 + private String myqpxWeek; + //母孕期贫血情况：Hb + private String myqpxHb; + //铁剂治疗 wu:true 无 you:true 有 yw:药物 jl:剂量 lc:疗程 + private Map tjzl; + //母乳喂养情况 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□ + private Map mrwyHistory; + //儿童开始添加含铁食物年龄 + private String kstjhtswage; + //儿童既往患病情况 + private String jwhbqk; + //Hb（g/L） + private String hb; + //治疗（药物、剂量） + private String treatment; + //母孕期和哺乳期 wbc:true rzbz:true xzjl:true + private Map myqbrq; + //儿童服用VitD wu:true 无 you:true 有 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; + //血液检查 + private String bloodCheck; + //X线检查 + private String xxCheck; + //户外活动时间（小时/日） + private String hwhdDate; + //VitD治疗（品名、剂量） + private String vitdzl; + + + public String getCaseClosed() { + return caseClosed; + } + + public void setCaseClosed(String caseClosed) { + this.caseClosed = caseClosed; + } + + public Date getcCDate() { + return cCDate; + } + + public void setcCDate(Date cCDate) { + this.cCDate = cCDate; + } + + public String getcCOutcome() { + return cCOutcome; + } + + public void setcCOutcome(String cCOutcome) { + this.cCOutcome = cCOutcome; + } + + public String getStartMdate() { + return startMdate; + } + + public void setStartMdate(String startMdate) { + this.startMdate = startMdate; + } + + public Map getBirthHistory() { + return birthHistory; + } + + public void setBirthHistory(Map birthHistory) { + this.birthHistory = birthHistory; + } + + public Map getFeedingHistory6() { + return feedingHistory6; + } + + public void setFeedingHistory6(Map feedingHistory6) { + this.feedingHistory6 = feedingHistory6; + } + + public String getFoodToAge() { + return foodToAge; + } + + public void setFoodToAge(String foodToAge) { + this.foodToAge = foodToAge; + } + + public String getSituation() { + return situation; + } + + public void setSituation(String situation) { + this.situation = situation; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String getAssess() { + return assess; + } + + public void setAssess(String assess) { + this.assess = assess; + } + + public String getProblem() { + return problem; + } + + public void setProblem(String problem) { + this.problem = problem; + } + + public String getGuidance() { + return guidance; + } + + public void setGuidance(String guidance) { + this.guidance = guidance; + } + + public String getCheckId() { + return checkId; + } + + public void setCheckId(String checkId) { + this.checkId = checkId; + } + + public String getMyqpxWeek() { + return myqpxWeek; + } + + public void setMyqpxWeek(String myqpxWeek) { + this.myqpxWeek = myqpxWeek; + } + + public String getMyqpxHb() { + return myqpxHb; + } + + public void setMyqpxHb(String myqpxHb) { + this.myqpxHb = myqpxHb; + } + + public Map getTjzl() { + return tjzl; + } + + public void setTjzl(Map tjzl) { + this.tjzl = tjzl; + } + + public Map getMrwyHistory() { + return mrwyHistory; + } + + public void setMrwyHistory(Map mrwyHistory) { + this.mrwyHistory = mrwyHistory; + } + + public String getKstjhtswage() { + return kstjhtswage; + } + + public void setKstjhtswage(String kstjhtswage) { + this.kstjhtswage = kstjhtswage; + } + + public String getJwhbqk() { + return jwhbqk; + } + + public void setJwhbqk(String jwhbqk) { + this.jwhbqk = jwhbqk; + } + + public String getHb() { + return hb; + } + + public void setHb(String hb) { + this.hb = hb; + } + + public String getTreatment() { + return treatment; + } + + public void setTreatment(String treatment) { + this.treatment = treatment; + } + + public Map getMyqbrq() { + return myqbrq; } + public void setMyqbrq(Map myqbrq) { + this.myqbrq = myqbrq; + } + + public Map getVitd() { + return vitd; + } + + public void setVitd(Map vitd) { + this.vitd = vitd; + } + + public Map getTiz() { + return tiz; + } + + public void setTiz(Map tiz) { + this.tiz = tiz; + } + + public String getBloodCheck() { + return bloodCheck; + } + + public void setBloodCheck(String bloodCheck) { + this.bloodCheck = bloodCheck; + } + + public String getXxCheck() { + return xxCheck; + } + + public void setXxCheck(String xxCheck) { + this.xxCheck = xxCheck; + } + + public String getHwhdDate() { + return hwhdDate; + } + + public void setHwhdDate(String hwhdDate) { + this.hwhdDate = hwhdDate; + } + + public String getVitdzl() { + return vitdzl; + } + + public void setVitdzl(String vitdzl) { + this.vitdzl = vitdzl; + } + + + public String getId() { return id; } @@ -242,7 +535,7 @@ public class BabyNutritionSpecialtyModel extends BaseModel { this.nextDate = nextDate; } - /*新增页面 4个页面内容*/ + diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java index 6bebddd..96ab79c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java @@ -45,8 +45,40 @@ public class BabyNutritionSpecialtyModelQuery extends BaseQuery implements IConv private Date checkDateStart; private Date checkDateEnd; + // 结案日期 + private Date cCDateStart; + private Date cCDateEnd; + + //结案 转归 1痊愈□ 2好转□ 3转院□ 4失访□ + private String cCOutcome; + private String sort; + + public String getcCOutcome() { + return cCOutcome; + } + + public void setcCOutcome(String cCOutcome) { + this.cCOutcome = cCOutcome; + } + + public Date getcCDateStart() { + return cCDateStart; + } + + public void setcCDateStart(Date cCDateStart) { + this.cCDateStart = cCDateStart; + } + + public Date getcCDateEnd() { + return cCDateEnd; + } + + public void setcCDateEnd(Date cCDateEnd) { + this.cCDateEnd = cCDateEnd; + } + @Override public String getSort() { return sort; @@ -217,7 +249,10 @@ public class BabyNutritionSpecialtyModelQuery extends BaseQuery implements IConv if (null != yyProject) { condition = condition.and("yyProject", yyProject, MongoOper.IS); } - + //结案 转归 1痊愈□ 2好转□ 3转院□ 4失访□ + if (null != cCOutcome) { + condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS); + } Criteria c = null; //月龄 @@ -292,6 +327,24 @@ public class BabyNutritionSpecialtyModelQuery extends BaseQuery implements IConv c = Criteria.where("checkDate").lte(checkDateEnd); } } + //结案日期 + if (null != cCDateStart) { + if (null != c) { + c = c.and("cCDate").gte(cCDateStart); + } else { + c = Criteria.where("cCDate").gte(cCDateStart ); + } + } + if (null != cCDateEnd) { + if (null != c) { + c = c.lte(cCDateEnd); + } else { + c = Criteria.where("cCDate").lte(cCDateEnd); + } + } + + + // 查询号 if (StringUtils.isNotEmpty(queryNo)) { MongoCondition c1 = MongoCondition.newInstance(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionSpecialtyController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionSpecialtyController.java index 1aac64f..6cd8c49 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionSpecialtyController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionSpecialtyController.java @@ -94,7 +94,12 @@ public class BabyNutritionSpecialtyController extends BaseController { /** * 查询单人所有营养专科检查记录 - * + * buildId + * yyProject + * dbznl("dbznl", "蛋白质-能量营养不良儿童检查"), + * pxet("pxet", "贫血儿童检查"), + * jlbet("jlbet", "佝偻病儿童检查"), + * fpetjc("fpetjc", "肥胖儿童检查"); * @param */ @RequestMapping(value = "/queryOne", method = RequestMethod.GET) 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 a9cb2f9..c29b1eb 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 @@ -94,11 +94,36 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { model.setCheckMonth(request.getCheckMonth());//检查月龄 前端传入 2月龄28天 model.setCheckDoctor(request.getCheckDoctor()); model.setNextDate(DateUtil.parseYMD(request.getNextDate())); - /*新增页面 4个页面内容*/ - - - + model.setCaseClosed(request.getCaseClosed()); + model.setcCDate(DateUtil.parseYMD(request.getcCDate())); + model.setcCOutcome(request.getcCOutcome()); + model.setStartMdate(request.getStartMdate()); + model.setBirthHistory(request.getBirthHistory()); + model.setFeedingHistory6(request.getFeedingHistory6()); + model.setFoodToAge(request.getFoodToAge()); + model.setSituation(request.getSituation()); + model.setHeight(request.getHeight()); + model.setWeight(request.getWeight()); + model.setAssess(request.getAssess()); + model.setProblem(request.getProblem()); + model.setGuidance(request.getGuidance()); + model.setCheckId(request.getCheckId()); + model.setMyqpxWeek(request.getMyqpxWeek()); + model.setMyqpxHb(request.getMyqpxHb()); + model.setTjzl(request.getTjzl()); + model.setMrwyHistory(request.getMrwyHistory()); + model.setKstjhtswage(request.getKstjhtswage()); + model.setJwhbqk(request.getJwhbqk()); + model.setHb(request.getHb()); + model.setTreatment(request.getTreatment()); + model.setMyqbrq(request.getMyqbrq()); + model.setVitd(request.getVitd()); + model.setTiz(request.getTiz()); + model.setBloodCheck(request.getBloodCheck()); + model.setXxCheck(request.getXxCheck()); + model.setHwhdDate(request.getHwhdDate()); + model.setVitdzl(request.getVitdzl()); return model; @@ -244,10 +269,10 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { List babyNutritionSpecialtyResults = new ArrayList<>(); //单人多条专病记录 List babyNutritionSpecialtyModelList = new ArrayList<>(); - if( StringUtils.isNotEmpty(babyQuery.getBuildId()) ){ + if( StringUtils.isNotEmpty(babyQuery.getBuildId()) || StringUtils.isNotEmpty(babyQuery.getYyProject())){ babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); - babyQuery.setSort("ASC"); + babyQuery.setSort("checkDate"); babyNutritionSpecialtyModelList = babyBabyNSService.queryOne(babyQuery); } @@ -289,8 +314,7 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { babyQuery.setNeed("true"); babyQuery.setYn(YnEnums.YES.getId()); babyQuery.setHospitalId(hospitalId); - babyQuery.setSort(null); - + babyQuery.setSort("createDate"); if(babyQuery.getCheckDateEnd()!=null){ babyQuery.setCheckDateEnd(DateUtil.getDayLastSecond(babyQuery.getCheckDateEnd())); } @@ -300,6 +324,10 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { if(babyQuery.getBirthEnd()!=null){ babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd())); } + if(babyQuery.getcCDateEnd()!=null){ + babyQuery.setcCDateEnd(DateUtil.getDayLastSecond(babyQuery.getcCDateEnd())); + } + babyNutritionSpecialtyModelList = babyBabyNSService.queryAll(babyQuery); System.out.println(babyQuery.convertToQuery().convertToMongoQuery()); } 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 e8bdeaa..133773f 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 @@ -3,6 +3,9 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.FormParam; import org.hibernate.validator.constraints.NotEmpty; +import java.util.Date; +import java.util.Map; + /** * 营养专科 入参类 * @@ -62,6 +65,300 @@ public class BabyNutritionSpecialtyRequest { //下次预约 private String nextDate; + //1是 2否 结案 + private String caseClosed; + //结案日期 + private String cCDate; + //结案 转归 1痊愈□ 2好转□ 3转院□ 4失访□ + private String cCOutcome; + /*新增页面 4个页面内容*/ + + //开始管理日期 + private String startMdate; + //出生史true是选中 默认是false。 zc:true 早产 dcstz:true 低出生体重 dt:true多胎 jdy:true 巨大婴 + private Map birthHistory; + //6个月内喂养史 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□ + private Map feedingHistory6; + //开始食物转换年龄 + private String foodToAge; + //既往患病情况 + private String situation; + //身高 + private String height; + //体重 + private String weight; + //评估 + private String assess; + //存在问题 + private String problem; + //指导 + private String guidance; + //检查者(检查医生id) + private String checkId; + //母孕期贫血情况：孕周 + private String myqpxWeek; + //母孕期贫血情况：Hb + private String myqpxHb; + //铁剂治疗 wu:true 无 you:true 有 yw:药物 jl:剂量 lc:疗程 + private Map tjzl; + //母乳喂养情况 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□ + private Map mrwyHistory; + //儿童开始添加含铁食物年龄 + private String kstjhtswage; + //儿童既往患病情况 + private String jwhbqk; + //Hb（g/L） + private String hb; + //治疗（药物、剂量） + private String treatment; + //母孕期和哺乳期 wbc:true rzbz:true xzjl:true + private Map myqbrq; + //儿童服用VitD wu:true 无 you:true 有 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; + //血液检查 + private String bloodCheck; + //X线检查 + private String xxCheck; + //户外活动时间（小时/日） + private String hwhdDate; + //VitD治疗（品名、剂量） + private String vitdzl; + + + public String getCaseClosed() { + return caseClosed; + } + + public void setCaseClosed(String caseClosed) { + this.caseClosed = caseClosed; + } + + public String getcCDate() { + return cCDate; + } + + public void setcCDate(String cCDate) { + this.cCDate = cCDate; + } + + public String getcCOutcome() { + return cCOutcome; + } + + public void setcCOutcome(String cCOutcome) { + this.cCOutcome = cCOutcome; + } + + public String getStartMdate() { + return startMdate; + } + + public void setStartMdate(String startMdate) { + this.startMdate = startMdate; + } + + public Map getBirthHistory() { + return birthHistory; + } + + public void setBirthHistory(Map birthHistory) { + this.birthHistory = birthHistory; + } + + public Map getFeedingHistory6() { + return feedingHistory6; + } + + public void setFeedingHistory6(Map feedingHistory6) { + this.feedingHistory6 = feedingHistory6; + } + + public String getFoodToAge() { + return foodToAge; + } + + public void setFoodToAge(String foodToAge) { + this.foodToAge = foodToAge; + } + + public String getSituation() { + return situation; + } + + public void setSituation(String situation) { + this.situation = situation; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String getAssess() { + return assess; + } + + public void setAssess(String assess) { + this.assess = assess; + } + + public String getProblem() { + return problem; + } + + public void setProblem(String problem) { + this.problem = problem; + } + + public String getGuidance() { + return guidance; + } + + public void setGuidance(String guidance) { + this.guidance = guidance; + } + + public String getCheckId() { + return checkId; + } + + public void setCheckId(String checkId) { + this.checkId = checkId; + } + + public String getMyqpxWeek() { + return myqpxWeek; + } + + public void setMyqpxWeek(String myqpxWeek) { + this.myqpxWeek = myqpxWeek; + } + + public String getMyqpxHb() { + return myqpxHb; + } + + public void setMyqpxHb(String myqpxHb) { + this.myqpxHb = myqpxHb; + } + + public Map getTjzl() { + return tjzl; + } + + public void setTjzl(Map tjzl) { + this.tjzl = tjzl; + } + + public Map getMrwyHistory() { + return mrwyHistory; + } + + public void setMrwyHistory(Map mrwyHistory) { + this.mrwyHistory = mrwyHistory; + } + + public String getKstjhtswage() { + return kstjhtswage; + } + + public void setKstjhtswage(String kstjhtswage) { + this.kstjhtswage = kstjhtswage; + } + + public String getJwhbqk() { + return jwhbqk; + } + + public void setJwhbqk(String jwhbqk) { + this.jwhbqk = jwhbqk; + } + + public String getHb() { + return hb; + } + + public void setHb(String hb) { + this.hb = hb; + } + + public String getTreatment() { + return treatment; + } + + public void setTreatment(String treatment) { + this.treatment = treatment; + } + + public Map getMyqbrq() { + return myqbrq; + } + + public void setMyqbrq(Map myqbrq) { + this.myqbrq = myqbrq; + } + + public Map getVitd() { + return vitd; + } + + public void setVitd(Map vitd) { + this.vitd = vitd; + } + + public Map getTiz() { + return tiz; + } + + public void setTiz(Map tiz) { + this.tiz = tiz; + } + + public String getBloodCheck() { + return bloodCheck; + } + + public void setBloodCheck(String bloodCheck) { + this.bloodCheck = bloodCheck; + } + + public String getXxCheck() { + return xxCheck; + } + + public void setXxCheck(String xxCheck) { + this.xxCheck = xxCheck; + } + + public String getHwhdDate() { + return hwhdDate; + } + + public void setHwhdDate(String hwhdDate) { + this.hwhdDate = hwhdDate; + } + + public String getVitdzl() { + return vitdzl; + } + + public void setVitdzl(String vitdzl) { + this.vitdzl = vitdzl; + } + public String getId() { return id; } @@ -237,6 +534,6 @@ public class BabyNutritionSpecialtyRequest { public void setNextDate(String nextDate) { this.nextDate = nextDate; } - /*新增页面 4个页面内容*/ + } 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 16bd50d..4c34114 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 @@ -7,6 +7,7 @@ import com.lyms.platform.pojo.BabyNutritionSpecialtyModel; import com.lyms.platform.pojo.BabyPsychologistModel; import java.util.Date; +import java.util.Map; public class BabyNutritionSpecialtyResult implements IBasicResultConvert { @@ -56,6 +57,300 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert birthHistory; + //6个月内喂养史 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□ + private Map feedingHistory6; + //开始食物转换年龄 + private String foodToAge; + //既往患病情况 + private String situation; + //身高 + private String height; + //体重 + private String weight; + //评估 + private String assess; + //存在问题 + private String problem; + //指导 + private String guidance; + //检查者(检查医生id) + private String checkId; + //母孕期贫血情况：孕周 + private String myqpxWeek; + //母孕期贫血情况：Hb + private String myqpxHb; + //铁剂治疗 wu:true 无 you:true 有 yw:药物 jl:剂量 lc:疗程 + private Map tjzl; + //母乳喂养情况 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□ + private Map mrwyHistory; + //儿童开始添加含铁食物年龄 + private String kstjhtswage; + //儿童既往患病情况 + private String jwhbqk; + //Hb（g/L） + private String hb; + //治疗（药物、剂量） + private String treatment; + //母孕期和哺乳期 wbc:true rzbz:true xzjl:true + private Map myqbrq; + //儿童服用VitD wu:true 无 you:true 有 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; + //血液检查 + private String bloodCheck; + //X线检查 + private String xxCheck; + //户外活动时间（小时/日） + private String hwhdDate; + //VitD治疗（品名、剂量） + private String vitdzl; + + + public String getCaseClosed() { + return caseClosed; + } + + public void setCaseClosed(String caseClosed) { + this.caseClosed = caseClosed; + } + + public String getcCDate() { + return cCDate; + } + + public void setcCDate(String cCDate) { + this.cCDate = cCDate; + } + + public String getcCOutcome() { + return cCOutcome; + } + + public void setcCOutcome(String cCOutcome) { + this.cCOutcome = cCOutcome; + } + + public String getStartMdate() { + return startMdate; + } + + public void setStartMdate(String startMdate) { + this.startMdate = startMdate; + } + + public Map getBirthHistory() { + return birthHistory; + } + + public void setBirthHistory(Map birthHistory) { + this.birthHistory = birthHistory; + } + + public Map getFeedingHistory6() { + return feedingHistory6; + } + + public void setFeedingHistory6(Map feedingHistory6) { + this.feedingHistory6 = feedingHistory6; + } + + public String getFoodToAge() { + return foodToAge; + } + + public void setFoodToAge(String foodToAge) { + this.foodToAge = foodToAge; + } + + public String getSituation() { + return situation; + } + + public void setSituation(String situation) { + this.situation = situation; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String getAssess() { + return assess; + } + + public void setAssess(String assess) { + this.assess = assess; + } + + public String getProblem() { + return problem; + } + + public void setProblem(String problem) { + this.problem = problem; + } + + public String getGuidance() { + return guidance; + } + + public void setGuidance(String guidance) { + this.guidance = guidance; + } + + public String getCheckId() { + return checkId; + } + + public void setCheckId(String checkId) { + this.checkId = checkId; + } + + public String getMyqpxWeek() { + return myqpxWeek; + } + + public void setMyqpxWeek(String myqpxWeek) { + this.myqpxWeek = myqpxWeek; + } + + public String getMyqpxHb() { + return myqpxHb; + } + + public void setMyqpxHb(String myqpxHb) { + this.myqpxHb = myqpxHb; + } + + public Map getTjzl() { + return tjzl; + } + + public void setTjzl(Map tjzl) { + this.tjzl = tjzl; + } + + public Map getMrwyHistory() { + return mrwyHistory; + } + + public void setMrwyHistory(Map mrwyHistory) { + this.mrwyHistory = mrwyHistory; + } + + public String getKstjhtswage() { + return kstjhtswage; + } + + public void setKstjhtswage(String kstjhtswage) { + this.kstjhtswage = kstjhtswage; + } + + public String getJwhbqk() { + return jwhbqk; + } + + public void setJwhbqk(String jwhbqk) { + this.jwhbqk = jwhbqk; + } + + public String getHb() { + return hb; + } + + public void setHb(String hb) { + this.hb = hb; + } + + public String getTreatment() { + return treatment; + } + + public void setTreatment(String treatment) { + this.treatment = treatment; + } + + public Map getMyqbrq() { + return myqbrq; + } + + public void setMyqbrq(Map myqbrq) { + this.myqbrq = myqbrq; + } + + public Map getVitd() { + return vitd; + } + + public void setVitd(Map vitd) { + this.vitd = vitd; + } + + public Map getTiz() { + return tiz; + } + + public void setTiz(Map tiz) { + this.tiz = tiz; + } + + public String getBloodCheck() { + return bloodCheck; + } + + public void setBloodCheck(String bloodCheck) { + this.bloodCheck = bloodCheck; + } + + public String getXxCheck() { + return xxCheck; + } + + public void setXxCheck(String xxCheck) { + this.xxCheck = xxCheck; + } + + public String getHwhdDate() { + return hwhdDate; + } + + public void setHwhdDate(String hwhdDate) { + this.hwhdDate = hwhdDate; + } + + public String getVitdzl() { + return vitdzl; + } + + public void setVitdzl(String vitdzl) { + this.vitdzl = vitdzl; + } + public String getId() { return id; } @@ -273,7 +568,35 @@ public class BabyNutritionSpecialtyResult implements IBasicResultConvert> checkMonthQhdEnums = EnumUtil.toJson(CheckMonthQhdEnums.class); /** (检查时间 */ List> checkMonthQhdBTGEnums = EnumUtil.toJson(CheckMonthQhdBTGEnums.class); /** 不通过 */ List> psychologistEnums = EnumUtil.toJson(PsychologistEnums.class); /** 心理专科项目 */ + List> nutritionSpecialtyEnums = EnumUtil.toJson(NutritionSpecialtyEnums.class); /** 营养专科项目 */ List> positive = new ArrayList<>(); /** 阳性项目 */ if ("197".equals(hospitalId)) { @@ -1881,7 +1882,8 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC } - return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth, "checkMonthQhdEnums", checkMonthQhdEnums, "checkMonthQhdBTGEnums", checkMonthQhdBTGEnums,"psychologistEnums",psychologistEnums); + return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth, "checkMonthQhdEnums", checkMonthQhdEnums, "checkMonthQhdBTGEnums", + checkMonthQhdBTGEnums,"psychologistEnums",psychologistEnums,"nutritionSpecialtyEnums",nutritionSpecialtyEnums); } @Override