diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDiagnosisMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDiagnosisMapper.xml index bf2fa56..1198aaf 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDiagnosisMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismDiagnosisMapper.xml @@ -256,7 +256,7 @@ select count(1) - from baby_autism_double_sieving + from (select id from baby_autism_double_sieving and id = #{doubleSieving.id} @@ -359,7 +359,7 @@ and rescreen_results = #{doubleSieving.rescreenResults} - GROUP BY baby_id + GROUP BY baby_id) as d diff --git a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml index 2ce08fc..933f4fe 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/BabyAutismPrimaryScreeningMapper.xml @@ -179,7 +179,8 @@ diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java index 2b4c498..81e0f0a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismDoubleSieving.java @@ -1,6 +1,7 @@ package com.lyms.platform.pojo; import com.lyms.platform.common.result.BaseModel; +import com.lyms.platform.common.utils.DateUtil; import org.apache.commons.lang3.StringUtils; import java.util.Date; @@ -17,11 +18,15 @@ public class BabyAutismDoubleSieving extends BaseModel { * 创建时间 */ private Date created; + + private String createdStr; /** * 修改时间 */ private Date modified; + private String modifiedStr; + /** * 记录删除状态0：删除 1：正常 */ @@ -44,6 +49,8 @@ public class BabyAutismDoubleSieving extends BaseModel { * 儿童建档日期 */ private Date babyBuildDate; + + private String babyBuildDateStr; /** * 儿童姓名 */ @@ -52,6 +59,8 @@ public class BabyAutismDoubleSieving extends BaseModel { * 儿童姓别 */ private Integer babySex; + + private String babySexStr; /** * 母亲姓名 */ @@ -94,16 +103,22 @@ public class BabyAutismDoubleSieving extends BaseModel { */ private Date birth; + private String birthStr; + /** * 检查时间 */ private Date checkTime; + private String checkTimeStr; + /** * 预约下次检查时间 */ private Date nextCheckTime; + private String nextCheckTimeStr; + /** * 检查医生 */ @@ -256,62 +271,60 @@ public class BabyAutismDoubleSieving extends BaseModel { */ private String rescreenResults; - @Override - public String toString() { - return "BabyAutismDoubleSieving{" + - "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 + '\'' + - ", doctor='" + doctor + '\'' + - ", displayState='" + displayState + '\'' + - ", errormsg='" + errormsg + '\'' + - ", checkHospital='" + checkHospital + '\'' + - ", doctorSign='" + doctorSign + '\'' + - ", patientSign='" + patientSign + '\'' + - ", preliminaryScreeningResults='" + preliminaryScreeningResults + '\'' + - ", preliminaryScreeningResultsFailedProject='" + preliminaryScreeningResultsFailedProject + '\'' + - ", medicalHistory=" + medicalHistory + - ", medicalHistoryName='" + medicalHistoryName + '\'' + - ", medicalHistoryRemark='" + medicalHistoryRemark + '\'' + - ", developerQuotient='" + developerQuotient + '\'' + - ", bigMovement='" + bigMovement + '\'' + - ", fineMotion='" + fineMotion + '\'' + - ", adaptability='" + adaptability + '\'' + - ", languageNum='" + languageNum + '\'' + - ", socialBehavior='" + socialBehavior + '\'' + - ", pediatricHeartScaleAssessMentresults='" + pediatricHeartScaleAssessMentresults + '\'' + - ", coreProjectNum='" + coreProjectNum + '\'' + - ", positivetNum='" + positivetNum + '\'' + - ", screeningScaleMentresults='" + screeningScaleMentresults + '\'' + - ", behaviorRatingScaleTotal='" + behaviorRatingScaleTotal + '\'' + - ", feelNum='" + feelNum + '\'' + - ", socialInteractionNum='" + socialInteractionNum + '\'' + - ", bodyMovementNum='" + bodyMovementNum + '\'' + - ", behaviorRatingLanguageNum='" + behaviorRatingLanguageNum + '\'' + - ", selfCareInDailyLifeNum='" + selfCareInDailyLifeNum + '\'' + - ", behaviorRatingScaleAssessMentresults='" + behaviorRatingScaleAssessMentresults + '\'' + - ", rescreenResults='" + rescreenResults + '\'' + - '}'; + public String getCreatedStr() { + return createdStr; + } + + public void setCreatedStr(String createdStr) { + this.createdStr = createdStr; + } + + public String getModifiedStr() { + return modifiedStr; + } + + public void setModifiedStr(String modifiedStr) { + this.modifiedStr = modifiedStr; + } + + public String getBabyBuildDateStr() { + return babyBuildDateStr; + } + + public void setBabyBuildDateStr(String babyBuildDateStr) { + this.babyBuildDateStr = babyBuildDateStr; + } + + public String getBabySexStr() { + return babySexStr; + } + + public void setBabySexStr(String babySexStr) { + this.babySexStr = babySexStr; + } + + public String getBirthStr() { + return birthStr; + } + + public void setBirthStr(String birthStr) { + this.birthStr = birthStr; + } + + public String getCheckTimeStr() { + return checkTimeStr; + } + + public void setCheckTimeStr(String checkTimeStr) { + this.checkTimeStr = checkTimeStr; + } + + public String getNextCheckTimeStr() { + return nextCheckTimeStr; + } + + public void setNextCheckTimeStr(String nextCheckTimeStr) { + this.nextCheckTimeStr = nextCheckTimeStr; } public String getMedicalHistoryName() { @@ -377,6 +390,7 @@ public class BabyAutismDoubleSieving extends BaseModel { public void setCreated(Date created) { this.created = created; + setCreatedStr(DateUtil.getyyyy_MM_dd(created)); } public Date getModified() { @@ -385,6 +399,7 @@ public class BabyAutismDoubleSieving extends BaseModel { public void setModified(Date modified) { this.modified = modified; + setModifiedStr(DateUtil.getyyyy_MM_dd(modified)); } public Integer getYn() { @@ -425,6 +440,7 @@ public class BabyAutismDoubleSieving extends BaseModel { public void setBabyBuildDate(Date babyBuildDate) { this.babyBuildDate = babyBuildDate; + setBabyBuildDateStr(DateUtil.getyyyy_MM_dd(babyBuildDate)); } public String getBabyName() { @@ -521,24 +537,17 @@ public class BabyAutismDoubleSieving extends BaseModel { public void setBirth(Date birth) { this.birth = birth; + setBirthStr(DateUtil.getyyyy_MM_dd(birth)); } public Date getCheckTime() { return checkTime; } - public void setCheckTime(Date checkTime) { - this.checkTime = checkTime; - } - public Date getNextCheckTime() { return nextCheckTime; } - public void setNextCheckTime(Date nextCheckTime) { - this.nextCheckTime = nextCheckTime; - } - public String getCheckDoctor() { return checkDoctor; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DoubleSievingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DoubleSievingFacade.java index 79add4b..8516b7b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DoubleSievingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DoubleSievingFacade.java @@ -143,6 +143,9 @@ public class DoubleSievingFacade extends BaseServiceImpl { public BaseResponse queryDateListPage(BabyAutismDoubleSieving babyAutismDoubleSieving, BaseQuery pageRequest, Integer id) { pageRequest.mysqlBuild(babyAutismDoubleSievingService.count(babyAutismDoubleSieving, pageRequest).intValue()); List primaryScreeningPage = babyAutismDoubleSievingService.queryByPage(babyAutismDoubleSieving, pageRequest); + for (BabyAutismDoubleSieving autismDoubleSieving : primaryScreeningPage) { + nameChange(autismDoubleSieving); + } BaseObjectResponse br = new BaseObjectResponse(); br.setErrorcode(ErrorCodeConstants.SUCCESS); br.setData(primaryScreeningPage); @@ -159,4 +162,15 @@ public class DoubleSievingFacade extends BaseServiceImpl { br.setErrormsg("成功"); return br; } + + public void nameChange(BabyAutismDoubleSieving primaryScreening) { + //查询医院 + try { + Organization org = organizationService.getOrganization(Integer.valueOf(primaryScreening.getHospitalId())); + primaryScreening.setCheckHospital(org.getName()); + primaryScreening.setBabySexStr(SexEnum.getTextById(primaryScreening.getBabySex())); + } catch (Exception e) { + e.printStackTrace(); + } + } }