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 dc42c5e..c03d67d 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 @@ -471,15 +471,36 @@ public class AntenatalExaminationFacade { } data.add(); }*/ - - antexListResult.convertToResult(list, patients, antExChulist); + antexListResult.setData(handlAntData(antExChulist,list)); antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId())); antexListResult.setRiskFactor(highScoreResult.getHighRisk()); antexListResult.setRiskScore(highScoreResult.getScore()+""); return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); } + public List handlAntData(List antExChulist,List list){ + List dataList = new ArrayList<>(); + Organization organization=null; + if(CollectionUtils.isNotEmpty(antExChulist)){ + for(AntExChuModel antExChuModel1:antExChulist){ + if (null != antExChuModel1.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId())); + } + dataList.add(new AntData(antExChuModel1,null != organization ? organization.getName() : "")); + } + } + if(CollectionUtils.isNotEmpty(list)){ + for(AntenatalExaminationModel model:list){ + if (null != model.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); + } + dataList.add(new AntData(model, null != organization ? organization.getName() : "")); + } + } + return dataList; + } + private List queryRiskName(List l) { List data = new ArrayList(); for (int i = 0; i < l.size(); i++) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 443a871..89b9111 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -159,7 +159,6 @@ public class AntexListResult { setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); - setRiskScore("60"); setCardNo(patients.getCardNo()); setVcCardNo(patients.getVcCardNo()); @@ -170,18 +169,7 @@ public class AntexListResult { if(null!=patients.getLastMenses()){ setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); } - List dataList = new ArrayList<>(); - if(CollectionUtils.isNotEmpty(antExChuModel)){ - for(AntExChuModel antExChuModel1:antExChuModel){ - dataList.add(new AntData(antExChuModel1,"")); - } - } - if(CollectionUtils.isNotEmpty(destModel)){ - for(AntenatalExaminationModel model:destModel){ - dataList.add(new AntData(model,"")); - } - } - setData(dataList); + return this; }