jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 7aa2a61fd443b8cf8cc100faaf25ee56247f6833

Authored by wtt
1 parent 26114f0e9a
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 9 changed files with 1082 additions and 17 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/NutritionSpecialtyEnums.java View file @ 7aa2a61
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +import com.lyms.platform.common.utils.StringUtils;
  4 +
  5 +/**
  6 + * 营养专科项目 查询条件
  7 + */
  8 +public enum NutritionSpecialtyEnums {
  9 +
  10 + dbznl("dbznl", "蛋白质-能量营养不良儿童检查"),
  11 + pxet("pxet", "贫血儿童检查"),
  12 + jlbet("jlbet", "佝偻病儿童检查"),
  13 + fpetjc("fpetjc", "肥胖儿童检查");
  14 +
  15 +
  16 + private String id;
  17 + private String name;
  18 +
  19 + public static NutritionSpecialtyEnums get(String id) {
  20 + NutritionSpecialtyEnums[] values = NutritionSpecialtyEnums.values();
  21 + for (NutritionSpecialtyEnums value : values) {
  22 + if (value.getId().equals(id)) {
  23 + return value;
  24 + }
  25 + }
  26 + return null;
  27 + }
  28 +
  29 + public static String getName(String id) {
  30 + if(StringUtils.isEmpty(id)) {
  31 + return null;
  32 + }
  33 + NutritionSpecialtyEnums[] values = NutritionSpecialtyEnums.values();
  34 + for (NutritionSpecialtyEnums value : values) {
  35 + if (value.id.equals(id)) {
  36 + return value.name;
  37 + }
  38 + }
  39 + return null;
  40 + }
  41 +
  42 + NutritionSpecialtyEnums(String id, String name){
  43 + this.id = id;
  44 + this.name = name;
  45 + }
  46 +
  47 + public String getId() {
  48 + return id;
  49 + }
  50 +
  51 + public void setId(String id) {
  52 + this.id = id;
  53 + }
  54 +
  55 + public String getName() {
  56 + return name;
  57 + }
  58 +
  59 + public void setName(String name) {
  60 + this.name = name;
  61 + }
  62 +
  63 +}
platform-dal/src/main/java/com/lyms/platform/beans/SerialIdEnum.java View file @ 7aa2a61
... ... @@ -19,6 +19,7 @@
19 19 BabyCheckModel("BabyCheckModel", 97531000070L),
20 20 BabySpecialDiseaseClinicModel("BabySpecialDiseaseClinicModel", -3921222841669886929L),
21 21 BabyPsychologistModel("BabyPsychologistModel", -2259889579698922924L),
  22 + BabyNutritionSpecialtyModel("BabyNutritionSpecialtyModel", 3787637966909666630L),
22 23 BabyModel("BabyModel", 97531000080L),
23 24 Records("records", 97531000081L),
24 25 Baby("Baby", 97531000081L),
platform-dal/src/main/java/com/lyms/platform/pojo/BabyNutritionSpecialtyModel.java View file @ 7aa2a61
... ... @@ -5,6 +5,7 @@
5 5 import org.springframework.data.mongodb.core.mapping.Document;
6 6  
7 7 import java.util.Date;
  8 +import java.util.Map;
