jiangjiazhi / regional-platform

Commit 87215ac44d7caf3f0919d4491b49c1a16cc4d199

Authored by liquanyu over 5 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 184 additions and 1 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CommonParamRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PreEugenicsBaseListResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PreEugebicsServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java

...	...	@@ -29,6 +29,11 @@
29	29
30	30
31	31	/**
	32	+ * 条形码
	33	+ */
	34	+ private String code;
	35	+
	36	+ /**
32	37	* 版本号
33	38	*/
34	39	private Integer version = 1;

...	...	@@ -17,9 +17,22 @@
17	17	private String cardNo;
18	18
19	19	/**
20		- * 编号/就诊卡号..
	20	+ * 就诊卡号..
21	21	*/
22	22	private String otherNo;
	23	+
	24	+ /**
	25	+ * 编号/
	26	+ */
	27	+ private String code;
	28	+
	29	+ public String getCode() {
	30	+ return code;
	31	+ }
	32	+
	33	+ public void setCode(String code) {
	34	+ this.code = code;
	35	+ }
23	36
24	37	public String getCardNo() {
25	38	return cardNo;

...	...	@@ -2,6 +2,7 @@
2	2
3	3	import com.lyms.platform.pojo.PreEugenicsBaseModel;
4	4
	5	+
5	6	public class PreEugenicsBaseListResult extends PreEugenicsBaseModel {
6	7
7	8	/**
...	...	@@ -23,6 +24,149 @@
23	24	* 妻子现住地址省市区街道详细地址
24	25	*/
25	26	private String wifeCurrentAddressStr;
	27	+
	28	+
	29	+ /**
	30	+ * 丈夫文化程度id
	31	+ */
	32	+ private String husbandEducationalStr;
	33	+
	34	+ /**
	35	+ * 丈夫证件类型
	36	+ */
	37	+ private String husbandCardTypeStr;
	38	+
	39	+
	40	+ /**
	41	+ * 丈夫职业 : 1农民 2工人 3服务业 4经商 5家务 6教师/公务员/职员 7其他
	42	+ */
	43	+ private String husbandCareerStr;
	44	+
	45	+
	46	+ /**
	47	+ * 丈夫民族id
	48	+ */
	49	+ private String husbandNationStr;
	50	+
	51	+
	52	+ /**
	53	+ * 丈夫户口性质:
	54	+ * 1农业户口 (含界定为农村居民者) 2.非农业
	55	+ */
	56	+ private String husbandAccountNatureStr;
	57	+
	58	+
	59	+
	60	+ /**
	61	+ * 妻子民族id
	62	+ */
	63	+ private String wifeNationStr;
	64	+
	65	+
	66	+
	67	+ /**
	68	+ * 妻子文化程度id
	69	+ */
	70	+ private String wifeEducationalStr;
	71	+
	72	+ /**
	73	+ * 妻子身份证号码类型
	74	+ */
	75	+ private String wifeCardTypeStr;
	76	+
	77	+ /**
	78	+ * 妻子职业 : 1农民 2工人 3服务业 4经商 5家务 6教师/公务员/职员 7其他
	79	+ */
	80	+ private String wifeCareerStr;
	81	+
	82	+
	83	+
	84	+ /**
	85	+ * 妻子户口性质:
	86	+ * 1农业户口 (含界定为农村居民者) 2.非农业
	87	+ */
	88	+ private String wifeAccountNatureStr;
	89	+
	90	+
	91	+ public String getHusbandEducationalStr() {
	92	+ return husbandEducationalStr;
	93	+ }
	94	+
	95	+ public void setHusbandEducationalStr(String husbandEducationalStr) {
	96	+ this.husbandEducationalStr = husbandEducationalStr;
	97	+ }
	98	+
	99	+ public String getHusbandCardTypeStr() {
	100	+ return husbandCardTypeStr;
	101	+ }
	102	+
	103	+ public void setHusbandCardTypeStr(String husbandCardTypeStr) {
	104	+ this.husbandCardTypeStr = husbandCardTypeStr;
	105	+ }
	106	+
	107	+ public String getHusbandCareerStr() {
	108	+ return husbandCareerStr;
	109	+ }
	110	+
	111	+ public void setHusbandCareerStr(String husbandCareerStr) {
	112	+ this.husbandCareerStr = husbandCareerStr;
	113	+ }
	114	+
	115	+ public String getHusbandNationStr() {
	116	+ return husbandNationStr;
	117	+ }
	118	+
	119	+ public void setHusbandNationStr(String husbandNationStr) {
	120	+ this.husbandNationStr = husbandNationStr;
	121	+ }
	122	+
	123	+ public String getHusbandAccountNatureStr() {
	124	+ return husbandAccountNatureStr;
	125	+ }
	126	+
	127	+ public void setHusbandAccountNatureStr(String husbandAccountNatureStr) {
	128	+ this.husbandAccountNatureStr = husbandAccountNatureStr;
	129	+ }
	130	+
	131	+ public String getWifeNationStr() {
	132	+ return wifeNationStr;
	133	+ }
	134	+
	135	+ public void setWifeNationStr(String wifeNationStr) {
	136	+ this.wifeNationStr = wifeNationStr;
	137	+ }
	138	+
	139	+ public String getWifeEducationalStr() {
	140	+ return wifeEducationalStr;
	141	+ }
	142	+
	143	+ public void setWifeEducationalStr(String wifeEducationalStr) {
	144	+ this.wifeEducationalStr = wifeEducationalStr;
	145	+ }
	146	+
	147	+ public String getWifeCardTypeStr() {
	148	+ return wifeCardTypeStr;
	149	+ }
	150	+
	151	+ public void setWifeCardTypeStr(String wifeCardTypeStr) {
	152	+ this.wifeCardTypeStr = wifeCardTypeStr;
	153	+ }
	154	+
	155	+ public String getWifeCareerStr() {
	156	+ return wifeCareerStr;
	157	+ }
	158	+
	159	+ public void setWifeCareerStr(String wifeCareerStr) {
	160	+ this.wifeCareerStr = wifeCareerStr;
	161	+ }
	162	+
	163	+ public String getWifeAccountNatureStr() {
	164	+ return wifeAccountNatureStr;
	165	+ }
	166	+
	167	+ public void setWifeAccountNatureStr(String wifeAccountNatureStr) {
	168	+ this.wifeAccountNatureStr = wifeAccountNatureStr;
	169	+ }
26	170
27	171	public String getHusbandAccountAddressStr() {
28	172	return husbandAccountAddressStr;

...	...	@@ -63,6 +63,11 @@
63	63	if (StringUtils.isNotEmpty(otherNo)) {
64	64	query.addCriteria(new Criteria().orOperator(Criteria.where("husbandNo").is(otherNo), Criteria.where("wifeNo").is(otherNo)));
65	65	}
	66	+ String code = param.getCode();
	67	+ if (StringUtils.isNotEmpty(otherNo)) {
	68	+ query.addCriteria(Criteria.where("code").is(code));
	69	+ }
	70	+
66	71	PreEugenicsBaseModel one = mongoTemplate.findOne(query, PreEugenicsBaseModel.class);
67	72	if (one == null) {
68	73	if (StringUtils.isNotEmpty(cardNo)) {
...	...	@@ -340,6 +345,18 @@
340	345	model.getWifeCurrentArea(),
341	346	model.getWifeCurrentStreet(),
342	347	model.getWifeCurrentAddress(), basicConfigService));
	348	+
	349	+ result.setHusbandEducationalStr(CommonsHelper.getName1(model.getHusbandEducational(),basicConfigService));
	350	+ result.setHusbandCardTypeStr(CommonsHelper.getName1(model.getHusbandCardType(), basicConfigService));
	351	+ result.setHusbandCareerStr(CommonsHelper.getName1(model.getHusbandCareer(), basicConfigService));
	352	+ result.setHusbandNationStr(CommonsHelper.getName1(model.getHusbandNation(), basicConfigService));
	353	+ result.setHusbandAccountNatureStr(CommonsHelper.getName1(model.getHusbandAccountNature(), basicConfigService));
	354	+ result.setWifeNationStr(CommonsHelper.getName1(model.getWifeNation(), basicConfigService));
	355	+ result.setWifeEducationalStr(CommonsHelper.getName1(model.getWifeEducational(), basicConfigService));
	356	+ result.setWifeCardTypeStr(CommonsHelper.getName1(model.getWifeCardType(), basicConfigService));
	357	+ result.setWifeCareerStr(CommonsHelper.getName1(model.getWifeCareer(), basicConfigService));
	358	+ result.setWifeAccountNatureStr(CommonsHelper.getName1(model.getWifeAccountNature(), basicConfigService));
	359	+
343	360	return result;
344	361	}
345	362

...	...	@@ -109,6 +109,10 @@
109	109
110	110
111	111	public static String getName1(String id, BasicConfigService basicConfigService) {
	112	+ if (StringUtils.isEmpty(id))
	113	+ {
	114	+ return "";
	115	+ }
112	116	BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(id);
113	117	if (basicConfig != null) {
114	118	return basicConfig.getName();