liquanyu / regional-platform

Commit 7dcb30b708408a65793ebb690f1bc3817457857c

Authored by yangfei over 8 years ago

Merge remote-tracking branch 'origin/master'

Showing 7 changed files

platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java
platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
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/facade/SmsConfigFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MsgObj.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java

...	...	@@ -126,5 +126,7 @@
126	126	List<Map<String,Object>> findHospitalInfoByIds2(Map<String, Object> map);
127	127
128	128	void invalid2(Map<String, Object> param);
	129	+
	130	+ List<String> findUsededId(List<String> usedIds);
129	131	}

...	...	@@ -758,5 +758,13 @@
758	758	</foreach>
759	759	order by a.user_id
760	760	</select>
	761	+
	762	+ <select id="findUsededId" parameterType="list" resultType="string">
	763	+ select used_id from coupon_info where used_id in
	764	+ <foreach collection="list" item="id" open="(" separator="," close=")">
	765	+ #{id}
	766	+ </foreach>
	767	+ </select>
	768	+
761	769	</mapper>

...	...	@@ -223,21 +223,21 @@
223	223	* @param limit
224	224	* @return
225	225	*/
226		- @RequestMapping(value = "/querySmsList", method = RequestMethod.GET)
227		- @ResponseBody
228		- @TokenRequired
229		- public BaseResponse querySmsList(@RequestParam(required = false) String hospitalName,
230		- @RequestParam(required = false) String phone,
231		- @RequestParam(required = false) Integer smsType,
232		- @RequestParam(required = false) Integer smsStatus,
233		- @RequestParam(required = false) Integer objType,
234		- @RequestParam(required = false) String content,
235		- @RequestParam(required = false) String planTime,
236		- @RequestParam(required = false) String actualTime,
237		- @RequestParam(required = false) Integer page,
238		- @RequestParam(required = false) Integer limit) {
239		- return smsConfigFacade.querySmsList(hospitalName, phone, smsType, smsStatus, content, planTime, actualTime, objType, page, limit);
240		- }
	226	+// @RequestMapping(value = "/querySmsList", method = RequestMethod.GET)
	227	+// @ResponseBody
	228	+// @TokenRequired
	229	+// public BaseResponse querySmsList(@RequestParam(required = false) String hospitalName,
	230	+// @RequestParam(required = false) String phone,
	231	+// @RequestParam(required = false) Integer smsType,
	232	+// @RequestParam(required = false) Integer smsStatus,
	233	+// @RequestParam(required = false) Integer objType,
	234	+// @RequestParam(required = false) String content,
	235	+// @RequestParam(required = false) String planTime,
	236	+// @RequestParam(required = false) String actualTime,
	237	+// @RequestParam(required = false) Integer page,
	238	+// @RequestParam(required = false) Integer limit) {
	239	+// return smsConfigFacade.querySmsList(hospitalName, phone, smsType, smsStatus, content, planTime, actualTime, objType, page, limit);
	240	+// }
