jiangjiazhi / regional-platform

Commit 91fc2f24762ba6cb1c2275fa55f37fc4eaf2a4c0

Authored by liquanyu over 6 years ago

Exists in master and in 6 other branches

威海分娩

Showing 5 changed files with 49 additions and 11 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.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/facade/ViewFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/NewBabyManagerQueryModel.java

...	...	@@ -1435,6 +1435,9 @@
1435	1435	// 脐带异常类型
1436	1436	private String umbilicalCordExType;
1437	1437
	1438	+ // 脐带异常备注
	1439	+ private String umbilicalCordExRemark;
	1440	+
1438	1441	/****威海妇幼新增字段****/
1439	1442	private String tpmcDate;//胎盘娩出时间
1440	1443	//娩出方式
...	...	@@ -1448,6 +1451,14 @@
1448	1451	private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
1449	1452	private String placentalQs;//胎盘缺损g
1450	1453	private String ccm;//粗糙面
	1454	+
	1455	+ public String getUmbilicalCordExRemark() {
	1456	+ return umbilicalCordExRemark;
	1457	+ }
	1458	+
	1459	+ public void setUmbilicalCordExRemark(String umbilicalCordExRemark) {
	1460	+ this.umbilicalCordExRemark = umbilicalCordExRemark;
	1461	+ }
1451	1462
1452	1463	public String getPlacentalComplete() {
1453	1464	return placentalComplete;

...	...	@@ -672,17 +672,20 @@
672	672	map.put("husbandName", patients.getHusbandName() == null ? "" : patients.getHusbandName());
673	673	map.put("husbandPhone", patients.getHusbandPhone() == null ? "" : patients.getHusbandPhone());
674	674
675		- AntExChuQuery antExChuQuery = new AntExChuQuery();
676		- antExChuQuery.setYn(YnEnums.YES.getId());
677		- antExChuQuery.setParentId(patients.getId());
678		- List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
679		- if (CollectionUtils.isNotEmpty(antExChuModels))
680		- {
681		- AntExChuModel antExChuModel = antExChuModels.get(0);
682		- map.put("yc",antExChuModel.getPregnancyTimes() == null ? "" : antExChuModel.getPregnancyTimes());
683		- map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime());
	675	+ map.put("yc",newBabyManagerQueryModel.getGravidity() == null ? "" : newBabyManagerQueryModel.getGravidity());
	676	+ map.put("cc",newBabyManagerQueryModel.getDueCount() == null ? "" : newBabyManagerQueryModel.getDueCount());
684	677
685		- }
	678	+// AntExChuQuery antExChuQuery = new AntExChuQuery();
	679	+// antExChuQuery.setYn(YnEnums.YES.getId());
	680	+// antExChuQuery.setParentId(patients.getId());
	681	+// List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery);
	682	+// if (CollectionUtils.isNotEmpty(antExChuModels))
	683	+// {
	684	+// AntExChuModel antExChuModel = antExChuModels.get(0);
	685	+// map.put("yc",antExChuModel.getPregnancyTimes() == null ? "" : antExChuModel.getPregnancyTimes());
	686	+// map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime());
	687	+//
	688	+// }
686	689	map.put("ts",newBabyManagerQueryModel.getTireNumber() == null ? "" : newBabyManagerQueryModel.getTireNumber());
687	690
688	691	if (StringUtils.isNotEmpty(patients.getFmHospital()))

...	...	@@ -2337,6 +2337,9 @@
2337	2337
2338	2338	newBabyManagerQueryModel.setTireNumber(maternalDeliverModel.getTireNumber());
2339	2339
	2340	+ newBabyManagerQueryModel.setGravidity(maternalDeliverModel.getGravidity());
	2341	+ newBabyManagerQueryModel.setDueCount(maternalDeliverModel.getDueCount());
	2342	+
2340	2343
2341	2344	newBabyManagerQueryModel.setFmWeek(maternalDeliverModel.getDueWeek());
2342	2345	for (SexEnum sexEnum : SexEnum.values()) {

...	...	@@ -2926,6 +2926,7 @@
2926	2926	}
2927	2927	extMap.put("umbilicalCordEx", umbilicalCordEx);
2928	2928	extMap.put("umbilicalCordExType", umbilicalCordExType);
	2929	+ extMap.put("umbilicalCordExRemark", temp.getUmbilicalCordExRemark());
2929	2930
2930	2931	/****威海新增胎盘字段*****/
2931	2932	extMap.put("tpmcDate",temp.getTpmcDate());

...	...	@@ -145,6 +145,26 @@
145	145
146	146	private String fmWeek;
147	147
	148	+ //产次
	149	+ private Integer dueCount;
	150	+ private Integer gravidity;//孕次
	151	+
	152	+ public Integer getDueCount() {
	153	+ return dueCount;
	154	+ }
	155	+
	156	+ public void setDueCount(Integer dueCount) {
	157	+ this.dueCount = dueCount;
	158	+ }
	159	+
	160	+ public Integer getGravidity() {
	161	+ return gravidity;
	162	+ }
	163	+
	164	+ public void setGravidity(Integer gravidity) {
	165	+ this.gravidity = gravidity;
	166	+ }
	167	+
148	168	public String getFmWeek() {
149	169	return fmWeek;
150	170	}