jiangjiazhi / regional-platform

Download as
Browse Code »

Commit b6637152ba941914abeb1ce194f400e07fe0b9a8

Authored by jiangjiazhi
1 parent 9cbaac4079
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

增加是否通知

Showing 1 changed file with 18 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ b663715
... ... @@ -129,7 +129,7 @@
129 129 model = list.get(0);
130 130 }
131 131 try {
132   - if(null!=model){
  132 + if(null!=model&&StringUtils.isNotEmpty(model.getRiskFactor())){
133 133 List list1 = JsonUtil.toList(model.getRiskFactor(), List.class);
134 134 return queryRisk(list1);
135 135 }
... ... @@ -144,7 +144,7 @@
144 144 antExChuModel = list1.get(0);
145 145 }
146 146 try {
147   - if(null!=antExChuModel){
  147 + if(null!=antExChuModel &&StringUtils.isNotEmpty(antExChuModel.getHighrisk())){
148 148 List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
149 149 return queryRisk(list2);
150 150 }
151 151  
... ... @@ -375,13 +375,17 @@
375 375 AntenatalExaminationResult antenatalExaminationResult = new AntenatalExaminationResult();
376 376 antenatalExaminationResult.convertToResult(examinationModel);
377 377 try {
378   - List list1 = JsonUtil.toList(examinationModel.getRiskFactor(), List.class);
379   - antenatalExaminationResult.setRiskFactor(queryRisk(list1));
  378 + if(StringUtils.isNotEmpty(examinationModel.getRiskFactor())){
  379 + List list1 = JsonUtil.toList(examinationModel.getRiskFactor(), List.class);
  380 + antenatalExaminationResult.setRiskFactor(queryRisk(list1));
  381 + }
380 382 } catch (Exception e) {
381 383 }
382 384 try {
383   - List list = JsonUtil.toList(examinationModel.getDiagnosis(), List.class);
384   - antenatalExaminationResult.setDiagnosis(queryRisk(list));
  385 + if(StringUtils.isNotEmpty(examinationModel.getDiagnosis())) {
  386 + List list = JsonUtil.toList(examinationModel.getDiagnosis(), List.class);
  387 + antenatalExaminationResult.setDiagnosis(queryRisk(list));
  388 + }
385 389 } catch (Exception e) {
386 390 }
387 391 ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();
388 392  
... ... @@ -405,13 +409,17 @@
405 409 }
406 410 antexChuResult.convertToResult(antExChuModel);
407 411 try {
408   - List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class);
409   - antexChuResult.setDiagnosis(queryRisk(list));
  412 + if(StringUtils.isNotEmpty(antExChuModel.getDiagnosis())){
  413 + List list = JsonUtil.toList(antExChuModel.getDiagnosis(), List.class);
  414 + antexChuResult.setDiagnosis(queryRisk(list));
  415 + }
410 416 } catch (Exception e) {
411 417 }
412 418 try {
413   - List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
414   - antexChuResult.setHighrisk(queryRisk(list1));
  419 + if(StringUtils.isNotEmpty(antExChuModel.getHighrisk())) {
  420 + List list1 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
  421 + antexChuResult.setHighrisk(queryRisk(list1));
  422 + }
415 423 } catch (Exception e) {
416 424 }
417 425 ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery();