shiyang / regional-platform

Download as
Browse Code »

Commit e0c88dfe7e653a77b067b93891677ca1f4f657b2

Authored by jiangjiazhi
1 parent e62790e0c6
Exists in master and in 1 other branch nobuildprocess

增加是否通知

Showing 1 changed file with 22 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ e0c88df
... ... @@ -16,6 +16,7 @@
16 16 import com.lyms.platform.permission.model.Organization;
17 17 import com.lyms.platform.permission.service.OrganizationService;
18 18 import com.lyms.platform.pojo.*;
  19 +import com.lyms.platform.query.AntExChuQuery;
19 20 import com.lyms.platform.query.AntExQuery;
20 21 import com.lyms.platform.query.MatDeliverQuery;
21 22 import com.lyms.platform.query.PatientsQuery;
22 23  
23 24  
... ... @@ -154,10 +155,11 @@
154 155 antExQuery.setYn(YnEnums.YES.getId());
155 156 List<AntenatalExaminationModel> examinationModel = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery());
156 157 try {
  158 + String tTireNumber="";
  159 + List data = new ArrayList();
157 160 if(CollectionUtils.isNotEmpty(examinationModel)){
158   - List data = new ArrayList();
159 161 if(null!=examinationModel&&StringUtils.isNotEmpty(examinationModel.get(0).getRiskFactor())){
160   - matDeliverListResult.setTireNumber1(examinationModel.get(0).getTireNumber());
  162 + tTireNumber=examinationModel.get(0).getTireNumber();
161 163 List l = JsonUtil.toList(examinationModel.get(0).getRiskFactor(),List.class);
162 164 for(int i=0;i<l.size();i++){
163 165 String key = (String)l.get(i);
164 166  
... ... @@ -167,10 +169,26 @@
167 169 }
168 170 }
169 171 }
170   - matDeliverListResult.setRiskFactor(data);
  172 + }else{
  173 + AntExChuQuery antExChuQuery=new AntExChuQuery();
  174 + antExChuQuery.setYn(YnEnums.YES.getId());
  175 + antExChuQuery.setParentId(patients.getId());
  176 + List<AntExChuModel> antExChuModels= antenatalExaminationService.queryAntExChu(antExChuQuery);
  177 + if(CollectionUtils.isNotEmpty(antExChuModels)){
  178 + tTireNumber=antExChuModels.get(0).getTireNumber();
  179 + List l = JsonUtil.toList(antExChuModels.get(0).getHighrisk(),List.class);
  180 + for(int i=0;i<l.size();i++){
  181 + String key = (String)l.get(i);
  182 + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(key);
  183 + if(null!=basicConfig){
  184 + data.add(basicConfig.getName());
  185 + }
  186 + }
  187 + }
171 188 }
172 189  
173   -
  190 + matDeliverListResult.setRiskFactor(data);
  191 + matDeliverListResult.setTireNumber1(tTireNumber);
174 192 }catch (Exception e){}
175 193 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(matDeliverListResult);
176 194 }