shiyang / regional-platform

Commit 2e4b96e7e859d847bc01790b6fdcdab34ac76d9f

Authored by jiangjiazhi almost 9 years ago

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java
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/facade/StopPregnancyFacade.java

...	...	@@ -556,7 +556,7 @@
556	556
557	557	// int s = getBabyAgeMonth(parseYMD("2016-05-26"), new Date());
558	558	// SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd ");
559		-//// System.out.println(getBabyAgeMonth(parseYMD("2016-05-23"), new Date()));
	559	+ System.out.println(getBabyAgeMonth(parseYMD("2016-05-23"), new Date()));
560	560	// System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(),-108)));
561	561	// System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(), -146)));
562	562	// System.out.print(1457688652-23341);

...	...	@@ -316,12 +316,10 @@
316	316	if(!StringUtils.isEmpty(diagnose)){
317	317	condition=condition.and("diagnose", diagnose, MongoOper.LIKE);
318	318	}
319		- if(!StringUtils.isEmpty(phoneId)){
320		- condition=condition.and("phoneId", phoneId, MongoOper.LIKE);
321		- }
322		-
323		- if(!StringUtils.isEmpty(cardId)){
324		- condition=condition.and("cardId", cardId, MongoOper.LIKE);
	319	+ if(!StringUtils.isEmpty(phoneId) \|\| !StringUtils.isEmpty(cardId)){
	320	+ MongoCondition con1 = MongoCondition.newInstance("phoneId", phoneId, MongoOper.LIKE);
	321	+ MongoCondition con = MongoCondition.newInstance("cardId", cardId, MongoOper.LIKE);
	322	+ condition = condition.orCondition(new MongoCondition[]{con1, con});
325	323	}
326	324
327	325	if(null!=sex){

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.common.annotation.TokenRequired;
3	4	import com.lyms.platform.common.base.BaseController;
	5	+import com.lyms.platform.common.base.LoginContext;
4	6	import com.lyms.platform.common.result.BaseResponse;
5	7	import com.lyms.platform.common.utils.StringUtils;
6	8	import com.lyms.platform.operate.web.facade.StopPregnancyFacade;
...	...	@@ -9,6 +11,7 @@
9	11	import org.springframework.stereotype.Controller;
10	12	import org.springframework.web.bind.annotation.*;
11	13
	14	+import javax.servlet.http.HttpServletRequest;
12	15	import javax.validation.Valid;
13	16
14	17	/**
15	18
16	19
...	...	@@ -51,13 +54,14 @@
51	54
52	55	/**
53	56	* 返回该医院可选择的录入人
54		- * @param hospitalId 医院Id
55	57	* @return
56	58	*/
57		- @RequestMapping(method = RequestMethod.GET, value = "/queryInPerson/{hospitalId}")
	59	+ @RequestMapping(method = RequestMethod.GET, value = "/queryInPerson")
58	60	@ResponseBody
59		- public BaseResponse queryInPerson(@PathVariable("hospitalId")Integer hospitalId) {
60		- return stopPregnancyFacade.queryInPerson(hospitalId);
	61	+ @TokenRequired
	62	+ public BaseResponse queryInPerson(HttpServletRequest request) {
	63	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	64	+ return stopPregnancyFacade.queryInPerson(loginState.getId());
61	65	}
62	66
63	67	}

...	...	@@ -125,13 +125,27 @@
125	125	public BaseResponse updateBabyBookbuilding(BabyBookbuildingAddRequest request) {
126	126	BabyModel model = getBabyModel(request);
127	127	model.setModified(new Date());
	128	+
	129	+ if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) {
	130	+
	131	+ String cardId = request.getMommyCertificateNum() +
	132	+ DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday()));
	133	+ model.setCardId(cardId + request.getBabyName());
	134	+ }
	135	+ if (StringUtils.isNotEmpty(request.getMommyPhone()))
	136	+ {
	137	+ String phoneId = request.getMommyPhone() +
	138	+ DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday()));
	139	+ model.setPhoneId(phoneId + request.getBabyName());
	140	+ }
	141	+
