jiangjiazhi / regional-platform

Commit 829ccedb6ab04e3a32bfac68f28867a6469c34ac

Authored by wtt over 5 years ago

Exists in master and in 6 other branches

update

Showing 4 changed files with 86 additions and 3 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/HandleOpinionsQhdEnums.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+import com.lyms.platform.common.utils.StringUtils;
	4	+
	5	+/**
	6	+ * 处理意见
	7	+ */
	8	+public enum HandleOpinionsQhdEnums {
	9	+ ONE(1, "请于1周后复查"),
	10	+ TWO(2, "请于2周后复查"),
	11	+ THREE(3, "请于1月后复查"),
	12	+ FOUR(4, "请于2月后复查"),
	13	+ FIVE(5, "请于3月后复查"),
	14	+ SIX(6, "请于6月后复查"),
	15	+ SEVEN(7, "请于1年后复查");
	16	+
	17	+
	18	+ private Integer id;
	19	+ private String name;
	20	+
	21	+ public static HandleOpinionsQhdEnums get(Integer id) {
	22	+ HandleOpinionsQhdEnums[] values = HandleOpinionsQhdEnums.values();
	23	+ for (HandleOpinionsQhdEnums value : values) {
	24	+ if (value.getId() == id) {
	25	+ return value;
	26	+ }
	27	+ }
	28	+ return null;
	29	+ }
	30	+
	31	+ public static String getName(String id) {
	32	+ if(StringUtils.isEmpty(id)) {
	33	+ return null;
	34	+ }
	35	+ int i = Integer.parseInt(id);
	36	+ HandleOpinionsQhdEnums[] values = HandleOpinionsQhdEnums.values();
	37	+ for (HandleOpinionsQhdEnums value : values) {
	38	+ if (value.id == i) {
	39	+ return value.name;
	40	+ }
	41	+ }
	42	+ return null;
	43	+ }
	44	+
	45	+ HandleOpinionsQhdEnums(Integer id, String name){
	46	+ this.id = id;
	47	+ this.name = name;
	48	+ }
	49	+
	50	+ public Integer getId() {
	51	+ return id;
	52	+ }
	53	+
	54	+ public void setId(Integer id) {
	55	+ this.id = id;
	56	+ }
	57	+
	58	+ public String getName() {
	59	+ return name;
	60	+ }
	61	+
	62	+ public void setName(String name) {
	63	+ this.name = name;
	64	+ }
	65	+
	66	+}

...	...	@@ -143,6 +143,11 @@
143	143	*/
144	144	private String handleOpinionsId;
145	145
	146	+ /*
	147	+ 秦皇岛处理意见定制
	148	+ */
	149	+ private List<String> handleOpinionsIdList;
	150	+
146	151	/**
147	152	* 指导意见
148	153	*/
...	...	@@ -324,6 +329,14 @@
324	329
325	330	//合作 0欠合作 1不合作
326	331	private String cooperation;
	332	+
	333	+ public List<String> getHandleOpinionsIdList() {
	334	+ return handleOpinionsIdList;
	335	+ }
	336	+
	337	+ public void setHandleOpinionsIdList(List<String> handleOpinionsIdList) {
	338	+ this.handleOpinionsIdList = handleOpinionsIdList;
	339	+ }
327	340
328	341	public Integer getVisionJudgment1() {
329	342	return visionJudgment1;

...	...	@@ -593,7 +593,7 @@
593	593	}
594	594	}
595	595
596		- if (StringUtils.isNotEmpty(sieveType)) {
	596	+ /* if (StringUtils.isNotEmpty(sieveType)) {
597	597	// sieveType = null/1 血清学筛查
598	598	if ("1".equals(sieveType)) {
599	599	MongoCondition c = MongoCondition.newInstance();
600	600
...	...	@@ -609,8 +609,10 @@
609	609	else {
610	610	condition = condition.and("sieveType", sieveType, MongoOper.IS);
611	611	}
	612	+ }*/
	613	+ if (null != sieveType) {
	614	+ condition = condition.and("sieveType", sieveType, MongoOper.IS);
612	615	}
613		-
614	616
615	617	if (StringUtils.isNotEmpty(costType)) {
616	618	// costType = null/1 免费

...	...	@@ -78,9 +78,10 @@
78	78	List<Map<String, Object>> addSubtract = EnumUtil.toJson(AddSubtractEnums.class); /** (+) (一) 其他 */
79	79	List<Map<String, Object>> checkMonth = EnumUtil.toJson(CheckMonthEnums.class); /** (检查时间 */
80	80	List<Map<String, Object>> highRisk = EnumUtil.toJson(EyeHighRiskEnums.class); /** 眼保健高危因素 */
	81	+ List<Map<String, Object>> highRiskQhd = EnumUtil.toJson(HandleOpinionsQhdEnums.class); /** 眼保健高危因素 */
81	82	List<Map<String, Object>> handleOpinions = EnumUtil.toJson(HandleOpinionsEnums.class); /** 处理意见 */
82	83	List<Map<String, Object>> eyePosition = EnumUtil.toJson(EyePositionEnums.class); /** 处理意见 */
83		- return RespBuilder.buildSuccess("eyePosition", eyePosition, "addSubtract", addSubtract, "checkMonth", checkMonth, "highRisk", highRisk, "handleOpinions", handleOpinions);
	84	+ return RespBuilder.buildSuccess("eyePosition", eyePosition, "addSubtract", addSubtract, "checkMonth", checkMonth, "highRisk", highRisk, "highRiskQhd", highRiskQhd,"handleOpinions", handleOpinions);
84	85	}
85	86
86	87	@Override
...	...	@@ -237,6 +238,7 @@
237	238	map.put("doctor", couponMapper.getUserName(doctor));
238	239	}
239	240	map.put("handleOpinionsId", HandleOpinionsEnums.getName(babyEyeCheck.getHandleOpinionsId()));
	241	+ map.put("handleOpinionsIdList", babyEyeCheck.getHandleOpinionsIdList());//秦皇岛眼保健新增的，保存是id，返回也是id
240	242	List<String> riskFactorNames = EyeHighRiskEnums.getName(babyEyeCheck.getRiskFactorId());
241	243	if (CollectionUtils.isNotEmpty(riskFactorNames)) {
242	244	for (int i = 0; i < riskFactorNames.size(); i++) {