jiangjiazhi / regional-platform

Commit 6e05c6c840fece148e7f20dddaa16d3f143be6fa

Authored by litao@lymsh.com about 8 years ago

Exists in master and in 6 other branches

修复bug

Showing 2 changed files with 133 additions and 3 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthEnums2.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 CheckMonthEnums2 {
	9	+ I1(1, "1月龄"),
	10	+ I2(2, "2月龄"),
	11	+ I3(3, "3月龄"),
	12	+ I4(4, "4月龄"),
	13	+ I5(5, "5月龄"),
	14	+ I6(6, "6月龄"),
	15	+ I7(7, "7月龄"),
	16	+ I8(8, "8月龄"),
	17	+ I9(9, "9月龄"),
	18	+ I10(10, "10月龄"),
	19	+ I11(11, "11月龄"),
	20	+ I12(12, "12月龄"),
	21	+ I13(13, "13月龄"),
	22	+ I14(14, "14月龄"),
	23	+ I15(15, "15月龄"),
	24	+ I16(16, "16月龄"),
	25	+ I17(17, "17月龄"),
	26	+ I18(18, "18月龄"),
	27	+ I19(19, "19月龄"),
	28	+ I20(20, "20月龄"),
	29	+ I21(21, "21月龄"),
	30	+ I22(22, "22月龄"),
	31	+ I23(23, "23月龄"),
	32	+ I24(24, "24月龄"),
	33	+ I25(25, "25月龄"),
	34	+ I26(26, "26月龄"),
	35	+ I27(27, "27月龄"),
	36	+ I28(28, "28月龄"),
	37	+ I29(29, "29月龄"),
	38	+ I30(30, "30月龄"),
	39	+ I31(31, "31月龄"),
	40	+ I32(32, "32月龄"),
	41	+ I33(33, "33月龄"),
	42	+ I34(34, "34月龄"),
	43	+ I35(35, "35月龄"),
	44	+ I36(36, "36月龄"),
	45	+ I37(37, "37月龄"),
	46	+ I38(38, "38月龄"),
	47	+ I39(39, "39月龄"),
	48	+ I40(40, "40月龄"),
	49	+ I41(41, "41月龄"),
	50	+ I42(42, "42月龄"),
	51	+ I43(43, "43月龄"),
	52	+ I44(44, "44月龄"),
	53	+ I45(45, "45月龄"),
	54	+ I46(46, "46月龄"),
	55	+ I47(47, "47月龄"),
	56	+ I48(48, "48月龄"),
	57	+ I49(49, "49月龄"),
	58	+ I50(50, "50月龄"),
	59	+ I51(51, "51月龄"),
	60	+ I52(52, "52月龄"),
	61	+ I53(53, "53月龄"),
	62	+ I54(54, "54月龄"),
	63	+ I55(55, "55月龄"),
	64	+ I56(56, "56月龄"),
	65	+ I57(57, "57月龄"),
	66	+ I58(58, "58月龄"),
	67	+ I59(59, "59月龄"),
	68	+ I60(60, "60月龄"),
	69	+ I61(61, "61月龄"),
	70	+ I62(62, "62月龄"),
	71	+ I63(63, "63月龄"),
	72	+ I64(64, "64月龄"),
	73	+ I65(65, "65月龄"),
	74	+ I66(66, "66月龄"),
	75	+ I67(67, "67月龄"),
	76	+ I68(68, "68月龄"),
	77	+ I69(69, "69月龄"),
	78	+ I70(70, "70月龄"),
	79	+ I71(71, "71月龄"),
	80	+ I72(72, "72月龄");
	81	+
	82	+ private Integer id;
	83	+ private String name;
	84	+
	85	+ public static CheckMonthEnums2 get(Integer id) {
	86	+ CheckMonthEnums2[] values = CheckMonthEnums2.values();
	87	+ for (CheckMonthEnums2 value : values) {
	88	+ if (value.getId() == id) {
	89	+ return value;
	90	+ }
	91	+ }
	92	+ return null;
	93	+ }
	94	+
	95	+ public static String getName(String id) {
	96	+ if(StringUtils.isEmpty(id)) {
	97	+ return null;
	98	+ }
	99	+ int i = Integer.parseInt(id);
	100	+ CheckMonthEnums2[] values = CheckMonthEnums2.values();
	101	+ for (CheckMonthEnums2 value : values) {
	102	+ if (value.id == i) {
	103	+ return value.name;
	104	+ }
	105	+ }
	106	+ return null;
	107	+ }
	108	+
	109	+ CheckMonthEnums2(Integer id, String name){
	110	+ this.id = id;
	111	+ this.name = name;
	112	+ }
	113	+
	114	+ public Integer getId() {
	115	+ return id;
	116	+ }
	117	+
	118	+ public void setId(Integer id) {
	119	+ this.id = id;
	120	+ }
	121	+
	122	+ public String getName() {
	123	+ return name;
	124	+ }
	125	+
	126	+ public void setName(String name) {
	127	+ this.name = name;
	128	+ }
	129	+
	130	+}

...	...	@@ -192,7 +192,7 @@
192	192	map.put("pupillaryRightReflex", parseYinYang(babyEyeCheck.getPupillaryRightReflex()));
193	193	map.put("pupillaryLeftReflex", parseYinYang(babyEyeCheck.getPupillaryLeftReflex()));
194	194	map.put("redRightReflex", parseYinYang(babyEyeCheck.getRedRightReflex()));
195		- map.put("eyePositionId", EyePositionEnums.getName(babyEyeCheck.getEyePositionId()));
	195	+ map.put("eyePositionId", EyePositionEnums.getName(babyEyeCheck.getEyePositionId()) + (StringUtils.isNotEmpty(babyEyeCheck.getEyePositionOther()) ? "：" + babyEyeCheck.getEyePositionOther() : ""));
196	196	map.put("redLeftReflex", parseYinYang(babyEyeCheck.getRedLeftReflex()));
197	197	map.put("redReflex", parseYinYang(babyEyeCheck.getRedReflex(), babyEyeCheck.getRedReflexOther()));
198	198	map.put("conjunctiva", parseYinYang(babyEyeCheck.getConjunctiva(), babyEyeCheck.getConjunctivaOther()));
...	...	@@ -426,7 +426,7 @@
426	426	return RespBuilder.buildSuccess();
427	427	}
428	428	List<BabyEyeCheck> babyEyeChecks = mongoTemplate.find(Query.query(Criteria.where("babyId").is(babyId).and("hospitalId").in(hospitalIds).and("yn").ne("0"))
429		- .with(new Sort(Sort.Direction.DESC, "checkTime")), BabyEyeCheck.class);
	429	+ .with(new Sort(Sort.Direction.ASC, "checkTime")), BabyEyeCheck.class);
430	430	List<Map<String, Object>> rest = new ArrayList<>();
431	431	for (BabyEyeCheck babyEyeCheck : babyEyeChecks) {
432	432	Map<String, Object> temp = new HashMap<>();
...	...	@@ -450,7 +450,7 @@
450	450
451	451	@Override
452	452	public BaseResponse listInit() {
453		- List<Map<String, Object>> checkMonth = EnumUtil.toJson(CheckMonthEnums.class); /** 检查月龄 */
	453	+ List<Map<String, Object>> checkMonth = EnumUtil.toJson(CheckMonthEnums2.class); /** 检查月龄 */
454	454	List<Map<String, Object>> positive = new ArrayList<>(); /** 阳性项目 */
455	455
456	456	Map<String, Object> extEyelookMap = new HashMap<>();