jiangjiazhi / regional-platform

Commit 87708e057e202b1f1f3b453646ee7553d94c72fb

Authored by wtt over 4 years ago

Exists in master and in 6 other branches

update

Showing 2 changed files with 58 additions and 0 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java

...	...	@@ -1700,6 +1700,12 @@
1700	1700	//返回婚检信息
1701	1701	public PremaritalCheckupPageResult getPageResult(PremaritalCheckup result, ResidentsArchiveModel archiveModel) {
1702	1702	PremaritalCheckupPageResult checkupResult = new PremaritalCheckupPageResult();
	1703	+ checkupResult.setBaseSign(result.getBaseSign());
	1704	+ checkupResult.setPhysiqueSign(result.getPhysiqueSign());
	1705	+ checkupResult.setRepSign(result.getRepSign());
	1706	+ checkupResult.setGuidSign(result.getGuidSign());
	1707	+ checkupResult.setUserSign(result.getUserSign());
	1708	+
1703	1709	checkupResult.setUsername(archiveModel.getUsername());
1704	1710	checkupResult.setSex(getBaseicConfigByid(archiveModel.getSex()));
1705	1711	checkupResult.setBirthday(DateUtil.getyyyy_MM_dd(archiveModel.getBirthday()));

...	...	@@ -9,8 +9,20 @@
9	9	public class PremaritalCheckupPageResult {
10	10
11	11
	12	+ //婚检信息签名
	13	+ private String baseSign;
12	14
	15	+ //体格检查签名
	16	+ private String physiqueSign;
13	17
	18	+ //生殖检查签名
	19	+ private String repSign;
	20	+
	21	+ //婚前指导签名
	22	+ private String guidSign;
	23	+
	24	+ //用户签名
	25	+ private String userSign;
14	26	// private String id;
15	27	// //女性/男性ID
16	28	// private String parentId;
...	...	@@ -946,6 +958,14 @@
946	958	return shiLi;
947	959	}
948	960
	961	+ public String getUserSign() {
	962	+ return userSign;
	963	+ }
	964	+
	965	+ public void setUserSign(String userSign) {
	966	+ this.userSign = userSign;
	967	+ }
	968	+
949	969	public void setShiLi(String shiLi) {
950	970	this.shiLi = shiLi;
951	971	}
...	...	@@ -1048,6 +1068,38 @@
1048	1068
1049	1069	public String getTiTai() {
1050	1070	return tiTai;
	1071	+ }
	1072	+
	1073	+ public String getBaseSign() {
	1074	+ return baseSign;
	1075	+ }
	1076	+
	1077	+ public void setBaseSign(String baseSign) {
	1078	+ this.baseSign = baseSign;
	1079	+ }
	1080	+
	1081	+ public String getPhysiqueSign() {
	1082	+ return physiqueSign;
	1083	+ }
	1084	+
	1085	+ public void setPhysiqueSign(String physiqueSign) {
	1086	+ this.physiqueSign = physiqueSign;
	1087	+ }
	1088	+
	1089	+ public String getRepSign() {
	1090	+ return repSign;
	1091	+ }
	1092	+
	1093	+ public void setRepSign(String repSign) {
	1094	+ this.repSign = repSign;
	1095	+ }
	1096	+
	1097	+ public String getGuidSign() {
	1098	+ return guidSign;
	1099	+ }
	1100	+
	1101	+ public void setGuidSign(String guidSign) {
	1102	+ this.guidSign = guidSign;
1051	1103	}
1052	1104
1053	1105	public void setTiTai(String tiTai) {