jiangjiazhi / regional-platform

Commit 9cad00c9ca8c82c768b6b3f0fb84a95c45333bc3

Authored by shiyang about 3 years ago

Exists in master and in 6 other branches

隆化-儿童健康体检统计表改为儿童户籍地筛选

Showing 5 changed files with 138 additions and 41 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyStatisticsManagerFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManageRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/BabyList3Task.java

...	...	@@ -859,9 +859,7 @@
859	859	private List<String> lhEyeHighRisk;
860	860
861	861	/********************************************/
862		-
863	862	//隆化-儿童建档户籍地
864		-
865	863	/**
866	864	*省
867	865	*/

...	...	@@ -383,6 +383,69 @@
383	383	//隆华、滦平儿保管理全部加健康/高危筛查 0：健康，1：高危
384	384	private Integer healthHigh;
385	385
	386	+ /********************************************/
	387	+ //隆化-儿童建档户籍地
	388	+ /**
	389	+ *省
	390	+ */
	391	+ private String babyProvinceId;
	392	+ /**
	393	+ *市
	394	+ */
	395	+ private String babyCityId;
	396	+ /**
	397	+ *县
	398	+ */
	399	+ private String babyAreaId;
	400	+ /**
	401	+ *乡镇街道
	402	+ */
	403	+ private String babyStreetId;
	404	+ /**
	405	+ *详细地址
	406	+ */
	407	+ private String babyAddress;
	408	+
	409	+ public String getBabyProvinceId() {
	410	+ return babyProvinceId;
	411	+ }
	412	+
	413	+ public void setBabyProvinceId(String babyProvinceId) {
	414	+ this.babyProvinceId = babyProvinceId;
	415	+ }
	416	+
	417	+ public String getBabyCityId() {
	418	+ return babyCityId;
	419	+ }
	420	+
	421	+ public void setBabyCityId(String babyCityId) {
	422	+ this.babyCityId = babyCityId;
	423	+ }
	424	+
	425	+ public String getBabyAreaId() {
	426	+ return babyAreaId;
	427	+ }
	428	+
	429	+ public void setBabyAreaId(String babyAreaId) {
	430	+ this.babyAreaId = babyAreaId;
	431	+ }
	432	+
	433	+ public String getBabyStreetId() {
	434	+ return babyStreetId;
	435	+ }
	436	+
	437	+ public void setBabyStreetId(String babyStreetId) {
	438	+ this.babyStreetId = babyStreetId;
	439	+ }
	440	+
	441	+ public String getBabyAddress() {
	442	+ return babyAddress;
	443	+ }
	444	+
	445	+ public void setBabyAddress(String babyAddress) {
	446	+ this.babyAddress = babyAddress;
	447	+ }
	448	+
386	449	public Integer getHealthHigh() {
387	450	return healthHigh;
388	451	}

...	...	@@ -1329,14 +1329,12 @@
1329	1329	BabyModelQuery babyQuery = new BabyModelQuery();
1330	1330	babyQuery.setHospitalId(hospitalId);
1331	1331	babyQuery.setYn(YnEnums.YES.getId());
1332		- // 省
1333		- babyQuery.setProvinceId(StringUtils.isEmpty(request.getProvinceId()) ? null : request.getProvinceId());
1334		- // 市
1335		- babyQuery.setCityId(StringUtils.isEmpty(request.getCityId()) ? null : request.getCityId());
1336		- // 区/县
1337		- babyQuery.setAreaId(StringUtils.isEmpty(request.getAreaId()) ? null : request.getAreaId());
1338		- //街道
1339		- babyQuery.setStreetId(StringUtils.isEmpty(request.getStreetId()) ? null : request.getStreetId());
	1332	+ //儿童建档户籍地
	1333	+ babyQuery.setBabyProvinceId(request.getBabyProvinceId());
	1334	+ babyQuery.setBabyCityId(request.getBabyCityId());
	1335	+ babyQuery.setBabyAreaId(request.getBabyAreaId());
	1336	+ babyQuery.setBabyStreetId(request.getBabyStreetId());
	1337	+ babyQuery.setBabyAddress(request.getBabyAddress());
1340	1338
1341	1339	//筛选检查时间
1342	1340	List<BabyModel> babyModels=babyBookbuildingService.queryBabyBuildByCond(babyQuery);

