jiangjiazhi / regional-platform | GitLab

Commit fd93e14aada2efa3ce806db25240f223d700bdeb

Authored by liquanyu over 6 years ago

1 parent a870a69df7

Exists in master and in 6 other branches

分娩

Showing 3 changed files with 13 additions and 1 deletions

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/result/NewBabyManagerQueryModel.java

...	...	@@ -392,8 +392,9 @@
392	392	AntExChuModel antExChuModel = antExChuModels.get(0);
393	393	map.put("yc",antExChuModel.getPregnancyTimes() == null ? "" : antExChuModel.getPregnancyTimes());
394	394	map.put("cc",antExChuModel.getProdTime() == null ? "" : antExChuModel.getProdTime());
395		- map.put("ts",antExChuModel.getTireNumber1() == null ? "" : antExChuModel.getTireNumber1());
	395	+
396	396	}
	397	+ map.put("ts",newBabyManagerQueryModel.getTireNumber() == null ? "" : newBabyManagerQueryModel.getTireNumber());
397	398
398	399	if (StringUtils.isNotEmpty(patients.getFmHospital()))
399	400	{

...	...	@@ -2555,6 +2555,7 @@
2555	2555	newBabyManagerQueryModel.setpId(maternalDeliverModel.getPid());
2556	2556	newBabyManagerQueryModel.setBabyWeight(StringUtils.isEmpty(babyModel.getBabyWeight()) ? "-" : String.valueOf(Double.valueOf(babyModel.getBabyWeight()) * 1000));
2557	2557
	2558	+ newBabyManagerQueryModel.setTireNumber(maternalDeliverModel.getTireNumber());
2558	2559	for (SexEnum sexEnum : SexEnum.values()) {
2559	2560	if (sexEnum.getId().equals(babyModel.getSex())) {
2560	2561	newBabyManagerQueryModel.setSex(sexEnum.getText());

...	...	@@ -141,6 +141,16 @@
141	141	//畸形 0非畸形 1畸形
142	142	private Integer deformity;
143	143
	144	+ private Integer tireNumber;
	145	+
	146	+ public Integer getTireNumber() {
	147	+ return tireNumber;
	148	+ }
	149	+
	150	+ public void setTireNumber(Integer tireNumber) {
	151	+ this.tireNumber = tireNumber;
	152	+ }
	153	+
144	154	public String getFmDate() {
145	155	return fmDate;
146	156	}