jiangjiazhi / regional-platform

Commit 100ecf759765300b4aabc90d6994dac8b69f0530

Authored by jiangjiazhi over 7 years ago

Exists in master and in 6 other branches

Merge remote-tracking branch 'origin/master'

Showing 9 changed files

platform-biz-service/src/main/resources/mainOrm/master/MeasureInfoMapper.xml
platform-dal/src/main/java/com/lyms/platform/pojo/MeasureInfoModel.java
platform-dal/src/main/java/com/lyms/platform/query/MeasureInfoQuery.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java
platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MeasureInfoRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/SendMysqlSyncDatUtil.java

...	...	@@ -25,25 +25,27 @@
25	25	<result column="created" property="created"/>
26	26	<result column="modified" property="modified"/>
27	27	<result column="today_count" property="todayCount"/>
	28	+ <result column="zy_no" property="zyNo"/>
	29	+ <result column="visit_id" property="visitId"/>
28	30	</resultMap>
29	31
30	32	<insert id="addMeasureInfo" parameterType="com.lyms.platform.pojo.MeasureInfoModel" >
31	33	INSERT INTO measure_info(user_name,cert_type,
32	34	cert_no,age,phone,sex,vc_card_no,
33	35	value_one,value_two,value_three,value_type,record_time,wx_code
34		- ,record_count,open_id,created,modified,hospital_id,today_count)
	36	+ ,record_count,open_id,created,modified,hospital_id,today_count,zy_no,visit_id)
35	37	VALUES (#{userName},#{certType},
36	38	#{certNo},#{age},#{phone},#{sex}
37	39	,#{vcCardNo},#{valueOne}
38	40	,#{valueTwo},#{valueThree},#{valueType},#{recordTime},
39		- #{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId},#{todayCount})
	41	+ #{wxCode},#{recordCount},#{openId},#{created},#{modified},#{hospitalId},#{todayCount},#{zyNo},#{visitId})
40	42	</insert>
41	43
42	44	<select id="queryMeasureInfoList" parameterType="com.lyms.platform.query.MeasureInfoQuery" resultMap="measureInfoModelMap">
43	45	SELECT id,user_name,cert_type,
44	46	cert_no,age,phone,sex,vc_card_no,
45	47	value_one,value_two,value_three,value_type,record_time,wx_code
46		- ,record_count,open_id,created,modified,hospital_id,today_count
	48	+ ,record_count,open_id,created,modified,hospital_id,today_count,zy_no,visit_id
47	49	FROM measure_info
48	50
49	51	<include refid="queryMeasureInfoCondition"/>
...	...	@@ -84,6 +86,12 @@
84	86	<if test="vcCardNo != null">
85	87	vc_card_no = #{vcCardNo,jdbcType=VARCHAR},
86	88	</if>
	89	+ <if test="zyNo != null and zyNo != ''">
	90	+ zy_no = #{zyNo,jdbcType=VARCHAR},
	91	+ </if>
	92	+ <if test="visitId != null and visitId != ''">
	93	+ visit_id = #{visitId,jdbcType=VARCHAR},
	94	+ </if>
87	95	<if test="valueOne != null and valueOne != ''">
88	96	value_one = #{valueOne,jdbcType=VARCHAR},
89	97	</if>
...	...	@@ -161,6 +169,12 @@
161	169	</if>
162	170	<if test="vcCardNo != null and vcCardNo != ''">
163	171	and vc_card_no = #{vcCardNo,jdbcType=VARCHAR}
	172	+ </if>
	173	+ <if test="zyNo != null and zyNo != ''">
	174	+ and zy_no = #{zyNo,jdbcType=VARCHAR}
	175	+ </if>
	176	+ <if test="visitId != null and visitId != ''">
	177	+ and visit_id = #{visitId,jdbcType=VARCHAR}
164	178	</if>
165	179	<if test="valueOne != null and valueOne != ''">
166	180	and value_one = #{valueOne,jdbcType=VARCHAR}

...	...	@@ -55,6 +55,28 @@
55	55	//当天记录次数
56	56	private Integer todayCount;
57	57
	58	+ //住院号
	59	+ private String zyNo;
	60	+
	61	+ //住院次数
	62	+ private String visitId;
	63	+
	64	+ public String getVisitId() {
	65	+ return visitId;
	66	+ }
	67	+
	68	+ public void setVisitId(String visitId) {
	69	+ this.visitId = visitId;
	70	+ }
	71	+
	72	+ public String getZyNo() {
	73	+ return zyNo;
	74	+ }
	75	+
	76	+ public void setZyNo(String zyNo) {
	77	+ this.zyNo = zyNo;
	78	+ }
	79	+
58	80	public String getValueThree() {
59	81	return valueThree;
60	82	}

...	...	@@ -65,9 +65,12 @@
65	65	private Date recordTime;
66	66
67	67	private Integer todayCount;
	68	+ //住院号
	69	+ private String zyNo;
68	70
	71	+ //住院次数
	72	+ private String visitId;
69	73
70		-
71	74	@Override
72	75	public MongoQuery convertToQuery() {
73	76	MongoCondition condition = MongoCondition.newInstance();
...	...	@@ -148,6 +151,22 @@
148	151	condition = condition.andCondition(new MongoCondition(c1));
149	152	}
150	153	return condition.toMongoQuery();
	154	+ }
	155	+
	156	+ public String getVisitId() {
	157	+ return visitId;
	158	+ }
	159	+
	160	+ public void setVisitId(String visitId) {
	161	+ this.visitId = visitId;
	162	+ }
	163	+
	164	+ public String getZyNo() {
	165	+ return zyNo;
	166	+ }
	167	+
	168	+ public void setZyNo(String zyNo) {
	169	+ this.zyNo = zyNo;
151	170	}
152	171
153	172	public String getValueThree() {

...	...	@@ -230,5 +230,11 @@
230	230	}
231	231	return Math.abs(result);
232	232	}
	233	+ public static void main(String[] args) {
	234	+ Date startDate = DateUtils.getNewDate(new Date(), -1 - 1, "月", 1);
	235	+ Date endDate = DateUtils.getNewDate(new Date(), -1, "月",2);
	236	+ System.out.println(DateUtils.getDateStr(startDate, Y_M_D));
	237	+ System.out.println(DateUtils.getDateStr(endDate,Y_M_D));
	238	+ }
