shiyang / regional-platform

Download as
Browse Code »

Commit e8a25441d07a34121258a26f91f2af8328ccd54e

Authored by jiangjiazhi
1 parent 76dfe4e91d
Exists in master

修改产检删除

Showing 1 changed file with 19 additions and 12 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ e8a2544
... ... @@ -1042,6 +1042,7 @@
1042 1042 Organization organization = null;
1043 1043 String pid = "";
1044 1044 List listData = new ArrayList();
  1045 +
1045 1046 while (iterator.hasNext()) {
1046 1047 Patients patients = iterator.next();
1047 1048  
... ... @@ -1084,6 +1085,7 @@
1084 1085 if (null != an.getHospitalId()) {
1085 1086 organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
1086 1087 }
  1088 +
1087 1089 listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses()));
1088 1090 }
1089 1091 }
... ... @@ -1105,6 +1107,7 @@
1105 1107 if (null != an.getHospitalId()) {
1106 1108 organization = organizationService.getOrganization(Integer.valueOf(an.getHospitalId()));
1107 1109 }
  1110 +
1108 1111 listData.add(new AntData(an, null != organization ? organization.getName() : "", patientses.get(0).getLastMenses()));
1109 1112 }
1110 1113 }
1111 1114  
... ... @@ -1117,12 +1120,13 @@
1117 1120 if (null != model.getHospitalId()) {
1118 1121 organization = organizationService.getOrganization(Integer.valueOf(model.getHospitalId()));
1119 1122 }
  1123 +
1120 1124 listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : ""));
1121 1125 }
1122 1126 }
1123 1127  
1124 1128 PostReviewQuery postReviewQuery = new PostReviewQuery();
1125   - if (list.size() - 1 > i) {
  1129 + if (list.size() - 1 >i) {
1126 1130 postReviewQuery.setStart(dueDate);
1127 1131 if (CollectionUtils.isNotEmpty(listDate)) {
1128 1132 //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示
1129 1133  
1130 1134  
1131 1135  
... ... @@ -1137,22 +1141,25 @@
1137 1141 //产后复查记录
1138 1142 List<PostReviewModel> reviewModels = postReviewService.findWithList(postReviewQuery);
1139 1143 if (CollectionUtils.isNotEmpty(reviewModels)) {
1140   - for (PostReviewModel postReviewModel : reviewModels) {
1141   - if (postReviewModel.getYn() == YnEnums.YES.getId()) {
1142   - if (null != postReviewModel.getHospitalId()) {
1143   - organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
1144   - }
  1144 + if(CollectionUtils.isNotEmpty(listData)){
  1145 + for (PostReviewModel postReviewModel : reviewModels) {
  1146 + if (postReviewModel.getYn() == YnEnums.YES.getId()) {
  1147 + if (null != postReviewModel.getHospitalId()) {
  1148 + organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId()));
  1149 + }
1145 1150  
1146   - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", dueDate));
  1151 + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", dueDate));
  1152 + }
1147 1153 }
1148   -
1149 1154 }
1150 1155 }
1151 1156 iterator.remove();
1152   - sort(listData);
1153   - updateEditEnable(listData, sortList);
1154   - sortList.add(listData);
1155   - listData = new ArrayList();
  1157 + if(CollectionUtils.isNotEmpty(listData)){
  1158 + sort(listData);
  1159 + updateEditEnable(listData, sortList);
  1160 + sortList.add(listData);
  1161 + listData = new ArrayList();
  1162 + }
1156 1163 }
1157 1164 }
1158 1165 }