diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java index cd081cb..c73580f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java @@ -14,15 +14,14 @@ import com.lyms.platform.operate.web.request.PuerperaMatcherCommunityRequest; import com.lyms.platform.operate.web.result.PuerperaResult; import com.lyms.platform.pojo.CommunityConfig; import com.lyms.platform.pojo.Patients; -import com.lyms.platform.pojo.PuerperaModel; import com.lyms.platform.query.PatientsQuery; -import com.lyms.platform.query.PuerperaModelQuery; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -43,23 +42,21 @@ public class PatientFacade { * 修改产妇的社区 * * @param puerperaMatcherCommunityRequest 修改产妇社区 - * * @return */ - public BaseResponse matchCommunity(PuerperaMatcherCommunityRequest puerperaMatcherCommunityRequest){ + public BaseResponse matchCommunity(PuerperaMatcherCommunityRequest puerperaMatcherCommunityRequest) { Patients puerperaModel = patientsService.findOnePatientById(puerperaMatcherCommunityRequest.getParentId()); Assert.notNull(puerperaModel, "产妇信息不存在"); puerperaModel.setCommunityId(puerperaMatcherCommunityRequest.getCommunityId()); patientsService.updatePatient(puerperaModel); //TODO 产妇分配了社区,需要给对应的社区提示消息 - return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); + return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } /** * 修改产妇信息 * - * @param managerUpdateRequest - * 产妇信息修改请求 + * @param managerUpdateRequest 产妇信息修改请求 * @return */ public BaseResponse updateOnePuerperaData(PuerperaManagerUpdateRequest managerUpdateRequest) { @@ -78,7 +75,12 @@ public class PatientFacade { PatientsQuery puerperaQuery = new PatientsQuery(); puerperaQuery.setLimit(managerRequest.getLimit()); puerperaQuery.setPage(managerRequest.getPage()); - puerperaQuery.setDueDateEnd(DateUtil.parseYMD(managerRequest.getDueDateEnd())); + Date date = DateUtil.parseYMD(managerRequest.getDueDateEnd()); + if (null != date) { + long d = date.getTime() + 86398000; + date = new Date(d); + } + puerperaQuery.setDueDateEnd(date); puerperaQuery.setDueDateStart(DateUtil.parseYMD(managerRequest.getDueDateStart())); puerperaQuery.setKeyword(managerRequest.getKeyword()); puerperaQuery.setCommunityId(managerRequest.getCommunityId()); @@ -94,15 +96,15 @@ public class PatientFacade { for (Patients model : puerperaList) { PuerperaResult result = new PuerperaResult(); - String comm="未分配"; - if(StringUtils.isNotEmpty(model.getCommunityId())){ + String comm = "未分配"; + if (StringUtils.isNotEmpty(model.getCommunityId())) { CommunityConfig communityConfig = communityConfigService.queryAreaById(model.getCommunityId()); - if(null!=communityConfig){ - comm= communityConfig.getName(); + if (null != communityConfig) { + comm = communityConfig.getName(); } } - String tips= visitFacade.getFindTips(model.getId()); - data.add(result.convertToResult(model,comm,tips)); + String tips = visitFacade.getFindTips(model.getId()); + data.add(result.convertToResult(model, comm, tips)); } } @@ -112,10 +114,8 @@ public class PatientFacade { /** * 删除一条产妇数据 * - * @param id - * 产妇id - * @param softDel - * 是否是软删除 true/false + * @param id 产妇id + * @param softDel 是否是软删除 true/false * @return 处理结果 */ public BaseResponse deleteOnePuerperaById(String id, boolean softDel) {