...	...	@@ -136,6 +136,69 @@
136	136	//儿保检查时间
137	137	private String checkTime;
138	138
	139	+ /********************************************/
	140	+ //隆化-儿童建档户籍地
	141	+ /**
	142	+ *省
	143	+ */
	144	+ private String babyProvinceId;
	145	+ /**
	146	+ *市
	147	+ */
	148	+ private String babyCityId;
	149	+ /**
	150	+ *县
	151	+ */
	152	+ private String babyAreaId;
	153	+ /**
	154	+ *乡镇街道
	155	+ */
	156	+ private String babyStreetId;
	157	+ /**
	158	+ *详细地址
	159	+ */
	160	+ private String babyAddress;
	161	+
	162	+ public String getBabyProvinceId() {
	163	+ return babyProvinceId;
	164	+ }
	165	+
	166	+ public void setBabyProvinceId(String babyProvinceId) {
	167	+ this.babyProvinceId = babyProvinceId;
	168	+ }
	169	+
	170	+ public String getBabyCityId() {
	171	+ return babyCityId;
	172	+ }
	173	+
	174	+ public void setBabyCityId(String babyCityId) {
	175	+ this.babyCityId = babyCityId;
	176	+ }
	177	+
	178	+ public String getBabyAreaId() {
	179	+ return babyAreaId;
	180	+ }
	181	+
	182	+ public void setBabyAreaId(String babyAreaId) {
	183	+ this.babyAreaId = babyAreaId;
	184	+ }
	185	+
	186	+ public String getBabyStreetId() {
	187	+ return babyStreetId;
	188	+ }
	189	+
	190	+ public void setBabyStreetId(String babyStreetId) {
	191	+ this.babyStreetId = babyStreetId;
	192	+ }
	193	+
	194	+ public String getBabyAddress() {
	195	+ return babyAddress;
	196	+ }
	197	+
	198	+ public void setBabyAddress(String babyAddress) {
	199	+ this.babyAddress = babyAddress;
	200	+ }
	201	+
139	202	public String getCheckTime() {
140	203	return checkTime;
141	204	}

...	...	@@ -68,42 +68,17 @@
68	68	result.setHospitalName(hospitalName);
69	69
70	70	result.setHospitalName(organizationService.getOrganization(Integer.valueOf(model.getHospitalId())).getName());
71		- // 开始查询省市区街道
72		- // 省
73		- BasicConfig provinceName = basicConfigService.getOneBasicConfigById(model.getProvinceId());
74		- // 市
75		- BasicConfig cityName = basicConfigService.getOneBasicConfigById(model.getCityId());
76		- // 区
77		- BasicConfig areaName = basicConfigService.getOneBasicConfigById(model.getAreaId());
78		- // 街道
79		- BasicConfig streetName = basicConfigService.getOneBasicConfigById(model.getStreetId());
80		- // 具体
81		- String address = model.getAddress();
82		- String habitat = "";
83		- if (provinceName != null) {
84		- habitat += provinceName.getName();
85		- }
86		- if (cityName != null) {
87		- habitat += cityName.getName();
88		- }
89		- if (areaName != null) {
90		- habitat += areaName.getName();
91		- }
92		- if (streetName != null) {
93		- habitat += streetName.getName();
94		- }
95		- if (!StringUtils.isEmpty(address)) {
96		- habitat += address;
97		- }
98		- if (habitat.length() == 0) {
99		- habitat = "-";
100		- }
101		- result.setHabitat(habitat);
102	71
	72	+ // 组装儿童档案户籍地
	73	+ String babyAddress = CommonsHelper.getResidence(model.getBabyProvinceId(), model.getBabyCityId(),
	74	+ model.getBabyAreaId(), model.getBabyStreetId(), model.getBabyAddress(), basicConfigService);
	75	+ result.setHabitat(babyAddress);
	76	+
103	77	BabyCheckModelQuery query = new BabyCheckModelQuery();
104	78	query.setBuildId(model.getId());
105	79	query.setYn(YnEnums.YES.getId());
106	80
	81	+ //组装检查时间
107	82	List <BabyCheckModel> models = babyCheckService.queryBabyCheckRecord(query);
108	83	if (CollectionUtils.isNotEmpty(models)) {
109	84	List<Map> listdata=new ArrayList<>();