diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java index ea36c81..096f4bc 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java @@ -63,6 +63,8 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ //膏药 private String gyState; private Long numCode; + //1 未同步 2已经同步 + private Integer isSync; @Override public MongoQuery convertToQuery() { @@ -106,6 +108,9 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ if (yn!=null) { condition = condition.and("yn", yn, MongoOper.IS); } + if (isSync != null) { + condition = condition.and("isSync", isSync, MongoOper.IS); + } if (sexType!=null) { condition = condition.and("sexType", sexType, MongoOper.IS); } @@ -149,6 +154,13 @@ public class PremaritalCheckupQuery extends BaseQuery implements IConvertToNativ return condition.toMongoQuery(); } + public Integer getIsSync() { + return isSync; + } + + public void setIsSync(Integer isSync) { + this.isSync = isSync; + } public Long getNumCode() { return numCode; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java index 79fce15..9c7451f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java @@ -9,6 +9,8 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.PremaritalCheckupFacade; import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest; import com.lyms.platform.operate.web.request.PremaritalCheckupQueryRequest; +import com.lyms.platform.pojo.CancerScreeningModel; +import com.lyms.platform.pojo.PremaritalCheckup; import org.apache.commons.lang.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -189,4 +191,19 @@ public class PremaritalCheckupController extends BaseController{ return premaritalCheckupFacade.queryPremaritalCheckupPage(id, loginState.getId()); } + + @RequestMapping(method = RequestMethod.POST, value = "/syncPremaritalCheckup") + @ResponseBody + public BaseResponse syncPremaritalCheckup(@RequestBody PremaritalCheckup checkup, + HttpServletRequest request) { + return premaritalCheckupFacade.syncPremaritalCheckup(checkup); + } + + @RequestMapping(method = RequestMethod.GET, value = "/doSyncPremaritalCheckup") + @ResponseBody + public BaseResponse doSyncPremaritalCheckup( + HttpServletRequest request) { + return premaritalCheckupFacade.doSyncPremaritalCheckup(); + } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index c3c6e06..857e12d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -455,7 +455,7 @@ public class CancerScreeningFacade { cancerScr.setModified(new Date()); List modelList = cancerScreenService.queryCancerScreList(query); if (CollectionUtils.isNotEmpty(modelList)) { - cancerScreenService.updateOneCancerScreen(modelList.get(0), modelList.get(0).getId()); + cancerScreenService.updateOneCancerScreen(cancerScr, cancerScr.getId()); } else { 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 1eefe83..7c202b6 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 @@ -10,10 +10,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.ExcelUtil; -import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.common.utils.SystemConfig; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest; import com.lyms.platform.operate.web.request.PremaritalCheckupQueryRequest; import com.lyms.platform.operate.web.result.PremaritalCheckupHistoryResult; @@ -617,8 +614,9 @@ public class PremaritalCheckupFacade { * 修改妇女的婚检状态 * */ ResidentsArchiveModel residentsArchiveModel = new ResidentsArchiveModel(); - residentsArchiveModel.setCheckup(archiveModel.getCheckup() == null ? 1 : archiveModel.getCheckup()+1); + residentsArchiveModel.setCheckup(archiveModel.getCheckup() == null ? 1 : archiveModel.getCheckup() + 1); residentsArchiveModel.setCheckupTime(new Date()); + residentsArchiveModel.setIsSync(1); residentsArchiveService.updateResident(residentsArchiveModel, archiveModel.getId()); id = addOrUpdate(addRequest, userId, archiveModel); } @@ -935,6 +933,7 @@ public class PremaritalCheckupFacade { checkup.setVcCardNo(addRequest.getVcCardNo()); checkup.setCertificateNum(addRequest.getCertificateNum()); checkup.setPremaritalUpTime(DateUtil.parseYMD(addRequest.getPremaritalUpTime())); + checkup.setIsSync(1); if (StringUtils.isNotEmpty(addRequest.getId())) { //修改 checkup.setId(addRequest.getId()); @@ -2951,4 +2950,41 @@ public class PremaritalCheckupFacade { return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); } + + public BaseResponse syncPremaritalCheckup(PremaritalCheckup checkup) { + //查询条件 + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); + query.setId(checkup.getId()); + List modelList = premaritalCheckupService.queryPremaritalCheckup(query); + if (CollectionUtils.isNotEmpty(modelList)) { + premaritalCheckupService.updatePremaritalCheckup(checkup,checkup.getId()); + } + else + { + premaritalCheckupService.addPremaritalCheckup(checkup); + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + + } + + public BaseResponse doSyncPremaritalCheckup() { + //查询条件 + PremaritalCheckupQuery query = new PremaritalCheckupQuery(); + query.setIsSync(1); + List modelList = premaritalCheckupService.queryPremaritalCheckup(query); + if (CollectionUtils.isNotEmpty(modelList)) { + for (PremaritalCheckup model : modelList) + { + model.setIsSync(2); + 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); + } + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url"); } 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 173dd36..936f548 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 @@ -70,6 +70,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { public BaseResponse add(CervicalCancerRequest param,Integer userId) { param.setCreated(new Date()); param.setHospitalId(autoMatchFacade.getHospitalId(userId)); + param.setIsSync(1); mongoTemplate.insert(param); return new BaseResponse(); } @@ -82,6 +83,7 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { */ @Override public BaseResponse edit(CervicalCancerRequest param) { + param.setIsSync(1); Query query = Query.query(Criteria.where("id").is(param.getId())); Update update = MongoConvertHelper .convertToNativeUpdate(ReflectionUtils.getUpdateField(param));