233	239	}

...	...	@@ -487,12 +487,13 @@
487	487	if (start != null && end != null)
488	488	{
489	489	Date startDate = DateUtils.getNewDate(new Date(),-end-1, "月", sendTimeType);
490		- Date endDate = DateUtils.getNewDate(new Date(),-start,"月",sendTimeType);
	490	+ Date endDate = DateUtils.getNewDate(new Date(),-start,"月",sendTimeType+1);
491	491	startDate = DateUtils.formatDate(startDate, DateUtils.Y_M_D);
492	492	endDate = DateUtils.formatDate(endDate,DateUtils.Y_M_D);
493	493	babyModelQuery.setBirthStart(startDate);
494	494	babyModelQuery.setBirthEnd(endDate);
495		-
	495	+ System.out.println(DateUtils.getDateStr(startDate, DateUtils.Y_M_D));
	496	+ System.out.println(DateUtils.getDateStr(endDate,DateUtils.Y_M_D));
496	497	List<BabyModel> babyModels = babyBookbuildingService.queryBabyBuildByCond(babyModelQuery);
497	498	if (CollectionUtils.isNotEmpty(babyModels))
498	499	{

...	...	@@ -76,6 +76,8 @@
76	76	@RequestParam(value = "hospitalId", required = false) String hospitalId,
77	77	@RequestParam(value = "age", required = false) Integer age,
78	78	@RequestParam(value = "phone", required = false) String phone,
	79	+ @RequestParam(value = "zyNo", required = false) String zyNo,
	80	+ @RequestParam(value = "visitId", required = false) String visitId,
79	81	HttpServletRequest request) {
80	82	MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest();
81	83	measureInfoRequest.setUserName(userName);
...	...	@@ -92,6 +94,8 @@
92	94	measureInfoRequest.setRecordTime(new Date().getTime());
93	95	measureInfoRequest.setRecordCount(1);
94	96	measureInfoRequest.setValueType(2);
	97	+ measureInfoRequest.setZyNo(zyNo);
	98	+ measureInfoRequest.setVisitId(visitId);
95	99	System.out.println(" 添加血压和脉搏请求参数："+measureInfoRequest.toString());
96	100	return measureInfoFacade.addMeasureInfo(measureInfoRequest);
97	101	}
...	...	@@ -116,6 +120,8 @@
116	120	@RequestParam(value = "hospitalId", required = false) String hospitalId,
117	121	@RequestParam(value = "age", required = false) Integer age,
118	122	@RequestParam(value = "phone", required = false) String phone,
	123	+ @RequestParam(value = "zyNo", required = false) String zyNo,
	124	+ @RequestParam(value = "visitId", required = false) String visitId,
119	125	HttpServletRequest request) {
120	126	MeasureInfoRequest measureInfoRequest = new MeasureInfoRequest();
121	127	measureInfoRequest.setUserName(userName);
...	...	@@ -133,6 +139,8 @@
133	139	measureInfoRequest.setRecordTime(new Date().getTime());
134	140	measureInfoRequest.setRecordCount(1);
135	141	measureInfoRequest.setValueType(1);
	142	+ measureInfoRequest.setZyNo(zyNo);
	143	+ measureInfoRequest.setVisitId(visitId);
136	144	System.out.println("添加体重和身高请求参数："+measureInfoRequest.toString());
137	145	return measureInfoFacade.addMeasureInfo(measureInfoRequest);
138	146	}