8 9  
9 10 /**
10 11 * 营养专科检查 实体类
... ... @@ -14,7 +15,7 @@
14 15 */
15 16 @Document(collection = "lyms_baby_nutrition_specialty")
16 17 public class BabyNutritionSpecialtyModel extends BaseModel {
17   - private static final long serialVersionUID = SerialIdEnum.BabyPsychologistModel.getCid();
  18 + private static final long serialVersionUID = SerialIdEnum.BabyNutritionSpecialtyModel.getCid();
18 19  
19 20 /*基础信息*/
20 21 private String id;
21 22  
... ... @@ -62,10 +63,302 @@
62 63 //下次预约
63 64 private Date nextDate;
64 65  
65   - public static long getSerialVersionUID() {
66   - return serialVersionUID;
  66 + //1是 2否 结案
  67 + private String caseClosed;
  68 + //结案日期
  69 + private Date cCDate;
  70 + //结案 转归 1痊愈□ 2好转□ 3转院□ 4失访□
  71 + private String cCOutcome;
  72 +
  73 + /*新增页面 4个页面内容*/
  74 + //开始管理日期
  75 + private String startMdate;
  76 + //出生史true是选中 默认是false。 zc:true 早产 dcstz:true 低出生体重 dt:true多胎 jdy:true 巨大婴
  77 + private Map<String, Object> birthHistory;
  78 + //6个月内喂养史 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□
  79 + private Map<String, Object> feedingHistory6;
  80 + //开始食物转换年龄
  81 + private String foodToAge;
  82 + //既往患病情况
  83 + private String situation;
  84 + //身高
  85 + private String height;
  86 + //体重
  87 + private String weight;
  88 + //评估
  89 + private String assess;
  90 + //存在问题
  91 + private String problem;
  92 + //指导
  93 + private String guidance;
  94 + //检查者(检查医生id)
  95 + private String checkId;
  96 + //母孕期贫血情况：孕周
  97 + private String myqpxWeek;
  98 + //母孕期贫血情况：Hb
  99 + private String myqpxHb;
  100 + //铁剂治疗 wu:true 无 you:true 有 yw:药物 jl:剂量 lc:疗程
  101 + private Map<String, Object> tjzl;
  102 + //母乳喂养情况 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□
  103 + private Map<String, Object> mrwyHistory;
  104 + //儿童开始添加含铁食物年龄
  105 + private String kstjhtswage;
  106 + //儿童既往患病情况
  107 + private String jwhbqk;
  108 + //Hb（g/L）
  109 + private String hb;
  110 + //治疗（药物、剂量）
  111 + private String treatment;
  112 + //母孕期和哺乳期 wbc:true rzbz:true xzjl:true
  113 + private Map<String, Object> myqbrq;
  114 + //儿童服用VitD wu:true 无 you:true 有 month:月 day:天 pm:品名 jl:剂量
  115 + private Map<String, Object> vitd;
  116 + //体征 fl:true 方颅□ lgcz:true 肋骨串珠□ lrggk:true 肋软骨沟□ jxk:true 鸡胸□ szk:true 手(足)镯□ xxt:true X型腿□ oxtk:true O型腿□
  117 + private Map<String, Object> tiz;
  118 + //血液检查
  119 + private String bloodCheck;
  120 + //X线检查
  121 + private String xxCheck;
  122 + //户外活动时间（小时/日）
  123 + private String hwhdDate;
  124 + //VitD治疗（品名、剂量）
  125 + private String vitdzl;
  126 +
  127 +
  128 + public String getCaseClosed() {
  129 + return caseClosed;
67 130 }
68 131  
  132 + public void setCaseClosed(String caseClosed) {
  133 + this.caseClosed = caseClosed;
  134 + }
  135 +
  136 + public Date getcCDate() {
  137 + return cCDate;
  138 + }
  139 +
  140 + public void setcCDate(Date cCDate) {
  141 + this.cCDate = cCDate;
  142 + }
  143 +
  144 + public String getcCOutcome() {
  145 + return cCOutcome;
  146 + }
  147 +
  148 + public void setcCOutcome(String cCOutcome) {
  149 + this.cCOutcome = cCOutcome;
  150 + }
  151 +
  152 + public String getStartMdate() {
  153 + return startMdate;
  154 + }
  155 +
  156 + public void setStartMdate(String startMdate) {
  157 + this.startMdate = startMdate;
  158 + }
  159 +
  160 + public Map<String, Object> getBirthHistory() {
  161 + return birthHistory;
  162 + }
  163 +
  164 + public void setBirthHistory(Map<String, Object> birthHistory) {
  165 + this.birthHistory = birthHistory;
  166 + }
  167 +
  168 + public Map<String, Object> getFeedingHistory6() {
  169 + return feedingHistory6;
  170 + }
  171 +
  172 + public void setFeedingHistory6(Map<String, Object> feedingHistory6) {
  173 + this.feedingHistory6 = feedingHistory6;
  174 + }
  175 +
  176 + public String getFoodToAge() {
  177 + return foodToAge;
  178 + }
  179 +
  180 + public void setFoodToAge(String foodToAge) {
  181 + this.foodToAge = foodToAge;
  182 + }
  183 +
  184 + public String getSituation() {
  185 + return situation;
  186 + }
  187 +
  188 + public void setSituation(String situation) {
  189 + this.situation = situation;
  190 + }
  191 +
  192 + public String getHeight() {
  193 + return height;
  194 + }
  195 +
  196 + public void setHeight(String height) {
  197 + this.height = height;
  198 + }
  199 +
  200 + public String getWeight() {
  201 + return weight;
  202 + }
  203 +
  204 + public void setWeight(String weight) {
  205 + this.weight = weight;
  206 + }
  207 +
  208 + public String getAssess() {
  209 + return assess;
  210 + }
  211 +
  212 + public void setAssess(String assess) {
  213 + this.assess = assess;
  214 + }
  215 +
  216 + public String getProblem() {
  217 + return problem;
  218 + }
  219 +
  220 + public void setProblem(String problem) {
  221 + this.problem = problem;
  222 + }
  223 +
  224 + public String getGuidance() {
  225 + return guidance;
  226 + }
  227 +
  228 + public void setGuidance(String guidance) {
  229 + this.guidance = guidance;
  230 + }
  231 +
  232 + public String getCheckId() {
  233 + return checkId;
  234 + }
  235 +
  236 + public void setCheckId(String checkId) {
  237 + this.checkId = checkId;
  238 + }
  239 +
  240 + public String getMyqpxWeek() {
  241 + return myqpxWeek;
  242 + }
  243 +
  244 + public void setMyqpxWeek(String myqpxWeek) {
  245 + this.myqpxWeek = myqpxWeek;
  246 + }
  247 +
  248 + public String getMyqpxHb() {
  249 + return myqpxHb;
  250 + }
  251 +
  252 + public void setMyqpxHb(String myqpxHb) {
  253 + this.myqpxHb = myqpxHb;
  254 + }
  255 +
  256 + public Map<String, Object> getTjzl() {
  257 + return tjzl;
  258 + }
  259 +
  260 + public void setTjzl(Map<String, Object> tjzl) {
  261 + this.tjzl = tjzl;
  262 + }
  263 +
  264 + public Map<String, Object> getMrwyHistory() {
  265 + return mrwyHistory;
  266 + }
  267 +
  268 + public void setMrwyHistory(Map<String, Object> mrwyHistory) {
  269 + this.mrwyHistory = mrwyHistory;
  270 + }
  271 +
  272 + public String getKstjhtswage() {
  273 + return kstjhtswage;
  274 + }
  275 +
  276 + public void setKstjhtswage(String kstjhtswage) {
  277 + this.kstjhtswage = kstjhtswage;
  278 + }
  279 +
  280 + public String getJwhbqk() {
  281 + return jwhbqk;
  282 + }
  283 +
  284 + public void setJwhbqk(String jwhbqk) {
  285 + this.jwhbqk = jwhbqk;
  286 + }
  287 +
  288 + public String getHb() {
  289 + return hb;
  290 + }
  291 +
  292 + public void setHb(String hb) {
  293 + this.hb = hb;
  294 + }
  295 +
  296 + public String getTreatment() {
  297 + return treatment;
  298 + }
  299 +
  300 + public void setTreatment(String treatment) {
  301 + this.treatment = treatment;
  302 + }
  303 +
  304 + public Map<String, Object> getMyqbrq() {
  305 + return myqbrq;
  306 + }
  307 +
  308 + public void setMyqbrq(Map<String, Object> myqbrq) {
  309 + this.myqbrq = myqbrq;
  310 + }
  311 +
  312 + public Map<String, Object> getVitd() {
  313 + return vitd;
  314 + }
  315 +
  316 + public void setVitd(Map<String, Object> vitd) {
  317 + this.vitd = vitd;
  318 + }
  319 +
  320 + public Map<String, Object> getTiz() {
  321 + return tiz;
  322 + }
  323 +
  324 + public void setTiz(Map<String, Object> tiz) {
  325 + this.tiz = tiz;
  326 + }
  327 +
  328 + public String getBloodCheck() {
  329 + return bloodCheck;
  330 + }
  331 +
  332 + public void setBloodCheck(String bloodCheck) {
  333 + this.bloodCheck = bloodCheck;
  334 + }
  335 +
  336 + public String getXxCheck() {
  337 + return xxCheck;
  338 + }
  339 +
  340 + public void setXxCheck(String xxCheck) {
  341 + this.xxCheck = xxCheck;
  342 + }
  343 +
  344 + public String getHwhdDate() {
  345 + return hwhdDate;
  346 + }
  347 +
  348 + public void setHwhdDate(String hwhdDate) {
  349 + this.hwhdDate = hwhdDate;
  350 + }
  351 +
  352 + public String getVitdzl() {
  353 + return vitdzl;
  354 + }
  355 +
  356 + public void setVitdzl(String vitdzl) {
  357 + this.vitdzl = vitdzl;
  358 + }
  359 +
  360 +
  361 +
69 362 public String getId() {
70 363 return id;
71 364 }
... ... @@ -242,7 +535,7 @@
242 535 this.nextDate = nextDate;
243 536 }
244 537  
245   - /*新增页面 4个页面内容*/
  538 +
246 539  
247 540  
248 541  
platform-dal/src/main/java/com/lyms/platform/query/BabyNutritionSpecialtyModelQuery.java View file @ 7aa2a61
... ... @@ -45,8 +45,40 @@
45 45 private Date checkDateStart;
46 46 private Date checkDateEnd;
47 47  
  48 + // 结案日期
  49 + private Date cCDateStart;
  50 + private Date cCDateEnd;
  51 +
  52 + //结案 转归 1痊愈□ 2好转□ 3转院□ 4失访□
  53 + private String cCOutcome;
  54 +
48 55 private String sort;
49 56  
  57 +
  58 + public String getcCOutcome() {
  59 + return cCOutcome;
  60 + }
  61 +
  62 + public void setcCOutcome(String cCOutcome) {
  63 + this.cCOutcome = cCOutcome;
  64 + }
  65 +
  66 + public Date getcCDateStart() {
  67 + return cCDateStart;
  68 + }
  69 +
  70 + public void setcCDateStart(Date cCDateStart) {
  71 + this.cCDateStart = cCDateStart;
  72 + }
  73 +
  74 + public Date getcCDateEnd() {
  75 + return cCDateEnd;
  76 + }
  77 +
  78 + public void setcCDateEnd(Date cCDateEnd) {
  79 + this.cCDateEnd = cCDateEnd;
  80 + }
  81 +
50 82 @Override
51 83 public String getSort() {
52 84 return sort;
53 85  
... ... @@ -217,8 +249,11 @@
217 249 if (null != yyProject) {
218 250 condition = condition.and("yyProject", yyProject, MongoOper.IS);
219 251 }
  252 + //结案 转归 1痊愈□ 2好转□ 3转院□ 4失访□
  253 + if (null != cCOutcome) {
  254 + condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS);
  255 + }
220 256  
221   -
222 257 Criteria c = null;
223 258 //月龄
224 259 /*if (null != monthStart) {
... ... @@ -292,6 +327,24 @@
292 327 c = Criteria.where("checkDate").lte(checkDateEnd);
293 328 }
294 329 }
  330 + //结案日期
  331 + if (null != cCDateStart) {
  332 + if (null != c) {
  333 + c = c.and("cCDate").gte(cCDateStart);
  334 + } else {
  335 + c = Criteria.where("cCDate").gte(cCDateStart );
  336 + }
  337 + }
  338 + if (null != cCDateEnd) {
  339 + if (null != c) {
  340 + c = c.lte(cCDateEnd);
  341 + } else {
  342 + c = Criteria.where("cCDate").lte(cCDateEnd);
  343 + }
  344 + }
  345 +
  346 +
  347 +
295 348 // 查询号
296 349 if (StringUtils.isNotEmpty(queryNo)) {
297 350 MongoCondition c1 = MongoCondition.newInstance();
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyNutritionSpecialtyController.java View file @ 7aa2a61
... ... @@ -94,7 +94,12 @@
94 94  
95 95 /**
96 96 * 查询单人所有营养专科检查记录
97   - *
  97 + * buildId
  98 + * yyProject
  99 + * dbznl("dbznl", "蛋白质-能量营养不良儿童检查"),
  100 + * pxet("pxet", "贫血儿童检查"),
  101 + * jlbet("jlbet", "佝偻病儿童检查"),
  102 + * fpetjc("fpetjc", "肥胖儿童检查");
98 103 * @param
99 104 */
100 105 @RequestMapping(value = "/queryOne", method = RequestMethod.GET)
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyNutritionSpecialtyFacade.java View file @ 7aa2a61
... ... @@ -94,12 +94,37 @@
94 94 model.setCheckMonth(request.getCheckMonth());//检查月龄 前端传入 2月龄28天
95 95 model.setCheckDoctor(request.getCheckDoctor());
96 96 model.setNextDate(DateUtil.parseYMD(request.getNextDate()));
97   - /*新增页面 4个页面内容*/
98 97  
  98 + model.setCaseClosed(request.getCaseClosed());
  99 + model.setcCDate(DateUtil.parseYMD(request.getcCDate()));
  100 + model.setcCOutcome(request.getcCOutcome());
  101 + model.setStartMdate(request.getStartMdate());
  102 + model.setBirthHistory(request.getBirthHistory());
  103 + model.setFeedingHistory6(request.getFeedingHistory6());
  104 + model.setFoodToAge(request.getFoodToAge());
  105 + model.setSituation(request.getSituation());
  106 + model.setHeight(request.getHeight());
  107 + model.setWeight(request.getWeight());
  108 + model.setAssess(request.getAssess());
  109 + model.setProblem(request.getProblem());
  110 + model.setGuidance(request.getGuidance());
  111 + model.setCheckId(request.getCheckId());
  112 + model.setMyqpxWeek(request.getMyqpxWeek());
  113 + model.setMyqpxHb(request.getMyqpxHb());
  114 + model.setTjzl(request.getTjzl());
  115 + model.setMrwyHistory(request.getMrwyHistory());
  116 + model.setKstjhtswage(request.getKstjhtswage());
  117 + model.setJwhbqk(request.getJwhbqk());
  118 + model.setHb(request.getHb());
  119 + model.setTreatment(request.getTreatment());
  120 + model.setMyqbrq(request.getMyqbrq());
  121 + model.setVitd(request.getVitd());
  122 + model.setTiz(request.getTiz());
  123 + model.setBloodCheck(request.getBloodCheck());
  124 + model.setXxCheck(request.getXxCheck());
  125 + model.setHwhdDate(request.getHwhdDate());
  126 + model.setVitdzl(request.getVitdzl());
99 127  
100   -
101   -
102   -
103 128 return model;
104 129  
105 130 }
106 131  
... ... @@ -244,10 +269,10 @@
244 269 List<BabyNutritionSpecialtyResult> babyNutritionSpecialtyResults = new ArrayList<>();
245 270 //单人多条专病记录
246 271 List<BabyNutritionSpecialtyModel> babyNutritionSpecialtyModelList = new ArrayList<>();
247   - if( StringUtils.isNotEmpty(babyQuery.getBuildId()) ){
  272 + if( StringUtils.isNotEmpty(babyQuery.getBuildId()) || StringUtils.isNotEmpty(babyQuery.getYyProject())){
248 273 babyQuery.setYn(YnEnums.YES.getId());
249 274 babyQuery.setHospitalId(hospitalId);
250   - babyQuery.setSort("ASC");
  275 + babyQuery.setSort("checkDate");
251 276 babyNutritionSpecialtyModelList = babyBabyNSService.queryOne(babyQuery);
252 277  
253 278 }
... ... @@ -289,8 +314,7 @@
289 314 babyQuery.setNeed("true");
290 315 babyQuery.setYn(YnEnums.YES.getId());
291 316 babyQuery.setHospitalId(hospitalId);
292   - babyQuery.setSort(null);
293   -
  317 + babyQuery.setSort("createDate");
294 318 if(babyQuery.getCheckDateEnd()!=null){
295 319 babyQuery.setCheckDateEnd(DateUtil.getDayLastSecond(babyQuery.getCheckDateEnd()));
296 320 }
... ... @@ -300,6 +324,10 @@
300 324 if(babyQuery.getBirthEnd()!=null){
301 325 babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd()));
302 326 }
  327 + if(babyQuery.getcCDateEnd()!=null){
  328 + babyQuery.setcCDateEnd(DateUtil.getDayLastSecond(babyQuery.getcCDateEnd()));
  329 + }
  330 +
