shiyang / regional-platform

Commit 32480a181fe52c79729fca70eabc268ff5bde238

Authored by hujiaqi over 8 years ago

区域分娩、跑分娩数据到patient

Showing 6 changed files with 609 additions and 73 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
platform-dal/src/main/java/com/lyms/platform/query/MatDeliverQuery.java
platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java

1	1	package com.lyms.platform.pojo;
2	2
3		-import java.util.Date;
4		-import java.util.List;
5		-import java.util.Objects;
6		-
7	3	import com.lyms.platform.beans.SerialIdEnum;
	4	+import com.lyms.platform.common.result.BaseModel;
	5	+import com.lyms.platform.common.utils.DateUtil;
8	6	import org.springframework.data.mongodb.core.mapping.Document;
9	7	import org.springframework.data.mongodb.core.mapping.Field;
10	8
11		-import com.lyms.platform.common.result.BaseModel;
12		-import com.lyms.platform.common.utils.DateUtil;
	9	+import java.util.Date;
	10	+import java.util.List;
	11	+import java.util.Objects;
13	12
14	13
15	14	@Document(collection="lyms_patient")
...	...	@@ -235,6 +234,48 @@
235	234	private Integer postViewTimes;
236	235	//操作人
237	236	private Integer operator;
	237	+
	238	+ // 分娩相关信息
	239	+ // 分娩医院
	240	+ private String fmHospital;
	241	+ // 分娩年龄
	242	+ private Integer fmAge;
	243	+ // 分娩孕周
	244	+ private Integer fmWeek;
	245	+ // 分娩方式
	246	+ private String fmType;
	247	+
	248	+ public String getFmHospital() {
	249	+ return fmHospital;
	250	+ }
	251	+
	252	+ public void setFmHospital(String fmHospital) {
	253	+ this.fmHospital = fmHospital;
	254	+ }
	255	+
	256	+ public Integer getFmAge() {
	257	+ return fmAge;
	258	+ }
	259	+
	260	+ public void setFmAge(Integer fmAge) {
	261	+ this.fmAge = fmAge;
	262	+ }
	263	+
	264	+ public Integer getFmWeek() {
	265	+ return fmWeek;
	266	+ }
	267	+
	268	+ public void setFmWeek(Integer fmWeek) {
	269	+ this.fmWeek = fmWeek;
	270	+ }
	271	+
	272	+ public String getFmType() {
	273	+ return fmType;
	274	+ }
	275	+
	276	+ public void setFmType(String fmType) {
	277	+ this.fmType = fmType;
	278	+ }
238	279
239	280	public String getSource() {
240	281	return source;

...	...	@@ -32,7 +32,16 @@
32	32	private boolean neEnd;
33	33
34	34	private String deliveryModeQueryJson;
	35	+ private String fmHospital;
35	36
	37	+ public String getFmHospital() {
	38	+ return fmHospital;
	39	+ }
	40	+
	41	+ public void setFmHospital(String fmHospital) {
	42	+ this.fmHospital = fmHospital;
	43	+ }
	44	+
36	45	public boolean isNeEnd() {
37	46	return neEnd;
38	47	}
...	...	@@ -128,6 +137,9 @@
128	137	}
129	138	if (null != hospitalId) {
130	139	condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
	140	+ }
	141	+ if (null != fmHospital) {
	142	+ condition = condition.and("fmHospital", fmHospital, MongoOper.IS);
131	143	}
132	144	if (null != deliveryModeQueryJson) {
133	145	condition = condition.and("deliveryMode", deliveryModeQueryJson, MongoOper.LIKE);

...	...	@@ -371,7 +371,20 @@
371	371
372	372	//档案编号
373	373	private String fileCode;
	374	+ // 分娩相关信息
	375	+ // 分娩医院
	376	+ private String fmHospital;
	377	+ private List<String> fmHospitalList;
	378	+ // 分娩年龄
	379	+ private Integer fmAgeStart;
	380	+ private Integer fmAgeEnd;
	381	+ // 分娩孕周
	382	+ private Integer fmWeekStart;
	383	+ private Integer fmWeekEnd;
	384	+ // 分娩方式
	385	+ private String fmType;
374	386
	387	+
375	388	public String getFileCode() {
376	389	return fileCode;
377	390	}
...	...	@@ -741,6 +754,54 @@
741	754	this.phone = phone;
742	755	}
743	756
	757	+ public String getFmHospital() {
	758	+ return fmHospital;
	759	+ }
	760	+
	761	+ public void setFmHospital(String fmHospital) {
	762	+ this.fmHospital = fmHospital;
	763	+ }
	764	+
	765	+ public Integer getFmAgeStart() {
	766	+ return fmAgeStart;
	767	+ }
	768	+
	769	+ public void setFmAgeStart(Integer fmAgeStart) {
	770	+ this.fmAgeStart = fmAgeStart;
	771	+ }
	772	+
	773	+ public Integer getFmAgeEnd() {
	774	+ return fmAgeEnd;
	775	+ }
	776	+
	777	+ public void setFmAgeEnd(Integer fmAgeEnd) {
	778	+ this.fmAgeEnd = fmAgeEnd;
	779	+ }
	780	+
	781	+ public Integer getFmWeekStart() {
	782	+ return fmWeekStart;
	783	+ }
	784	+
	785	+ public void setFmWeekStart(Integer fmWeekStart) {
	786	+ this.fmWeekStart = fmWeekStart;
	787	+ }
	788	+
	789	+ public Integer getFmWeekEnd() {
	790	+ return fmWeekEnd;
	791	+ }
	792	+
	793	+ public void setFmWeekEnd(Integer fmWeekEnd) {
	794	+ this.fmWeekEnd = fmWeekEnd;
	795	+ }
	796	+
	797	+ public String getFmType() {
	798	+ return fmType;
	799	+ }
	800	+
	801	+ public void setFmType(String fmType) {
	802	+ this.fmType = fmType;
	803	+ }
	804	+