...	...	@@ -159,8 +159,6 @@
159	159	{
160	160	map.put("errorcode", String.valueOf(ErrorCodeConstants.SUCCESS));
161	161	map.put("errormsg", "对不起，每天最多可以测量5次，请明天再来吧!");
162		-// map.put("errormsg", measureInfoRequest.getValueType() == 1
163		-// ? "今日测量体重和身高次数已经使用完了!" : "今日测量血压和脉搏次数已经使用完了!");
164	162	return map;
165	163	}
166	164	model.setTodayCount(todayCount);
...	...	@@ -243,6 +241,8 @@
243	241	model.setVcCardNo(measureInfoRequest.getVcCardNo());
244	242	model.setWxCode(measureInfoRequest.getWxCode());
245	243	model.setPhone(measureInfoRequest.getPhone());
	244	+ model.setZyNo(measureInfoRequest.getZyNo());
	245	+ model.setVisitId(measureInfoRequest.getVisitId());
246	246	return model;
247	247	}
248	248	}

...	...	@@ -41,6 +41,28 @@
41	41	//手机号码
42	42	private String phone;
43	43
	44	+ //住院号
	45	+ private String zyNo;
	46	+
	47	+ //住院次数
	48	+ private String visitId;
	49	+
	50	+ public String getVisitId() {
	51	+ return visitId;
	52	+ }
	53	+
	54	+ public void setVisitId(String visitId) {
	55	+ this.visitId = visitId;
	56	+ }
	57	+
	58	+ public String getZyNo() {
	59	+ return zyNo;
	60	+ }
	61	+
	62	+ public void setZyNo(String zyNo) {
	63	+ this.zyNo = zyNo;
	64	+ }
	65	+
44	66	public String getValueThree() {
45	67	return valueThree;
46	68	}

...	...	@@ -91,7 +91,7 @@
91	91	for (int i = 0 ; i < 3 ; i++)
92	92	{
93	93	String result = HttpClientUtil.doPostSSL(url,json,"3d19960bf3e81e7d816c4f26051c49ba");
94		- System.out.println("sync mysql result = " + result+";url="+url);
	94	+ System.out.println("sync mysql result = " + result+";url="+url+";json="+json);
95	95	if (result == null)
96	96	{
97	97	continue;