liquanyu / regional-platform

Commit 85e04ef9d7854df99826e8489954f93f9fb31a6d

Authored by liquanyu almost 9 years ago

update code

Showing 16 changed files with 513 additions and 242 deletions

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
platform-biz-service/src/main/java/com/lyms/platform/permission/model/CouponInfo.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java
platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java
platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java
platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java
platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/QhdDjq.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java

...	...	@@ -90,5 +90,9 @@
90	90	String getUserName(String doctor);
91	91
92	92	String getHospitalName(String visitHospitalId);
	93	+
	94	+ Map<String,String> findCouponByCode(Map<String,String> param);
	95	+
	96	+ int updateCouponStatus(Map<String, String> param);
93	97	}

...	...	@@ -65,8 +65,30 @@
65	65	*/
66	66	private String operatorUseId;
67	67
	68	+ //临时使用状态 0未使用 1使用默认为0
	69	+ private Integer tempStatus;
	70	+
	71	+ //临时使用医院
	72	+ private String tempHospitalId;
	73	+
68	74	public CouponInfo() {
69	75	id = UUID.randomUUID().toString().replace("-", "");
	76	+ }
	77	+
	78	+ public Integer getTempStatus() {
	79	+ return tempStatus;
	80	+ }
	81	+
	82	+ public void setTempStatus(Integer tempStatus) {
	83	+ this.tempStatus = tempStatus;
	84	+ }
	85	+
	86	+ public String getTempHospitalId() {
	87	+ return tempHospitalId;
	88	+ }
	89	+
	90	+ public void setTempHospitalId(String tempHospitalId) {
	91	+ this.tempHospitalId = tempHospitalId;
70	92	}
71	93
72	94	public String getId() {

1	1	package com.lyms.platform.permission.service;
2	2
3	3	import com.lyms.platform.common.result.BaseObjectResponse;
	4	+import com.lyms.platform.permission.model.CouponInfo;
4	5
5	6	import java.util.List;
6	7	import java.util.Map;
...	...	@@ -40,5 +41,9 @@
40	41	void invalid(String personId, String couponTypes);
41	42
42	43	String findByUsedId(String usedId);
	44	+
	45	+ Map<String,String> findCouponByCode(Map<String,String> param);
	46	+
	47	+ int updateCouponStatus(Map<String, String> param);
43	48	}

...	...	@@ -319,6 +319,18 @@
319	319	if(!validateArea(data.get("area_type").toString(), couponInfo.getCreateHospitalId(), hospitalId)) {
320	320	return RespBuilder.buildErro(ResponseCode.COUPON_AREA_NO_USE, patientsInfo);
321	321	}
	322	+
	323	+ //验证优惠劵是否临时使用了该功能属于秦皇岛区域
	324	+ if (couponInfo.getTempStatus() != null && couponInfo.getTempStatus() == 1)
	325	+ {
	326	+ //验证临时使用的医院是不是当前登陆的医院
	327	+ if (StringUtils.isNotEmpty(couponInfo.getTempHospitalId()) && !couponInfo.getTempHospitalId().equals(hospitalId))
	328	+ {
	329	+ RespBuilder.buildErro(ResponseCode.COUPON_IS_USED);
	330	+ }
	331	+ }
	332	+
	333	+
322	334	return RespBuilder.buildSuccess(patientsInfo);
323	335	}
324	336
...	...	@@ -445,6 +457,17 @@
445	457	@Override
446	458	public String findByUsedId(String usedId) {
447	459	return couponMapper.findByUsedId(usedId);
	460	+ }
	461	+
	462	+ @Override
	463	+ public Map<String,String> findCouponByCode(Map<String,String> param) {
	464	+
	465	+ return couponMapper.findCouponByCode(param);
	466	+ }
	467	+
	468	+ @Override
	469	+ public int updateCouponStatus(Map<String, String> param) {
	470	+ return couponMapper.updateCouponStatus(param);
448	471	}
449	472
450	473	@Override

...	...	@@ -15,10 +15,12 @@
15	15	<result column="status" property="status"/>
16	16	<result column="operator_use_id" property="operatorUseId"/>
17	17	<result column="used_id" property="usedId"/>
	18	+ <result column="temp_hospital_id" property="tempHospitalId"/>
	19	+ <result column="temp_status" property="tempStatus"/>
18	20	</resultMap>
19	21
20	22	<sql id="columnList">
21		- sequence_id,create_date,use_date, operator_use_id, user_id,create_user_id,coupon_template_id,create_hospital_id,used_id,used_hospital_id,status
	23	+ sequence_id,create_date,use_date, operator_use_id, user_id,create_user_id,coupon_template_id,create_hospital_id,used_id,used_hospital_id,status,temp_hospital_id,temp_status
22	24	</sql>
23	25
24	26	<select id="getUserName" parameterType="string" resultType="string">
...	...	@@ -497,6 +499,18 @@
497	499	</if>
498	500	) a
499	501	</select>
	502	+
	503	+
	504	+ <select id="findCouponByCode" parameterType="Map" resultType="Map">
	505	+ SELECT c.user_id as pId,t.coupon_order as couponOrder,m.type,date_format(c.create_date,'%Y-%m-%d') as createDate from coupon_info c
	506	+ INNER JOIN coupon_template t on c.coupon_template_id = t.id
	507	+ INNER JOIN coupon_type m on t.type_id = m.id
	508	+ where c.create_hospital_id=#{hospitalId} and c.sequence_id = #{code}
	509	+ </select>
	510	+
	511	+ <update id="updateCouponStatus" parameterType="Map">
	512	+ update coupon_info set temp_status = 1,temp_hospital_id=#{hospitalId} where sequence_id = #{code}
	513	+ </update>
