jiangjiazhi / regional-platform

Commit 6c850cd59b08e0ad5c417386c0b4e323956fcc7f

Authored by liquanyu almost 5 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 73 additions and 6 deletions

platform-dal/src/main/java/com/lyms/platform/query/PremaritalCheckupQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PremaritalCheckupController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java

...	...	@@ -63,6 +63,8 @@
63	63	//膏药
64	64	private String gyState;
65	65	private Long numCode;
	66	+ //1 未同步 2已经同步
	67	+ private Integer isSync;
66	68
67	69	@Override
68	70	public MongoQuery convertToQuery() {
...	...	@@ -106,6 +108,9 @@
106	108	if (yn!=null) {
107	109	condition = condition.and("yn", yn, MongoOper.IS);
108	110	}
	111	+ if (isSync != null) {
	112	+ condition = condition.and("isSync", isSync, MongoOper.IS);
	113	+ }
109	114	if (sexType!=null) {
110	115	condition = condition.and("sexType", sexType, MongoOper.IS);
111	116	}
...	...	@@ -149,6 +154,13 @@
149	154	return condition.toMongoQuery();
150	155	}
151	156
	157	+ public Integer getIsSync() {
	158	+ return isSync;
	159	+ }
	160	+
	161	+ public void setIsSync(Integer isSync) {
	162	+ this.isSync = isSync;
	163	+ }
152	164	public Long getNumCode() {
153	165	return numCode;
154	166	}

...	...	@@ -9,6 +9,8 @@
9	9	import com.lyms.platform.operate.web.facade.PremaritalCheckupFacade;
10	10	import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest;
11	11	import com.lyms.platform.operate.web.request.PremaritalCheckupQueryRequest;
	12	+import com.lyms.platform.pojo.CancerScreeningModel;
	13	+import com.lyms.platform.pojo.PremaritalCheckup;
12	14	import org.apache.commons.lang.StringUtils;
13	15	import org.springframework.beans.factory.annotation.Autowired;
14	16	import org.springframework.stereotype.Controller;
...	...	@@ -187,6 +189,21 @@
187	189	HttpServletRequest request){
188	190	LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
189	191	return premaritalCheckupFacade.queryPremaritalCheckupPage(id, loginState.getId());
	192	+ }
	193	+
	194	+
	195	+ @RequestMapping(method = RequestMethod.POST, value = "/syncPremaritalCheckup")
	196	+ @ResponseBody
	197	+ public BaseResponse syncPremaritalCheckup(@RequestBody PremaritalCheckup checkup,
	198	+ HttpServletRequest request) {
	199	+ return premaritalCheckupFacade.syncPremaritalCheckup(checkup);
	200	+ }
	201	+
	202	+ @RequestMapping(method = RequestMethod.GET, value = "/doSyncPremaritalCheckup")
	203	+ @ResponseBody
	204	+ public BaseResponse doSyncPremaritalCheckup(
	205	+ HttpServletRequest request) {
	206	+ return premaritalCheckupFacade.doSyncPremaritalCheckup();
190	207	}
191	208
192	209	}

...	...	@@ -455,7 +455,7 @@
455	455	cancerScr.setModified(new Date());
456	456	List <CancerScreeningModel> modelList = cancerScreenService.queryCancerScreList(query);
457	457	if (CollectionUtils.isNotEmpty(modelList)) {
458		- cancerScreenService.updateOneCancerScreen(modelList.get(0), modelList.get(0).getId());
	458	+ cancerScreenService.updateOneCancerScreen(cancerScr, cancerScr.getId());
459	459	}
460	460	else
461	461	{

...	...	@@ -10,10 +10,7 @@
10	10	import com.lyms.platform.common.result.BaseListResponse;
11	11	import com.lyms.platform.common.result.BaseObjectResponse;
12	12	import com.lyms.platform.common.result.BaseResponse;
13		-import com.lyms.platform.common.utils.DateUtil;
14		-import com.lyms.platform.common.utils.ExcelUtil;
15		-import com.lyms.platform.common.utils.JsonUtil;
16		-import com.lyms.platform.common.utils.SystemConfig;
	13	+import com.lyms.platform.common.utils.*;
17	14	import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest;
18	15	import com.lyms.platform.operate.web.request.PremaritalCheckupQueryRequest;
19	16	import com.lyms.platform.operate.web.result.PremaritalCheckupHistoryResult;
20	17
...	...	@@ -617,8 +614,9 @@
617	614	* 修改妇女的婚检状态
618	615	* */
619	616	ResidentsArchiveModel residentsArchiveModel = new ResidentsArchiveModel();
620		- residentsArchiveModel.setCheckup(archiveModel.getCheckup() == null ? 1 : archiveModel.getCheckup()+1);
	617	+ residentsArchiveModel.setCheckup(archiveModel.getCheckup() == null ? 1 : archiveModel.getCheckup() + 1);
621	618	residentsArchiveModel.setCheckupTime(new Date());
	619	+ residentsArchiveModel.setIsSync(1);
622	620	residentsArchiveService.updateResident(residentsArchiveModel, archiveModel.getId());
623	621	id = addOrUpdate(addRequest, userId, archiveModel);
624	622	}
...	...	@@ -935,6 +933,7 @@
935	933	checkup.setVcCardNo(addRequest.getVcCardNo());
936	934	checkup.setCertificateNum(addRequest.getCertificateNum());
937	935	checkup.setPremaritalUpTime(DateUtil.parseYMD(addRequest.getPremaritalUpTime()));
	936	+ checkup.setIsSync(1);