241	241
242	242
243	243	/**
244	244
...	...	@@ -258,10 +258,11 @@
258	258	@RequestParam(required = false) Integer objType,
259	259	@RequestParam(required = false) String planTime,
260	260	@RequestParam(required = false) String actualTime,
	261	+ @RequestParam(required = false) String smsActualTime,
261	262	@RequestParam(required = false) Integer sendType,
262	263	@RequestParam(required = false) Integer dxStatus,
263	264	@RequestParam(required = false) Integer timeType) {
264		- smsConfigFacade.exportSmsList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType,sendType,dxStatus, timeType,httpServletResponse);
	265	+ smsConfigFacade.exportSmsList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType,sendType,dxStatus, timeType,httpServletResponse);
265	266	}
266	267
267	268
268	269
...	...	@@ -289,12 +290,13 @@
289	290	@RequestParam(required = false) Integer objType,
290	291	@RequestParam(required = false) String planTime,
291	292	@RequestParam(required = false) String actualTime,
	293	+ @RequestParam(required = false) String smsActualTime,
292	294	@RequestParam(required = false) Integer sendType,
293	295	@RequestParam(required = false) Integer dxStatus,
294	296	@RequestParam(required = false) Integer timeType,
295	297	@RequestParam(required = false) Integer page,
296	298	@RequestParam(required = false) Integer limit) {
297		- return smsConfigFacade.queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType, sendType,dxStatus,timeType,page, limit);
	299	+ return smsConfigFacade.queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType, sendType,dxStatus,timeType,page, limit);
298	300	}
299	301
300	302
301	303
...	...	@@ -317,10 +319,11 @@
317	319	@RequestParam(required = false) Integer objType,
318	320	@RequestParam(required = false) String planTime,
319	321	@RequestParam(required = false) String actualTime,
	322	+ @RequestParam(required = false) String smsActualTime,
320	323	@RequestParam(required = false) Integer sendType,
321	324	@RequestParam(required = false) Integer dxStatus,
322	325	@RequestParam(required = false) Integer timeType) {
323		- smsConfigFacade.exportMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType,sendType,dxStatus, timeType,httpServletResponse);
	326	+ smsConfigFacade.exportMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType,sendType,dxStatus, timeType,httpServletResponse);
324	327	}
325	328
326	329

...	...	@@ -1038,12 +1038,12 @@
1038	1038	* @param objType 发送短信
1039	1039	* @param httpServletResponse
1040	1040	*/
1041		- public void exportSmsList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime, Integer objType,
	1041	+ public void exportSmsList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime, String smsActualTime, Integer objType,
1042	1042	Integer sendType,Integer dxStatus,Integer timeType,HttpServletResponse httpServletResponse) {
1043	1043
1044	1044	try
1045	1045	{
1046		- BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType,sendType,dxStatus,timeType, 1, 999999999);
	1046	+ BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType,sendType,dxStatus,timeType, 1, 999999999);
1047	1047	List<Map<String, Object>> datas = new ArrayList<>();
1048	1048	List<Map<String,String>> results = list.getData();
1049	1049
...	...	@@ -1058,7 +1058,7 @@
1058	1058	data.put("phone",map.get("phone"));
1059	1059	data.put("first", map.get("first"));
1060	1060	data.put("planTime",map.get("planTime"));
1061		- data.put("actualTime",map.get("actualTime"));
	1061	+ data.put("smsActualTime",map.get("smsActualTime"));
1062	1062	data.put("dxStatus",map.get("dxStatus"));
1063	1063	data.put("timeType",map.get("timeType"));
1064	1064	datas.add(data);
...	...	@@ -1073,7 +1073,7 @@
1073	1073	cnames.put("phone", "电话号码");
1074	1074	cnames.put("first", "短信内容");
1075	1075	cnames.put("planTime", "计划发送时间");
1076		- cnames.put("actualTime", "实际发送时间");
	1076	+ cnames.put("smsActualTime", "实际发送时间");
1077	1077	cnames.put("dxStatus", "推送状态");
1078	1078	cnames.put("timeType", "是否及时");
1079	1079	httpServletResponse.setContentType("application/octet-stream");
...	...	@@ -1086,7 +1086,7 @@
1086	1086	}
1087	1087
1088	1088	public BaseListResponse queryMsgList(String hospitalId, String phone, Integer smsType, Integer smsStatus,
1089		- String planTime, String actualTime, Integer objType,Integer sendType,Integer dxStatus,Integer timeType, Integer page, Integer limit) {
	1089	+ String planTime, String actualTime,String smsActualTime, Integer objType,Integer sendType,Integer dxStatus,Integer timeType, Integer page, Integer limit) {
1090	1090
1091	1091	String planTimeStart = "";
1092	1092	String planTimeEnd = "";
1093	1093
...	...	@@ -1104,10 +1104,21 @@
1104	1104	actualTimeStart = actualTime.split(" - ")[0]+"%2000:00:00";
1105	1105	actualTimeEnd = actualTime.split(" - ")[1] + "%2023:59:59";
1106	1106	}
	1107	+
	1108	+
	1109	+ String smsActualTimeStart = "";
	1110	+ String smsActualTimeEnd = "";
	1111	+ if (StringUtils.isNotEmpty(smsActualTime))
	1112	+ {
	1113	+
	1114	+ smsActualTimeStart = smsActualTime.split(" - ")[0]+"%2000:00:00";
	1115	+ smsActualTimeEnd = smsActualTime.split(" - ")[1] + "%2023:59:59";
	1116	+ }
	1117	+