303 331 babyNutritionSpecialtyModelList = babyBabyNSService.queryAll(babyQuery);
304 332 System.out.println(babyQuery.convertToQuery().convertToMongoQuery());
305 333 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyNutritionSpecialtyRequest.java View file @ 7aa2a61
... ... @@ -3,6 +3,9 @@
3 3 import com.lyms.platform.common.core.annotation.form.FormParam;
4 4 import org.hibernate.validator.constraints.NotEmpty;
5 5  
  6 +import java.util.Date;
  7 +import java.util.Map;
  8 +
6 9 /**
7 10 * 营养专科 入参类
8 11 *
... ... @@ -62,6 +65,300 @@
62 65 //下次预约
63 66 private String nextDate;
64 67  
  68 + //1是 2否 结案
  69 + private String caseClosed;
  70 + //结案日期
  71 + private String cCDate;
  72 + //结案 转归 1痊愈□ 2好转□ 3转院□ 4失访□
  73 + private String cCOutcome;
  74 + /*新增页面 4个页面内容*/
  75 +
  76 + //开始管理日期
  77 + private String startMdate;
  78 + //出生史true是选中 默认是false。 zc:true 早产 dcstz:true 低出生体重 dt:true多胎 jdy:true 巨大婴
  79 + private Map<String, Object> birthHistory;
  80 + //6个月内喂养史 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□
  81 + private Map<String, Object> feedingHistory6;
  82 + //开始食物转换年龄
  83 + private String foodToAge;
  84 + //既往患病情况
  85 + private String situation;
  86 + //身高
  87 + private String height;
  88 + //体重
  89 + private String weight;
  90 + //评估
  91 + private String assess;
  92 + //存在问题
  93 + private String problem;
  94 + //指导
  95 + private String guidance;
  96 + //检查者(检查医生id)
  97 + private String checkId;
  98 + //母孕期贫血情况：孕周
  99 + private String myqpxWeek;
  100 + //母孕期贫血情况：Hb
  101 + private String myqpxHb;
  102 + //铁剂治疗 wu:true 无 you:true 有 yw:药物 jl:剂量 lc:疗程
  103 + private Map<String, Object> tjzl;
  104 + //母乳喂养情况 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□
  105 + private Map<String, Object> mrwyHistory;
  106 + //儿童开始添加含铁食物年龄
  107 + private String kstjhtswage;
  108 + //儿童既往患病情况
  109 + private String jwhbqk;
  110 + //Hb（g/L）
  111 + private String hb;
  112 + //治疗（药物、剂量）
  113 + private String treatment;
  114 + //母孕期和哺乳期 wbc:true rzbz:true xzjl:true
  115 + private Map<String, Object> myqbrq;
  116 + //儿童服用VitD wu:true 无 you:true 有 month:月 day:天 pm:品名 jl:剂量
  117 + private Map<String, Object> vitd;
  118 + //体征 fl:true 方颅□ lgcz:true 肋骨串珠□ lrggk:true 肋软骨沟□ jxk:true 鸡胸□ szk:true 手(足)镯□ xxt:true X型腿□ oxtk:true O型腿□
  119 + private Map<String, Object> tiz;
  120 + //血液检查
  121 + private String bloodCheck;
  122 + //X线检查
  123 + private String xxCheck;
  124 + //户外活动时间（小时/日）
  125 + private String hwhdDate;
  126 + //VitD治疗（品名、剂量）
  127 + private String vitdzl;
  128 +
  129 +
  130 + public String getCaseClosed() {
  131 + return caseClosed;
  132 + }
  133 +
  134 + public void setCaseClosed(String caseClosed) {
  135 + this.caseClosed = caseClosed;
  136 + }
  137 +
  138 + public String getcCDate() {
  139 + return cCDate;
  140 + }
  141 +
  142 + public void setcCDate(String cCDate) {
  143 + this.cCDate = cCDate;
  144 + }
  145 +
  146 + public String getcCOutcome() {
  147 + return cCOutcome;
  148 + }
  149 +
  150 + public void setcCOutcome(String cCOutcome) {
  151 + this.cCOutcome = cCOutcome;
  152 + }
  153 +
  154 + public String getStartMdate() {
  155 + return startMdate;
  156 + }
  157 +
  158 + public void setStartMdate(String startMdate) {
  159 + this.startMdate = startMdate;
  160 + }
  161 +
  162 + public Map<String, Object> getBirthHistory() {
  163 + return birthHistory;
  164 + }
  165 +
  166 + public void setBirthHistory(Map<String, Object> birthHistory) {
  167 + this.birthHistory = birthHistory;
  168 + }
  169 +
  170 + public Map<String, Object> getFeedingHistory6() {
  171 + return feedingHistory6;
  172 + }
  173 +
  174 + public void setFeedingHistory6(Map<String, Object> feedingHistory6) {
  175 + this.feedingHistory6 = feedingHistory6;
  176 + }
  177 +
  178 + public String getFoodToAge() {
  179 + return foodToAge;
  180 + }
  181 +
  182 + public void setFoodToAge(String foodToAge) {
  183 + this.foodToAge = foodToAge;
  184 + }
  185 +
  186 + public String getSituation() {
  187 + return situation;
  188 + }
  189 +
  190 + public void setSituation(String situation) {
  191 + this.situation = situation;
  192 + }
  193 +
  194 + public String getHeight() {
  195 + return height;
  196 + }
  197 +
  198 + public void setHeight(String height) {
  199 + this.height = height;
  200 + }
  201 +
  202 + public String getWeight() {
  203 + return weight;
  204 + }
  205 +
  206 + public void setWeight(String weight) {
  207 + this.weight = weight;
  208 + }
  209 +
  210 + public String getAssess() {
  211 + return assess;
  212 + }
  213 +
  214 + public void setAssess(String assess) {
  215 + this.assess = assess;
  216 + }
  217 +
  218 + public String getProblem() {
  219 + return problem;
  220 + }
  221 +
  222 + public void setProblem(String problem) {
  223 + this.problem = problem;
  224 + }
  225 +
  226 + public String getGuidance() {
  227 + return guidance;
  228 + }
  229 +
  230 + public void setGuidance(String guidance) {
  231 + this.guidance = guidance;
  232 + }
  233 +
  234 + public String getCheckId() {
  235 + return checkId;
  236 + }
  237 +
  238 + public void setCheckId(String checkId) {
  239 + this.checkId = checkId;
  240 + }
  241 +
  242 + public String getMyqpxWeek() {
  243 + return myqpxWeek;
  244 + }
  245 +
  246 + public void setMyqpxWeek(String myqpxWeek) {
  247 + this.myqpxWeek = myqpxWeek;
  248 + }
  249 +
  250 + public String getMyqpxHb() {
  251 + return myqpxHb;
  252 + }
  253 +
  254 + public void setMyqpxHb(String myqpxHb) {
  255 + this.myqpxHb = myqpxHb;
  256 + }
  257 +
  258 + public Map<String, Object> getTjzl() {
  259 + return tjzl;
  260 + }
  261 +
  262 + public void setTjzl(Map<String, Object> tjzl) {
  263 + this.tjzl = tjzl;
  264 + }
  265 +
  266 + public Map<String, Object> getMrwyHistory() {
  267 + return mrwyHistory;
  268 + }
  269 +
  270 + public void setMrwyHistory(Map<String, Object> mrwyHistory) {
  271 + this.mrwyHistory = mrwyHistory;
  272 + }
  273 +
  274 + public String getKstjhtswage() {
  275 + return kstjhtswage;
  276 + }
  277 +
  278 + public void setKstjhtswage(String kstjhtswage) {
  279 + this.kstjhtswage = kstjhtswage;
  280 + }
  281 +
  282 + public String getJwhbqk() {
  283 + return jwhbqk;
  284 + }
  285 +
  286 + public void setJwhbqk(String jwhbqk) {
  287 + this.jwhbqk = jwhbqk;
  288 + }
  289 +
  290 + public String getHb() {
  291 + return hb;
  292 + }
  293 +
  294 + public void setHb(String hb) {
  295 + this.hb = hb;
  296 + }
  297 +
  298 + public String getTreatment() {
  299 + return treatment;
  300 + }
  301 +
  302 + public void setTreatment(String treatment) {
  303 + this.treatment = treatment;
  304 + }
  305 +
  306 + public Map<String, Object> getMyqbrq() {
  307 + return myqbrq;
  308 + }
  309 +
  310 + public void setMyqbrq(Map<String, Object> myqbrq) {
  311 + this.myqbrq = myqbrq;
  312 + }
  313 +
  314 + public Map<String, Object> getVitd() {
  315 + return vitd;
  316 + }
  317 +
  318 + public void setVitd(Map<String, Object> vitd) {
  319 + this.vitd = vitd;
  320 + }
  321 +
  322 + public Map<String, Object> getTiz() {
  323 + return tiz;
  324 + }
  325 +
  326 + public void setTiz(Map<String, Object> tiz) {
  327 + this.tiz = tiz;
  328 + }
  329 +
  330 + public String getBloodCheck() {
  331 + return bloodCheck;
  332 + }
  333 +
  334 + public void setBloodCheck(String bloodCheck) {
  335 + this.bloodCheck = bloodCheck;
  336 + }
  337 +
  338 + public String getXxCheck() {
  339 + return xxCheck;
  340 + }
  341 +
  342 + public void setXxCheck(String xxCheck) {
  343 + this.xxCheck = xxCheck;
  344 + }
  345 +
  346 + public String getHwhdDate() {
  347 + return hwhdDate;
  348 + }
  349 +
  350 + public void setHwhdDate(String hwhdDate) {
  351 + this.hwhdDate = hwhdDate;
  352 + }
  353 +
  354 + public String getVitdzl() {
  355 + return vitdzl;
  356 + }
  357 +
  358 + public void setVitdzl(String vitdzl) {
  359 + this.vitdzl = vitdzl;
  360 + }
  361 +