744	805	public String getAddress() {
745	806	return address;
746	807	}
747	808
...	...	@@ -840,7 +901,9 @@
840	901	condition = condition.and("areaRegisterId", areaRegisterId, MongoOper.IS);
841	902	}
842	903
	904	+ // 分娩信息
843	905
	906	+
844	907	/* //户籍地
845	908	private String provinceRegisterId;
846	909	private String cityRegisterId;
847	910
...	...	@@ -1121,12 +1184,65 @@
1121	1184	c1 = Criteria.where("birth").lte(birthEnd);
1122	1185	}
1123	1186	}
	1187	+
	1188	+ if (null != fmAgeStart) {
	1189	+ if (null != c1) {
	1190	+ c1 = c1.and("fmAge").gte(fmAgeStart);
	1191	+ } else {
	1192	+ c1 = Criteria.where("fmAge").gte(fmAgeStart);
	1193	+ }
	1194	+ }
	1195	+
	1196	+ if (null != fmAgeEnd) {
	1197	+ if (null != fmAgeStart) {
	1198	+ c1 = c1.lte(fmAgeEnd);
	1199	+ } else {
	1200	+ c1 = Criteria.where("fmAge").lte(fmAgeEnd);
	1201	+ }
	1202	+ }
	1203	+
	1204	+ if (null != fmWeekStart) {
	1205	+ if (null != c1) {
	1206	+ c1 = c1.and("fmWeek").gte(fmWeekStart);
	1207	+ } else {
	1208	+ c1 = Criteria.where("fmWeek").gte(fmWeekStart);
	1209	+ }
	1210	+ }
	1211	+
	1212	+ if (null != fmWeekEnd) {
	1213	+ if (null != fmWeekStart) {
	1214	+ c1 = c1.lte(fmWeekEnd);
	1215	+ } else {
	1216	+ c1 = Criteria.where("fmWeek").lte(fmWeekEnd);
	1217	+ }
	1218	+ }
	1219	+
	1220	+ if (null != fmHospital) {
	1221	+ condition = condition.and("fmHospital", fmHospital, MongoOper.IS);
	1222	+ }
	1223	+
	1224	+ if (null != fmHospitalList) {
	1225	+ condition = condition.and("fmHospital", fmHospitalList, MongoOper.IN);
	1226	+ }
	1227	+
	1228	+ if (null != fmType) {
	1229	+ condition = condition.and("fmType", fmType, MongoOper.LIKE);
	1230	+ }
	1231	+
1124	1232	if (null != c1) {
1125	1233	condition = condition.andCondition(new MongoCondition(c1));
1126	1234
1127	1235	}
1128	1236
1129	1237	return condition.toMongoQuery();
	1238	+ }
	1239	+
	1240	+ public List<String> getFmHospitalList() {
	1241	+ return fmHospitalList;
	1242	+ }
	1243	+
	1244	+ public void setFmHospitalList(List<String> fmHospitalList) {
	1245	+ this.fmHospitalList = fmHospitalList;
1130	1246	}
1131	1247
1132	1248	public Integer gethScoreEnd() {

1	1	package com.lyms.platform.operate.web.controller;
2	2
3	3	import com.lyms.hospitalapi.qhdfy.QhdfyHisService;
4		-import com.lyms.platform.biz.service.AntenatalExaminationService;
5		-import com.lyms.platform.biz.service.AssayConfigService;
6		-import com.lyms.platform.biz.service.PatientsService;
7		-import com.lyms.platform.biz.service.SieveService;
	4	+import com.lyms.platform.biz.service.*;
8	5	import com.lyms.platform.common.enums.YnEnums;
9	6	import com.lyms.platform.common.utils.CompressEncodeingUtil;
10	7	import com.lyms.platform.common.utils.DateUtil;
11	8
...	...	@@ -13,12 +10,10 @@
13	10	import com.lyms.platform.operate.web.result.HighScoreResult;
14	11	import com.lyms.platform.operate.web.service.SyncDataTaskService;
15	12	import com.lyms.platform.permission.service.OrganizationService;
16		-import com.lyms.platform.pojo.AntExChuModel;
17		-import com.lyms.platform.pojo.AntenatalExaminationModel;
18		-import com.lyms.platform.pojo.AssayConfig;
19		-import com.lyms.platform.pojo.Patients;
	13	+import com.lyms.platform.pojo.*;
20	14	import com.lyms.platform.query.AntExChuQuery;
21	15	import com.lyms.platform.query.AntExQuery;
	16	+import com.lyms.platform.query.MatDeliverQuery;
22	17	import com.lyms.platform.query.PatientsQuery;
23	18	import org.apache.commons.collections.CollectionUtils;
24	19	import org.apache.commons.io.FileUtils;
...	...	@@ -67,6 +62,9 @@
67	62	@Autowired
68	63	private AntenatalExaminationFacade antenatalExaminationFacade;
69	64
	65	+ @Autowired
	66	+ private MatDeliverService matDeliverService;
	67	+
70	68	/**
71	69	* 获取科室
72	70	*/
...	...	@@ -364,6 +362,11 @@
364	362	return "syncPatNextTime finish";
365	363	}
366	364
	365	+ /**
	366	+ * @auther HuJiaqi
	367	+ * @createTime 2016年12月21日 15时56分
	368	+ * @discription 冗余最后一次产检
	369	+ */
