diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java index 76b813c..8782bd6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java @@ -71,10 +71,23 @@ public class VisitFacade { */ public BaseObjectResponse findOneByCardNo(String cardNo) { Patients puerperaModel = findOnePuerperaByCardNo(cardNo, 3); - if (null == puerperaModel) { - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("产妇信息不存在"); + if (null != puerperaModel) { + return doBiz(puerperaModel); + } + BabyModelQuery babyModelQuery =new BabyModelQuery(); + babyModelQuery.setYn(YnEnums.YES.getId()); + babyModelQuery.setMphone(cardNo); + List babyModels = babyService.queryBabyWithQuery(babyModelQuery); + + if(CollectionUtils.isNotEmpty(babyModels)){ + VisitResult data = new VisitResult(); + BabyModel babyModel = babyModels.get(0); + data.convertToResult1(babyModel, CommonsHelper.fullAddress(babyModel, basicConfigService)); + data.setData(Collections.EMPTY_LIST); + return new BaseObjectResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - return doBiz(puerperaModel); + + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.DEPT_NOT_EXISTS).setErrormsg("产妇信息不存在"); } /** @@ -160,14 +173,7 @@ public class VisitFacade { } else { // 表示是新的产妇直接新增 // parentId = puerperaService.addPuerpera(visitRequest.getPuerpera().build()).getId(); - Patients patients = visitRequest.getPatients(); - patients.setType(3); - patients.setYn(YnEnums.YES.getId()); - patients.setId(null); - patients.setCreated(new Date()); - patients.setModified(new Date()); - patients.setIsVisit(VisitStatusEnums.UNVISIT.getId()); - parentId = patientsService.addPatient(patients).getId(); + parentId= addOnePatients(visitRequest.getPatients()); } // 如果为空表示新增 @@ -194,6 +200,31 @@ public class VisitFacade { } /** + * + * 增加一个患者并根据患者的手机号去关联小孩的数据 + * + * @param patients + * @return + */ + public String addOnePatients(Patients patients){ + patients.setType(3); + patients.setYn(YnEnums.YES.getId()); + patients.setId(null); + patients.setCreated(new Date()); + patients.setModified(new Date()); + patients.setIsVisit(VisitStatusEnums.UNVISIT.getId()); + String parentId = patientsService.addPatient(patients).getId(); + + BabyModelQuery babyModelQuery = new BabyModelQuery(); + babyModelQuery.setMphone(patients.getPhone()); + babyModelQuery.setYn(YnEnums.YES.getId()); + BabyModel babyModel = new BabyModel(); + babyModel.setParentId(parentId); + babyService.findAndModify(babyModelQuery.convertToQuery(),babyModel); + return parentId; + } + + /** * 增加一条小孩的访视记录 * * @param babyVisitAddRequest diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java index f38d99b..6b98350 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java @@ -6,6 +6,7 @@ import java.util.Map; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; +import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.Patients; import com.lyms.platform.pojo.PuerperaModel; @@ -129,4 +130,21 @@ public class VisitResult { setDueType(model.getDueType()==null?"":model.getDueType()); setName(model.getUsername()); } + + public void convertToResult1(BabyModel model,Address address) { + try { + setAddress(address); + } catch (Exception e) { + } + try { + setAge(DateUtil.getyyyy_MM_dd(model.getBirth())); + }catch (Exception e){ + } + setPhone(model.getMphone()); +// setId(model.getId()); +// setCardNo(null==model.getCardNo()?"":model.getCardNo()); + setCardNo(null==model.getMphone()?"":model.getMphone()); + setDueDate(DateUtil.getyyyy_MM_dd(model.getBirth())); + setName(model.getMname()); + } } \ No newline at end of file