shiyang / regional-platform

Commit aa479d4c67fde8ab5e294c206550d551f0083d51

Authored by liquanyu almost 9 years ago

update code

Showing 2 changed files with 23 additions and 5 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyCheckResult.java

...	...	@@ -137,6 +137,23 @@
137	137	*/
138	138	public BaseObjectResponse addBabyBookbuilding(BabyBookbuildingAddRequest request) {
139	139
	140	+ //判断儿童的就诊卡号是否建档在该家医院
	141	+ if (StringUtils.isNotEmpty(request.getVcCardNo()))
	142	+ {
	143	+ BabyModelQuery babyQuery = new BabyModelQuery();
	144	+ babyQuery.setYn(YnEnums.YES.getId());
	145	+ babyQuery.setVcCardNo(request.getVcCardNo());
	146	+ babyQuery.setHospitalId(request.getHospitalId());
	147	+ List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
	148	+ if (CollectionUtils.isNotEmpty(models))
	149	+ {
	150	+ BaseObjectResponse br = new BaseObjectResponse();
	151	+ br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
	152	+ br.setErrormsg("该就诊卡号儿童已经建档");
	153	+ return br;
	154	+ }
	155	+ }
	156	+
140	157	//通过查询是否有该孕妇
141	158	PatientsQuery puerperaQuery = new PatientsQuery();
142	159	puerperaQuery.setCardNo(request.getMommyCertificateNum());
143	160
...	...	@@ -196,13 +213,15 @@
196	213	DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday()));
197	214	babyQuery.setCardId(cardId);
198	215	count = babyBookbuildingService.queryBabyCount(babyQuery);
199		- model.setCardId(cardId + request.getSex() + count + 1);
200		- } else {
	216	+ model.setCardId(cardId + request.getSex() + (count + 1));
	217	+ }
	218	+ if (StringUtils.isNotEmpty(request.getMommyPhone()))
	219	+ {
201	220	String phoneId = request.getMommyPhone() +
202	221	DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday()));
203	222	babyQuery.setPhoneId(phoneId);
204	223	count = babyBookbuildingService.queryBabyCount(babyQuery);
205		- model.setPhoneId(phoneId + request.getSex() + count + 1);
	224	+ model.setPhoneId(phoneId + request.getSex() + (count + 1));
206	225	}
207	226
208	227	model.setParentId(patients.getId());

...	...	@@ -207,9 +207,8 @@
207	207
208	208	//检查时间
209	209	private String checkDate;
210		-
211		- //月龄
212	210	private String monthAge;
	211	+
213	212
214	213	public String getMonthAge() {
215	214	return monthAge;