128	142	if (!StringUtils.isEmpty(request.getPid())) {
129	143	PersonModel pmodel = new PersonModel();
130	144	pmodel.setName(request.getBabyName());
131	145	pmodel.setBirth(DateUtil.parseYMD(request.getBabyBirthday()));
132	146	pmodel.setPhone(request.getMommyPhone());
133	147	pmodel.setCardNo(request.getMommyCertificateNum());
134		- pmodel.setType(1);
	148	+ pmodel.setType(2);
135	149	pmodel.setYn(YnEnums.YES.getId());
136	150	pmodel.setModified(new Date());
137	151	personService.updatePerson(pmodel, request.getPid());
138	152
139	153
140	154
...	...	@@ -150,23 +164,30 @@
150	164	*/
151	165	public BaseObjectResponse addBabyBookbuilding(BabyBookbuildingAddRequest request) {
152	166
153		- //判断儿童的就诊卡号是否建档在该家医院
154		- if (StringUtils.isNotEmpty(request.getVcCardNo()))
	167	+ //判断儿童是否建档在该医院
	168	+ if (StringUtils.isNotEmpty(request.getMommyPhone()) \|\| StringUtils.isNotEmpty(request.getMommyCertificateNum()))
155	169	{
156	170	BabyModelQuery babyQuery = new BabyModelQuery();
157	171	babyQuery.setYn(YnEnums.YES.getId());
158		- babyQuery.setVcCardNo(request.getVcCardNo());
	172	+ String phoneId = request.getMommyPhone() +
	173	+ DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday())) +request.getBabyName();
	174	+
	175	+ String cardId = request.getMommyCertificateNum() +
	176	+ DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday())) +request.getBabyName();
	177	+ babyQuery.setPhoneId(phoneId);
	178	+ babyQuery.setCardId(cardId);
159	179	babyQuery.setHospitalId(request.getHospitalId());
160	180	List<BabyModel> models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
161	181	if (CollectionUtils.isNotEmpty(models))
162	182	{
163	183	BaseObjectResponse br = new BaseObjectResponse();
164	184	br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
165		- br.setErrormsg("该就诊卡号儿童已经建档");
	185	+ br.setErrormsg("儿童在医院已经建档");
166	186	return br;
167	187	}
168	188	}
169	189
	190	+
170	191	//通过查询是否有该孕妇
171	192	PatientsQuery puerperaQuery = new PatientsQuery();
172	193	puerperaQuery.setCardNo(request.getMommyCertificateNum());
173	194
174	195
...	...	@@ -236,25 +257,18 @@
236	257	BabyModel model = getBabyModel(request);
237	258	model.setPid(resperson.getId());
238	259
239		- BabyModelQuery babyQuery = new BabyModelQuery();
240		- babyQuery.setYn(YnEnums.YES.getId());
241		-
242		- int count = 0;
243	260	if (StringUtils.isNotEmpty(request.getMommyCertificateNum())) {
244	261
245	262	String cardId = request.getMommyCertificateNum() +
246	263	DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday()));
247		- babyQuery.setCardId(cardId);
248		- count = babyBookbuildingService.queryBabyCount(babyQuery);
249		- model.setCardId(cardId + request.getSex() + (count + 1));
	264	+ //count = babyBookbuildingService.queryBabyCount(babyQuery);
	265	+ model.setCardId(cardId + request.getBabyName());
250	266	}
251	267	if (StringUtils.isNotEmpty(request.getMommyPhone()))
252	268	{
253	269	String phoneId = request.getMommyPhone() +
254	270	DateUtil.getYmd(DateUtil.parseYMD(request.getBabyBirthday()));
255		- babyQuery.setPhoneId(phoneId);
256		- count = babyBookbuildingService.queryBabyCount(babyQuery);
257		- model.setPhoneId(phoneId + request.getSex() + (count + 1));
	271	+ model.setPhoneId(phoneId + request.getBabyName());
258	272	}
259	273
260	274	model.setParentId(patients.getId());
...	...	@@ -443,7 +457,7 @@
443	457	patient.setBuildType(1);
444	458	patient.setDueStatus(0);
445	459	//1孕妇 3 产妇
446		- patient.setType(1);
	460	+ patient.setType(3);