1107	1118	List<Map<String,String>> list = new ArrayList<>();
1108	1119
1109	1120	MsgResult sms = MessageCenterService.queryMsgList(hospitalId, phone, smsType, smsStatus, planTimeStart,
1110		- planTimeEnd, actualTimeStart, actualTimeEnd, objType,sendType,dxStatus,timeType, page, limit);
	1121	+ planTimeEnd, actualTimeStart, actualTimeEnd,smsActualTimeStart, smsActualTimeEnd, objType,sendType,dxStatus,timeType, page, limit);
1111	1122
1112	1123	if (sms != null && sms.getData() != null )
1113	1124	{
...	...	@@ -1137,6 +1148,7 @@
1137	1148	map.put("objType",ServiceObjEnums.getServiceObjById(obj.getObjtype()));
1138	1149	map.put("planTime", obj.getPlanTime());
1139	1150	map.put("actualTime", obj.getActualTime() == null ? "" : obj.getActualTime());
	1151	+ map.put("smsActualTime", obj.getSmsActualTime() == null ? "" : obj.getSmsActualTime());
1140	1152	map.put("timeType",SmsTimeTypeEnums.getNameById(obj.getTimeType()));
1141	1153	map.put("smsStatus", MsgStatusEnums.getNameById(obj.getStatus()));
1142	1154	map.put("first", obj.getFirst());
1143	1155
...	...	@@ -1178,12 +1190,12 @@
1178	1190	* @param objType 发送短信
1179	1191	* @param httpServletResponse
1180	1192	*/
1181		- public void exportMsgList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime, Integer objType,
	1193	+ public void exportMsgList(String hospitalId, String phone, Integer smsType, Integer smsStatus, String planTime, String actualTime,String smsActualTime, Integer objType,
1182	1194	Integer sendType,Integer dxStatus,Integer timeType,HttpServletResponse httpServletResponse) {
1183	1195
1184	1196	try
1185	1197	{
1186		- BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime, objType,sendType,dxStatus,timeType, 1, 999999999);
	1198	+ BaseListResponse list = queryMsgList(hospitalId, phone, smsType, smsStatus, planTime, actualTime,smsActualTime, objType,sendType,dxStatus,timeType, 1, 999999999);
1187	1199	List<Map<String, Object>> datas = new ArrayList<>();
1188	1200	List<Map<String,String>> results = list.getData();
1189	1201

...	...	@@ -12,6 +12,7 @@
12	12	private String created;
13	13	private String planTime;
14	14	private String actualTime;
	15	+ private String smsActualTime;
15	16	private String hospitalId;
16	17	private String patientId;
17	18	private String wxTempId;
...	...	@@ -31,6 +32,15 @@
31	32
32	33	//短信发送状态
33	34	private Integer smsStatus;
	35	+
	36	+
	37	+ public String getSmsActualTime() {
	38	+ return smsActualTime;
	39	+ }
	40	+
	41	+ public void setSmsActualTime(String smsActualTime) {
	42	+ this.smsActualTime = smsActualTime;
	43	+ }
34	44
35	45	public Integer getServiceType() {
36	46	return serviceType;

...	...	@@ -705,14 +705,155 @@
705	705	return "";
706	706	}
707	707
708		- private List<String> getNeedUsedIds(List<Patients> patients, List<AntExChuModel> antExChuModels, List<AntenatalExaminationModel> antenatalExaminationModels, List<MaternalDeliverModel> maternalDeliverModels, List<DischargeAbstractMotherModel> deliverModels, List<PostReviewModel> postReviewModels) {
	708	+ private List<String> getNeedUsedIds(List<Patients> patients, List<AntExChuModel> antExChuModels, List<AntenatalExaminationModel> antenatalExaminationModels,
	709	+ List<MaternalDeliverModel> maternalDeliverModels, List<DischargeAbstractMotherModel> deliverModels, List<PostReviewModel> postReviewModels) {
709	710	List<String> needUsedIds = new ArrayList<>();
710	711	for (Patients patient : patients) {
711	712	needUsedIds.add(patient.getId());
712	713	}
	714	+ for (AntExChuModel antExChuModel : antExChuModels) {
	715	+ needUsedIds.add(antExChuModel.getId());
	716	+ }
	717	+ for (AntenatalExaminationModel antenatalExaminationModel : antenatalExaminationModels) {
	718	+ needUsedIds.add(antenatalExaminationModel.getId());
	719	+ }
	720	+ for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModels) {
	721	+ needUsedIds.add(maternalDeliverModel.getId());
	722	+ }
	723	+ for (DischargeAbstractMotherModel deliverModel : deliverModels) {
	724	+ needUsedIds.add(deliverModel.getId());
	725	+ }
	726	+ for (PostReviewModel postReviewModel : postReviewModels) {
	727	+ needUsedIds.add(postReviewModel.getId());
	728	+ }
713	729	return needUsedIds;
714	730	}
715	731
	732	+ private boolean checkHospital(List<Patients> patients, List<AntExChuModel> antExChuModels, List<AntenatalExaminationModel> antenatalExaminationModels,
	733	+ List<MaternalDeliverModel> maternalDeliverModels, List<DischargeAbstractMotherModel> deliverModels, List<PostReviewModel> postReviewModels, String hid, String usedId) {
	734	+ for (Patients patient : patients) {
	735	+ if(hid.equals(patient.getHospitalId()) && usedId.equals(patient.getId())) {
	736	+ return true;
	737	+ }
	738	+ }
	739	+ for (AntExChuModel antExChuModel : antExChuModels) {
	740	+ for (Patients patient : patients) {
	741	+ if(antExChuModel.getParentId().equals(patient.getId()) && patient.getHospitalId().equals(hid) && usedId.equals(antExChuModel.getId())) {
	742	+ return true;
	743	+ }
	744	+ }
	745	+ }
	746	+ for (AntenatalExaminationModel antenatalExaminationModel : antenatalExaminationModels) {
	747	+ for (Patients patient : patients) {
	748	+ if(antenatalExaminationModel.getParentId().equals(patient.getId()) && patient.getHospitalId().equals(hid) && usedId.equals(antenatalExaminationModel.getId())) {
	749	+ return true;
	750	+ }
	751	+ }
	752	+ }
	753	+ for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModels) {
	754	+ for (Patients patient : patients) {
	755	+ if(maternalDeliverModel.getParentId().equals(patient.getId()) && patient.getHospitalId().equals(hid) && usedId.equals(maternalDeliverModel.getId())) {
	756	+ return true;
	757	+ }
	758	+ }
	759	+ }
	760	+ for (DischargeAbstractMotherModel deliverModel : deliverModels) {
	761	+ for (Patients patient : patients) {
	762	+ if(deliverModel.getPatientId().equals(patient.getId()) && patient.getHospitalId().equals(hid) && usedId.equals(deliverModel.getId())) {
	763	+ return true;
	764	+ }
	765	+ }
	766	+ }
	767	+ for (PostReviewModel postReviewModel : postReviewModels) {
	768	+ for (Patients patient : patients) {
	769	+ if(postReviewModel.getParentId().equals(patient.getId()) && patient.getHospitalId().equals(hid) && usedId.equals(postReviewModel.getId())) {
	770	+ return true;
	771	+ }
	772	+ }
	773	+ }
	774	+ return false;
	775	+ }
	776	+
	777	+ private Patients getParentByUsedId(List<Patients> patients, List<AntExChuModel> antExChuModels, List<AntenatalExaminationModel> antenatalExaminationModels,
	778	+ List<MaternalDeliverModel> maternalDeliverModels, List<DischargeAbstractMotherModel> deliverModels, List<PostReviewModel> postReviewModels, String usedId) {
	779	+ for (Patients patient : patients) {
	780	+ if(patient.getId().equals(usedId)) {
	781	+ return patient;
	782	+ }
	783	+ }
	784	+ for (AntExChuModel antExChuModel : antExChuModels) {
	785	+ for (Patients patient : patients) {
	786	+ if(antExChuModel.getParentId().equals(patient.getId())) {
	787	+ return patient;
	788	+ }
	789	+ }
	790	+ }
	791	+ for (AntenatalExaminationModel antenatalExaminationModel : antenatalExaminationModels) {
	792	+ for (Patients patient : patients) {
	793	+ if(antenatalExaminationModel.getParentId().equals(patient.getId())) {
	794	+ return patient;
	795	+ }
	796	+ }
	797	+ }
	798	+ for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModels) {
	799	+ for (Patients patient : patients) {
	800	+ if(maternalDeliverModel.getParentId().equals(patient.getId())) {
	801	+ return patient;
	802	+ }
	803	+ }
	804	+ }
	805	+ for (DischargeAbstractMotherModel deliverModel : deliverModels) {
	806	+ for (Patients patient : patients) {
	807	+ if(deliverModel.getPatientId().equals(patient.getId())) {
	808	+ return patient;
	809	+ }
	810	+ }
	811	+ }
	812	+ for (PostReviewModel postReviewModel : postReviewModels) {
	813	+ for (Patients patient : patients) {
	814	+ if(postReviewModel.getParentId().equals(patient.getId())) {
	815	+ return patient;
	816	+ }
	817	+ }
	818	+ }
	819	+ return null;
	820	+ }
	821	+
	822	+ private String getCheckTimeByUsedId(List<Patients> patients, List<AntExChuModel> antExChuModels, List<AntenatalExaminationModel> antenatalExaminationModels,
	823	+ List<MaternalDeliverModel> maternalDeliverModels, List<DischargeAbstractMotherModel> deliverModels, List<PostReviewModel> postReviewModels, String usedId) {
	824	+ for (Patients patient : patients) {
	825	+ if(patient.getId().equals(usedId)) {
	826	+ return DateUtil.getyyyy_MM_dd(patient.getBookbuildingDate());
	827	+ }
	828	+ }
	829	+ for (AntExChuModel antExChuModel : antExChuModels) {
	830	+ if(antExChuModel.getId().equals(usedId)) {
	831	+ return DateUtil.getyyyy_MM_dd(antExChuModel.getCheckTime());
	832	+ }
	833	+ }
	834	+ for (AntenatalExaminationModel antenatalExaminationModel : antenatalExaminationModels) {
	835	+ if(antenatalExaminationModel.getId().equals(usedId)) {
	836	+ return DateUtil.getyyyy_MM_dd(antenatalExaminationModel.getCheckDate());
	837	+ }
	838	+ }
	839	+ for (MaternalDeliverModel maternalDeliverModel : maternalDeliverModels) {
	840	+ if(maternalDeliverModel.getId().equals(usedId)) {
	841	+ return maternalDeliverModel.getDueDate();
	842	+ }
	843	+ }
	844	+ for (DischargeAbstractMotherModel deliverModel : deliverModels) {
	845	+ if(deliverModel.getId().equals(usedId)) {
	846	+ return DateUtil.getyyyy_MM_dd(deliverModel.getLeaveHospitalDate());
	847	+ }
	848	+ }
	849	+ for (PostReviewModel postReviewModel : postReviewModels) {
	850	+ if(postReviewModel.getId().equals(usedId)) {
	851	+ return DateUtil.getyyyy_MM_dd(postReviewModel.getCheckTime());
	852	+ }
	853	+ }
	854	+ return "";
	855	+ }
	856	+