500	514
501	515	</mapper>

...	...	@@ -26,6 +26,9 @@
26	26	} else {
27	27	resp.setData(createMap(data));
28	28	}
	29	+
	30	+ resp.setErrorcode(ResponseCode.SUCCESS.getCode());
	31	+ resp.setErrormsg(ResponseCode.SUCCESS.getMsg());
29	32	}
30	33	return resp;
31	34	}

...	...	@@ -28,6 +28,7 @@
28	28	COUPON_TIME_OUT(1003, "当前优惠券不在使用时间范围内"),
29	29	COUPON_IS_USERD(1004, "优惠券已被使用"),
30	30	COUPON_IS_DISABLED(1005, "优惠券已被禁用"),
	31	+ COUPON_IS_USED(1006, "当前优惠劵已经在其他医院使用，不能重复使用"),
31	32
32	33	NEED_BUILD(1101, "未找到建档信息");
33	34

...	...	@@ -113,7 +113,7 @@
113	113	if(response != null){
114	114
115	115	int statusCode = response.getStatusLine().getStatusCode();
116		- System.out.println("return code = "+ HttpStatus.SC_OK);
	116	+ System.out.println("return code = "+ statusCode);
117	117	if (statusCode != HttpStatus.SC_OK) {
118	118	return null;
119	119	}
...	...	@@ -151,7 +151,7 @@
151	151	httpPost.setEntity(stringEntity);
152	152	response = httpClient.execute(httpPost);
153	153	int statusCode = response.getStatusLine().getStatusCode();
154		- System.out.println("return code = "+ HttpStatus.SC_OK);
	154	+ System.out.println("return code = "+ statusCode);
155	155	if (statusCode != HttpStatus.SC_OK) {
156	156	return null;
157	157	}
158	158
159	159
160	160
...	...	@@ -177,16 +177,13 @@
177	177	public static void main(String[] args) throws Exception {
178	178
179	179	Map<String,String> map = new HashMap<String, String>();
180		- map.put("patientIds","59687f1de4b0b4e56acd1f81");
181	180	map.put("page","1");
182	181	map.put("limit","10");
183	182	long start = System.currentTimeMillis();
184		- String s = doGet("https://area-lc-api.healthbaby.com.cn:55581/getAppLis", map, "utf-8","3d19960bf3e81e7d816c4f26051c49ba");
	183	+ String s = doGet("https://area-qhd-api.healthbaby.com.cn:18019/getNoSendLis", map, "utf-8","3d19960bf3e81e7d816c4f26051c49ba");
185	184
186		- List<SyncDataModel> list = JsonUtil.toList(s, SyncDataModel.class);
187	185	long end = System.currentTimeMillis();
188	186	System.out.print(end -start);
189		- System.out.println(s);
190	187	}
191	188	}

...	...	@@ -237,7 +237,7 @@
237	237	SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
238	238	String EndDate=df.format(new Date());
239	239	c.setTime(new Date());
240		- c.add(Calendar.YEAR, -1);
	240	+ c.add(Calendar.YEAR, -12);
241	241	Date date = c.getTime();
242	242	String StartDate=df.format(date);
243	243	final String url="http://mihp.nc120.cn/PlatformService/platform/api";
...	...	@@ -366,7 +366,7 @@
366	366
367	367	public static void main(String[] args)
368	368	{
369		- List<CheckResponse> list = queryLisCheckList("1002332625");
	369	+ List<CheckResponse> list = queryLisCheckList("1002064489");
370	370	System.out.println(list.size());
371	371	}
372	372	}