367	370	@ResponseBody
368	371	@RequestMapping(value = "/syncPatientsLastCheckEmployeeId", method = RequestMethod.GET)
369	372	public String syncPatientsLastCheckEmployeeId(@RequestParam String hospitalId,
...	...	@@ -422,6 +425,70 @@
422	425	if (!StringUtils.isEmpty(lastCheckEmployeeId)) {
423	426	patientsService.updatePatientLastCheckEmployeeIdOne(id, lastCheckEmployeeId);
424	427	System.out.println("更新lyms_patient：id=" + id + "，lastCheckEmployeeId=" + lastCheckEmployeeId + "，来自" + flag);
	428	+ }
	429	+ }
	430	+ }
	431	+ }
	432	+ }).start();
	433	+ }
	434	+ return "syncPatientsLastCheckEmployeeId start......";
	435	+ }
	436	+
	437	+ /**
	438	+ * @auther HuJiaqi
	439	+ * @createTime 2016年12月21日 15时56分
	440	+ * @discription 冗余分娩分娩医院，分娩年龄，分娩孕周，分娩方式
	441	+ */
	442	+ @ResponseBody
	443	+ @RequestMapping(value = "/syncPatientsFmInfo", method = RequestMethod.GET)
	444	+ public String syncPatientsFmInfo(@RequestParam(required = false) String size,@RequestParam(required = false) String hospitalId) {
	445	+ MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
	446	+ matDeliverQuery.setYn(YnEnums.YES.getId());
	447	+ if (StringUtils.isNotEmpty(hospitalId)) {
	448	+ matDeliverQuery.setFmHospital(hospitalId);
	449	+ }
	450	+ // 查询
	451	+ List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
	452	+ System.out.println("本次读取了【" + maternalDeliverModelList.size() + "】条数据");
	453	+ int batchSize = StringUtils.isEmpty(size) ? 1000 : Integer.valueOf(size);
	454	+ int end = 0;
	455	+ for (int i = 0; i < maternalDeliverModelList.size(); i += batchSize) {
	456	+ end = (end + batchSize);
	457	+ if (end > maternalDeliverModelList.size()) {
	458	+ end = maternalDeliverModelList.size();
	459	+ }
	460	+ final List<MaternalDeliverModel> tempList = maternalDeliverModelList.subList(i, end);
	461	+ new Thread(new Runnable() {
	462	+ @Override
	463	+ public void run() {
	464	+ if (CollectionUtils.isNotEmpty(tempList)) {
	465	+ for (MaternalDeliverModel maternalDeliverModel : tempList) {
	466	+ Patients patients = patientsService.findOnePatientById(maternalDeliverModel.getParentId());
	467	+ if (patients != null) {
	468	+ // 顺便跑成产妇
	469	+ patients.setType(3);
	470	+ patients.setFmHospital(maternalDeliverModel.getFmHospital());
	471	+ patients.setFmType(maternalDeliverModel.getDeliveryMode());
	472	+ try {
	473	+ patients.setFmAge(DateUtil.getAge(patients.getBirth(), patients.getFmDate()));
	474	+ } catch (Exception e) {
	475	+ System.out.println(patients.getId() + "：这条数据的生日和分娩时间异常");
	476	+ // 跳过
	477	+ }
	478	+ try {
	479	+ patients.setFmWeek(DateUtil.getDays(patients.getLastMenses(), patients.getFmDate()));
	480	+ } catch (Exception e) {
	481	+ System.out.println(patients.getId() + "：这条数据的末日月经和分娩时间异常");
	482	+ // 跳过
	483	+ }
	484	+
	485	+ System.out.println(patients.getFmHospital());
	486	+ System.out.println(patients.getFmType());
	487	+ System.out.println(patients.getFmAge());
	488	+ System.out.println(patients.getFmWeek());
	489	+ System.out.println(patients.toString());
	490	+
	491	+ patientsService.updatePatient(patients);
425	492	}
426	493	}
427	494	}

...	...	@@ -15,6 +15,7 @@
15	15	import com.lyms.platform.operate.web.request.NewBabyManagerRequest;
16	16	import com.lyms.platform.operate.web.result.*;
17	17	import com.lyms.platform.permission.model.Organization;
	18	+import com.lyms.platform.permission.model.OrganizationQuery;
18	19	import com.lyms.platform.permission.model.Users;
19	20	import com.lyms.platform.permission.service.OrganizationService;
20	21	import com.lyms.platform.permission.service.UsersService;
...	...	@@ -70,6 +71,10 @@
70	71	private BabyBookbuildingFacade babyBookbuildingFacade;
71	72	@Autowired
72	73	private DeleteProcessHandler deleteProcessHandler;
	74	+
	75	+ @Autowired
	76	+ private DataPermissionService dataPermissionService;
	77	+
73	78	@Value(("#{configProperties['run.region']}"))
74	79	private String runType;
75	80
76	81
...	...	@@ -914,9 +919,64 @@
914	919
915	920	patientsQuery.setYn(YnEnums.YES.getId());
916	921	patientsQuery.setType(3);
917		- patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()));
	922	+ // 构造医院id集合
	923	+ List<String> hospitalList = new ArrayList<>();
	924	+ if (StringUtils.isEmpty(childbirthManagerRequest.getIsArea())) {
	925	+ // 非区域
	926	+ hospitalList.add(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()));
	927	+ } else {
	928	+ // 区域
	929	+ if (StringUtils.isNotEmpty(childbirthManagerRequest.getHospitalId())) {
	930	+ // 传入了医院id
	931	+ hospitalList.add(childbirthManagerRequest.getHospitalId());
	932	+ } else {
	933	+ // 没传入医院id
	934	+ // 先判断是否传入了传条件
	935	+ // 未传入查询条件
	936	+ if (StringUtils.isEmpty(childbirthManagerRequest.getHospitalProvinceId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalProvinceId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalAreaId()) && StringUtils.isEmpty(childbirthManagerRequest.getHospitalId())) {
	937	+ hospitalList.add(autoMatchFacade.getHospitalId(childbirthManagerRequest.getOperatorId()));
	938	+ DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
	939	+ dataPermissionsModelQuery.setUserId(childbirthManagerRequest.getOperatorId());
	940	+ List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery);
	941	+ if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) {
	942	+ Map data = dataPermissionsModelList.get(0).getData();
	943	+ for (Object hospitalId : data.keySet()) {
	944	+ if (StringUtils.isNotEmpty(hospitalId.toString()) && !hospitalList.contains(hospitalId.toString())) {
	945	+ hospitalList.add(hospitalId.toString());
	946	+ }
	947	+ }
	948	+ }
	949	+ } else {
	950	+ // 传入了查询条件
	951	+ OrganizationQuery organizationQuery = new OrganizationQuery();
	952	+ organizationQuery.setProvinceId(childbirthManagerRequest.getHospitalProvinceId());
	953	+ organizationQuery.setCityId(childbirthManagerRequest.getHospitalCityId());
	954	+ organizationQuery.setAreaId(childbirthManagerRequest.getHospitalAreaId());
	955	+ organizationQuery.setYn(YnEnums.YES.getId());
	956	+ List<Organization> organizationList = organizationService.queryHospitals(organizationQuery);
	957	+ if (CollectionUtils.isNotEmpty(organizationList)) {
	958	+ for (Organization organization : organizationList) {
	959	+ hospitalList.add(organization.getId().toString());
	960	+ }
	961	+ }
	962	+ }
	963	+ }
	964	+ }
	965	+ patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterProvinceId())?null:childbirthManagerRequest.getRegisterProvinceId());
	966	+ patientsQuery.setCityRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId())?null:childbirthManagerRequest.getRegisterCityId());
	967	+ patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterAreaId())?null:childbirthManagerRequest.getRegisterAreaId());
	968	+ patientsQuery.setProvinceId(StringUtils.isEmpty(childbirthManagerRequest.getLivingProvinceId())?null:childbirthManagerRequest.getLivingProvinceId());
	969	+ patientsQuery.setCityId(StringUtils.isEmpty(childbirthManagerRequest.getLivingCityId())?null:childbirthManagerRequest.getLivingCityId());
	970	+ patientsQuery.setAreaId(StringUtils.isEmpty(childbirthManagerRequest.getLivingAreaId())?null:childbirthManagerRequest.getLivingAreaId());