716	857	@Override
717	858	public BaseObjectResponse unUsed(Date startDate, Date endDate, String provinceId, String cityId, String areaId, String hospitalId, Integer page, Integer limit, Integer userId) {
718	859	List<String> hospitalIds = getHospitalIds(userId, hospitalId);
...	...	@@ -730,12 +871,6 @@
730	871	for (Patients patient : patients) {
731	872	parentIds.add(patient.getId());
732	873	}
733		- List<BabyModel> babyModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("parentId").in(parentIds)), BabyModel.class);
734		- List<String> babyIds = new ArrayList<>();
735		- for (BabyModel babyModel : babyModels) {
736		- babyIds.add(babyModel.getId());
737		- }
738		- List<BabyCheckModel> babyCheckModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("buildId").in(babyModels)), BabyCheckModel.class);
739	874	List<AntExChuModel> antExChuModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("parentId").in(parentIds)), AntExChuModel.class);
740	875	List<AntenatalExaminationModel> antenatalExaminationModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("parentId").in(parentIds)), AntenatalExaminationModel.class);
741	876	List<MaternalDeliverModel> maternalDeliverModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("parentId").in(parentIds)), MaternalDeliverModel.class);
742	877
743	878
744	879
745	880
746	881
...	...	@@ -743,12 +878,59 @@
743	878	List<PostReviewModel> postReviewModels = mongoTemplate.find(Query.query(Criteria.where("yn").ne(0).and("parentId").in(parentIds)), PostReviewModel.class);
744	879
745	880	List<String> usedIds = getNeedUsedIds(patients, antExChuModels, antenatalExaminationModels, maternalDeliverModels, deliverModels, postReviewModels);
	881	+ List<Map<String, Object>> restList = new ArrayList<>();
	882	+ if(CollectionUtils.isNotEmpty(usedIds)) {
	883	+ List<String> list = couponMapper.findUsededId(usedIds);
	884	+ usedIds.removeAll(list);
746	885
	886	+ Map<String, String> hospitalNameCache = new HashMap<>();
	887	+ for (String hid : hids) {
	888	+ boolean flag = false;
	889	+ Set<String> unUsedIds = new HashSet<>(); // 未使用优惠券patientid
	890	+ List<Map<String, Object>> un_used_coupons = new ArrayList<>(); // 未使用优惠券详情
	891	+ for (String usedId : usedIds) {
	892	+ if(checkHospital(patients, antExChuModels, antenatalExaminationModels, maternalDeliverModels, deliverModels, postReviewModels, hid, usedId)) {
	893	+ flag = true;
	894	+ Patients p = getParentByUsedId(patients, antExChuModels, antenatalExaminationModels, maternalDeliverModels, deliverModels, postReviewModels, usedId);
	895	+ if(p != null) {
	896	+ unUsedIds.add(p.getId());
	897	+ Map<String, Object> map = new HashMap<>();
747	898
	899	+ map.put("username", p.getUsername());
	900	+ map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(p.getPhone()));
	901	+ map.put("cardNo", com.lyms.platform.common.utils.StringUtils.encryCardNo(p.getCardNo()));
	902	+ map.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
	903	+ map.put("doctorName", couponMapper.getUserName(p.getBookbuildingDoctor()));
	904	+ String hName = hospitalNameCache.get(p.getHospitalId());
	905	+ if(StringUtils.isNotEmpty(hName)) {
	906	+ hName = couponMapper.findHospitalNameById(p.getHospitalId());
	907	+ }
	908	+ map.put("hospitalName", hName);
	909	+ map.put("checkTime", getCheckTimeByUsedId(patients, antExChuModels, antenatalExaminationModels, maternalDeliverModels, deliverModels, postReviewModels, usedId));
	910	+ un_used_coupons.add(map);
	911	+ }
	912	+ }
748	913
	914	+ }
	915	+ if(flag) {
	916	+ Map<String, Object> hospitalInfo = couponMapper.findHospitalInfoById(hid);
	917	+ hospitalInfo.put("cityName", findName(hospitalInfo.get("city_id")));
	918	+ hospitalInfo.put("areaName", findName(hospitalInfo.get("area_id")));
	919	+ hospitalInfo.put("un_used_coupons", un_used_coupons);
	920	+ hospitalInfo.put("un_used_coupon_count", un_used_coupons.size());
	921	+ hospitalInfo.put("unUsedIds", unUsedIds);
	922	+ hospitalInfo.put("un_used_people", unUsedIds.size());
	923	+ hospitalInfo.put("hospitalId", hid);
	924	+ hospitalInfo.put("hospitalName", hospitalInfo.get("name"));
	925	+ restList.add(hospitalInfo);
	926	+ }
	927	+ }
	928	+ }
