jiangjiazhi / regional-platform

Authored by landong2015 over 8 years ago

Exists in master and in 8 other branches

Showing 4 changed files with 41 additions and 0 deletions

...	...	@@ -34,6 +34,8 @@
34	34	private String certificateTypeId;
35	35	//就诊卡号
36	36	private String vcCardNo;
	37	+ //性别类型
	38	+ private Integer sexType;
37	39
38	40	/**************** 配偶信息 ******************/
39	41	//配偶姓名
...	...	@@ -337,6 +339,14 @@
337	339	private String zhiDaoYiJian;
338	340	//婚检医生
339	341	private String hunJianDoctor;
	342	+
	343	+ public Integer getSexType() {
	344	+ return sexType;
	345	+ }
	346	+
	347	+ public void setSexType(Integer sexType) {
	348	+ this.sexType = sexType;
	349	+ }
340	350
341	351	public String getBingGan() {
342	352	return bingGan;

...	...	@@ -45,7 +45,10 @@
45	45	private String hunJianDoctor;
46	46	//医学意见
47	47	private Integer yiXueYiJian;
	48	+ //性别类型
	49	+ private Integer sexType;
48	50
	51	+
49	52	@Override
50	53	public MongoQuery convertToQuery() {
51	54	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -70,6 +73,9 @@
70	73	if (yn!=null) {
71	74	condition = condition.and("yn", yn, MongoOper.IS);
72	75	}
	76	+ if (sexType!=null) {
	77	+ condition = condition.and("sexType", sexType, MongoOper.IS);
	78	+ }
73	79	if (publishId!=null) {
74	80	condition = condition.and("publishId", publishId, MongoOper.IS);
75	81	}
...	...	@@ -103,6 +109,14 @@
103	109	condition = condition.andCondition(new MongoCondition(c1));
104	110	}
105	111	return condition.toMongoQuery();
	112	+ }
	113	+
	114	+ public Integer getSexType() {
	115	+ return sexType;
	116	+ }
	117	+
	118	+ public void setSexType(Integer sexType) {
	119	+ this.sexType = sexType;
106	120	}
107	121
108	122	public String getId() {

...	...	@@ -11,6 +11,7 @@
11	11	import com.lyms.platform.common.result.BaseListResponse;
12	12	import com.lyms.platform.common.result.BaseObjectResponse;
13	13	import com.lyms.platform.common.utils.DateUtil;
	14	+import com.lyms.platform.common.utils.SystemConfig;
14	15	import com.lyms.platform.operate.web.request.PremaritalCheckupAddRequest;
15	16	import com.lyms.platform.operate.web.request.PremaritalCheckupQueryRequest;
16	17	import com.lyms.platform.operate.web.result.PremaritalCheckupHistoryResult;
...	...	@@ -188,6 +189,7 @@
188	189	query.setYiXueYiJian(request.getYiXueYiJian());
189	190	query.setPremaritalUpTimeStart(request.getPremaritalUpTimeStart());
190	191	query.setPremaritalUpTimeEnd(request.getPremaritalUpTimeEnd());
	192	+ query.setSexType(request.getSexType());
191	193
192	194	if (CollectionUtils.isNotEmpty(parentIds)){
193	195	for (String parentId : parentIds){
...	...	@@ -265,6 +267,11 @@
265	267	String id = null;
266	268
267	269	PremaritalCheckup checkup = new PremaritalCheckup();
	270	+ if (model.getSex() != null && model.getSex()== SystemConfig.WOMAN_ID){
	271	+ checkup.setSexType(1);
	272	+ }else {
	273	+ checkup.setSexType(2);
	274	+ }
268	275
269	276	/* 配偶信息 */
270	277	if (addRequest.getDeliverStatus()!=null && addRequest.getDeliverStatus()==1){

...	...	@@ -26,6 +26,16 @@
26	26	private Integer yiXueYiJian;
27	27	//医院ID
28	28	private String hospitalId;
	29	+ //性别类型
	30	+ private Integer sexType;
	31	+
	32	+ public Integer getSexType() {
	33	+ return sexType;
	34	+ }
	35	+
	36	+ public void setSexType(Integer sexType) {
	37	+ this.sexType = sexType;
	38	+ }
29	39
30	40	public String getHospitalId() {
31	41	return hospitalId;