918	971	patientsQuery.setHusbandPhone(StringUtils.isEmpty(childbirthManagerRequest.getHusbandPhone()) ? null : childbirthManagerRequest.getHusbandPhone());
919		- patientsQuery.setQueryNo1(childbirthManagerRequest.getQueryNo());
	972	+ patientsQuery.setQueryNo1(StringUtils.isEmpty(childbirthManagerRequest.getQueryNo())?null:childbirthManagerRequest.getQueryNo());
	973	+ patientsQuery.setFmHospitalList(hospitalList);
	974	+ String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode();
	975	+ patientsQuery.setFmType(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson);
	976	+ patientsQuery.setFmAgeStart(StringUtils.isEmpty(childbirthManagerRequest.getStartAge()) ? null : Integer.valueOf(childbirthManagerRequest.getStartAge()));
	977	+ patientsQuery.setFmAgeEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndAge()) ? null : Integer.valueOf(childbirthManagerRequest.getEndAge()));
	978	+ patientsQuery.setFmWeekStart(StringUtils.isEmpty(childbirthManagerRequest.getStartDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getStartDueWeek()));
	979	+ patientsQuery.setFmWeekEnd(StringUtils.isEmpty(childbirthManagerRequest.getEndDueWeek()) ? null : Integer.valueOf(childbirthManagerRequest.getEndDueWeek()));
