jiangjiazhi / regional-platform

Authored by litao about 8 years ago

Exists in master and in 6 other branches

Showing 7 changed files with 17 additions and 21 deletions

...	...	@@ -18,7 +18,7 @@
18	18
19	19	List<Map<String,Object>> findTemp(Map<String, Object> map);
20	20
21		- String findTopName(String hospitalId);
	21	+ List<Map<String,Object>> findTopName(String hospitalId);
22	22
23	23	List<Map<String,Object>> findInfo(Map<String, Object> param);
24	24

...	...	@@ -45,8 +45,8 @@
45	45	@Override
46	46	public BaseObjectResponse getConfigs() {
47	47	Map<String, Object> restMap = new HashMap<>();
48		- restMap.put("fmType", EnumUtil.buildEnumJson(FmTypeEnums.class)); /** 分娩方式 */
49		- restMap.put("aborType", EnumUtil.buildEnumJson(AbortionEnums.class)); /** 流产方式 */
	48	+ restMap.put("fmType", EnumUtil.toJson(FmTypeEnums.class)); /** 分娩方式 */
	49	+ restMap.put("aborType", EnumUtil.toJson(AbortionEnums.class)); /** 流产方式 */
50	50	List<BasicConfig> basicConfigs = mongoTemplate.find(Query.query(Criteria.where("").is("")), BasicConfig.class);
51	51
52	52

...	...	@@ -445,7 +445,8 @@
445	445	restMap.put("topName", couponMapper.findTopName(hospitalId));
446	446	List<Map<String, Object>> couponInfos = couponMapper.findInfo(param);
447	447	for (Map<String,Object> map : couponInfos) {
448		- map.put("url", PropertiesUtil.getInstance().getDefault("or.code.url", map.get("sequence_id").toString()));
	448	+// map.put("url", PropertiesUtil.getInstance().getDefault("or.code.url", map.get("sequence_id").toString()));
	449	+ map.put("url", findUrl(map.get("sequence_id").toString()));
449	450	}
450	451	restMap.put("couponInfos", couponInfos);
451	452	return RespBuilder.buildSuccess(restMap);

...	...	@@ -50,14 +50,14 @@
50	50	order by b.coupon_order
51	51	</select>
52	52
53		- <select id="findTopName" parameterType="string" resultType="string">
54		- select b.name
	53	+ <select id="findTopName" parameterType="string" resultType="map">
	54	+ select b.name, a.coupon_desc, a.img_base64
55	55	from hospital_coupon_template_group a, coupon_template_group b
56	56	where a.coupon_template_group_id = b.id and a.hospital_id = #{hospital_id}
57	57	</select>
58	58
59	59	<select id="findInfo" parameterType="map" resultType="map">
60		- select a.create_date, d.coupon_desc, d.img_base64, b.name, b.title, b.show_start, b.show_end, b.unit_type, b.content, a.sequence_id, a.status
	60	+ select a.create_date, b.name, b.title, b.show_start, b.show_end, b.unit_type, b.content, a.sequence_id, a.status
61	61	from coupon_info a, coupon_template b, coupon_type c, hospital_coupon_template_group d
62	62	where a.user_id = #{userId} and a.create_hospital_id = #{hospitalId} and a.coupon_template_id = b.id and b.type_id=c.id and d.hospital_id = #{hospitalId}
63	63	order by c.type, b.coupon_order

1	1	package com.lyms.platform.common.utils;
2	2
3		-import com.lyms.platform.common.enums.FmTypeEnums;
4	3	import org.apache.commons.beanutils.PropertyUtils;
5	4
6	5	import java.security.InvalidParameterException;
7	6
...	...	@@ -19,11 +18,11 @@
19	18	private static final String DEFAULT_KEY_NAME = "id";
20	19	private static final String DEFAULT_VALUE_NAME = "name";
21	20
22		- public static <T> List<Map<String, Object>> buildEnumJson(Class<T> clazz) {
23		- return buildEnumJson(clazz, DEFAULT_KEY_NAME, DEFAULT_VALUE_NAME);
	21	+ public static <T> List<Map<String, Object>> toJson(Class<T> clazz) {
	22	+ return toJson(clazz, DEFAULT_KEY_NAME, DEFAULT_VALUE_NAME);
24	23	}
25	24
26		- public static <T> List<Map<String, Object>> buildEnumJson(Class<T> clazz, String codeName, String valueName) {
	25	+ public static <T> List<Map<String, Object>> toJson(Class<T> clazz, String codeName, String valueName) {
27	26	List<Map<String, Object>> list = new ArrayList<>();
28	27
29	28	if (!clazz.isEnum()) {

1	1	package com.lyms.platform.operate.web.controller;
2	2
	3	+import com.lyms.platform.biz.service.PatientsService;
3	4	import com.lyms.platform.common.annotation.TokenRequired;
4	5	import com.lyms.platform.common.base.BaseController;
5	6	import com.lyms.platform.common.base.LoginContext;
6	7	import com.lyms.platform.common.result.BaseObjectResponse;
	8	+import com.lyms.platform.common.result.RespBuilder;
7	9	import com.lyms.platform.operate.web.facade.AutoMatchFacade;
8	10	import com.lyms.platform.permission.service.CouponService;
9		-import com.lyms.platform.pojo.PatientCheckTicket;
10	11	import org.springframework.beans.factory.annotation.Autowired;
11	12	import org.springframework.beans.factory.annotation.Value;
12	13	import org.springframework.data.mongodb.core.MongoTemplate;
...	...	@@ -39,6 +40,8 @@
39	40	@Autowired
40	41	private MongoTemplate mongoTemplate;
41	42
	43	+ @Autowired
	44	+ private PatientsService patientsService;
42	45	/**
43	46	* 创建用户产检券
44	47	* @param userId
...	...	@@ -80,10 +83,8 @@
80	83	@RequestMapping(method = RequestMethod.POST, value = "/test")
81	84	@ResponseBody
82	85	public BaseObjectResponse testUse() {
83		- PatientCheckTicket ticket = new PatientCheckTicket();
84		- mongoTemplate.save(ticket);
85		- System.err.println("ticket > " + ticket + " : " + ticket.getId());
86		- return null;
	86	+// patientsService.
	87	+ return RespBuilder.buildSuccess();
87	88	}
88	89
89	90	/**

...	...	@@ -54,10 +54,5 @@
54	54	return babyPatientExtendEarService.getConfigs();
55	55	}
56	56
57		- @RequestMapping("/test")
58		- @ResponseBody
59		- public BaseObjectResponse test() {
60		- return RespBuilder.buildSuccess(EnumUtil.buildEnumJson(FmTypeEnums.class));
61		- }
62	57	}