shiyang / regional-platform

Download as
Browse Code »

Commit b28cd56768f8308261a26da90580acece33be5d3

Authored by hujiaqi
2 parents 2e192bfc2f 900f190a79
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ b28cd56
... ... @@ -182,6 +182,8 @@
182 182 Object id = map.get("_id");
183 183 if(null!=id){
184 184 dId =id.toString();
  185 + }else {
  186 + continue;
185 187 }
186 188  
187 189 cjStatisticsResult.setdId(dId);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PredictedStatisticsFacade.java View file @ b28cd56
... ... @@ -149,14 +149,14 @@
149 149  
150 150 }
151 151  
152   - private static String getGestationalWeeks(Date date, int type, int dueStatus) {
  152 + private static String getGestationalWeeks(Date date, int type, Integer dueStatus) {
153 153 if (type == 3) {
154   - if (dueStatus == 0) {
  154 + if (dueStatus!=null&&dueStatus == 0 ) {
155 155 return "已分娩";
156   - } else if (dueStatus == 1) {
  156 + } else if (dueStatus!=null&&dueStatus == 1) {
157 157 return "终止妊娠";
158 158 } else {
159   - return "";
  159 + return "已分娩";
160 160 }
161 161 }
162 162 try {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ b28cd56
... ... @@ -185,6 +185,17 @@
185 185 if (CollectionUtils.isNotEmpty(modelList)){
186 186 ResidentsArchiveModel archiveModel = modelList.get(0);
187 187  
  188 + if (archiveModel != null & StringUtils.isNotEmpty(addRequest.getPhone()) && !archiveModel.getPhone().equals(addRequest.getPhone()) ){
  189 + query.setCertificateNum(null);
  190 + query.setPhone(addRequest.getPhone());
  191 + modelList = residentsArchiveService.queryResident(query);
  192 + if (CollectionUtils.isNotEmpty(modelList)){
  193 + br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
  194 + br.setErrormsg("该手机号在医院已经建档");
  195 + return br;
  196 + }
  197 + }
  198 +
188 199 if (archiveModel != null && StringUtils.isNotEmpty(archiveModel.getVcCardNo()) && !archiveModel.getVcCardNo().equals(addRequest.getVcCardNo())){
189 200  
190 201 //判断该就诊卡号是否在该医院建档