liquanyu / regional-platform

Download as
Browse Code »

Commit 3b0a269804e97b4629f536bc2dbb5c503e1dfe7a

Authored by liquanyu
1 parent 6f273a0710
Exists in master and in 1 other branch dev

update

Showing 6 changed files with 41 additions and 22 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java View file @ 3b0a269
... ... @@ -83,7 +83,7 @@
83 83 /**
84 84 * 丈夫出生日期
85 85 */
86   - @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
  86 + // @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
87 87 private Date husbandBirthday;
88 88  
89 89 /**
... ... @@ -190,7 +190,7 @@
190 190 /**
191 191 * 妻子出生日期
192 192 */
193   - @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
  193 + //@JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
194 194 private Date wifeBirthday;
195 195  
196 196 /**
... ... @@ -286,7 +286,7 @@
286 286 /**
287 287 * 结婚时间
288 288 */
289   - @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
  289 + //@JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
290 290 private Date marriageTime;
291 291  
292 292 /**
... ... @@ -307,7 +307,7 @@
307 307 /**
308 308 * 填写日期
309 309 */
310   - @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
  310 + // @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
311 311 private Date fillDate;
312 312  
313 313 /**
platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java View file @ 3b0a269
... ... @@ -93,7 +93,7 @@
93 93 public void autoInLis()
94 94 {
95 95 Query query = new Query();
96   - Date start = DateUtil.addDay(new Date(),-10);
  96 + Date start = DateUtil.addDay(new Date(),-3);
97 97 query.addCriteria(Criteria.where("fillDate").gte(start));
98 98  
99 99 List <PreEugenicsBaseModel> preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class);
... ... @@ -149,6 +149,11 @@
149 149 System.out.println("lisReportModels="+lisReportModels.size());
150 150 if (CollectionUtils.isNotEmpty(lisReportModels)) {
151 151 for (LisReportModel model : lisReportModels) {
  152 +
  153 + wifeClinicalCheck.put("fillDate",DateUtil.getyyyy_MM_dd(model.getPublishTime()));
  154 + wifeClinicalCheck.put("doctor",2100002229);
  155 + wifeClinicalCheck.put("doctorStr","郝艳清");
  156 +
152 157 System.out.println("LisReportModel="+model.getLisId());
153 158 List<LisReportItemModel> itemModels = model.getItems();
154 159 if (CollectionUtils.isNotEmpty(itemModels)) {
... ... @@ -498,6 +503,11 @@
498 503 List<LisReportModel> hlisReportModels = getLhxfyLis(preEugenicsBaseModel.getHusbandCardNo());
499 504 if (CollectionUtils.isNotEmpty(hlisReportModels)) {
500 505 for (LisReportModel model : hlisReportModels) {
  506 +
  507 + husbandClinicalCheck.put("fillDate",DateUtil.getyyyy_MM_dd(model.getPublishTime()));
  508 + husbandClinicalCheck.put("doctor",2100002229);
  509 + husbandClinicalCheck.put("doctorStr","郝艳清");
  510 +
501 511 List<LisReportItemModel> itemModels = model.getItems();
502 512 if (CollectionUtils.isNotEmpty(itemModels)) {
503 513 for (LisReportItemModel itemModel : itemModels) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 3b0a269
... ... @@ -2999,8 +2999,11 @@
2999 2999 String json = JsonUtil.obj2Str1(model);
3000 3000 System.out.println(json);
3001 3001 String syncRsult = HttpClientUtil.doPostSSL(AREA_URL + "/syncPremaritalCheckup", json);
3002   - premaritalCheckupService.updatePremaritalCheckup(model, model.getId());
3003   - System.out.println("doSyncPremaritalCheckup=" + syncRsult);
  3002 + if(syncRsult != null)
  3003 + {
  3004 + premaritalCheckupService.updatePremaritalCheckup(model, model.getId());
  3005 + System.out.println("doSyncPremaritalCheckup=" + syncRsult);
  3006 + }
3004 3007 }
3005 3008 }
3006 3009 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 3b0a269
... ... @@ -1270,8 +1270,11 @@
1270 1270 String json = JsonUtil.obj2Str1(model);
1271 1271 System.out.println(json);
1272 1272 String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/syncResidentsArchive",json);
1273   - residentsArchiveService.updateResident(model,model.getId());
1274   - System.out.println("doSyncResidentsArchive=" + syncRsult);
  1273 + if(syncRsult != null)
  1274 + {
  1275 + residentsArchiveService.updateResident(model,model.getId());
  1276 + System.out.println("doSyncResidentsArchive=" + syncRsult);
  1277 + }
1275 1278 }
1276 1279 }
1277 1280 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 3b0a269
... ... @@ -704,14 +704,16 @@
704 704 String json = JsonUtil.obj2Str1(model);
705 705 System.out.println(json);
706 706 String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/cervicalCancer/syncCervicalCancer",json);
  707 + if(syncRsult != null)
  708 + {
  709 + Query query = Query.query(Criteria.where("id").is(model.getId()));
  710 + Update update = MongoConvertHelper
  711 + .convertToNativeUpdate(ReflectionUtils.getUpdateField(model));
  712 + mongoTemplate.updateFirst(query, update, CervicalCancerModel.class);
707 713  
  714 + System.out.println("doSyncCervicalCancer=" + syncRsult);
  715 + }
708 716  
709   - Query query = Query.query(Criteria.where("id").is(model.getId()));
710   - Update update = MongoConvertHelper
711   - .convertToNativeUpdate(ReflectionUtils.getUpdateField(model));
712   - mongoTemplate.updateFirst(query, update, CervicalCancerModel.class);
713   -
714   - System.out.println("doSyncCervicalCancer=" + syncRsult);
715 717 }
716 718 }
717 719 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java View file @ 3b0a269
... ... @@ -1050,12 +1050,13 @@
1050 1050 System.out.println(json);
1051 1051 String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/preEugenicsBase/syncPreEugenicsBase",json);
1052 1052  
1053   -
1054   - Query query = Query.query(Criteria.where("id").is(model.getId()));
1055   - Update update = MongoConvertHelper
1056   - .convertToNativeUpdate(ReflectionUtils.getUpdateField(model));
1057   - mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class);
1058   -
  1053 + if(syncRsult != null)
  1054 + {
  1055 + Query query = Query.query(Criteria.where("id").is(model.getId()));
  1056 + Update update = MongoConvertHelper
  1057 + .convertToNativeUpdate(ReflectionUtils.getUpdateField(model));
  1058 + mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class);
  1059 + }
1059 1060 System.out.println("doSyncPreEugenicsBase=" + syncRsult);
1060 1061 }
1061 1062 }