920	980	// 分娩方式去另外一张表查
921	981	List<Patients> patientsList = patientsService.queryPatient(patientsQuery);
922	982	List<String> parentIdList = new ArrayList<>();
923	983
...	...	@@ -931,12 +991,7 @@
931	991	}
932	992
933	993	MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
934		- String deliveryModeQueryJson = "fmfs\\\":\\\"" + childbirthManagerRequest.getDeliveryMode();
935		- matDeliverQuery.setDeliveryModeQueryJson(StringUtils.isEmpty(childbirthManagerRequest.getDeliveryMode()) ? null : deliveryModeQueryJson);
936	994	matDeliverQuery.setParentIdList(parentIdList);
937		- matDeliverQuery.setPage(childbirthManagerRequest.getPage());
938		- matDeliverQuery.setLimit(childbirthManagerRequest.getLimit());
939		- matDeliverQuery.setNeed("Need");
940	995	List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.pageQuery(matDeliverQuery);
941	996	if (CollectionUtils.isEmpty(maternalDeliverModelList)) {
942	997	// 没有查到，直接抛出
...	...	@@ -1180,7 +1235,6 @@
1180	1235
1181	1236	public NewBabyManagerResult newBabyManager(NewBabyManagerRequest newBabyManagerRequest) {
1182	1237	NewBabyManagerResult newBabyManagerResult = new NewBabyManagerResult();
1183		-
1184	1238	BabyModelQuery babyModelQuery = new BabyModelQuery();
1185	1239	babyModelQuery.setYn(YnEnums.YES.getId());
1186	1240	babyModelQuery.setQueryNo(StringUtils.isEmpty(newBabyManagerRequest.getQueryNo()) ? null : newBabyManagerRequest.getQueryNo());
1187	1241
1188	1242
1189	1243
1190	1244
1191	1245
1192	1246
...	...	@@ -1197,55 +1251,61 @@
1197	1251	babyModelQuery.setLimit(newBabyManagerRequest.getLimit());
1198	1252	babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId()));
1199	1253	babyModelQuery.setNeed("Need");
1200		-
	1254	+ babyModelQuery.setBuildType(2);
1201	1255	List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
	1256	+ if (CollectionUtils.isEmpty(babyModelList)) {
	1257	+ newBabyManagerResult.setPageInfo(babyModelQuery.getPageInfo());
	1258	+ newBabyManagerResult.setErrorcode(ErrorCodeConstants.SUCCESS);
	1259	+ newBabyManagerResult.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
	1260	+ return newBabyManagerResult;
	1261	+ }
	1262	+ List<String> parentIdList = new ArrayList<>();
	1263	+ for (BabyModel babyModel : babyModelList) {
	1264	+ parentIdList.add(babyModel.getParentId());
	1265	+ }
	1266	+ MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
	1267	+ matDeliverQuery.setYn(YnEnums.YES.getId());
	1268	+ matDeliverQuery.setParentIdList(parentIdList);
	1269	+ List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
