jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

1 parent 65e1913b29

Exists in master and in 6 other branches

Showing 9 changed files with 111 additions and 1 deletions

...	...	@@ -263,6 +263,7 @@
263	263	antExRecordModel.setBarCode(antExChuModel.getBarCode());
264	264	antExRecordModel.setCheckTime(antExChuModel.getCheckTime());
265	265	antExRecordModel.setNextCheckTime(antExChuModel.getNextCheckTime());
	266	+ antExRecordModel.setFirst(antExChuModel.getFirst());
266	267
267	268	//高危信息
268	269	List li = null;

...	...	@@ -3,7 +3,10 @@
3	3	import com.lyms.platform.biz.dal.ISyncDataDao;
4	4	import com.lyms.platform.common.dao.operator.MongoQuery;
5	5	import com.lyms.platform.common.pojo.SyncDataModel;
	6	+import com.lyms.platform.common.pojo.SyncMysqlDataModel;
	7	+import com.lyms.platform.common.utils.JsonUtil;
6	8	import com.lyms.platform.query.SyncDataQuery;
	9	+import org.apache.commons.codec.binary.Base64;
7	10	import org.apache.commons.lang.StringUtils;
8	11	import org.springframework.beans.factory.annotation.Autowired;
9	12	import org.springframework.data.domain.Sort;
10	13
...	...	@@ -58,7 +61,20 @@
58	61	return iSyncDataDao.querySyncData(query.addOrder(Sort.Direction.ASC, "created"));
59	62	}
60	63
	64	+ public boolean savePostMysql(String sql ,String sqlId) {
	65	+ SyncMysqlDataModel syncMysqlDataModel = new SyncMysqlDataModel();
	66	+ syncMysqlDataModel.setSql(Base64.encodeBase64String(sql.getBytes()));
	67	+ syncMysqlDataModel.setSqlId(sqlId);
61	68
62		-
	69	+ SyncDataModel model = new SyncDataModel();
	70	+ model.setStatus(1);
	71	+ model.setJsonData(JsonUtil.obj2JsonString(model));
	72	+ model.setAction("POSTMYSQL");
	73	+ model.setCreated(new Date());
	74	+ model.setClassName("syncmysql");
	75	+ model.setModified(model.getCreated());
	76	+ iSyncDataDao.addSyncData(model);
	77	+ return true;
	78	+ }
63	79	}

	1	+package com.lyms.platform.common.pojo;
	2	+
	3	+
	4	+import com.lyms.platform.common.result.BaseModel;
	5	+
	6	+
	7	+
	8	+/**
	9	+ * Created by Administrator on 2016/9/20.
	10	+ */
	11	+public class SyncMysqlDataModel extends BaseModel {
	12	+
	13	+ private static final long serialVersionUID = 27531300010L;
	14	+
	15	+ private String sql;
	16	+ private String sqlId;
	17	+
	18	+ public String getSql() {
	19	+ return sql;
	20	+ }
	21	+
	22	+ public void setSql(String sql) {
	23	+ this.sql = sql;
	24	+ }
	25	+
	26	+ public String getSqlId() {
	27	+ return sqlId;
	28	+ }
	29	+
	30	+ public void setSqlId(String sqlId) {
	31	+ this.sqlId = sqlId;
	32	+ }
	33	+}

...	...	@@ -21,9 +21,20 @@
21	21	private String genRemark; // 一般检查备注
22	22	private String gynRemark; // 妇科检查备注
23	23
	24	+ private Integer first; // 1否 2 是，是否当前医院第一次初诊德州需求
24	25
	26	+
25	27	//该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
26	28	private String lisCheckItems;
	29	+
	30	+
	31	+ public Integer getFirst() {
	32	+ return first;
	33	+ }
	34	+
	35	+ public void setFirst(Integer first) {
	36	+ this.first = first;
	37	+ }
27	38
28	39	public String getLisCheckItems() {
29	40	return lisCheckItems;

...	...	@@ -84,6 +84,17 @@
84	84	// 1 表示在上面各个孕周范围内的第一次检查，2或者空表示不是
85	85	private Integer isFirst;
86	86
	87	+
	88	+ private Integer first; // 1否 2 是，是否当前医院第一次初诊德州需求
	89	+
	90	+ public Integer getFirst() {
	91	+ return first;
	92	+ }
	93	+
	94	+ public void setFirst(Integer first) {
	95	+ this.first = first;
	96	+ }
	97	+
87	98	public Integer getIsFirst() {
88	99	return isFirst;
89	100	}

...	...	@@ -41,6 +41,16 @@
41	41
42	42	//是否范围孕周
43	43	private boolean isRangeWeek;
	44	+ private Integer first; // 1否 2 是，是否当前医院第一次初诊德州需求
	45	+
	46	+
	47	+ public Integer getFirst() {
	48	+ return first;
	49	+ }
	50	+
	51	+ public void setFirst(Integer first) {
	52	+ this.first = first;
	53	+ }
44	54
45	55	public boolean isRangeWeek() {
46	56	return isRangeWeek;

...	...	@@ -101,6 +101,11 @@
101	101	antExRecordQuery.setCityId(antExManagerQueryRequest.getCityId());
102	102	antExRecordQuery.setAreaId(antExManagerQueryRequest.getAreaId());
103	103	antExRecordQuery.setStreetId(antExManagerQueryRequest.getStreetId());
	104	+ if (antExManagerQueryRequest.getFirst() != null && antExManagerQueryRequest.getFirst() == 2)
	105	+ {
	106	+ antExRecordQuery.setFirst(antExManagerQueryRequest.getFirst());
	107	+ }
	108	+
104	109
105	110
106	111	//产检日期

...	...	@@ -75,6 +75,16 @@
75	75	//查询号
76	76	private String queryNo;
77	77
	78	+ private Integer first; // 1否 2 是，是否当前医院第一次初诊德州需求
	79	+
	80	+ public Integer getFirst() {
	81	+ return first;
	82	+ }
	83	+
	84	+ public void setFirst(Integer first) {
	85	+ this.first = first;
	86	+ }
	87	+
78	88	public String getQueryNo() {
79	89	return queryNo;
80	90	}

...	...	@@ -24,9 +24,20 @@
24	24	private String genRemark; // 一般检查备注
25	25	private String gynRemark; // 妇科检查备注
26	26
	27	+
	28	+ private Integer first; // 1否 2 是，是否当前医院第一次初诊德州需求
	29	+
27	30	//该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
28	31	private String lisCheckItems;
29	32
	33	+ public Integer getFirst() {
	34	+ return first;
	35	+ }
	36	+
	37	+ public void setFirst(Integer first) {
	38	+ this.first = first;
	39	+ }
	40	+
30	41	public String getLisCheckItems() {
31	42	return lisCheckItems;
32	43	}
...	...	@@ -1490,6 +1501,8 @@
1490	1501	antExChuModel.setYljzxs(yljzxs);
1491	1502	antExChuModel.setJzxgyhwmkt(jzxgyhwmkt);
1492	1503	antExChuModel.setEdema(edema);
	1504	+
	1505	+ antExChuModel.setFirst(first);
1493	1506
1494	1507	return antExChuModel;
1495	1508	}