diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java index d28ac77..ac17988 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java @@ -83,7 +83,7 @@ public class PreEugenicsBaseModel extends BaseModel { /** * 丈夫出生日期 */ - @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + // @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date husbandBirthday; /** @@ -190,7 +190,7 @@ public class PreEugenicsBaseModel extends BaseModel { /** * 妻子出生日期 */ - @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + //@JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date wifeBirthday; /** @@ -286,7 +286,7 @@ public class PreEugenicsBaseModel extends BaseModel { /** * 结婚时间 */ - @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + //@JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date marriageTime; /** @@ -307,7 +307,7 @@ public class PreEugenicsBaseModel extends BaseModel { /** * 填写日期 */ - @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + // @JsonFormat(pattern = DateUtil.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") private Date fillDate; /** diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java index 8fe874e..0da8484 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lhxfy/LhxfyService.java @@ -93,7 +93,7 @@ public class LhxfyService { public void autoInLis() { Query query = new Query(); - Date start = DateUtil.addDay(new Date(),-10); + Date start = DateUtil.addDay(new Date(),-3); query.addCriteria(Criteria.where("fillDate").gte(start)); List preEugenicsBaseModels = mongoTemplate.find(query, PreEugenicsBaseModel.class); @@ -149,6 +149,11 @@ public class LhxfyService { System.out.println("lisReportModels="+lisReportModels.size()); if (CollectionUtils.isNotEmpty(lisReportModels)) { for (LisReportModel model : lisReportModels) { + + wifeClinicalCheck.put("fillDate",DateUtil.getyyyy_MM_dd(model.getPublishTime())); + wifeClinicalCheck.put("doctor",2100002229); + wifeClinicalCheck.put("doctorStr","郝艳清"); + System.out.println("LisReportModel="+model.getLisId()); List itemModels = model.getItems(); if (CollectionUtils.isNotEmpty(itemModels)) { @@ -498,6 +503,11 @@ public class LhxfyService { List hlisReportModels = getLhxfyLis(preEugenicsBaseModel.getHusbandCardNo()); if (CollectionUtils.isNotEmpty(hlisReportModels)) { for (LisReportModel model : hlisReportModels) { + + husbandClinicalCheck.put("fillDate",DateUtil.getyyyy_MM_dd(model.getPublishTime())); + husbandClinicalCheck.put("doctor",2100002229); + husbandClinicalCheck.put("doctorStr","郝艳清"); + List itemModels = model.getItems(); if (CollectionUtils.isNotEmpty(itemModels)) { for (LisReportItemModel itemModel : itemModels) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index dbeba79..a0607fe 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -2999,8 +2999,11 @@ public class PremaritalCheckupFacade { String json = JsonUtil.obj2Str1(model); System.out.println(json); String syncRsult = HttpClientUtil.doPostSSL(AREA_URL + "/syncPremaritalCheckup", json); - premaritalCheckupService.updatePremaritalCheckup(model, model.getId()); - System.out.println("doSyncPremaritalCheckup=" + syncRsult); + if(syncRsult != null) + { + premaritalCheckupService.updatePremaritalCheckup(model, model.getId()); + System.out.println("doSyncPremaritalCheckup=" + syncRsult); + } } } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java index 85bdf19..db994f4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java @@ -1270,8 +1270,11 @@ public class ResidentsArchiveFacade { String json = JsonUtil.obj2Str1(model); System.out.println(json); String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/syncResidentsArchive",json); - residentsArchiveService.updateResident(model,model.getId()); - System.out.println("doSyncResidentsArchive=" + syncRsult); + if(syncRsult != null) + { + residentsArchiveService.updateResident(model,model.getId()); + System.out.println("doSyncResidentsArchive=" + syncRsult); + } } } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index 5eb0ff1..e107334 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -704,14 +704,16 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { String json = JsonUtil.obj2Str1(model); System.out.println(json); String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/cervicalCancer/syncCervicalCancer",json); + if(syncRsult != null) + { + Query query = Query.query(Criteria.where("id").is(model.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); + mongoTemplate.updateFirst(query, update, CervicalCancerModel.class); + + System.out.println("doSyncCervicalCancer=" + syncRsult); + } - - Query query = Query.query(Criteria.where("id").is(model.getId())); - Update update = MongoConvertHelper - .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); - mongoTemplate.updateFirst(query, update, CervicalCancerModel.class); - - System.out.println("doSyncCervicalCancer=" + syncRsult); } } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java index 100e983..3ad7a58 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java @@ -1050,12 +1050,13 @@ public class PreEugebicsServiceImpl extends BaseServiceImpl implements IPreEugen System.out.println(json); String syncRsult = HttpClientUtil.doPostSSL(AREA_URL+"/preEugenicsBase/syncPreEugenicsBase",json); - - Query query = Query.query(Criteria.where("id").is(model.getId())); - Update update = MongoConvertHelper - .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); - mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class); - + if(syncRsult != null) + { + Query query = Query.query(Criteria.where("id").is(model.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(model)); + mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class); + } System.out.println("doSyncPreEugenicsBase=" + syncRsult); } }