1202	1270	List<NewBabyManagerQueryModel> newBabyManagerQueryModelList = new ArrayList<>();
1203		- if (babyModelList != null && babyModelList.size() > 0) {
	1271	+ for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModelList) {
1204	1272	for (BabyModel babyModel : babyModelList) {
1205		- NewBabyManagerQueryModel newBabyManagerQueryModel = new NewBabyManagerQueryModel();
1206		- BeanUtils.copy(babyModel, newBabyManagerQueryModel);
1207		- newBabyManagerQueryModel.setAge(DateUtil.getAge(babyModel.getMbirth()));
1208		- newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
1209		- newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth()));
1210		- newBabyManagerQueryModel.setMphone(StringUtils.isEmpty(babyModel.getMphone()) ? "" : babyModel.getMphone().substring(0, 3) + "****" + babyModel.getMphone().substring(7));
1211		- newBabyManagerQueryModel.setBirthDays(DateUtil.getDays(babyModel.getBirth(), new Date()));
1212		- newBabyManagerQueryModel.setBabyId(babyModel.getId());
1213		- try {
1214		- MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
1215		- matDeliverQuery.setYn(YnEnums.YES.getId());
1216		- matDeliverQuery.setParentId(babyModel.getParentId());
1217		- List<MaternalDeliverModel> maternalDeliverModelList = matDeliverService.query(matDeliverQuery);
1218		- if (maternalDeliverModelList != null && maternalDeliverModelList.size() == 1) {
1219		- MaternalDeliverModel maternalDeliverModel = maternalDeliverModelList.get(0);
1220		- newBabyManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
1221		- newBabyManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
1222		- newBabyManagerQueryModel.setPatientId(maternalDeliverModel.getParentId());
1223		- newBabyManagerQueryModel.setpId(maternalDeliverModel.getPid());
	1273	+ if (maternalDeliverModel.getParentId().equals(babyModel.getParentId())) {
	1274	+ NewBabyManagerQueryModel newBabyManagerQueryModel = new NewBabyManagerQueryModel();
	1275	+ BeanUtils.copy(babyModel, newBabyManagerQueryModel);
	1276	+ newBabyManagerQueryModel.setAge(DateUtil.getAge(babyModel.getMbirth()));
	1277	+ newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
	1278	+ newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth()));
	1279	+ newBabyManagerQueryModel.setMphone(StringUtils.isEmpty(babyModel.getMphone()) ? "" : babyModel.getMphone().substring(0, 3) + "****" + babyModel.getMphone().substring(7));
	1280	+ newBabyManagerQueryModel.setBirthDays(DateUtil.getDays(babyModel.getBirth(), new Date()));
	1281	+ newBabyManagerQueryModel.setBabyId(babyModel.getId());
	1282	+ newBabyManagerQueryModel.setDeliverDoctor(usersService.getUsers(Integer.valueOf(maternalDeliverModel.getDeliverDoctor())).getName());
	1283	+ newBabyManagerQueryModel.setMaternalDeliverId(maternalDeliverModel.getId());
	1284	+ newBabyManagerQueryModel.setPatientId(maternalDeliverModel.getParentId());
	1285	+ newBabyManagerQueryModel.setpId(maternalDeliverModel.getPid());
	1286	+
	1287	+ for (SexEnum sexEnum : SexEnum.values()) {
	1288	+ if (sexEnum.getId().equals(babyModel.getSex())) {
	1289	+ newBabyManagerQueryModel.setSex(sexEnum.getText());
	1290	+ break;
	1291	+ }
1224	1292	}
1225		- } catch (Exception e) {
1226		- // 什么都不干，这么干是为了避开原始数据的问题
1227		- }
1228		- for (SexEnum sexEnum : SexEnum.values()) {
1229		- if (sexEnum.getId().equals(babyModel.getSex())) {
1230		- newBabyManagerQueryModel.setSex(sexEnum.getText());
1231		- break;
	1293	+ Integer highRisk = babyModel.getHighRisk();
	1294	+ if (new Integer(0).equals(highRisk)) {
	1295	+ newBabyManagerQueryModel.setHighRisk("健康");
1232	1296	}
	1297	+ if (new Integer(1).equals(highRisk)) {
	1298	+ newBabyManagerQueryModel.setHighRisk("高危");
	1299	+ }
	1300	+ String dueType = newBabyManagerQueryModel.getDueType();
	1301	+ if ("1".equals(dueType)) {
	1302	+ newBabyManagerQueryModel.setDueType("顺产");
	1303	+ }
	1304	+ if ("2".equals(dueType)) {
	1305	+ newBabyManagerQueryModel.setDueType("刨宫产");
	1306	+ }
	1307	+ newBabyManagerQueryModelList.add(newBabyManagerQueryModel);
1233	1308	}
1234		- Integer highRisk = babyModel.getHighRisk();
1235		- if (new Integer(0).equals(highRisk)) {
1236		- newBabyManagerQueryModel.setHighRisk("健康");
1237		- }
1238		- if (new Integer(1).equals(highRisk)) {
1239		- newBabyManagerQueryModel.setHighRisk("高危");
1240		- }
1241		- String dueType = newBabyManagerQueryModel.getDueType();
1242		- if ("1".equals(dueType)) {
1243		- newBabyManagerQueryModel.setDueType("顺产");
1244		- }
1245		- if ("2".equals(dueType)) {
1246		- newBabyManagerQueryModel.setDueType("刨宫产");
1247		- }
1248		- newBabyManagerQueryModelList.add(newBabyManagerQueryModel);
1249	1309	}
1250	1310	}
1251	1311

