diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index 3bfcedc..63911ad 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -77,6 +77,7 @@ public class TrackDownFacade { trackDownTypeHandlerMap.put(TrackDownDateEnums.B.getId(), new FQTrackDownTypeHandler()); trackDownTypeHandlerMap.put(TrackDownDateEnums.C.getId(), new CJTrackDownTypeHandler()); trackDownTypeHandlerMap.put(TrackDownDateEnums.D.getId(), new CJTrackDownTypeHandler()); + trackDownTypeHandlerMap.put(TrackDownDateEnums.E.getId(), new CJTrackDownTypeHandler()); } /** @@ -93,10 +94,12 @@ public class TrackDownFacade { downRecordQuery.setStreetId(downQueryRequest.getStreetId()); downRecordQuery.setTrackType(downQueryRequest.getTrackType()); //如果是产筛请求 - if(null!=downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId()==downQueryRequest.getTrackType()){ + if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) { downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140)); downRecordQuery.setTrackType(3); - } + }/*else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.E.getId() == downQueryRequest.getTrackType()){ + downRecordQuery.setLastMensesStart(); + }*/ downRecordQuery.setPage(downQueryRequest.getPage()); downRecordQuery.setLimit(downQueryRequest.getLimit()); downRecordQuery.setNeed("1"); @@ -112,17 +115,17 @@ public class TrackDownFacade { * @param trackType 业务类型 * @return */ - public BaseObjectResponse mother(String parentId,Integer trackType,Integer userId){ - String hospitalId= autoMatchFacade.getHospitalId(userId); + public BaseObjectResponse mother(String parentId, Integer trackType, Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); Map map = new HashMap<>(); - if(TrackDownDateEnums.C.getId()>trackType){ + if (TrackDownDateEnums.C.getId() > trackType) { ResidentsArchiveModel resid = residentsArchiveService.getResident(parentId); map.put("username", resid.getUsername()); map.put("phone", resid.getPhone()); map.put("cardNo", resid.getCertificateNum()); map.put("age", DateUtil.getAge(resid.getBirthday())); - }else{ - Patients patients =patientsService.findOnePatientById(parentId); + } else { + Patients patients = patientsService.findOnePatientById(parentId); map.put("username", patients.getUsername()); map.put("phone", patients.getPhone()); map.put("cardNo", patients.getCardNo()); @@ -157,6 +160,13 @@ public class TrackDownFacade { return RespBuilder.buildSuccess(map); } + /** + * 获取追访列表 + * + * @param downQueryRequest 请求对象 + * @param userId 用户id + * @return 返回的数据 + */ public BaseObjectResponse list(TrackDownQueryRequest downQueryRequest, Integer userId) { //转换为本地的查询条件 TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId); @@ -264,7 +274,7 @@ public class TrackDownFacade { temp.put("id", downRecord.getId()); temp.put("parentId", downRecord.getParentId()); // temp.put("dueDate", DateUtil.getyyyy_MM_dd(patient.getDueDate())); - if(null!=downRecord.getLastMenses()){ + if (null != downRecord.getLastMenses()) { temp.put("week", DateUtil.getWeekDesc(downRecord.getLastMenses(), new Date())); /** 孕周 */ } temp.put("cjDate", ""); /** 产检日期 */