jiangjiazhi / regional-platform

Commit 29a3ed9f6170db39e2122799236ccf16fbe1d763

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

update

Showing 3 changed files with 34 additions and 65 deletions

platform-dal/src/main/java/com/lyms/platform/query/BabyStuntingQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStuntingFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyStuntingResult.java

...	...	@@ -39,46 +39,26 @@
39	39	private String queryNo;
40	40	// 检查医生
41	41	private String checkDoctor;
42		- // 营养专科项目
43		- private String yyProject;
	42	+
44	43	// 检查日期
45	44	private Date checkDateStart;
46	45	private Date checkDateEnd;
47	46
48		- // 结案日期
49		- private Date cCDateStart;
50		- private Date cCDateEnd;
51	47
52		- //结案转归 1痊愈□ 2好转□ 3转院□ 4失访□
53		- private String cCOutcome;
54		-
55	48	private String sort;
56	49
	50	+ // true 个人历史检查记录，只现实复诊不显示初诊
	51	+ private boolean type;
57	52
58		- public String getcCOutcome() {
59		- return cCOutcome;
	53	+ public boolean isType() {
	54	+ return type;
60	55	}
61	56
62		- public void setcCOutcome(String cCOutcome) {
63		- this.cCOutcome = cCOutcome;
	57	+ public void setType(boolean type) {
	58	+ this.type = type;
64	59	}
65	60
66		- public Date getcCDateStart() {
67		- return cCDateStart;
68		- }
69	61
70		- public void setcCDateStart(Date cCDateStart) {
71		- this.cCDateStart = cCDateStart;
72		- }
73		-
74		- public Date getcCDateEnd() {
75		- return cCDateEnd;
76		- }
77		-
78		- public void setcCDateEnd(Date cCDateEnd) {
79		- this.cCDateEnd = cCDateEnd;
80		- }
81		-
82	62	@Override
83	63	public String getSort() {
84	64	return sort;
85	65
...	...	@@ -196,13 +176,7 @@
196	176	this.checkDoctor = checkDoctor;
197	177	}
198	178
199		- public String getYyProject() {
200		- return yyProject;
201		- }
202	179
203		- public void setYyProject(String yyProject) {
204		- this.yyProject = yyProject;
205		- }
206	180
207	181	public Date getCheckDateStart() {
208	182	return checkDateStart;
209	183
...	...	@@ -245,15 +219,9 @@
245	219	if(null!=checkDoctor){
246	220	condition=condition.and("checkDoctor", checkDoctor, MongoOper.IS);
247	221	}
248		- // 专病项目
249		- if (null != yyProject) {
250		- condition = condition.and("yyProject", yyProject, MongoOper.IS);
251		- }
252		- //结案转归 1痊愈□ 2好转□ 3转院□ 4失访□
253		- if (null != cCOutcome) {
254		- condition = condition.and("cCOutcome", cCOutcome, MongoOper.IS);
255		- }
256	222
	223	+
	224	+
257	225	Criteria c = null;
258	226	//月龄
259	227	/*if (null != monthStart) {
...	...	@@ -327,22 +295,6 @@
327	295	c = Criteria.where("checkDate").lte(checkDateEnd);
328	296	}
329	297	}
330		- //结案日期
331		- if (null != cCDateStart) {
332		- if (null != c) {
333		- c = c.and("cCDate").gte(cCDateStart);
334		- } else {
335		- c = Criteria.where("cCDate").gte(cCDateStart );
336		- }
337		- }
338		- if (null != cCDateEnd) {
339		- if (null != c) {
340		- c = c.lte(cCDateEnd);
341		- } else {
342		- c = Criteria.where("cCDate").lte(cCDateEnd);
343		- }
344		- }
345		-
346	298
347	299
348	300	// 查询号

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.biz.service.BabyBabyNutritionSpecialtyService;
4	4	import com.lyms.platform.biz.service.BabyBookbuildingService;
5	5	import com.lyms.platform.biz.service.BabyStuntingService;
	6	+import com.lyms.platform.biz.service.BasicConfigService;
6	7	import com.lyms.platform.common.constants.ErrorCodeConstants;
7	8	import com.lyms.platform.common.enums.OptActionEnums;
8	9	import com.lyms.platform.common.enums.YnEnums;
9	10
...	...	@@ -58,7 +59,10 @@
58	59	private OperateLogFacade operateLogFacade;
59	60	@Autowired
60	61	private OrganizationService organizationService;
	62	+
61	63	@Autowired
	64	+ private BasicConfigService basicConfigService;
	65	+ @Autowired
62	66	private UsersService usersService;
63	67
64	68	public static final String HIS_VERSION = PropertiesUtils.getPropertyValue("his_version");
...	...	@@ -104,8 +108,8 @@
104	108	model.setNextDate(DateUtil.parseYMD(request.getNextDate()));
105	109	model.setCzOrfzProject(request.getCzOrfzProject());
106	110
107		- if(StringUtils.isNotEmpty(request.getCzOrfzProject())){
108		- if("cz".equals(request.getCzOrfzProject())){
	111	+ if (StringUtils.isNotEmpty(request.getCzOrfzProject())) {
	112	+ if ("cz".equals(request.getCzOrfzProject())) {
109	113	model.setBlbh(request.getBlbh());
110	114	}
111	115	}
...	...	@@ -269,6 +273,10 @@
269	273	if (StringUtils.isNotEmpty(babyStuntingModel.getHospitalId())) {
270	274	babyStuntingResult.setHospitalName(CommonsHelper.getHospitalName(babyStuntingModel.getHospitalId(), organizationService));
271	275	}
	276	+
	277	+ babyStuntingResult.setAddrStr(CommonsHelper.getResidence(babyStuntingModel.getProvinceId(), babyStuntingModel.getCityId(),
	278	+ babyStuntingModel.getAreaId(), babyStuntingModel.getStreetId(), babyStuntingModel.getAddr(), basicConfigService));
	279	+
272	280	br.setData(babyStuntingResult);
273	281	br.setErrorcode(ErrorCodeConstants.SUCCESS);
274	282	br.setErrormsg("成功");
...	...	@@ -318,7 +326,7 @@
318	326	//单人多条专病记录
319	327	List <BabyStuntingModel> babyStuntingModelList = new ArrayList <>();
320	328
321		- if (StringUtils.isNotEmpty(babyQuery.getBuildId()) \|\| StringUtils.isNotEmpty(babyQuery.getYyProject())) {
	329	+ if (StringUtils.isNotEmpty(babyQuery.getBuildId())) {
322	330	babyQuery.setYn(YnEnums.YES.getId());
323	331	babyQuery.setHospitalId(hospitalId);
324	332	babyQuery.setSort("checkDate");
325	333
...	...	@@ -330,10 +338,12 @@
330	338	BabyStuntingModel babyNutritionSpecialtyModel = babyStuntingModelList.get(i);
331	339	BabyStuntingResult babyStuntingResult = new BabyStuntingResult();
332	340	if (babyNutritionSpecialtyModel != null) {
333		- if(StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getBlbh())){
	341	+ if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getBlbh())) {
334	342	blbh = babyNutritionSpecialtyModel.getBlbh();
335	343	}
336		-
	344	+ if(babyQuery!=null && babyQuery.isType() && "cz".equals(babyNutritionSpecialtyModel.getCzOrfzProject())){
	345	+ continue;
	346	+ }
337	347	babyStuntingResult.convertToResult(babyNutritionSpecialtyModel);
338	348
339	349	if (StringUtils.isNotEmpty(babyNutritionSpecialtyModel.getHospitalId())) {
...	...	@@ -382,9 +392,6 @@
382	392	}
383	393	if (babyQuery.getBirthEnd() != null) {
384	394	babyQuery.setBirthEnd(DateUtil.getDayLastSecond(babyQuery.getBirthEnd()));
385		- }
386		- if (babyQuery.getcCDateEnd() != null) {
387		- babyQuery.setcCDateEnd(DateUtil.getDayLastSecond(babyQuery.getcCDateEnd()));
388	395	}
389	396
390	397	babyStuntingModelList = babyStuntingService.queryAll(babyQuery);

...	...	@@ -76,6 +76,8 @@
76	76	private String cityId;//市
77	77	private String areaId;//区
78	78	private String streetId;//街道
	79	+ private String addrStr; //地址
	80	+
79	81	//邮政编号
80	82	private String postalNumber;
81	83
...	...	@@ -646,6 +648,14 @@
646	648
647	649	public void setZlsZgcp(Map <String, Object> zlsZgcp) {
648	650	this.zlsZgcp = zlsZgcp;
	651	+ }
	652	+
	653	+ public String getAddrStr() {
	654	+ return addrStr;
	655	+ }
	656	+
	657	+ public void setAddrStr(String addrStr) {
	658	+ this.addrStr = addrStr;
649	659	}
650	660
651	661	public String getZlsMxjb() {