...	...	@@ -37,6 +37,118 @@
37	37
38	38	// TODO 高帆说条码号暂时先不管
39	39
	40	+ /**
	41	+ * @auther HuJiaqi
	42	+ * @createTime 2016年12月21日 10时41分
	43	+ * @discription 是否区域
	44	+ */
	45	+ private String isArea;
	46	+
	47	+ /**
	48	+ * @auther HuJiaqi
	49	+ * @createTime 2016年12月21日 10时56分
	50	+ * @discription 户籍地省
	51	+ */
	52	+ private String registerProvinceId;
	53	+
	54	+ /**
	55	+ * @auther HuJiaqi
	56	+ * @createTime 2016年12月21日 10时56分
	57	+ * @discription 户籍地市
	58	+ */
	59	+ private String registerCityId;
	60	+
	61	+ /**
	62	+ * @auther HuJiaqi
	63	+ * @createTime 2016年12月21日 10时56分
	64	+ * @discription 户籍地区县
	65	+ */
	66	+ private String registerAreaId;
	67	+
	68	+ /**
	69	+ * @auther HuJiaqi
	70	+ * @createTime 2016年12月21日 10时56分
	71	+ * @discription 居住地省
	72	+ */
	73	+ private String livingProvinceId;
	74	+
	75	+ /**
	76	+ * @auther HuJiaqi
	77	+ * @createTime 2016年12月21日 10时56分
	78	+ * @discription 居住地市
	79	+ */
	80	+ private String livingCityId;
	81	+
	82	+ /**
	83	+ * @auther HuJiaqi
	84	+ * @createTime 2016年12月21日 10时56分
	85	+ * @discription 居住地区县
	86	+ */
	87	+ private String livingAreaId;
	88	+
	89	+ /**
	90	+ * @auther HuJiaqi
	91	+ * @createTime 2016年12月21日 10时56分
	92	+ * @discription 分娩医院省
	93	+ */
	94	+ private String hospitalProvinceId;
	95	+
	96	+ /**
	97	+ * @auther HuJiaqi
	98	+ * @createTime 2016年12月21日 10时56分
	99	+ * @discription 分娩医院市
	100	+ */
	101	+ private String hospitalCityId;
	102	+
	103	+ /**
	104	+ * @auther HuJiaqi
	105	+ * @createTime 2016年12月21日 10时56分
	106	+ * @discription 分娩医院区县
	107	+ */
	108	+ private String hospitalAreaId;
	109	+
	110	+ /**
	111	+ * @auther HuJiaqi
	112	+ * @createTime 2016年12月21日 10时56分
	113	+ * @discription 分娩医院id
	114	+ */
	115	+ private String hospitalId;
	116	+
	117	+ /**
	118	+ * @auther HuJiaqi
	119	+ * @createTime 2016年12月21日 10时56分
	120	+ * @discription 分娩年龄start
	121	+ */
	122	+ private String startAge;
	123	+
	124	+ /**
	125	+ * @auther HuJiaqi
	126	+ * @createTime 2016年12月21日 10时56分
	127	+ * @discription 分娩年龄end
	128	+ */
	129	+ private String endAge;
	130	+
	131	+ /**
	132	+ * @auther HuJiaqi
	133	+ * @createTime 2016年12月21日 10时56分
	134	+ * @discription 分娩孕周start
	135	+ */
	136	+ private String startDueWeek;
	137	+
	138	+ /**
	139	+ * @auther HuJiaqi
	140	+ * @createTime 2016年12月21日 10时56分
	141	+ * @discription 分娩孕周end
	142	+ */
	143	+ private String endDueWeek;
	144	+
	145	+ /**
	146	+ * @auther HuJiaqi
	147	+ * @createTime 2016年12月21日 10时41分
	148	+ * @discription 自定义查询
	149	+ */
	150	+ private String initQuery;
	151	+
