diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index d18dfb0..951a120 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -326,6 +326,13 @@ public class AntenatalExaminationFacade { antenatalExaminationResult.setDiagnosis(queryRisk(list)); } catch (Exception e) { } + ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setParentId(examinationModel.getParentId()); + antenatalExaminationResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1); + SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery(); + applyOrderQuery.setParentId(examinationModel.getParentId()); + applyOrderQuery.setYn(YnEnums.YES.getId()); + antenatalExaminationResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1); object = antenatalExaminationResult; } else { //查询初诊数据 @@ -348,8 +355,14 @@ public class AntenatalExaminationFacade { List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class); antexChuResult.setHighrisk(queryRisk(list1)); } catch (Exception e) { - } + ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setParentId(antExChuModel.getParentId()); + antexChuResult.setHasRefer(CollectionUtils.isEmpty(applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery)) ? 0 : 1); + SieveApplyOrderQuery applyOrderQuery=new SieveApplyOrderQuery(); + applyOrderQuery.setParentId(antExChuModel.getParentId()); + applyOrderQuery.setYn(YnEnums.YES.getId()); + antexChuResult.setHasSieve(CollectionUtils.isEmpty(applyOrderService.querySieveApplyOrderWithQuery(applyOrderQuery))?0:1); object = antexChuResult; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index 2e4eedf..a404fdb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -69,6 +69,26 @@ public class AntenatalExaminationResult implements IBasicResultConvert