jiangjiazhi / regional-platform

Authored by shiyang almost 4 years ago

Exists in master and in 6 other branches

区域妇幼管理-->孕产妇管理-->全部产妇管理导出数据增加两列“建档状态”“分娩孕周”

Showing 5 changed files with 38 additions and 0 deletions

...	...	@@ -2273,6 +2273,7 @@
2273	2273	data.put("serviceType", rp.getServiceType());
2274	2274	data.put("serviceStatus", rp.getServiceStatus());
2275	2275	data.put("remark", rp.getRemark());
	2276	+ data.put("normal", rp.getNormal());
2276	2277	datas.add(data);
2277	2278	}else {
2278	2279	//全部产妇
...	...	@@ -2293,6 +2294,8 @@
2293	2294	data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone()));
2294	2295	data.put("cardNo", patientsQueryRequest.getIsEncry() == 0 ? rp.getCardNo() : StringUtils.encryCardNo(rp.getCardNo()));
2295	2296	data.put("remark", rp.getRemark());
	2297	+ data.put("dueWeek", rp.getDueWeek());
	2298	+ data.put("normal", rp.getNormal());
2296	2299	datas.add(data);
2297	2300	}
2298	2301	}
...	...	@@ -2328,6 +2331,7 @@
2328	2331	cnames.put("cardNo", "身份证");
2329	2332	cnames.put("dueWeek", "当前孕周");
2330	2333	cnames.put("bTime", "建档日期");
	2334	+ cnames.put("normal", "建档状态");
2331	2335	cnames.put("cTimes", "产检次数");
2332	2336	cnames.put("createdWeek", "建档孕周");
2333	2337	cnames.put("dueDate", "预产期");
...	...	@@ -2349,6 +2353,8 @@
2349	2353	cnames.put("age", "分娩年龄");
2350	2354	cnames.put("dueWeek", "分娩日期");
2351	2355	cnames.put("createdWeek", "建档孕周");
	2356	+ cnames.put("normal", "建档状态");
	2357	+ cnames.put("dueWeek", "分娩孕周");
2352	2358	cnames.put("cTimes", "总复查次数");
2353	2359	cnames.put("tireNumber", "胎数");
2354	2360	cnames.put("rLevel", "高危等级");

...	...	@@ -109,6 +109,19 @@
109	109	private String chfc;
110	110
111	111	private String remark;
	112	+ /**
	113	+ * 承德需求外地过来分娩或者内蒙只过来分娩，临时建档只为了开证的，在建档页面加一个补录的字段标记
	114	+ */
	115	+ //空或者1为正常 2为补录
	116	+ private String normal;
	117	+
	118	+ public String getNormal() {
	119	+ return normal;
	120	+ }
	121	+
	122	+ public void setNormal(String normal) {
	123	+ this.normal = normal;
	124	+ }
112	125
113	126	public String getRemark() {
114	127	return remark;

...	...	@@ -107,6 +107,20 @@
107	107	//秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
108	108	public Integer productionSieveType;
109	109
	110	+ /**
	111	+ * 承德需求外地过来分娩或者内蒙只过来分娩，临时建档只为了开证的，在建档页面加一个补录的字段标记
	112	+ */
	113	+ //空或者1为正常 2为补录
	114	+ private String normal;
	115	+
	116	+ public String getNormal() {
	117	+ return normal;
	118	+ }
	119	+
	120	+ public void setNormal(String normal) {
	121	+ this.normal = normal;
	122	+ }
	123	+
110	124	public Integer getProductionSieveType() {
111	125	return productionSieveType;
112	126	}

...	...	@@ -242,6 +242,8 @@
242	242	stopWatch.start("query matdeliver");
243	243	List <MaternalDeliverModel> maternalDeliverModels = matDeliverService.query(matDeliverQuery);
244	244	if (CollectionUtils.isNotEmpty(maternalDeliverModels)) {
	245	+ //分娩孕周
	246	+ chanResult.setDueWeek(maternalDeliverModels.get(0).getDueWeek());
245	247	chanResult.setTireNumber(TaiShuEnums.getTitle(maternalDeliverModels.get(0).getTireNumber() + ""));
246	248	try {
247	249	chanResult.setfCh(organizationService.getOrganization(Integer.valueOf(maternalDeliverModels.get(0).getHospitalId())).getName());
...	...	@@ -367,6 +369,7 @@
367	369	}
368	370
369	371	chanResult.sethScore(patients.getRiskScore());
	372	+ chanResult.setNormal(StringUtils.isNotEmpty(patients.getNormal())?"2".equals(patients.getNormal())?"补录":"正常":"正常");
370	373	data.add(chanResult);
371	374	logger.debug(stopWatch.toString());
372	375	}

...	...	@@ -263,6 +263,8 @@
263	263	// HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
264	264	// quanPatientsResult.setrLevel(highScoreResult.filter(highScoreResult.getLevel()));
265	265	quanPatientsResult.setcTime(nextCheckTime);
	266	+ //补录、正常
	267	+ quanPatientsResult.setNormal(StringUtils.isNotEmpty(patients.getNormal())?"2".equals(patients.getNormal())?"补录":"正常":"正常");
266	268	List level = new ArrayList();
267	269	if (StringUtils.isNotEmpty(patients.getRiskLevelId())) {
268	270	try {