1	1	package com.lyms.hospitalapi.pojo;
2	2
3		-import java.text.SimpleDateFormat;
4		-import java.util.Date;
5	3
6	4	/**
7	5	* Created by Administrator on 2017/7/11.
8	6	*/
9	7	public class QhdDjq {
10	8
11		- private Integer ID; //ID
	9	+ private Integer id;
	10	+ //身份证号
	11	+ private String patIdCardNo;
	12	+ //手机号码
	13	+ private String patPhoneNumber;
	14	+ //健康卡、社保卡号
	15	+ private String patCardNo;
	16	+ //产检卷号
	17	+ private String tokenCardNo;
	18	+ //消费密码
	19	+ private String tokenCardPwd;
	20	+ //1 正常 9作废默认1
	21	+ private String cardStatus;
	22	+ //序号
	23	+ private String serialNumber;
	24	+ //末次月经
	25	+ private String lmpDate;
	26	+ //有效期
	27	+ private String expDate;
	28	+ //孕次
	29	+ private String gravidity;
	30	+ //卡面金额
	31	+ private String cardBalance;
	32	+ //序号
	33	+ private String cardAmont;
	34	+ //产检券打印医生
	35	+ private String postDoc;
	36	+ //产检券发放医院
	37	+ private String postHos;
	38	+ //所属县区
	39	+ private String areaFrom;
	40	+ //产检
	41	+ private String applyInfo;
	42	+ //产检券打使用时间
	43	+ private String applyTime;
	44	+ //备注
	45	+ private String remark;
12	46
13		- private String Pat_ID_CardNo; //身份这证号
	47	+ public String getSerialNumber() {
	48	+ return serialNumber;
	49	+ }
14	50
15		- private String Pat_PhoneNumber; //手机号码
	51	+ public void setSerialNumber(String serialNumber) {
	52	+ this.serialNumber = serialNumber;
	53	+ }
16	54
17		- private String Pat_CardNo; //健康卡号，社保卡号
	55	+ public Integer getId() {
	56	+ return id;
	57	+ }
18	58
19		- private String TokenCard_No; //产检券号
20		-
21		- private String TokenCard_Pwd; //消费密码
22		-
23		- private Integer CardStatus; //1 正常 9作废默认1
24		-
25		- private String LMP_Date; //末次月经
26		-
27		- private String Exp_Date; //有效期（最晚使用时间默认设置成末次月经+300天）
28		-
29		- private Integer Gravidity; //孕次
30		-
31		- private Double CardBalance; //卡面金额
32		-
33		- private Double CardAmont; //余额
34		-
35		- private String PostHos; //办卡医院
36		-
37		- private String PostDoc; //办卡医生
38		-
39		- private String AreaFrom; //所属县区
40		-
41		- private String ApplyInfo; //办卡原因
42		-
43		- private String ApplyTime; //办卡日期
44		-
45		- private String Remark; //备注
46		-
47		- public QhdDjq(){}
48		-
49		-
50		- public QhdDjq(Integer ID,String Pat_ID_CardNo,String Pat_PhoneNumber,String Pat_CardNo,String TokenCard_No,String TokenCard_Pwd,
51		- Integer CardStatus,String LMP_Date,String Exp_Date,Integer Gravidity,Double CardBalance,Double CardAmont,String PostHos,
52		- String PostDoc,String AreaFrom,String ApplyInfo,String ApplyTime,String Remark){
53		-
54		- this.ID=ID;
55		- this.Pat_ID_CardNo=Pat_ID_CardNo;
56		- this.Pat_PhoneNumber=Pat_PhoneNumber;
57		- this.Pat_CardNo=Pat_CardNo;
58		- this.TokenCard_No=TokenCard_No;
59		- this.TokenCard_Pwd=TokenCard_Pwd;
60		- this.CardStatus=CardStatus;
61		- this.LMP_Date=LMP_Date;
62		- this.Exp_Date=Exp_Date;
63		- this.Gravidity=Gravidity;
64		- this.CardBalance=CardBalance;
65		- this.CardAmont=CardAmont;
66		- this.PostHos=PostHos;
67		- this.PostDoc=PostDoc;
68		- this.AreaFrom=AreaFrom;
69		- this.ApplyInfo=ApplyInfo;
70		- this.ApplyTime=ApplyTime;
71		- this.Remark=Remark;
72		-
	59	+ public void setId(Integer id) {
	60	+ this.id = id;
73	61	}
74	62
75		-
76		-
77		-
78		- public Integer getID() {
79		- return ID;
	63	+ public String getPatIdCardNo() {
	64	+ return patIdCardNo;
80	65	}
81	66
82		- public void setID(Integer ID) {
83		- this.ID = ID;
	67	+ public void setPatIdCardNo(String patIdCardNo) {
	68	+ this.patIdCardNo = patIdCardNo;
84	69	}
85	70
86		- public String getPat_ID_CardNo() {
87		- return Pat_ID_CardNo;
	71	+ public String getPatPhoneNumber() {
	72	+ return patPhoneNumber;
88	73	}
89	74
90		- public void setPat_ID_CardNo(String pat_ID_CardNo) {
91		- Pat_ID_CardNo = pat_ID_CardNo;
	75	+ public void setPatPhoneNumber(String patPhoneNumber) {
	76	+ this.patPhoneNumber = patPhoneNumber;
92	77	}
93	78
94		- public String getPat_PhoneNumber() {
95		- return Pat_PhoneNumber;
	79	+ public String getPatCardNo() {
	80	+ return patCardNo;
96	81	}
97	82
98		- public void setPat_PhoneNumber(String pat_PhoneNumber) {
99		- Pat_PhoneNumber = pat_PhoneNumber;
	83	+ public void setPatCardNo(String patCardNo) {
	84	+ this.patCardNo = patCardNo;
100	85	}
101	86
102		- public String getPat_CardNo() {
103		- return Pat_CardNo;
	87	+ public String getTokenCardNo() {
	88	+ return tokenCardNo;
104	89	}
105	90
106		- public void setPat_CardNo(String pat_CardNo) {
107		- Pat_CardNo = pat_CardNo;
	91	+ public void setTokenCardNo(String tokenCardNo) {
	92	+ this.tokenCardNo = tokenCardNo;
108	93	}
109	94
110		- public String getTokenCard_No() {
111		- return TokenCard_No;
	95	+ public String getTokenCardPwd() {
	96	+ return tokenCardPwd;
112	97	}
113	98
114		- public void setTokenCard_No(String tokenCard_No) {
115		- TokenCard_No = tokenCard_No;
	99	+ public void setTokenCardPwd(String tokenCardPwd) {
	100	+ this.tokenCardPwd = tokenCardPwd;
116	101	}
117	102
118		- public String getTokenCard_Pwd() {
119		- return TokenCard_Pwd;
	103	+ public String getCardStatus() {
	104	+ return cardStatus;
120	105	}
121	106
122		- public void setTokenCard_Pwd(String tokenCard_Pwd) {
123		- TokenCard_Pwd = tokenCard_Pwd;
	107	+ public void setCardStatus(String cardStatus) {
	108	+ this.cardStatus = cardStatus;
124	109	}
125	110
126		- public Integer getCardStatus() {
127		- return CardStatus;
	111	+ public String getLmpDate() {
	112	+ return lmpDate;
128	113	}
129	114
130		- public void setCardStatus(Integer cardStatus) {
131		- CardStatus = cardStatus;
	115	+ public void setLmpDate(String lmpDate) {
	116	+ this.lmpDate = lmpDate;
132	117	}
133	118
134		- public String getLMP_Date() {
135		- return LMP_Date;
	119	+ public String getExpDate() {
	120	+ return expDate;
136	121	}
137	122
138		- public void setLMP_Date(String LMP_Date) {
139		- this.LMP_Date = LMP_Date;
	123	+ public void setExpDate(String expDate) {
	124	+ this.expDate = expDate;
140	125	}
141	126
142		- public String getExp_Date() {
143		- return Exp_Date;
	127	+ public String getGravidity() {
	128	+ return gravidity;
144	129	}
145	130
146		- public void setExp_Date(String exp_Date) {
147		- Exp_Date = exp_Date;
	131	+ public void setGravidity(String gravidity) {
	132	+ this.gravidity = gravidity;
148	133	}
149	134
150		- public Integer getGravidity() {
151		- return Gravidity;
	135	+ public String getCardBalance() {
	136	+ return cardBalance;
152	137	}
153	138
154		- public void setGravidity(Integer gravidity) {
155		- Gravidity = gravidity;
	139	+ public void setCardBalance(String cardBalance) {
	140	+ this.cardBalance = cardBalance;
156	141	}
157	142
158		- public Double getCardBalance() {
159		- return CardBalance;
	143	+ public String getCardAmont() {
	144	+ return cardAmont;
160	145	}
161	146
162		- public void setCardBalance(Double cardBalance) {
163		- CardBalance = cardBalance;
	147	+ public void setCardAmont(String cardAmont) {
	148	+ this.cardAmont = cardAmont;
164	149	}
165	150
166		- public Double getCardAmont() {
167		- return CardAmont;
	151	+ public String getPostDoc() {
	152	+ return postDoc;
168	153	}
169	154
170		- public void setCardAmont(Double cardAmont) {
171		- CardAmont = cardAmont;
	155	+ public void setPostDoc(String postDoc) {
	156	+ this.postDoc = postDoc;
172	157	}
173	158
174	159	public String getPostHos() {
175		- return PostHos;
	160	+ return postHos;
176	161	}
177	162
178	163	public void setPostHos(String postHos) {
179		- PostHos = postHos;
	164	+ this.postHos = postHos;
180	165	}
181	166
182		- public String getPostDoc() {
183		- return PostDoc;
184		- }
185		-
186		- public void setPostDoc(String postDoc) {
187		- PostDoc = postDoc;
188		- }
189		-
190	167	public String getAreaFrom() {
191		- return AreaFrom;
	168	+ return areaFrom;
192	169	}
193	170
194	171	public void setAreaFrom(String areaFrom) {
195		- AreaFrom = areaFrom;
	172	+ this.areaFrom = areaFrom;
196	173	}
197	174
198	175	public String getApplyInfo() {
199		- return ApplyInfo;
	176	+ return applyInfo;
200	177	}
201	178
202	179	public void setApplyInfo(String applyInfo) {
203		- ApplyInfo = applyInfo;
	180	+ this.applyInfo = applyInfo;
204	181	}
205	182
206	183	public String getApplyTime() {
207		- return ApplyTime;
	184	+ return applyTime;
208	185	}
209	186
210	187	public void setApplyTime(String applyTime) {
211		- ApplyTime = applyTime;
	188	+ this.applyTime = applyTime;
212	189	}
213	190
214	191	public String getRemark() {
215		- return Remark;
	192	+ return remark;
216	193	}
217	194
218	195	public void setRemark(String remark) {
219		- Remark = remark;
	196	+ this.remark = remark;
	197	+ }
	198	+
	199	+ @Override
	200	+ public String toString() {
	201	+ return "QhdDjq{" +
	202	+ "id=" + id +
	203	+ ", patIdCardNo='" + patIdCardNo + '\'' +
	204	+ ", patPhoneNumber='" + patPhoneNumber + '\'' +
	205	+ ", patCardNo='" + patCardNo + '\'' +
	206	+ ", tokenCardNo='" + tokenCardNo + '\'' +
	207	+ ", tokenCardPwd='" + tokenCardPwd + '\'' +
	208	+ ", cardStatus='" + cardStatus + '\'' +
	209	+ ", serialNumber='" + serialNumber + '\'' +
	210	+ ", lmpDate='" + lmpDate + '\'' +
	211	+ ", expDate='" + expDate + '\'' +
	212	+ ", gravidity='" + gravidity + '\'' +
	213	+ ", cardBalance='" + cardBalance + '\'' +
	214	+ ", cardAmont='" + cardAmont + '\'' +
	215	+ ", postDoc='" + postDoc + '\'' +
	216	+ ", postHos='" + postHos + '\'' +
	217	+ ", areaFrom='" + areaFrom + '\'' +
	218	+ ", applyInfo='" + applyInfo + '\'' +
	219	+ ", applyTime='" + applyTime + '\'' +
	220	+ ", remark='" + remark + '\'' +
	221	+ '}';
220	222	}
221	223	}

...	...	@@ -2,14 +2,38 @@
2	2
3	3	import java.text.SimpleDateFormat;
4	4	import java.util.Date;
	5	+import java.util.HashMap;
	6	+import java.util.List;
	7	+import java.util.Map;
5	8
6	9	import javax.servlet.http.HttpServletRequest;
7	10
8	11	import com.lyms.hospitalapi.pojo.QhdDjq;
	12	+import com.lyms.platform.biz.service.AntenatalExaminationService;
	13	+import com.lyms.platform.biz.service.BasicConfigService;
	14	+import com.lyms.platform.common.base.BaseController;
	15	+import com.lyms.platform.common.base.LoginContext;
	16	+import com.lyms.platform.common.enums.YnEnums;
	17	+import com.lyms.platform.common.utils.DateUtil;
	18	+import com.lyms.platform.common.utils.StringUtils;
	19	+import com.lyms.platform.operate.web.facade.AutoMatchFacade;
	20	+import com.lyms.platform.operate.web.utils.CommonsHelper;
	21	+import com.lyms.platform.permission.model.CouponInfo;
	22	+import com.lyms.platform.permission.model.Organization;
	23	+import com.lyms.platform.permission.model.Users;
	24	+import com.lyms.platform.permission.service.CouponService;
	25	+import com.lyms.platform.permission.service.OrganizationService;
	26	+import com.lyms.platform.permission.service.UsersService;
	27	+import com.lyms.platform.pojo.AntExChuModel;
	28	+import com.lyms.platform.pojo.BasicConfig;
	29	+import com.lyms.platform.query.AntExChuQuery;
	30	+import com.lyms.platform.query.PatientsQuery;
	31	+import org.apache.commons.collections.CollectionUtils;
9	32	import org.springframework.beans.factory.annotation.Autowired;
10	33	import org.springframework.stereotype.Controller;
11	34	import org.springframework.web.bind.annotation.RequestMapping;
12	35	import org.springframework.web.bind.annotation.RequestMethod;
	36	+import org.springframework.web.bind.annotation.RequestParam;
13	37	import org.springframework.web.bind.annotation.ResponseBody;
14	38
15	39	import com.lyms.platform.biz.service.PatientsService;
16	40
17	41
18	42
...	...	@@ -23,21 +47,36 @@
23	47
24	48	@Controller
25	49	@RequestMapping("/couponPrint")
26		-public class CouponPrintController {
	50	+public class CouponPrintController extends BaseController{
27	51
28		-
29		- @Autowired
30		- private PatientsService patientsService;
31		-
32	52	private static final String shanDong_DeZhou_fuYou_hopitalId = "1000000114";
33	53
34	54	public static final String shanDong_Dezhou_youHuiQuan_money_Number = PropertiesUtils.getPropertyValue("shanDong_Dezhou_youHuiQuan_money_Number");
35		-
36		-
37		- /**
	55	+
	56	+ @Autowired
	57	+ private CouponService couponService;
	58	+
	59	+ @Autowired
	60	+ private AutoMatchFacade autoMatchFacade;
	61	+
	62	+ @Autowired
	63	+ private PatientsService patientsService;
	64	+
	65	+ @Autowired
	66	+ private UsersService usersService;
	67	+ @Autowired
	68	+ private OrganizationService organizationService;
	69	+
	70	+ @Autowired
	71	+ private BasicConfigService basicConfigService;
	72	+
	73	+ @Autowired
	74	+ private AntenatalExaminationService antenatalExaminationService;
	75	+
	76	+
	77	+
	78	+ /**
38	79	* 产检券打印触发后台操作
39		- * @param userId
40		- * @param hospitalId
41	80	* @return
42	81	*/
43	82	@RequestMapping(method = RequestMethod.POST,value = "/printTrigger")
44	83
45	84
46	85
47	86
48	87
49	88
50	89
51	90
52	91
...	...	@@ -71,45 +110,165 @@
71	110	}
72	111	}
73	112
	113	+ /**
	114	+ * 优惠劵查询
	115	+ * @param request
	116	+ * @return
	117	+ */
	118	+ @RequestMapping(method = RequestMethod.GET,value = "/queryCouponByCode")
	119	+ @TokenRequired
	120	+ @ResponseBody
	121	+ public BaseObjectResponse queryCouponByCode(HttpServletRequest request,
	122	+ @RequestParam(required = true)String code) {
74	123
	124	+ String hospitalId = autoMatchFacade.getHospitalId(getUserId(request));
	125	+
	126	+ Map<String, String> result = new HashMap<>();
	127	+ //获取优惠劵类型
	128	+ Map<String, String> param = new HashMap<>();
	129	+ param.put("hospitalId", hospitalId);
	130	+ param.put("code", code);
	131	+ Map<String, String> couponInfo = couponService.findCouponByCode(param);
	132	+
	133	+ Object type = couponInfo.get("type");
	134	+ //验证优惠劵是否可以使用
	135	+ BaseObjectResponse objectResponse = couponService.validate(code, Integer.parseInt(type.toString()), hospitalId);
	136	+ if (objectResponse.getErrorcode() != ResponseCode.SUCCESS.getCode())
	137	+ {
	138	+ return objectResponse;
	139	+ }
	140	+
	141	+ PatientsQuery patientsQuery = new PatientsQuery();
	142	+ patientsQuery.setPid(couponInfo.get("pId"));
	143	+ patientsQuery.setYn(YnEnums.YES.getId());
	144	+ List<Patients> list = patientsService.queryPatient1(patientsQuery, "created");
	145	+ if (CollectionUtils.isNotEmpty(list))
	146	+ {
	147	+ Patients patient = list.get(0);
	148	+ result.put("couponCode",code); //优惠劵
	149	+ result.put("createDate",couponInfo.get("createDate"));//发放时间
	150	+ result.put("hospitalName",CommonsHelper.getHospitalName(patient.getHospitalId(), organizationService));//医院名称
	151	+ result.put("userName",patient.getUsername()); //用户名
	152	+
	153	+ String areaName = "";
	154	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(patient.getHospitalId())) {
	155	+ Organization organization = organizationService.getOrganization(Integer.parseInt(patient.getHospitalId()));
	156	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	157	+ String areaId = organization.getAreaId();
	158	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(areaId);
	159	+ areaName = basicConfig.getName();
	160	+ }
	161	+ }
	162	+ result.put("areaName",areaName);//区域
	163	+ String certeType = "";
	164	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(patient.getPcerteTypeId());
	165	+ if (StringUtils.isNotEmpty(patient.getPcerteTypeId()))
	166	+ {
	167	+ certeType = basicConfig.getName();
	168	+ }
	169	+ result.put("certeType",certeType);//证件类型
	170	+ result.put("cardNo",patient.getCardNo()); //证件号码
	171	+ }
	172	+ objectResponse.setData(result);
	173	+ return objectResponse;
	174	+ }
	175	+
	176	+
75	177	/**
76		- * 产检券打印触发后台操作（秦皇岛产检券）
	178	+ * 秦皇岛优惠劵消费
77	179	* @param request
78	180	* @return
79	181	*/
80		- @RequestMapping(method = RequestMethod.POST,value = "/QhdprintTrigger")
	182	+ @RequestMapping(method = RequestMethod.POST,value = "/qhdCouponUse")
81	183	@ResponseBody
82	184	@TokenRequired
83		- public BaseObjectResponse QhdprintTrigger(HttpServletRequest request){
	185	+ public BaseObjectResponse qhdCouponUse(HttpServletRequest request,
	186	+ @RequestParam(required = true)String code){
84	187
85		- QhdDjq qhddjq =new QhdDjq(1,"1","1","1","1","1",1,"2017-7-12","",1,1.0,1.0,"1","1","1","1","1","aa");
86		- Integer ID=qhddjq.getID();
87		- String Pat_ID_CardNo=qhddjq.getPat_ID_CardNo();
88		- String Pat_PhoneNumber=qhddjq.getPat_PhoneNumber();
89		- String Pat_CardNo=qhddjq.getPat_CardNo();
90		- String TokenCard_No=qhddjq.getTokenCard_No();
91		- String TokenCard_Pwd=qhddjq.getTokenCard_Pwd();
92		- Integer CardStatus=qhddjq.getCardStatus();
93		- String LMP_Date=qhddjq.getLMP_Date();
94		- String Exp_Date=qhddjq.getExp_Date();
95		- Integer Gravidity=qhddjq.getGravidity();
96		- Double CardBalance=qhddjq.getCardBalance();
97		- Double CardAmont=qhddjq.getCardAmont();
98		- String PostHos=qhddjq.getPostHos();
99		- String PostDoc=qhddjq.getPostDoc();
100		- String AreaFrom=qhddjq.getAreaFrom();
101		- String ApplyInfo=qhddjq.getApplyInfo();
102		- String ApplyTime=qhddjq.getApplyTime();
103		- String Remark=qhddjq.getRemark();
104		- String result = HospitalCouponPrintUtils.getQhddjq(ID,Pat_ID_CardNo,Pat_PhoneNumber,Pat_CardNo,TokenCard_No,TokenCard_Pwd,
105		- CardStatus,LMP_Date,Exp_Date,Gravidity,CardBalance,CardAmont,PostHos,PostDoc,AreaFrom,ApplyInfo,ApplyTime,Remark);
	188	+ LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
	189	+ String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
106	190
	191	+ //获取优惠劵类型
	192	+ Map<String,String> param = new HashMap<>();
	193	+ param.put("hospitalId",hospitalId);
	194	+ param.put("code", code);
	195	+ Map<String,String> couponInfo = couponService.findCouponByCode(param);
	196	+
	197	+ Object type = couponInfo.get("type");
	198	+ //验证优惠劵是否可以使用
	199	+ BaseObjectResponse objectResponse = couponService.validate(code,Integer.parseInt(type.toString()),hospitalId);
	200	+ if (objectResponse.getErrorcode() != ResponseCode.SUCCESS.getCode())
	201	+ {
	202	+ return objectResponse;
	203	+ }
	204	+
	205	+ PatientsQuery patientsQuery = new PatientsQuery();
	206	+ patientsQuery.setPid(couponInfo.get("pId"));
	207	+ patientsQuery.setYn(YnEnums.YES.getId());
	208	+
	209	+ List<Patients> list = patientsService.queryPatient1(patientsQuery, "created");
	210	+ QhdDjq model = new QhdDjq();
	211	+ if (CollectionUtils.isNotEmpty(list))
	212	+ {
	213	+ Patients patient = list.get(0);
	214	+ model.setPatIdCardNo(patient.getCardNo());
	215	+ model.setPatCardNo(patient.getVcCardNo());
	216	+ model.setPatPhoneNumber(patient.getPhone());
	217	+ model.setTokenCardNo(code);
	218	+ model.setCardStatus("1");//1 正常 9作废默认1（必须填写）
	219	+ model.setLmpDate(DateUtil.getyyyy_MM_dd_hms(patient.getLastMenses()));
	220	+
	221	+ AntExChuQuery antExChuQuery1 = new AntExChuQuery();
	222	+ antExChuQuery1.setParentId(patient.getId());
	223	+ antExChuQuery1.setYn(YnEnums.YES.getId());
	224	+ List<AntExChuModel> data = antenatalExaminationService.queryAntExChu(antExChuQuery1);
	225	+ Integer gravidity = 1; //孕次
	226	+ if (CollectionUtils.isNotEmpty(data))
	227	+ {
	228	+ AntExChuModel chuModel = data.get(0);
	229	+ if (chuModel != null && chuModel.getPregnancyTimes() != null)
	230	+ {
	231	+ gravidity = chuModel.getPregnancyTimes();
	232	+ }
	233	+ }
	234	+
	235	+ model.setGravidity(String.valueOf(gravidity));
	236	+ Object order = couponInfo.get("couponOrder");
	237	+ model.setSerialNumber(order == null ? "0" : order.toString());
	238	+
	239	+ String hospital = "";
	240	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(patient.getHospitalId())) {
	241	+ Organization organization = organizationService.getOrganization(Integer.parseInt(patient.getHospitalId()));
	242	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	243	+ hospital = organization.getName();
	244	+ String areaId = organization.getAreaId();
	245	+ BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(areaId);
	246	+ String areaName = basicConfig.getName();
	247	+ model.setAreaFrom(areaName);
	248	+ }
	249	+ }
	250	+ model.setPostHos(hospital);
	251	+
	252	+ String checkDoctor = CommonsHelper.getUserName(patient.getBookbuildingDoctor(),usersService);
	253	+
	254	+ model.setPostDoc(checkDoctor);
	255	+ model.setApplyInfo("产检");
	256	+ model.setApplyTime(DateUtil.getyyyy_MM_dd_hms(new Date()));
	257	+ model.setRemark("");
	258	+
	259	+ }
	260	+ System.out.println(model.toString());
	261	+// String result = HospitalCouponPrintUtils.qhdCouponUse(model);
	262	+ String result= "0";
	263	+ System.out.print(result);
107	264	if("0".equals(result)){
	265	+ int count = couponService.updateCouponStatus(param);
	266	+ System.out.println("update coupon count " + count);
108	267	return RespBuilder.buildErro(ResponseCode.SUCCESS);
109		- }else{
110		- return RespBuilder.buildErro(ResponseCode.ERROR);
	268	+ }else if ("1".equals(result)){
	269	+ return RespBuilder.buildErro(ResponseCode.COUPON_IS_USERD);
111	270	}
112		-
	271	+ return RespBuilder.buildErro(ResponseCode.ERROR);
113	272	}
114	273
115	274

...	...	@@ -252,13 +252,13 @@
252	252
253	253	/**
254	254	* 查询推送消息列表
255		- * @param hospitalId
256		- * @param phone
257		- * @param smsType
258		- * @param smsStatus
259		- * @param objType
260		- * @param planTime
261		- * @param actualTime
	255	+ * @param hospitalId 医院id
	256	+ * @param phone 手机号码
	257	+ * @param smsType 消息类型
	258	+ * @param smsStatus 消息状态
	259	+ * @param objType 发送对象
	260	+ * @param planTime 计划发送时间
	261	+ * @param actualTime 实际发送时间
262	262	* @param page
263	263	* @param limit
264	264	* @return

1	1	package com.lyms.platform.operate.web.utils;
2	2
3	3	import com.lyms.platform.biz.service.BasicConfigService;
	4	+import com.lyms.platform.common.enums.YnEnums;
4	5	import com.lyms.platform.operate.web.result.Address;
5	6	import com.lyms.platform.operate.web.result.AddressInner;
	7	+import com.lyms.platform.permission.model.Organization;
	8	+import com.lyms.platform.permission.model.Users;
	9	+import com.lyms.platform.permission.service.OrganizationService;
	10	+import com.lyms.platform.permission.service.UsersService;
6	11	import com.lyms.platform.pojo.BabyModel;
7	12	import com.lyms.platform.pojo.BasicConfig;
8	13	import com.lyms.platform.pojo.Patients;
...	...	@@ -114,6 +119,30 @@
114	119	}
115	120	addressInner.setName(config.getName());
116	121	return addressInner;
	122	+ }
	123	+
	124	+ public static String getHospitalName(String hospitalId,OrganizationService organizationService)
	125	+ {
	126	+ String hospital = "";
	127	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(hospitalId)) {
	128	+ Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
	129	+ if (organization != null && organization.getYn() == YnEnums.YES.getId()) {
	130	+ hospital = organization.getName();
	131	+ }
	132	+ }
	133	+ return hospital;
	134	+ }
	135	+
	136	+ public static String getUserName(String userId,UsersService usersService)
	137	+ {
	138	+ String checkDoctor = "";
	139	+ if (org.apache.commons.lang.StringUtils.isNotEmpty(userId)) {
	140	+ Users users = usersService.getUsers(Integer.parseInt(userId));
	141	+ if (users != null && users.getYn() == YnEnums.YES.getId()) {
	142	+ checkDoctor = users.getName();
	143	+ }
	144	+ }
	145	+ return checkDoctor;
117	146	}
118	147	}

1	1	package com.lyms.platform.operate.web.utils;
2	2
	3	+import com.lyms.hospitalapi.pojo.QhdDjq;
	4	+import com.lyms.platform.common.utils.JsonUtil;
3	5	import org.apache.http.HttpEntity;
4	6	import org.apache.http.client.methods.CloseableHttpResponse;
5	7	import org.apache.http.client.methods.HttpPost;
6	8
7	9
...	...	@@ -93,59 +95,14 @@
93	95
94	96
95	97	/**
96		- *
97		- * @param ID 自增
98		- * @param Pat_ID_CardNo 身份证号（必须填写）
99		- * @param Pat_PhoneNumber 手机号码（必须填写手机号码）
100		- * @param Pat_CardNo 健康卡、社保卡号（必须填写）
101		- * @param TokenCard_No 产检卷号（印刷在产检卷上）（必须填写）
102		- * @param TokenCard_Pwd 消费密码（不填写）
103		- * @param CardStatus 1 正常 9作废默认1（必须填写）
104		- * @param LMP_Date 末次月经（必须填写）
105		- * @param Exp_Date 有效期（最晚使用时间默认设置成末次月经+300天）
106		- * @param Gravidity 孕次（必须填写）
107		- * @param CardBalance 卡面金额（不填写）
108		- * @param Serial_Number 序号（不填写）
109		- * @param PostHos 产检券发放医院（必须填写）
110		- * @param PostDoc 产检券打印医生（必须填写）
111		- * @param AreaFrom 所属县区（必须填写）
112		- * @param ApplyInfo （产检）
113		- * @param ApplyTime 产检券打印时间
114		- * @param Remark 备注信息
	98	+ *秦皇岛消费优惠劵
115	99	* @return
116	100	*/
117		- public static String getQhddjq(Integer ID,String Pat_ID_CardNo,String Pat_PhoneNumber,String Pat_CardNo,String TokenCard_No,String TokenCard_Pwd,
118		- Integer CardStatus,String LMP_Date,String Exp_Date,Integer Gravidity,Double CardBalance,Double CardAmont,String PostHos,
119		- String PostDoc,String AreaFrom,String ApplyInfo,String ApplyTime,String Remark){
120		-
121		- Map<String,String> params = new HashMap<>();
122		- params.put("ID",ID.toString());
123		- params.put("Pat_ID_CardNo",Pat_ID_CardNo);
124		- params.put("Pat_PhoneNumber",Pat_PhoneNumber);
125		- params.put("Pat_CardNo",Pat_CardNo);
126		- params.put("TokenCard_No",TokenCard_No);
127		- params.put("TokenCard_Pwd",TokenCard_Pwd);
128		- params.put("CardStatus",CardStatus.toString());
129		- params.put("LMP_Date",LMP_Date);
130		- params.put("Exp_Date",Exp_Date);
131		- params.put("Gravidity",Gravidity.toString());
132		- params.put("CardBalance",CardBalance.toString());
133		- params.put("CardAmont",CardAmont.toString());
134		- params.put("PostHos",PostHos);
135		- params.put("PostDoc",PostDoc);
136		- params.put("AreaFrom",AreaFrom);
137		- params.put("ApplyInfo",ApplyInfo);
138		- params.put("ApplyTime",ApplyTime);
139		- params.put("Remark",Remark);
140		-
141		-
142		- String result = HttpClientUtil.doPost(DJQ_URL, params, "UTF-8");
143		- System.out.println("result== "+result);
	101	+ public static String qhdCouponUse(QhdDjq model){
	102	+ String json = JsonUtil.obj2Str(model);
	103	+ String result = HttpClientUtil.doPost("http://localhost:9090/his/insertQhdfycjDjq", json, "utf-8");
	104	+ System.out.println("result= "+result);
144	105	return result;
145	106	}
146		-
147		-
148		-
149		-
150	107	}

...	...	@@ -4,6 +4,8 @@
4	4	* Created by Administrator on 2017-01-18.
5	5	*/
6	6	import java.io.IOException;
	7	+import java.io.InputStream;
	8	+import java.io.OutputStream;
7	9	import java.util.*;
8	10	import java.util.Map.Entry;
9	11
...	...	@@ -11,10 +13,7 @@
11	13	import com.lyms.platform.common.utils.ExceptionUtils;
12	14	import com.lyms.platform.common.utils.JsonUtil;
13	15	import com.alibaba.fastjson.JSONObject;
14		-import org.apache.http.HttpEntity;
15		-import org.apache.http.HttpResponse;
16		-import org.apache.http.HttpStatus;
17		-import org.apache.http.NameValuePair;
	16	+import org.apache.http.*;
18	17	import org.apache.http.client.HttpClient;
19	18	import org.apache.http.client.config.RequestConfig;
20	19	import org.apache.http.client.entity.UrlEncodedFormEntity;
...	...	@@ -86,6 +85,36 @@
86	85	}
87	86	return result;
88	87	}
	88	+
	89	+
	90	+ public static String doPost(String url,String json,String charset){
	91	+ HttpClient httpClient = null;
	92	+ HttpPost httpPost = null;
	93	+ String result = null;
	94	+ try{
	95	+ httpClient = new SSLClient();
	96	+ httpPost = new HttpPost(url);
	97	+
	98	+ StringEntity stringEntity = new StringEntity(json.toString(),charset);
	99	+ httpPost.setEntity(stringEntity);
	100	+ stringEntity.setContentEncoding("UTF-8");
	101	+ stringEntity.setContentType("application/json");
	102	+ HttpResponse response = httpClient.execute(httpPost);
	103	+ int statusCode = response.getStatusLine().getStatusCode();
	104	+ if (statusCode != HttpStatus.SC_OK) {
	105	+ return null;
	106	+ }
	107	+ HttpEntity entity = response.getEntity();
	108	+ if (entity == null) {
	109	+ return null;
	110	+ }
	111	+ result = EntityUtils.toString(entity, "utf-8");
	112	+ }catch(Exception ex){
	113	+ ex.printStackTrace();
	114	+ }
	115	+ return result;
	116	+ }
	117	+
89	118
90	119
91	120	/**

...	...	@@ -47,6 +47,23 @@
47	47	}
48	48
49	49
	50	+ public static boolean updateMsgStatus(List<Config> configs,String hid)
	51	+ {
	52	+ String json = JsonUtil.array2JsonString(configs);
	53	+ String result = HttpClientUtil.doPostSSL("https://push.stage.platform.healthbaby.com.cn/biz-push-web/push/" + hid, json);
	54	+ if (StringUtils.isNotEmpty(result))
	55	+ {
	56	+ Map<String,String> map = JsonUtil.str2Obj(result, Map.class);
	57	+ if ("0".equals(map.get("errorcode")))
	58	+ {
	59	+ return true;
	60	+ }
	61	+ }
	62	+ return false;
	63	+ }
	64	+
	65	+
	66	+
50	67	/**
51	68	* 线上环境调用
52	69	* 保存到短信中心短信
...	...	@@ -249,11 +266,20 @@
249	266	// map.setList(JsonUtil.toList(list, SmsObj.class));
250	267	// System.out.print(map);
251	268
252		- queryMsgList("216", null,null,
253		- null,null,
254		- null,null,
255		- null,null ,
256		- 1,10);
	269	+// queryMsgList("216", null,null,
	270	+// null,null,
	271	+// null,null,
	272	+// null,null ,
	273	+// 1,10);
	274	+
	275	+ List<Config> configs = new ArrayList<>();
	276	+ Config config = new Config();
	277	+ config.setKey("6");
	278	+ config.setValue("true");
	279	+ configs.add(config);
	280	+
	281	+
	282	+ updateMsgStatus(configs,"216");
257	283
258	284	}
259	285	}