From e4411c5e7afa0c33be705b40a21a7bcaa4224732 Mon Sep 17 00:00:00 2001 From: wtt Date: Tue, 18 Aug 2020 16:21:11 +0800 Subject: [PATCH] update --- .../com/lyms/platform/pojo/BabyStuntingModel.java | 21 --------- .../web/facade/BabyNutritionSpecialtyFacade.java | 14 ++++++ .../operate/web/facade/BabyStuntingFacade.java | 6 --- .../operate/web/request/BabyStuntingRequest.java | 54 +++++++++++++--------- .../operate/web/result/BabyStuntingResult.java | 40 +++++----------- 5 files changed, 58 insertions(+), 77 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyStuntingModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyStuntingModel.java index 60df89a..cbcc2e4 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyStuntingModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyStuntingModel.java @@ -26,11 +26,6 @@ public class BabyStuntingModel extends BaseModel { private Date createDate; private Date modifyDate; private String hospitalId; - //备注 - private String mremark; - // 母亲高危因素 - List mHighRiskReason; - /*母亲信息*/ //母亲姓名 @@ -681,22 +676,6 @@ public class BabyStuntingModel extends BaseModel { this.hospitalId = hospitalId; } - public String getMremark() { - return mremark; - } - - public void setMremark(String mremark) { - this.mremark = mremark; - } - - public List getmHighRiskReason() { - return mHighRiskReason; - } - - public void setmHighRiskReason(List mHighRiskReason) { - this.mHighRiskReason = mHighRiskReason; - } - public String getMname() { return mname; } 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 76424af..8148f69 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 @@ -344,6 +344,13 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getHospitalId())) { babyNutritionSpecialtyResult.setHospitalName(CommonsHelper.getHospitalName(babyNutritionSpecialtyModel.getHospitalId(), organizationService)); } + + if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getCheckDoctor())) { + Users users = usersService.getUsers(NumberUtils.toInt(babyNutritionSpecialtyModel.getCheckDoctor())); + if (users != null && StringUtils.isNotEmpty(users.getName())) { + babyNutritionSpecialtyResult.setCheckDoctor(users.getName()); + } + } babyNutritionSpecialtyResults.add(babyNutritionSpecialtyResult); } } @@ -392,6 +399,13 @@ public class BabyNutritionSpecialtyFacade extends BaseServiceImpl { if (babyNutritionSpecialtyModel != null) { babyNutritionSpecialtyResult.convertToResult(babyNutritionSpecialtyModel); babyNutritionSpecialtyResult.setHospitalId(CommonsHelper.getHospitalName(babyNutritionSpecialtyModel.getHospitalId(), organizationService)); + if(StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getCaseClosed())){ + String caseClosed = babyNutritionSpecialtyModel.getCaseClosed(); + babyNutritionSpecialtyResult.setCaseClosed("1".equals(caseClosed)?"是":"否"); + }else { + babyNutritionSpecialtyResult.setCaseClosed(null); + } + babyNutritionSpecialtyResults.add(babyNutritionSpecialtyResult); } } 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 31cec96..535cdc0 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 @@ -96,8 +96,6 @@ public class BabyStuntingFacade extends BaseServiceImpl { model.setsINCard(babyModel.getsINCard()); model.setBirthday(babyModel.getBirth()); model.setModifyDate(new Date()); - model.setMremark(babyModel.getMremark()); - model.setmHighRiskReason(babyModel.getmHighRiskReason()); //createDate,hospitalId调用外添加赋值 } @@ -259,10 +257,6 @@ public class BabyStuntingFacade extends BaseServiceImpl { BabyStuntingResult babyStuntingResult = new BabyStuntingResult(); babyStuntingResult.convertToShowResult(babyStuntingModel); - // 母亲高危因素 - if (CollectionUtils.isNotEmpty(babyStuntingModel.getmHighRiskReason())) { - babyStuntingResult.setmHighRiskReason(mongoUtil.findColor(babyStuntingModel.getmHighRiskReason())); - } //检查医生 if (StringUtils.isNotEmpty(babyStuntingResult.getCheckDoctor())) { Users users = usersService.getUsers(NumberUtils.toInt(babyStuntingModel.getCheckDoctor())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyStuntingRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyStuntingRequest.java index 40d05f0..5577d2c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyStuntingRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyStuntingRequest.java @@ -25,11 +25,7 @@ public class BabyStuntingRequest { private String createDate; private String modifyDate; private String hospitalId; - //备注 - private String mremark; - // 母亲高危因素 - List mHighRiskReason; - + private String hospitalName; /*母亲信息*/ //母亲姓名 @@ -69,6 +65,7 @@ public class BabyStuntingRequest { private String nextDate; //发育迟缓专科检查 cz初诊，fz复诊 private String czOrfzProject; + private String czOrfzProjectName; /*新增页面 2个页面内容*/ //病历编号 手动输入 必填项 @@ -79,6 +76,7 @@ public class BabyStuntingRequest { //儿童家庭住址省市县区具体 //居住地 private String addr; //地址 + private String addrStr; //地址 private String provinceId;//省 private String cityId;//市 private String areaId;//区 @@ -109,6 +107,8 @@ public class BabyStuntingRequest { /*既往史*/ // （多选）nws:true 脑外伤 ，lngr:true 颅内感染 zl:true 肿瘤 yybl:true 营养不良 fp:true 肥胖 xlsh:true 心理伤害 private Map jws; + private String jwsStr; + //其他 private String jwsqt; @@ -191,8 +191,29 @@ public class BabyStuntingRequest { private String gyzd; - /*新增页面 4个页面内容*/ + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName; + } + public String getCzOrfzProjectName() { + return czOrfzProjectName; + } + + public void setCzOrfzProjectName(String czOrfzProjectName) { + this.czOrfzProjectName = czOrfzProjectName; + } + + public String getJwsStr() { + return jwsStr; + } + + public void setJwsStr(String jwsStr) { + this.jwsStr = jwsStr; + } public String getCreateDate() { return createDate; @@ -210,13 +231,7 @@ public class BabyStuntingRequest { this.modifyDate = modifyDate; } - public List getmHighRiskReason() { - return mHighRiskReason; - } - public void setmHighRiskReason(List mHighRiskReason) { - this.mHighRiskReason = mHighRiskReason; - } public Integer getSex() { return sex; @@ -684,13 +699,6 @@ public class BabyStuntingRequest { this.gyzd = gyzd; } - public String getMremark() { - return mremark; - } - - public void setMremark(String mremark) { - this.mremark = mremark; - } public String getId() { return id; @@ -812,7 +820,11 @@ public class BabyStuntingRequest { this.checkDoctor = checkDoctor; } + public String getAddrStr() { + return addrStr; + } - - + public void setAddrStr(String addrStr) { + this.addrStr = addrStr; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyStuntingResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyStuntingResult.java index ca3c6bc..b300ff9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyStuntingResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyStuntingResult.java @@ -7,8 +7,6 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.utils.FunvCommonUtil; import com.lyms.platform.pojo.BabyStuntingModel; -import java.util.Date; -import java.util.List; import java.util.Map; public class BabyStuntingResult implements IBasicResultConvert { @@ -19,14 +17,11 @@ public class BabyStuntingResult implements IBasicResultConvert> mHighRiskReason; + /*母亲信息*/ //母亲姓名 private String mname; @@ -50,10 +45,8 @@ public class BabyStuntingResult implements IBasicResultConvert> getmHighRiskReason() { - return mHighRiskReason; - } - - public void setmHighRiskReason(List > mHighRiskReason) { - this.mHighRiskReason = mHighRiskReason; - } public String getMname() { return mname; -- 1.8.3.1