938	937	if (StringUtils.isNotEmpty(addRequest.getId())) {
939	938	//修改
940	939	checkup.setId(addRequest.getId());
...	...	@@ -2951,5 +2950,42 @@
2951	2950
2952	2951	return new BaseResponse().setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS);
2953	2952	}
	2953	+
	2954	+ public BaseResponse syncPremaritalCheckup(PremaritalCheckup checkup) {
	2955	+ //查询条件
	2956	+ PremaritalCheckupQuery query = new PremaritalCheckupQuery();
	2957	+ query.setId(checkup.getId());
	2958	+ List<PremaritalCheckup> modelList = premaritalCheckupService.queryPremaritalCheckup(query);
	2959	+ if (CollectionUtils.isNotEmpty(modelList)) {
	2960	+ premaritalCheckupService.updatePremaritalCheckup(checkup,checkup.getId());
	2961	+ }
	2962	+ else
	2963	+ {
	2964	+ premaritalCheckupService.addPremaritalCheckup(checkup);
	2965	+ }
	2966	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	2967	+
	2968	+ }
	2969	+
	2970	+ public BaseResponse doSyncPremaritalCheckup() {
	2971	+ //查询条件
	2972	+ PremaritalCheckupQuery query = new PremaritalCheckupQuery();
	2973	+ query.setIsSync(1);
	2974	+ List<PremaritalCheckup> modelList = premaritalCheckupService.queryPremaritalCheckup(query);
	2975	+ if (CollectionUtils.isNotEmpty(modelList)) {
	2976	+ for (PremaritalCheckup model : modelList)
	2977	+ {
	2978	+ model.setIsSync(2);
	2979	+ String json = JsonUtil.obj2Str1(model);
	2980	+ System.out.println(json);
	2981	+ String syncRsult = HttpClientUtil.doPostSSL(AREA_URL + "/syncPremaritalCheckup", json);
	2982	+ premaritalCheckupService.updatePremaritalCheckup(model, model.getId());
	2983	+ System.out.println("doSyncPremaritalCheckup=" + syncRsult);
	2984	+ }
	2985	+ }
	2986	+ return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
	2987	+ }
	2988	+
	2989	+ public static final String AREA_URL = PropertiesUtils.getPropertyValue("area_url");
2954	2990	}

...	...	@@ -70,6 +70,7 @@
70	70	public BaseResponse add(CervicalCancerRequest param,Integer userId) {
71	71	param.setCreated(new Date());
72	72	param.setHospitalId(autoMatchFacade.getHospitalId(userId));
	73	+ param.setIsSync(1);
73	74	mongoTemplate.insert(param);
74	75	return new BaseResponse();
75	76	}
...	...	@@ -82,6 +83,7 @@
82	83	*/
83	84	@Override
84	85	public BaseResponse edit(CervicalCancerRequest param) {
	86	+ param.setIsSync(1);
85	87	Query query = Query.query(Criteria.where("id").is(param.getId()));
86	88	Update update = MongoConvertHelper
87	89	.convertToNativeUpdate(ReflectionUtils.getUpdateField(param));