40	152	private Integer operatorId;
41	153
42	154	public String getQueryNo() {
43	155
...	...	@@ -63,20 +175,148 @@
63	175	this.deliveryMode = deliveryMode;
64	176	}
65	177
66		- public Integer getOperatorId() {
67		- return operatorId;
68		- }
69		-
70		- public void setOperatorId(Integer operatorId) {
71		- this.operatorId = operatorId;
72		- }
73		-
74	178	public String getHusbandPhone() {
75	179	return husbandPhone;
76	180	}
77	181
78	182	public void setHusbandPhone(String husbandPhone) {
79	183	this.husbandPhone = husbandPhone;
	184	+ }
	185	+
	186	+ public String getIsArea() {
	187	+ return isArea;
	188	+ }
	189	+
	190	+ public void setIsArea(String isArea) {
	191	+ this.isArea = isArea;
	192	+ }
	193	+
	194	+ public String getRegisterProvinceId() {
	195	+ return registerProvinceId;
	196	+ }
	197	+
	198	+ public void setRegisterProvinceId(String registerProvinceId) {
	199	+ this.registerProvinceId = registerProvinceId;
	200	+ }
	201	+
	202	+ public String getRegisterCityId() {
	203	+ return registerCityId;
	204	+ }
	205	+
	206	+ public void setRegisterCityId(String registerCityId) {
	207	+ this.registerCityId = registerCityId;
	208	+ }
	209	+
	210	+ public String getRegisterAreaId() {
	211	+ return registerAreaId;
	212	+ }
	213	+
	214	+ public void setRegisterAreaId(String registerAreaId) {
	215	+ this.registerAreaId = registerAreaId;
	216	+ }
	217	+
	218	+ public String getLivingProvinceId() {
	219	+ return livingProvinceId;
	220	+ }
	221	+
	222	+ public void setLivingProvinceId(String livingProvinceId) {
	223	+ this.livingProvinceId = livingProvinceId;
	224	+ }
	225	+
	226	+ public String getLivingCityId() {
	227	+ return livingCityId;
	228	+ }
	229	+
	230	+ public void setLivingCityId(String livingCityId) {
	231	+ this.livingCityId = livingCityId;
	232	+ }
	233	+
	234	+ public String getLivingAreaId() {
	235	+ return livingAreaId;
	236	+ }
	237	+
	238	+ public void setLivingAreaId(String livingAreaId) {
	239	+ this.livingAreaId = livingAreaId;
	240	+ }
	241	+
	242	+ public String getHospitalProvinceId() {
	243	+ return hospitalProvinceId;
	244	+ }
	245	+
	246	+ public void setHospitalProvinceId(String hospitalProvinceId) {
	247	+ this.hospitalProvinceId = hospitalProvinceId;
	248	+ }
	249	+
	250	+ public String getHospitalCityId() {
	251	+ return hospitalCityId;
	252	+ }
	253	+
	254	+ public void setHospitalCityId(String hospitalCityId) {
	255	+ this.hospitalCityId = hospitalCityId;
	256	+ }
	257	+
	258	+ public String getHospitalAreaId() {
	259	+ return hospitalAreaId;
	260	+ }
	261	+
	262	+ public void setHospitalAreaId(String hospitalAreaId) {
	263	+ this.hospitalAreaId = hospitalAreaId;
	264	+ }
	265	+
	266	+ public String getHospitalId() {
	267	+ return hospitalId;
	268	+ }
	269	+
	270	+ public void setHospitalId(String hospitalId) {
	271	+ this.hospitalId = hospitalId;
	272	+ }
	273	+
	274	+ public String getStartAge() {
	275	+ return startAge;
	276	+ }
	277	+
	278	+ public void setStartAge(String startAge) {
	279	+ this.startAge = startAge;
	280	+ }
	281	+
	282	+ public String getEndAge() {
	283	+ return endAge;
	284	+ }
	285	+
	286	+ public void setEndAge(String endAge) {
	287	+ this.endAge = endAge;
	288	+ }
	289	+
	290	+ public String getStartDueWeek() {
	291	+ return startDueWeek;
	292	+ }
	293	+
	294	+ public void setStartDueWeek(String startDueWeek) {
	295	+ this.startDueWeek = startDueWeek;
	296	+ }
	297	+
	298	+ public String getEndDueWeek() {
	299	+ return endDueWeek;
	300	+ }
	301	+
	302	+ public void setEndDueWeek(String endDueWeek) {
	303	+ this.endDueWeek = endDueWeek;
	304	+ }
	305	+
	306	+ public String getInitQuery() {
	307	+ return initQuery;
	308	+ }
	309	+
	310	+ public void setInitQuery(String initQuery) {
	311	+ this.initQuery = initQuery;
	312	+ }
	313	+
	314	+ public Integer getOperatorId() {
	315	+ return operatorId;
	316	+ }
	317	+
	318	+ public void setOperatorId(Integer operatorId) {
	319	+ this.operatorId = operatorId;
80	320	}
81	321	}