diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismPrimaryScreening.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismPrimaryScreening.java index 0293b72..b9d624e 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismPrimaryScreening.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismPrimaryScreening.java @@ -147,6 +147,16 @@ public class BabyAutismPrimaryScreening extends BaseModel { */ private String warningSignstring; + /** + * 语言功能和社会交往能力询问 + */ + private String languageSocialName; + + /** + * 预警征象筛查 + */ + private String warningSignstringName; + private String checkHospital; @@ -211,41 +221,20 @@ public class BabyAutismPrimaryScreening extends BaseModel { */ private String global; - @Override - public String toString() { - return "BabyAutismPrimaryScreening{" + - "id='" + id + '\'' + - ", created=" + created + - ", modified=" + modified + - ", yn=" + yn + - ", operaterId='" + operaterId + '\'' + - ", hospitalId='" + hospitalId + '\'' + - ", babyId='" + babyId + '\'' + - ", babyBuildDate=" + babyBuildDate + - ", babyName='" + babyName + '\'' + - ", babySex=" + babySex + - ", babyMName='" + babyMName + '\'' + - ", babyFName='" + babyFName + '\'' + - ", babyMPhone='" + babyMPhone + '\'' + - ", babyFPhone='" + babyFPhone + '\'' + - ", babyMCertNo='" + babyMCertNo + '\'' + - ", babyFCertNo='" + babyFCertNo + '\'' + - ", pid='" + pid + '\'' + - ", checkMonthAge='" + checkMonthAge + '\'' + - ", checkMonthId='" + checkMonthId + '\'' + - ", birth=" + birth + - ", checkTime=" + checkTime + - ", nextCheckTime=" + nextCheckTime + - ", checkDoctor='" + checkDoctor + '\'' + - ", doctorSign='" + doctorSign + '\'' + - ", patientSign='" + patientSign + '\'' + - ", guidanceOpinions='" + guidanceOpinions + '\'' + - ", handleOpinions='" + handleOpinions + '\'' + - ", warningSigns=" + warningSigns + - ", languageSocial=" + languageSocial + - ", preliminaryScreeningResults='" + preliminaryScreeningResults + '\'' + - ", global='" + global + '\'' + - '}'; + public String getLanguageSocialName() { + return languageSocialName; + } + + public void setLanguageSocialName(String languageSocialName) { + this.languageSocialName = languageSocialName; + } + + public String getWarningSignstringName() { + return warningSignstringName; + } + + public void setWarningSignstringName(String warningSignstringName) { + this.warningSignstringName = warningSignstringName; } public String getGlobal() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java index a2c6a2c..7950d3a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PrimaryScreeningController.java @@ -10,6 +10,7 @@ import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.operate.web.facade.PrimaryScreeningFacade; import com.lyms.platform.operate.web.inteceptor.InitDataConfig; import com.lyms.platform.pojo.BabyAutismPrimaryScreening; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -138,7 +139,9 @@ public class PrimaryScreeningController extends BaseController { } } primaryScreening.setWarningSigns(warningSigns); + primaryScreening.setWarningSignstringName(StringUtils.join(warningSigns,",")); primaryScreening.setLanguageSocial(languageSocial); + primaryScreening.setLanguageSocialName(StringUtils.join(languageSocial,",")); BaseObjectResponse br = new BaseObjectResponse(); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setData(primaryScreening);