749	929
750		- return null;
751	930
	931	+
	932	+ return RespBuilder.buildSuccess(new PageResult(restList.size(), page, limit, restList));
	933	+
752	934	/*List<String> userIds = new ArrayList<>(); // 存储patientId
753	935	for (Patients patient : patients) {
754	936	userIds.add(patient.getPid());
...	...	@@ -794,7 +976,7 @@
794	976	continue;
795	977	}
796	978	String checkTime = getCheckTime((Integer) map.get("type"), (String) map.get("user_id"), patientId);
797		- if(StringUtils.isNotEmpty(checkTime)) { //* 如果没有做检查那么返回的时间就是空字符串这里等于做了检查但是没用券 //
	979	+ if(StringUtils.isNotEmpty(checkTime)) { * 如果没有做检查那么返回的时间就是空字符串这里等于做了检查但是没用券
798	980	unUsedIds.add(p.getId());
799	981	unUsedCouponCount ++;
800	982	map.put("couponName", (couponReportMap.get(map.get("type") + "_" + map.get("coupon_order"))).toString()

...	...	@@ -199,7 +199,7 @@
199	199	public static MsgResult queryMsgList(String hospitalId, String phone,Integer smsType,
200	200	Integer smsStatus,String planTimeStart,
201	201	String planTimeEnd,String actualTimeStart,
202		- String actualTimeEnd,Integer objType ,
	202	+ String actualTimeEnd,String smsActualTimeStart,String smsActualTimeEnd,Integer objType ,
203	203	Integer sendType,Integer dxStatus,Integer timeType,
204	204	Integer page, Integer limit)
205	205	{
...	...	@@ -217,6 +217,10 @@
217	217	param.put("planTimeEnd",planTimeEnd);
218	218	param.put("actualTimeStart",actualTimeStart);
219	219	param.put("actualTimeEnd",actualTimeEnd);
	220	+
	221	+ param.put("smsActualTimeStart",smsActualTimeStart);
	222	+ param.put("smsActualTimeEnd",smsActualTimeEnd);
	223	+
220	224	param.put("objType",objType == null ? null : String.valueOf(objType));
221	225	String result = HttpClientUtil.doGet(/CENTER_BASE_URL+/"https://push.stage.platform.healthbaby.com.cn/biz-push-web/push", param, "utf-8", null);
222	226	if (result != null)
...	...	@@ -240,8 +244,8 @@
240	244	public static void main(String[] args){
241	245	queryMsgList(null, null,null,
242	246	null,null,
243		- null,null,
244		- null,null ,null,null,null,
	247	+ null,null,null,null,
	248	+ null,null ,2,null,null,
245	249	1,10);
246	250	}
247	251	}