jiangjiazhi / regional-platform

Authored by yangfei over 7 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 28 additions and 11 deletions

...	...	@@ -764,6 +764,8 @@
764	764	base.setBabyLastHighRisk(getBabyLastHighRisk(model.getPid()));
765	765	base.setId(id);
766	766	base.setSex(model.getSex());
	767	+ base.setDueWeek(model.getDueWeek());
	768	+ base.setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate()));
767	769	base.setName(model.getName());
768	770	base.setCardNo(model.getMcertNo());
769	771	base.setPregnantCertificateTypeId(model.getMcertTypeId());

...	...	@@ -3147,7 +3147,7 @@
3147	3147	model.setTcType(ChildCareEnums.JCTCEnums.H.getId());
3148	3148	}
3149	3149	}
3150		- if (model.getTcType() == null) {
	3150	+ if (model.getTcType() == null) {//如果月龄未完成赋值
3151	3151	String checkMonthAge = DateUtil.getBabyMonthAge(babyModel.getBirth(), checkModel.getCheckDate());
3152	3152	if (StringUtils.isNotEmpty(checkMonthAge)) {
3153	3153	if (checkMonthAge.indexOf("岁") != -1) {

1	1	package com.lyms.platform.operate.web.inteceptor;
2	2
3	3
4		-import java.sql.Statement;
5		-import java.text.DateFormat;
6		-import java.util.*;
7		-
8		-import com.lyms.platform.common.utils.DateUtil;
9	4	import com.lyms.platform.common.utils.ExceptionUtils;
10	5	import com.lyms.platform.operate.web.utils.SendMysqlSyncDatUtil;
11	6	import org.apache.commons.collections.CollectionUtils;
12	7
...	...	@@ -15,14 +10,14 @@
15	10	import org.apache.ibatis.mapping.BoundSql;
16	11	import org.apache.ibatis.mapping.MappedStatement;
17	12	import org.apache.ibatis.mapping.ParameterMapping;
18		-import org.apache.ibatis.plugin.Interceptor;
19		-import org.apache.ibatis.plugin.Intercepts;
20		-import org.apache.ibatis.plugin.Invocation;
21		-import org.apache.ibatis.plugin.Plugin;
22		-import org.apache.ibatis.plugin.Signature;
	13	+import org.apache.ibatis.plugin.*;
23	14	import org.apache.ibatis.reflection.MetaObject;
24	15	import org.apache.ibatis.session.Configuration;
25	16	import org.apache.ibatis.type.TypeHandlerRegistry;
	17	+
	18	+import java.sql.Statement;
	19	+import java.text.DateFormat;
	20	+import java.util.*;
26	21
27	22	/**
28	23	* 同步线上mysql的操作到区域

...	...	@@ -49,6 +49,26 @@
49	49	private String pregnantCertificateTypeId;
50	50	//是否高危儿童 0 非高危 1高危
51	51	private Integer babyLastHighRisk;
	52	+ //分娩孕周
	53	+ private Integer dueWeek;
	54	+ //预产期
	55	+ private String dueDate;
	56	+
	57	+ public String getDueDate() {
	58	+ return dueDate;
	59	+ }
	60	+
	61	+ public void setDueDate(String dueDate) {
	62	+ this.dueDate = dueDate;
	63	+ }
	64	+
	65	+ public Integer getDueWeek() {
	66	+ return dueWeek;
	67	+ }
	68	+
	69	+ public void setDueWeek(Integer dueWeek) {
	70	+ this.dueWeek = dueWeek;
	71	+ }
52	72
53	73	public String getPregnantCertificateTypeId() {
54	74	return pregnantCertificateTypeId;