jiangjiazhi / regional-platform

Authored by liquanyu over 4 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 70 additions and 0 deletions

...	...	@@ -568,7 +568,19 @@
568	568	private String openDisease;
569	569	private Date openDiseaseEndTime;
570	570
	571	+
	572	+
571	573	private String openDiseaseType; //1一个月 12一年
	574	+ //高危儿童唯一编号根据年来分配
	575	+ private Long riskCode;
	576	+
	577	+ public Long getRiskCode() {
	578	+ return riskCode;
	579	+ }
	580	+
	581	+ public void setRiskCode(Long riskCode) {
	582	+ this.riskCode = riskCode;
	583	+ }
572	584
573	585	public String getOpenDiseaseType() {
574	586	return openDiseaseType;

...	...	@@ -1214,7 +1214,15 @@
1214	1214	public void setHasBlno(Boolean hasBlno) {
1215	1215	this.hasBlno = hasBlno;
1216	1216	}
	1217	+ private Long riskCode;
1217	1218
	1219	+ public Long getRiskCode() {
	1220	+ return riskCode;
	1221	+ }
	1222	+
	1223	+ public void setRiskCode(Long riskCode) {
	1224	+ this.riskCode = riskCode;
	1225	+ }
1218	1226	@Override
1219	1227	public MongoQuery convertToQuery() {
1220	1228	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -1328,6 +1336,10 @@
1328	1336
1329	1337	if (null != dueWeek) {
1330	1338	condition = condition.and("dueWeek", dueWeek, MongoOper.LTE);
	1339	+ }
	1340	+
	1341	+ if (null != riskCode) {
	1342	+ condition = condition.and("riskCode", true, MongoOper.EXISTS);
1331	1343	}
1332	1344	if (StringUtils.isNotEmpty(openDisease)) {
1333	1345	if ("2".equals(openDisease))

...	...	@@ -4183,6 +4183,28 @@
4183	4183	return "syncPatFirstTime finish";
4184	4184	}
4185	4185
	4186	+ @RequestMapping(value = "/getRiksCode", method = RequestMethod.GET)
	4187	+ @ResponseBody
	4188	+ public synchronized Long getRiksCode(String hospitalId)
	4189	+ {
	4190	+ Long result = Long.valueOf(DateUtil.getYearStr()+"0001");
	4191	+ BabyModelQuery babyQuery = new BabyModelQuery();
	4192	+ babyQuery.setHospitalId(hospitalId);
	4193	+ babyQuery.setRiskCode(1L);
	4194	+ babyQuery.setNeed("true");
	4195	+ babyQuery.setPage(1);
	4196	+ babyQuery.setLimit(1);
	4197	+ babyBookbuildingService.queryBabyBuildByCond(babyQuery, "riskCode", Sort.Direction.DESC);
	4198	+ List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
	4199	+ if (CollectionUtils.isNotEmpty(models))
	4200	+ {
	4201	+ if (models.get(0).getRiskCode() != null && String.valueOf(models.get(0).getRiskCode()).contains(DateUtil.getYearStr()))
	4202	+ {
	4203	+ return models.get(0).getRiskCode()+1;
	4204	+ }
	4205	+ }
	4206	+ return result;
	4207	+ }
4186	4208
4187	4209
4188	4210

...	...	@@ -877,6 +877,8 @@
877	877	getNumberCode(model);
878	878	operateLogFacade.addAddOptLog(userId, Integer.valueOf(hid), model, OptActionEnums.ADD.getId(), "儿童建档");
879	879	model.setEndCase(0);//秦皇岛，默认未结案
	880	+
	881	+ //setRiksCode(model);
880	882	model = babyBookbuildingService.addBabyBookbuilding(model);
881	883
882	884
...	...	@@ -933,6 +935,28 @@
933	935	ExceptionUtils.catchException(e, "add baby building 异常");
934	936	}
935	937	return br;
	938	+ }
	939	+
	940	+
	941	+ public synchronized void setRiksCode(BabyModel model)
	942	+ {
	943	+ Long result = Long.valueOf(DateUtil.getYmd()+"0001");
	944	+ BabyModelQuery babyQuery = new BabyModelQuery();
	945	+ babyQuery.setHospitalId(model.getHospitalId());
	946	+ babyQuery.setNeed("true");
	947	+ babyQuery.setPage(1);
	948	+ babyQuery.setLimit(1);
	949	+ babyQuery.setRiskCode(1L);
	950	+ babyBookbuildingService.queryBabyBuildByCond(babyQuery, "riskCode", Sort.Direction.DESC);
	951	+ List <BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
	952	+ if (CollectionUtils.isNotEmpty(models))
	953	+ {
	954	+ if (models.get(0).getRiskCode() != null && String.valueOf(models.get(0).getRiskCode()).contains(DateUtil.getYmd()))
	955	+ {
	956	+ result = models.get(0).getRiskCode()+1;
	957	+ }
	958	+ }
	959	+ model.setRiskCode(result);
936	960	}
937	961
938	962	/**