65 362 public String getId() {
66 363 return id;
67 364 }
... ... @@ -237,7 +534,7 @@
237 534 public void setNextDate(String nextDate) {
238 535 this.nextDate = nextDate;
239 536 }
240   - /*新增页面 4个页面内容*/
  537 +
241 538  
242 539 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyNutritionSpecialtyResult.java View file @ 7aa2a61
... ... @@ -7,6 +7,7 @@
7 7 import com.lyms.platform.pojo.BabyPsychologistModel;
8 8  
9 9 import java.util.Date;
  10 +import java.util.Map;
10 11  
11 12 public class BabyNutritionSpecialtyResult implements IBasicResultConvert<BabyNutritionSpecialtyResult, BabyNutritionSpecialtyModel> {
12 13  
... ... @@ -56,6 +57,300 @@
56 57 //下次预约
57 58 private String nextDate;
58 59  
  60 + //1是 2否 结案
  61 + private String caseClosed;
  62 + //结案日期
  63 + private String cCDate;
  64 + //结案 转归 1痊愈□ 2好转□ 3转院□ 4失访□
  65 + private String cCOutcome;
  66 +
  67 + /*新增页面 4个页面内容*/
  68 + //开始管理日期
  69 + private String startMdate;
  70 + //出生史true是选中 默认是false。 zc:true 早产 dcstz:true 低出生体重 dt:true多胎 jdy:true 巨大婴
  71 + private Map<String, Object> birthHistory;
  72 + //6个月内喂养史 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□
  73 + private Map<String, Object> feedingHistory6;
  74 + //开始食物转换年龄
  75 + private String foodToAge;
  76 + //既往患病情况
  77 + private String situation;
  78 + //身高
  79 + private String height;
  80 + //体重
  81 + private String weight;
  82 + //评估
  83 + private String assess;
  84 + //存在问题
  85 + private String problem;
  86 + //指导
  87 + private String guidance;
  88 + //检查者(检查医生id)
  89 + private String checkId;
  90 + //母孕期贫血情况：孕周
  91 + private String myqpxWeek;
  92 + //母孕期贫血情况：Hb
  93 + private String myqpxHb;
  94 + //铁剂治疗 wu:true 无 you:true 有 yw:药物 jl:剂量 lc:疗程
  95 + private Map<String, Object> tjzl;
  96 + //母乳喂养情况 cmr 纯母乳□ bfmr 部分母乳□ pfn 配方奶□
  97 + private Map<String, Object> mrwyHistory;
  98 + //儿童开始添加含铁食物年龄
  99 + private String kstjhtswage;
  100 + //儿童既往患病情况
  101 + private String jwhbqk;
  102 + //Hb（g/L）
  103 + private String hb;
  104 + //治疗（药物、剂量）
  105 + private String treatment;
  106 + //母孕期和哺乳期 wbc:true rzbz:true xzjl:true
  107 + private Map<String, Object> myqbrq;
  108 + //儿童服用VitD wu:true 无 you:true 有 month:月 day:天 pm:品名 jl:剂量
  109 + private Map<String, Object> vitd;
  110 + //体征 fl:true 方颅□ lgcz:true 肋骨串珠□ lrggk:true 肋软骨沟□ jxk:true 鸡胸□ szk:true 手(足)镯□ xxt:true X型腿□ oxtk:true O型腿□
  111 + private Map<String, Object> tiz;
  112 + //血液检查
  113 + private String bloodCheck;
  114 + //X线检查
  115 + private String xxCheck;
  116 + //户外活动时间（小时/日）
  117 + private String hwhdDate;
  118 + //VitD治疗（品名、剂量）
  119 + private String vitdzl;
  120 +
  121 +
  122 + public String getCaseClosed() {
  123 + return caseClosed;
  124 + }
  125 +
  126 + public void setCaseClosed(String caseClosed) {
  127 + this.caseClosed = caseClosed;
  128 + }
  129 +
  130 + public String getcCDate() {
  131 + return cCDate;
  132 + }
  133 +
  134 + public void setcCDate(String cCDate) {
  135 + this.cCDate = cCDate;
  136 + }
  137 +
  138 + public String getcCOutcome() {
  139 + return cCOutcome;
  140 + }
  141 +
  142 + public void setcCOutcome(String cCOutcome) {
  143 + this.cCOutcome = cCOutcome;
  144 + }
  145 +
  146 + public String getStartMdate() {
  147 + return startMdate;
  148 + }
  149 +
  150 + public void setStartMdate(String startMdate) {
  151 + this.startMdate = startMdate;
  152 + }
  153 +
  154 + public Map<String, Object> getBirthHistory() {
  155 + return birthHistory;
  156 + }
  157 +
  158 + public void setBirthHistory(Map<String, Object> birthHistory) {
  159 + this.birthHistory = birthHistory;
  160 + }
  161 +
  162 + public Map<String, Object> getFeedingHistory6() {
  163 + return feedingHistory6;
  164 + }
  165 +
  166 + public void setFeedingHistory6(Map<String, Object> feedingHistory6) {
  167 + this.feedingHistory6 = feedingHistory6;
  168 + }
  169 +
  170 + public String getFoodToAge() {
  171 + return foodToAge;
  172 + }
  173 +
  174 + public void setFoodToAge(String foodToAge) {
  175 + this.foodToAge = foodToAge;
  176 + }
  177 +
  178 + public String getSituation() {
  179 + return situation;
  180 + }
  181 +
  182 + public void setSituation(String situation) {
  183 + this.situation = situation;
  184 + }
  185 +
  186 + public String getHeight() {
  187 + return height;
  188 + }
  189 +
  190 + public void setHeight(String height) {
  191 + this.height = height;
  192 + }
  193 +
  194 + public String getWeight() {
  195 + return weight;
  196 + }
  197 +
  198 + public void setWeight(String weight) {
  199 + this.weight = weight;
  200 + }
  201 +
  202 + public String getAssess() {
  203 + return assess;
  204 + }
  205 +
  206 + public void setAssess(String assess) {
  207 + this.assess = assess;
  208 + }
  209 +
  210 + public String getProblem() {
  211 + return problem;
  212 + }
  213 +
  214 + public void setProblem(String problem) {
  215 + this.problem = problem;
  216 + }
  217 +
  218 + public String getGuidance() {
  219 + return guidance;
  220 + }
  221 +
  222 + public void setGuidance(String guidance) {
  223 + this.guidance = guidance;
  224 + }
  225 +
  226 + public String getCheckId() {
  227 + return checkId;
  228 + }
  229 +
  230 + public void setCheckId(String checkId) {
  231 + this.checkId = checkId;
  232 + }
  233 +
  234 + public String getMyqpxWeek() {
  235 + return myqpxWeek;
  236 + }
  237 +
  238 + public void setMyqpxWeek(String myqpxWeek) {
  239 + this.myqpxWeek = myqpxWeek;
  240 + }
  241 +
  242 + public String getMyqpxHb() {
  243 + return myqpxHb;
  244 + }
  245 +
  246 + public void setMyqpxHb(String myqpxHb) {
  247 + this.myqpxHb = myqpxHb;
  248 + }
  249 +
  250 + public Map<String, Object> getTjzl() {
  251 + return tjzl;
  252 + }
  253 +
  254 + public void setTjzl(Map<String, Object> tjzl) {
  255 + this.tjzl = tjzl;
  256 + }
  257 +
  258 + public Map<String, Object> getMrwyHistory() {
  259 + return mrwyHistory;
  260 + }
  261 +
  262 + public void setMrwyHistory(Map<String, Object> mrwyHistory) {
  263 + this.mrwyHistory = mrwyHistory;
  264 + }
  265 +
  266 + public String getKstjhtswage() {
  267 + return kstjhtswage;
  268 + }
  269 +
  270 + public void setKstjhtswage(String kstjhtswage) {
  271 + this.kstjhtswage = kstjhtswage;
  272 + }
  273 +
  274 + public String getJwhbqk() {
  275 + return jwhbqk;
  276 + }
  277 +
  278 + public void setJwhbqk(String jwhbqk) {
  279 + this.jwhbqk = jwhbqk;
  280 + }
  281 +
  282 + public String getHb() {
  283 + return hb;
  284 + }
  285 +
  286 + public void setHb(String hb) {
  287 + this.hb = hb;
  288 + }
  289 +
  290 + public String getTreatment() {
  291 + return treatment;
  292 + }
  293 +
  294 + public void setTreatment(String treatment) {
  295 + this.treatment = treatment;
  296 + }
  297 +
  298 + public Map<String, Object> getMyqbrq() {
  299 + return myqbrq;
  300 + }
  301 +
  302 + public void setMyqbrq(Map<String, Object> myqbrq) {
  303 + this.myqbrq = myqbrq;
  304 + }
  305 +
  306 + public Map<String, Object> getVitd() {
  307 + return vitd;
  308 + }
  309 +
  310 + public void setVitd(Map<String, Object> vitd) {
  311 + this.vitd = vitd;
  312 + }
  313 +
  314 + public Map<String, Object> getTiz() {
  315 + return tiz;
  316 + }
  317 +
  318 + public void setTiz(Map<String, Object> tiz) {
  319 + this.tiz = tiz;
  320 + }
  321 +
  322 + public String getBloodCheck() {
  323 + return bloodCheck;
  324 + }
  325 +
  326 + public void setBloodCheck(String bloodCheck) {
  327 + this.bloodCheck = bloodCheck;
  328 + }
  329 +
  330 + public String getXxCheck() {
  331 + return xxCheck;
  332 + }
  333 +
  334 + public void setXxCheck(String xxCheck) {
  335 + this.xxCheck = xxCheck;
  336 + }
  337 +
  338 + public String getHwhdDate() {
  339 + return hwhdDate;
  340 + }
  341 +
  342 + public void setHwhdDate(String hwhdDate) {
  343 + this.hwhdDate = hwhdDate;
  344 + }
  345 +
  346 + public String getVitdzl() {
  347 + return vitdzl;
  348 + }
  349 +
  350 + public void setVitdzl(String vitdzl) {
  351 + this.vitdzl = vitdzl;
  352 + }
  353 +
59 354 public String getId() {
60 355 return id;
61 356 }
... ... @@ -273,7 +568,35 @@
273 568 setCheckMonth(destModel.getCheckMonth());
274 569 //checkDoctor
275 570 setNextDate(DateUtil.getYyyyMmDd(destModel.getNextDate()));
276   -
  571 + setCaseClosed(destModel.getCaseClosed());
  572 + setcCDate(DateUtil.getYyyyMmDd(destModel.getcCDate()));
  573 + setcCOutcome(destModel.getcCOutcome());
  574 + setStartMdate(destModel.getStartMdate());
  575 + setBirthHistory(destModel.getBirthHistory());
  576 + setFeedingHistory6(destModel.getFeedingHistory6());
  577 + setFoodToAge(destModel.getFoodToAge());
  578 + setSituation(destModel.getSituation());
  579 + setHeight(destModel.getHeight());
  580 + setWeight(destModel.getWeight());
  581 + setAssess(destModel.getAssess());
  582 + setProblem(destModel.getProblem());
  583 + setGuidance(destModel.getGuidance());
  584 + setCheckId(destModel.getCheckId());
  585 + setMyqpxWeek(destModel.getMyqpxWeek());
  586 + setMyqpxHb(destModel.getMyqpxHb());
  587 + setTjzl(destModel.getTjzl());
  588 + setMrwyHistory(destModel.getMrwyHistory());
  589 + setKstjhtswage(destModel.getKstjhtswage());
  590 + setJwhbqk(destModel.getJwhbqk());
  591 + setHb(destModel.getHb());
  592 + setTreatment(destModel.getTreatment());
  593 + setMyqbrq(destModel.getMyqbrq());
  594 + setVitd(destModel.getVitd());
  595 + setTiz(destModel.getTiz());
  596 + setBloodCheck(destModel.getBloodCheck());
  597 + setXxCheck(destModel.getXxCheck());
  598 + setHwhdDate(destModel.getHwhdDate());
  599 + setVitdzl(destModel.getVitdzl());
277 600  
278 601  
279 602  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java View file @ 7aa2a61
... ... @@ -1696,6 +1696,7 @@
1696 1696 List<Map<String, Object>> checkMonthQhdEnums = EnumUtil.toJson(CheckMonthQhdEnums.class); /** (检查时间 */
1697 1697 List<Map<String, Object>> checkMonthQhdBTGEnums = EnumUtil.toJson(CheckMonthQhdBTGEnums.class); /** 不通过 */
1698 1698 List<Map<String, Object>> psychologistEnums = EnumUtil.toJson(PsychologistEnums.class); /** 心理专科项目 */
  1699 + List<Map<String, Object>> nutritionSpecialtyEnums = EnumUtil.toJson(NutritionSpecialtyEnums.class); /** 营养专科项目 */
1699 1700 List<Map<String, Object>> positive = new ArrayList<>(); /** 阳性项目 */
1700 1701  
1701 1702 if ("197".equals(hospitalId)) {
... ... @@ -1881,7 +1882,8 @@
1881 1882 }
1882 1883  
1883 1884  
1884   - return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth, "checkMonthQhdEnums", checkMonthQhdEnums, "checkMonthQhdBTGEnums", checkMonthQhdBTGEnums,"psychologistEnums",psychologistEnums);
  1885 + return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth, "checkMonthQhdEnums", checkMonthQhdEnums, "checkMonthQhdBTGEnums",
  1886 + checkMonthQhdBTGEnums,"psychologistEnums",psychologistEnums,"nutritionSpecialtyEnums",nutritionSpecialtyEnums);
1885 1887 }
1886 1888  
1887 1889 @Override