447	461	return patient;
448	462	}
449	463
450	464
...	...	@@ -761,19 +775,18 @@
761	775	List<BabyModel> models = null;
762	776	if (!StringUtils.isEmpty(param.getCardNo())) {
763	777	babyQuery.setCardId(param.getCardNo());
764		- models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
765		- if (!CollectionUtils.isNotEmpty(models)) {
766		- //通过查询孕妇
767		- PatientsQuery puerperaQuery = new PatientsQuery();
768		- puerperaQuery.setCardNo(param.getCardNo());
769		- puerperaQuery.setYn(YnEnums.YES.getId());
770		- Patients patients = patientsService.findOnePatientByCardNo(puerperaQuery);
771		- if (patients != null && StringUtils.isNotEmpty(patients.getPhone())) {
772		- babyQuery.setPhoneId(patients.getPhone());
773		- babyQuery.setCardId(null);
774		- models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
775		- }
	778	+
	779	+ //通过查询孕妇
	780	+ PatientsQuery puerperaQuery = new PatientsQuery();
	781	+ puerperaQuery.setCardNo(param.getCardNo());
	782	+ puerperaQuery.setYn(YnEnums.YES.getId());
	783	+ Patients patients = patientsService.findOnePatientByCardNo(puerperaQuery);
	784	+ if (patients != null && StringUtils.isNotEmpty(patients.getPhone())) {
	785	+ babyQuery.setPhoneId(patients.getPhone());
776	786	}
	787	+
	788	+ models = babyBookbuildingService.queryBabyBuildByCond(babyQuery);
	789	+
777	790	} else if (param.getHospitalId() != null & !StringUtils.isEmpty(param.getVcCardNo())) {
778	791	babyQuery.setHospitalId(param.getHospitalId());
779	792	babyQuery.setVcCardNo(param.getVcCardNo());
...	...	@@ -784,15 +797,7 @@
784	797	Set<String> uid = new HashSet<>();
785	798	for (BabyModel model : models) {
786	799	if (model != null) {
787		- if (StringUtils.isNotEmpty(model.getCardId()))
788		- {
789		- uid.add(model.getCardId());
790		- }
791		- else if (StringUtils.isNotEmpty(model.getPhoneId()))
792		- {
793		- uid.add(model.getPhoneId());
794		- }
795		-
	800	+ uid.add(model.getId());
796	801	}
797	802
798	803	}
...	...	@@ -803,7 +808,7 @@
803	808	List<Map<String, String>> list = new ArrayList<>();
804	809	for (BabyModel model : models) {
805	810
806		- if ((id.equals(model.getCardId()) \|\| id.equals(model.getPhoneId())) && isNotExist(list, model.getId())) {
	811	+ if (id.equals(model.getId())) {
807	812	Map<String, String> buildRecords = new HashMap<>();
808	813	buildRecords.put("id", model.getId());
809	814	buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(model.getBuildDate()));

...	...	@@ -4,6 +4,7 @@
4	4	import com.lyms.platform.common.constants.ErrorCodeConstants;
5	5	import com.lyms.platform.common.enums.StopPregEnums;
6	6	import com.lyms.platform.common.enums.YnEnums;
	7	+import com.lyms.platform.common.enums.ZhiChenEnums;
7	8	import com.lyms.platform.common.result.BaseObjectResponse;
8	9	import com.lyms.platform.common.result.BaseResponse;
9	10	import com.lyms.platform.common.utils.DateUtil;
10	11
11	12
12	13
13	14
14	15
15	16
...	...	@@ -236,26 +237,39 @@
236	237
237	238	/**
238	239	* 返回该医院可选择的录入人
239		- * @param hospitalId
240	240	* @return
241	241	*/
242		- public BaseResponse queryInPerson(Integer hospitalId) {
243		-
244		- UsersQuery usersQuery = new UsersQuery();
245		- usersQuery.setYn(YnEnums.YES.getId());
246		- usersQuery.setOrgId(hospitalId);
247		- List<Users> users = usersService.queryUsers2(usersQuery);
	242	+ public BaseResponse queryInPerson(Integer id) {
248	243	List<Map> list = new ArrayList<>();
249		- if (CollectionUtils.isNotEmpty(users))
	244	+ if (id != null)
250	245	{
251		- for(Users user : users)
	246	+ Users dbuser = usersService.getUsers(id);
	247	+
	248	+ if (dbuser != null)
252	249	{
253		- Map pmap = new HashMap();
254		- pmap.put("id",user.getId());
255		- pmap.put("name",user.getName());
256		- list.add(pmap);
	250	+ UsersQuery usersQuery = new UsersQuery();
	251	+ usersQuery.setYn(YnEnums.YES.getId());
	252	+ usersQuery.setOrgId(dbuser.getOrgId());
	253	+ if (dbuser != null && dbuser.getZhiChenId() == ZhiChenEnums.DOCTOR.getId() && dbuser.getDeptId() != null)
	254	+ {
	255	+ usersQuery.setDeptId(dbuser.getDeptId());
	256	+ }
	257	+ List<Users> users = usersService.queryUsers2(usersQuery);
	258	+
	259	+ if (CollectionUtils.isNotEmpty(users))
	260	+ {
	261	+ for(Users user : users)
	262	+ {
	263	+ Map pmap = new HashMap();
	264	+ pmap.put("id",user.getId());
	265	+ pmap.put("name",user.getName());
	266	+ list.add(pmap);
	267	+ }
	268	+ }
257	269	}
	270	+
258	271	}
	272	+
259	273	BaseObjectResponse objectResponse = new BaseObjectResponse();
260	274	objectResponse.setData(list);
261	275	objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);