Commit 3a0510891852ffabb616478c09e71b10325b702e
1 parent
5a9b385cec
Exists in
master
and in
4 other branches
孤独症初筛名字
Showing 3 changed files with 15 additions and 10 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/BabyAutismPrimaryScreening.java
View file @
3a05108
| ... | ... | @@ -100,12 +100,12 @@ |
| 100 | 100 | /** |
| 101 | 101 | * 检查时间 |
| 102 | 102 | */ |
| 103 | - private Date checkTime; | |
| 103 | + private String checkTime; | |
| 104 | 104 | |
| 105 | 105 | /** |
| 106 | 106 | * 预约下次检查时间 |
| 107 | 107 | */ |
| 108 | - private Date nextCheckTime; | |
| 108 | + private String nextCheckTime; | |
| 109 | 109 | |
| 110 | 110 | /** |
| 111 | 111 | * 检查医生 |
| 112 | 112 | |
| 113 | 113 | |
| 114 | 114 | |
| ... | ... | @@ -405,19 +405,19 @@ |
| 405 | 405 | this.birth = birth; |
| 406 | 406 | } |
| 407 | 407 | |
| 408 | - public Date getCheckTime() { | |
| 408 | + public String getCheckTime() { | |
| 409 | 409 | return checkTime; |
| 410 | 410 | } |
| 411 | 411 | |
| 412 | - public void setCheckTime(Date checkTime) { | |
| 412 | + public void setCheckTime(String checkTime) { | |
| 413 | 413 | this.checkTime = checkTime; |
| 414 | 414 | } |
| 415 | 415 | |
| 416 | - public Date getNextCheckTime() { | |
| 416 | + public String getNextCheckTime() { | |
| 417 | 417 | return nextCheckTime; |
| 418 | 418 | } |
| 419 | 419 | |
| 420 | - public void setNextCheckTime(Date nextCheckTime) { | |
| 420 | + public void setNextCheckTime(String nextCheckTime) { | |
| 421 | 421 | this.nextCheckTime = nextCheckTime; |
| 422 | 422 | } |
| 423 | 423 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PrimaryScreeningFacade.java
View file @
3a05108
| ... | ... | @@ -11,7 +11,6 @@ |
| 11 | 11 | import com.lyms.platform.common.result.RespBuilder; |
| 12 | 12 | import com.lyms.platform.common.result.ResponseCode; |
| 13 | 13 | import com.lyms.platform.common.utils.DateUtil; |
| 14 | -import com.lyms.platform.common.utils.StringUtils; | |
| 15 | 14 | import com.lyms.platform.operate.web.inteceptor.InitDataConfig; |
| 16 | 15 | import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; |
| 17 | 16 | import com.lyms.platform.permission.model.Organization; |
| ... | ... | @@ -19,6 +18,7 @@ |
| 19 | 18 | import com.lyms.platform.permission.service.OrganizationService; |
| 20 | 19 | import com.lyms.platform.pojo.BabyAutismPrimaryScreening; |
| 21 | 20 | import com.lyms.platform.pojo.BabyModel; |
| 21 | +import org.apache.commons.lang3.StringUtils; | |
| 22 | 22 | import org.slf4j.Logger; |
| 23 | 23 | import org.slf4j.LoggerFactory; |
| 24 | 24 | import org.springframework.beans.factory.annotation.Autowired; |
| ... | ... | @@ -92,7 +92,7 @@ |
| 92 | 92 | temp.put("sex", SexEnum.getTextById(babyModel.getSex())); |
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | - temp.put("checkTime", DateUtil.getYyyyMmDd(babyCheck.getCheckTime())); | |
| 95 | + temp.put("checkTime", babyCheck.getCheckTime()); | |
| 96 | 96 | temp.put("type", "2");//展示区分（1：档案2：检查记录） |
| 97 | 97 | rest.add(temp); |
| 98 | 98 | } |
| ... | ... | @@ -133,6 +133,7 @@ |
| 133 | 133 | }else { |
| 134 | 134 | return RespBuilder.buildSuccess(ResponseCode.NEED_BUILD); |
| 135 | 135 | } |
| 136 | + primaryScreening.setDoctor(primaryScreening.getCheckDoctor().getName()); | |
| 136 | 137 | //添加 |
| 137 | 138 | if (StringUtils.isEmpty(primaryScreening.getId())) { |
| 138 | 139 | primaryScreening.setId(UUID.randomUUID().toString()); |
| ... | ... | @@ -159,6 +160,9 @@ |
| 159 | 160 | public BaseResponse queryDateListPage(BabyAutismPrimaryScreening babyAutismPrimaryScreening, BaseQuery pageRequest, Integer id) { |
| 160 | 161 | List<BabyAutismPrimaryScreening> primaryScreeningPage = babyAutismPrimaryScreeningService.queryByPage(babyAutismPrimaryScreening, pageRequest); |
| 161 | 162 | for (BabyAutismPrimaryScreening primaryScreening : primaryScreeningPage) { |
| 163 | + //查询医院 | |
| 164 | + Organization org = organizationService.getOrganization(Integer.valueOf(primaryScreening.getHospitalId())); | |
| 165 | + primaryScreening.setCheckHospital(org.getName()); | |
| 162 | 166 | String checkMonthId = primaryScreening.getCheckMonthId(); |
| 163 | 167 | HashMap<String, List<BaseMap>> monthageInfo = InitDataConfig.MONTHAGEINFO.get(Integer.valueOf(checkMonthId)); |
| 164 | 168 | String[] warningSignsId = primaryScreening.getWarningSignstring().split(","); |
| ... | ... | @@ -186,8 +190,8 @@ |
| 186 | 190 | } |
| 187 | 191 | } |
| 188 | 192 | } |
| 189 | - primaryScreening.setWarningSignstringName(org.apache.commons.lang.StringUtils.join(warningSigns,",")); | |
| 190 | - primaryScreening.setLanguageSocialName(org.apache.commons.lang.StringUtils.join(languageSocial,",")); | |
| 193 | + primaryScreening.setWarningSignstringName(StringUtils.join(warningSigns,",")); | |
| 194 | + primaryScreening.setLanguageSocialName(StringUtils.join(languageSocial,",")); | |
| 191 | 195 | |
| 192 | 196 | } |
| 193 | 197 | BaseObjectResponse br = new BaseObjectResponse(); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/inteceptor/InitDataConfig.java
View file @
3a05108