Commit df93843ae2c16436eed410f95cc1a2a30217ab81
1 parent
13c8eb806a
Exists in
master
and in
8 other branches
孕妇分娩后 变成产妇
Showing 2 changed files with 24 additions and 15 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
df93843
| ... | ... | @@ -471,13 +471,34 @@ |
| 471 | 471 | } |
| 472 | 472 | data.add(); |
| 473 | 473 | }*/ |
| 474 | - | |
| 475 | - | |
| 476 | 474 | antexListResult.convertToResult(list, patients, antExChulist); |
| 475 | + antexListResult.setData(handlAntData(antExChulist,list)); | |
| 477 | 476 | antexListResult.setIsSieve(cap(patients.getLastMenses(), patients.getId())); |
| 478 | 477 | antexListResult.setRiskFactor(highScoreResult.getHighRisk()); |
| 479 | 478 | antexListResult.setRiskScore(highScoreResult.getScore()+""); |
| 480 | 479 | return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(antexListResult); |
| 480 | + } | |
| 481 | + | |
| 482 | + public List handlAntData(List<AntExChuModel> antExChulist,List<AntenatalExaminationModel> list){ | |
| 483 | + List<AntData> dataList = new ArrayList<>(); | |
| 484 | + Organization organization=null; | |
| 485 | + if(CollectionUtils.isNotEmpty(antExChulist)){ | |
| 486 | + for(AntExChuModel antExChuModel1:antExChulist){ | |
| 487 | + if (null != antExChuModel1.getHospitalId()) { | |
| 488 | + organization = organizationService.getOrganization(Integer.valueOf(antExChuModel1.getHospitalId())); | |
| 489 | + } | |
| 490 | + dataList.add(new AntData(antExChuModel1,null != organization ? organization.getName() : "")); | |
| 491 | + } | |
| 492 | + } | |
| 493 | + if(CollectionUtils.isNotEmpty(list)){ | |
| 494 | + for(AntenatalExaminationModel model:list){ | |
| 495 | + if (null != model.getHospitalId()) { | |
| 496 | + organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId())); | |
| 497 | + } | |
| 498 | + dataList.add(new AntData(model, null != organization ? organization.getName() : "")); | |
| 499 | + } | |
| 500 | + } | |
| 501 | + return dataList; | |
| 481 | 502 | } |
| 482 | 503 | |
| 483 | 504 | private List queryRiskName(List l) { |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
View file @
df93843
| ... | ... | @@ -159,7 +159,6 @@ |
| 159 | 159 | setName(patients.getUsername()); |
| 160 | 160 | setPhone(patients.getPhone()); |
| 161 | 161 | setRemarks(patients.getMremark()); |
| 162 | - setRiskScore("60"); | |
| 163 | 162 | setCardNo(patients.getCardNo()); |
| 164 | 163 | |
| 165 | 164 | setVcCardNo(patients.getVcCardNo()); |
| ... | ... | @@ -170,18 +169,7 @@ |
| 170 | 169 | if(null!=patients.getLastMenses()){ |
| 171 | 170 | setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); |
| 172 | 171 | } |
| 173 | - List<AntData> dataList = new ArrayList<>(); | |
| 174 | - if(CollectionUtils.isNotEmpty(antExChuModel)){ | |
| 175 | - for(AntExChuModel antExChuModel1:antExChuModel){ | |
| 176 | - dataList.add(new AntData(antExChuModel1,"")); | |
| 177 | - } | |
| 178 | - } | |
| 179 | - if(CollectionUtils.isNotEmpty(destModel)){ | |
| 180 | - for(AntenatalExaminationModel model:destModel){ | |
| 181 | - dataList.add(new AntData(model,"")); | |
| 182 | - } | |
| 183 | - } | |
| 184 | - setData(dataList); | |
| 172 | + | |
| 185 | 173 | return this; |
| 186 | 174 | } |
| 187 | 175 |