Commit 4a078f55fa5e0d50dc6413be748c4077d01ed5aa
1 parent
620708068a
Exists in
master
and in
6 other branches
update
Showing 8 changed files with 315 additions and 30 deletions
- platform-common/src/main/java/com/lyms/platform/common/enums/QhdBasicOrganization.java
- platform-common/src/main/java/com/lyms/platform/common/enums/QhdKindergarten.java
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
- platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
platform-common/src/main/java/com/lyms/platform/common/enums/QhdBasicOrganization.java
View file @
4a078f5
1 | +package com.lyms.platform.common.enums; | |
2 | + | |
3 | +import java.util.HashMap; | |
4 | +import java.util.Map; | |
5 | + | |
6 | +public enum QhdBasicOrganization { | |
7 | + //基层机构 | |
8 | + basic1(1,"山海关区 "), | |
9 | + basic2(2,"开发区"), | |
10 | + basic3(3,"抚宁区"), | |
11 | + basic4(4,"昌黎县"), | |
12 | + basic5(5,"青龙县"), | |
13 | + basic6(6,"卢龙县"); | |
14 | + private Integer id; | |
15 | + private String name; | |
16 | + | |
17 | + public Integer getId() { | |
18 | + return id; | |
19 | + } | |
20 | + | |
21 | + public void setId(Integer id) { | |
22 | + this.id = id; | |
23 | + } | |
24 | + | |
25 | + public String getName() { | |
26 | + return name; | |
27 | + } | |
28 | + | |
29 | + public void setName(String name) { | |
30 | + this.name = name; | |
31 | + } | |
32 | + | |
33 | + private QhdBasicOrganization(Integer id, String name) { | |
34 | + this.id = id; | |
35 | + this.name = name; | |
36 | + } | |
37 | + | |
38 | + public static String getName(Integer id){ | |
39 | + if(null!=id){ | |
40 | + for (QhdBasicOrganization value : values()) { | |
41 | + if (id == value.getId()) { | |
42 | + return value.getName(); | |
43 | + } | |
44 | + } | |
45 | + } | |
46 | + return null; | |
47 | + } | |
48 | + public static Map<Integer,String> getMap() { | |
49 | + Map<Integer,String> map =new HashMap<>(); | |
50 | + for (QhdBasicOrganization value : values()) { | |
51 | + map.put(value.getId(), value.getName()); | |
52 | + } | |
53 | + return map; | |
54 | + } | |
55 | +} |
platform-common/src/main/java/com/lyms/platform/common/enums/QhdKindergarten.java
View file @
4a078f5
1 | +package com.lyms.platform.common.enums; | |
2 | + | |
3 | +import java.util.HashMap; | |
4 | +import java.util.Map; | |
5 | + | |
6 | +public enum QhdKindergarten { | |
7 | + | |
8 | + //幼儿园 | |
9 | + kid1( 1, "燕山大街办事处幼儿园"), | |
10 | + kid2( 2, "海鸥幼儿园"), | |
11 | + kid3( 3, "昌黎幼儿园"), | |
12 | + kid4( 4, "金色阳光幼儿园"), | |
13 | + kid5( 5, "金鹰幼儿园"), | |
14 | + kid6( 6, "沃龙幼儿园"), | |
15 | + kid7( 7, "抚宁老园幼儿园"), | |
16 | + kid8( 8, "抚宁新园幼儿园"), | |
17 | + kid9( 9, "北戴河育花路幼儿园"), | |
18 | + kid10(10, "紫金红衫树幼儿园"), | |
19 | + kid11(11, "山海关古城幼儿园"), | |
20 | + kid12(12, "北一幼幼儿园"), | |
21 | + kid13(13, "兴华幼儿园"), | |
22 | + kid14(14, "奥体中心幼儿园"), | |
23 | + kid15(15, "小海星三园幼儿园"), | |
24 | + kid16(16, "开发区眀德幼儿园"), | |
25 | + kid17(17, "红杉树生态谷幼儿园"), | |
26 | + kid18(18, "建设路幼儿园"), | |
27 | + kid19(19, "91404幼儿园"), | |
28 | + kid20(20, "红杉树龙溪幼儿园"), | |
29 | + kid21(21, "盛秦福地天元幼儿园"), | |
30 | + kid22(22, "卢龙幼儿园"), | |
31 | + kid23(23, "东方明珠幼儿园"), | |
32 | + kid24(24, "大风车幼儿园"), | |
33 | + kid25(25, "阳光宝贝幼儿园"), | |
34 | + kid26(26, "博奥幼儿园"), | |
35 | + kid27(27, "和安里天元幼儿园"), | |
36 | + kid28(28, "天宝幼儿园"), | |
37 | + kid29(29, "兴桐幼儿园"), | |
38 | + kid30(30, "萌芽幼儿园"), | |
39 | + kid31(31, "世极城堡幼儿园"), | |
40 | + kid32(32, "力迈幼儿园"), | |
41 | + kid33(33, "紫金红衫树幼儿园"), | |
42 | + kid34(34, "海后幼儿园"), | |
43 | + kid35(35, "小树苗幼儿园"), | |
44 | + kid36(36, "和平里幼儿园"), | |
45 | + kid37(37, "阳光宝贝幼儿园"), | |
46 | + kid38(38, "晨曦幼儿园"), | |
47 | + kid39(39, "星宿幼儿园"), | |
48 | + kid40(40, "驻操营幼儿园"), | |
49 | + kid41(41, "电力幼儿园"), | |
50 | + kid42(42, "清华园双语幼儿园"), | |
51 | + kid43(43, "市一幼幼儿园"), | |
52 | + kid44(44, "山桥幼儿园"), | |
53 | + kid45(45, "云河幼儿园"), | |
54 | + kid46(46, "燕大一幼幼儿园"), | |
55 | + kid47(47, "港二幼儿园"), | |
56 | + kid48(48, "普鑫幼儿园"), | |
57 | + kid49(49, "红黄蓝幼儿园"), | |
58 | + kid50(50, "剑桥幼儿园"), | |
59 | + kid51(51, "贝儿首府幼儿园"), | |
60 | + kid52(52, "文化里幼儿园"), | |
61 | + kid53(53, "开发区幼儿园"), | |
62 | + kid54(54, "白塔岭幼儿园"), | |
63 | + kid55(55, "启航幼儿园"), | |
64 | + kid56(56, "为明幼儿园"), | |
65 | + kid57(57, "先盛里幼儿园"), | |
66 | + kid58(58, "新一路幼儿园"), | |
67 | + kid59(59, "热电里幼儿园"), | |
68 | + kid60(60, "希望幼儿园"), | |
69 | + kid61(61, "滨海城巧娃幼儿园"), | |
70 | + kid62(62, "杜庄幼儿园"), | |
71 | + kid63(63, "小海星一园幼儿园"), | |
72 | + kid64(64, "河东福娃幼儿园"), | |
73 | + kid65(65, "南园幼儿园"), | |
74 | + kid66(66, "小海星四园幼儿园"), | |
75 | + kid67(67, "北二幼幼儿园"), | |
76 | + kid68(68, "燕大二幼幼儿园"), | |
77 | + kid69(69, "滨河湾幼儿园"), | |
78 | + kid70(70, "交运里幼儿园"), | |
79 | + kid71(71, "星光幼儿园"); | |
80 | + private Integer id; | |
81 | + private String name; | |
82 | + | |
83 | + public Integer getId() { | |
84 | + return id; | |
85 | + } | |
86 | + | |
87 | + public void setId(Integer id) { | |
88 | + this.id = id; | |
89 | + } | |
90 | + | |
91 | + public String getName() { | |
92 | + return name; | |
93 | + } | |
94 | + | |
95 | + public void setName(String name) { | |
96 | + this.name = name; | |
97 | + } | |
98 | + | |
99 | + private QhdKindergarten(Integer id, String name) { | |
100 | + this.id = id; | |
101 | + this.name = name; | |
102 | + } | |
103 | + | |
104 | + public static String getName(Integer id){ | |
105 | + if(null!=id){ | |
106 | + for (QhdKindergarten value : values()) { | |
107 | + if (id == value.getId()) { | |
108 | + return value.getName(); | |
109 | + } | |
110 | + } | |
111 | + } | |
112 | + return null; | |
113 | + } | |
114 | + public static Map<Integer,String> getMap() { | |
115 | + Map<Integer,String> map =new HashMap<>(); | |
116 | + for (QhdKindergarten value : values()) { | |
117 | + map.put(value.getId(), value.getName()); | |
118 | + } | |
119 | + return map; | |
120 | + } | |
121 | +} |
platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
View file @
4a078f5
1 | 1 | package com.lyms.platform.pojo; |
2 | 2 | |
3 | 3 | import com.lyms.platform.beans.SerialIdEnum; |
4 | +import com.lyms.platform.common.enums.QhdBasicOrganization; | |
5 | +import com.lyms.platform.common.enums.QhdKindergarten; | |
4 | 6 | import com.lyms.platform.common.result.BaseModel; |
5 | 7 | import org.springframework.data.mongodb.core.mapping.Document; |
6 | 8 | |
7 | -import java.util.Date; | |
8 | -import java.util.List; | |
9 | -import java.util.Map; | |
9 | +import java.lang.reflect.Array; | |
10 | +import java.util.*; | |
10 | 11 | |
11 | 12 | /** |
12 | 13 | * 儿童眼保健检查 |
... | ... | @@ -440,9 +441,9 @@ |
440 | 441 | private String babySource; //来源多选 1:健康查体 2:幼儿园转诊 3:基层转诊 4:本院 |
441 | 442 | private Integer healthCheckType;//1:健康查体: 1:散居、2:整体 |
442 | 443 | private String healthCheckTypeScattered; //1:散居(手输) |
443 | - private String healthCheckTypeWhole; //2:整体(直接存选中的名字) | |
444 | - private String kindergarten;//2:幼儿园转诊--幼儿园机构(直接存选中的名字) | |
445 | - private String basicOrganization;//3:基层转诊--基层机构(直接存选中的名字) | |
444 | + private Integer healthCheckTypeWhole; //2:整体--幼儿园机构 | |
445 | + private Integer kindergarten;//2:幼儿园转诊--幼儿园机构 | |
446 | + private Integer basicOrganization;//3:基层转诊--基层机构 | |
446 | 447 | |
447 | 448 | public String getBabySource() { |
448 | 449 | return babySource; |
449 | 450 | |
450 | 451 | |
451 | 452 | |
452 | 453 | |
453 | 454 | |
... | ... | @@ -468,27 +469,27 @@ |
468 | 469 | this.healthCheckTypeScattered = healthCheckTypeScattered; |
469 | 470 | } |
470 | 471 | |
471 | - public String getHealthCheckTypeWhole() { | |
472 | + public Integer getHealthCheckTypeWhole() { | |
472 | 473 | return healthCheckTypeWhole; |
473 | 474 | } |
474 | 475 | |
475 | - public void setHealthCheckTypeWhole(String healthCheckTypeWhole) { | |
476 | + public void setHealthCheckTypeWhole(Integer healthCheckTypeWhole) { | |
476 | 477 | this.healthCheckTypeWhole = healthCheckTypeWhole; |
477 | 478 | } |
478 | 479 | |
479 | - public String getKindergarten() { | |
480 | + public Integer getKindergarten() { | |
480 | 481 | return kindergarten; |
481 | 482 | } |
482 | 483 | |
483 | - public void setKindergarten(String kindergarten) { | |
484 | + public void setKindergarten(Integer kindergarten) { | |
484 | 485 | this.kindergarten = kindergarten; |
485 | 486 | } |
486 | 487 | |
487 | - public String getBasicOrganization() { | |
488 | + public Integer getBasicOrganization() { | |
488 | 489 | return basicOrganization; |
489 | 490 | } |
490 | 491 | |
491 | - public void setBasicOrganization(String basicOrganization) { | |
492 | + public void setBasicOrganization(Integer basicOrganization) { | |
492 | 493 | this.basicOrganization = basicOrganization; |
493 | 494 | } |
494 | 495 | |
... | ... | @@ -1442,5 +1443,6 @@ |
1442 | 1443 | public void setDisplayState(String displayState) { |
1443 | 1444 | this.displayState = displayState; |
1444 | 1445 | } |
1446 | + | |
1445 | 1447 | } |
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java
View file @
4a078f5
... | ... | @@ -9,6 +9,7 @@ |
9 | 9 | import java.util.Date; |
10 | 10 | import java.util.List; |
11 | 11 | import java.util.Map; |
12 | +import java.util.Objects; | |
12 | 13 | |
13 | 14 | /** |
14 | 15 | * 新生儿模型 |
... | ... | @@ -640,7 +641,7 @@ |
640 | 641 | } |
641 | 642 | /****************************************/ |
642 | 643 | |
643 | - /** | |
644 | + /**************************************** | |
644 | 645 | * 秦皇岛 |
645 | 646 | * 儿童眼保健检查-新增页面 检查套餐上面加“来源”这四类可以多选。 |
646 | 647 | * 第1类:健康查体 又分为 ,散居 手动输入 ,整体 选择幼儿园机构(院方提供商的幼儿园数据) |
... | ... | @@ -651,9 +652,9 @@ |
651 | 652 | private String babySource; //来源多选 1:健康查体 2:幼儿园转诊 3:基层转诊 4:本院 |
652 | 653 | private Integer healthCheckType;//1:健康查体: 1:散居、2:整体 |
653 | 654 | private String healthCheckTypeScattered; //1:散居(手输) |
654 | - private String healthCheckTypeWhole; //2:整体(直接存选中的名字) | |
655 | - private String kindergarten;//2:幼儿园转诊--幼儿园机构(直接存选中的名字) | |
656 | - private String basicOrganization;//3:基层转诊--基层机构(直接存选中的名字) | |
655 | + private Integer healthCheckTypeWhole; //2:整体--幼儿园机构 | |
656 | + private Integer kindergarten;//2:幼儿园转诊--幼儿园机构 | |
657 | + private Integer basicOrganization;//3:基层转诊--基层机构 | |
657 | 658 | |
658 | 659 | public String getBabySource() { |
659 | 660 | return babySource; |
660 | 661 | |
661 | 662 | |
662 | 663 | |
663 | 664 | |
664 | 665 | |
... | ... | @@ -679,27 +680,27 @@ |
679 | 680 | this.healthCheckTypeScattered = healthCheckTypeScattered; |
680 | 681 | } |
681 | 682 | |
682 | - public String getHealthCheckTypeWhole() { | |
683 | + public Integer getHealthCheckTypeWhole() { | |
683 | 684 | return healthCheckTypeWhole; |
684 | 685 | } |
685 | 686 | |
686 | - public void setHealthCheckTypeWhole(String healthCheckTypeWhole) { | |
687 | + public void setHealthCheckTypeWhole(Integer healthCheckTypeWhole) { | |
687 | 688 | this.healthCheckTypeWhole = healthCheckTypeWhole; |
688 | 689 | } |
689 | 690 | |
690 | - public String getKindergarten() { | |
691 | + public Integer getKindergarten() { | |
691 | 692 | return kindergarten; |
692 | 693 | } |
693 | 694 | |
694 | - public void setKindergarten(String kindergarten) { | |
695 | + public void setKindergarten(Integer kindergarten) { | |
695 | 696 | this.kindergarten = kindergarten; |
696 | 697 | } |
697 | 698 | |
698 | - public String getBasicOrganization() { | |
699 | + public Integer getBasicOrganization() { | |
699 | 700 | return basicOrganization; |
700 | 701 | } |
701 | 702 | |
702 | - public void setBasicOrganization(String basicOrganization) { | |
703 | + public void setBasicOrganization(Integer basicOrganization) { | |
703 | 704 | this.basicOrganization = basicOrganization; |
704 | 705 | } |
705 | 706 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
View file @
4a078f5
... | ... | @@ -2,12 +2,14 @@ |
2 | 2 | |
3 | 3 | import com.lyms.platform.common.annotation.TokenRequired; |
4 | 4 | import com.lyms.platform.common.base.BaseController; |
5 | +import com.lyms.platform.common.enums.QhdBasicOrganization; | |
6 | +import com.lyms.platform.common.enums.QhdKindergarten; | |
5 | 7 | import com.lyms.platform.common.result.BaseResponse; |
8 | +import com.lyms.platform.common.result.RespBuilder; | |
6 | 9 | import com.lyms.platform.common.utils.StringUtils; |
7 | 10 | import com.lyms.platform.operate.web.request.PatientSignRequest; |
8 | 11 | import com.lyms.platform.operate.web.service.BabyEyeCheckService; |
9 | 12 | import com.lyms.platform.pojo.BabyEyeCheck; |
10 | -import com.lyms.platform.pojo.BabyEyePatient; | |
11 | 13 | import org.springframework.beans.factory.annotation.Autowired; |
12 | 14 | import org.springframework.stereotype.Controller; |
13 | 15 | import org.springframework.web.bind.annotation.*; |
... | ... | @@ -16,6 +18,8 @@ |
16 | 18 | import javax.servlet.http.HttpServletResponse; |
17 | 19 | import javax.validation.Valid; |
18 | 20 | import java.util.Date; |
21 | +import java.util.HashMap; | |
22 | +import java.util.Map; | |
19 | 23 | |
20 | 24 | /** |
21 | 25 | * 眼保健检查 |
... | ... | @@ -228,6 +232,18 @@ |
228 | 232 | @RequestMapping(value = "/getBabyEyeCheckInfo", method = RequestMethod.GET) |
229 | 233 | public BaseResponse getBabyEyeCheckInfo(HttpServletRequest request,@RequestParam String hospitalId,@RequestParam String babyId) { |
230 | 234 | return babyEyeCheckService.getBabyEyeCheckInfo(hospitalId,babyId); |
235 | + } | |
236 | + /** | |
237 | + * 用于秦皇岛 来源 模块 幼儿园和机构的数据源 | |
238 | + * @return | |
239 | + */ | |
240 | + @ResponseBody | |
241 | + @RequestMapping(value = "/getQhdBabySource", method = RequestMethod.GET) | |
242 | + public BaseResponse getQhdBabySource() { | |
243 | + Map<String, Map<Integer, String>> map=new HashMap<>(); | |
244 | + map.put("QhdKindergarten", QhdKindergarten.getMap()); | |
245 | + map.put("QhdBasicOrganization", QhdBasicOrganization.getMap()); | |
246 | + return RespBuilder.buildSuccess(map); | |
231 | 247 | } |
232 | 248 | |
233 | 249 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java
View file @
4a078f5
... | ... | @@ -1648,6 +1648,13 @@ |
1648 | 1648 | |
1649 | 1649 | base.setBabyDiagnosis(model.getBabyDiagnosis()); |
1650 | 1650 | |
1651 | + //秦皇岛 来源模块 | |
1652 | + base.setBabySource(StringUtils.isNotEmpty(model.getBabySource())?model.getBabySource():null); | |
1653 | + base.setHealthCheckType(null!=model.getHealthCheckType()?model.getHealthCheckType():null); | |
1654 | + base.setHealthCheckTypeScattered(StringUtils.isNotEmpty(model.getHealthCheckTypeScattered())?model.getHealthCheckTypeScattered():null); | |
1655 | + base.setHealthCheckTypeWhole(null!=model.getHealthCheckTypeWhole()?model.getHealthCheckTypeWhole():null); | |
1656 | + base.setKindergarten(null!=model.getKindergarten()?model.getKindergarten():null); | |
1657 | + base.setBasicOrganization(null!=model.getBasicOrganization()?model.getBasicOrganization():null); | |
1651 | 1658 | |
1652 | 1659 | } |
1653 | 1660 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBasicResult.java
View file @
4a078f5
... | ... | @@ -111,6 +111,71 @@ |
111 | 111 | //儿童高危-其它高危 |
112 | 112 | private String wcOtherHighRisk; |
113 | 113 | |
114 | + /**************************************** | |
115 | + * 秦皇岛 | |
116 | + * 儿童眼保健检查-新增页面 检查套餐上面加“来源”这四类可以多选。 | |
117 | + * 第1类:健康查体 又分为 ,散居 手动输入 ,整体 选择幼儿园机构(院方提供商的幼儿园数据) | |
118 | + * 第2类:幼儿园转诊 选择幼儿园机构(院方提供幼儿园数据) | |
119 | + * 第3类:基层转诊 选择基层机构(院方提供基层数据) | |
120 | + * 第4类:本院 | |
121 | + */ | |
122 | + private String babySource; //来源多选 1:健康查体 2:幼儿园转诊 3:基层转诊 4:本院 | |
123 | + private Integer healthCheckType;//1:健康查体: 1:散居、2:整体 | |
124 | + private String healthCheckTypeScattered; //1:散居(手输) | |
125 | + private Integer healthCheckTypeWhole; //2:整体--幼儿园机构 | |
126 | + private Integer kindergarten;//2:幼儿园转诊--幼儿园机构 | |
127 | + private Integer basicOrganization;//3:基层转诊--基层机构 | |
128 | + | |
129 | + public String getBabySource() { | |
130 | + return babySource; | |
131 | + } | |
132 | + | |
133 | + public void setBabySource(String babySource) { | |
134 | + this.babySource = babySource; | |
135 | + } | |
136 | + | |
137 | + public Integer getHealthCheckType() { | |
138 | + return healthCheckType; | |
139 | + } | |
140 | + | |
141 | + public void setHealthCheckType(Integer healthCheckType) { | |
142 | + this.healthCheckType = healthCheckType; | |
143 | + } | |
144 | + | |
145 | + public String getHealthCheckTypeScattered() { | |
146 | + return healthCheckTypeScattered; | |
147 | + } | |
148 | + | |
149 | + public void setHealthCheckTypeScattered(String healthCheckTypeScattered) { | |
150 | + this.healthCheckTypeScattered = healthCheckTypeScattered; | |
151 | + } | |
152 | + | |
153 | + public Integer getHealthCheckTypeWhole() { | |
154 | + return healthCheckTypeWhole; | |
155 | + } | |
156 | + | |
157 | + public void setHealthCheckTypeWhole(Integer healthCheckTypeWhole) { | |
158 | + this.healthCheckTypeWhole = healthCheckTypeWhole; | |
159 | + } | |
160 | + | |
161 | + public Integer getKindergarten() { | |
162 | + return kindergarten; | |
163 | + } | |
164 | + | |
165 | + public void setKindergarten(Integer kindergarten) { | |
166 | + this.kindergarten = kindergarten; | |
167 | + } | |
168 | + | |
169 | + public Integer getBasicOrganization() { | |
170 | + return basicOrganization; | |
171 | + } | |
172 | + | |
173 | + public void setBasicOrganization(Integer basicOrganization) { | |
174 | + this.basicOrganization = basicOrganization; | |
175 | + } | |
176 | + | |
177 | + /****************************************/ | |
178 | + | |
114 | 179 | public String getWcOtherHighRisk() { |
115 | 180 | return wcOtherHighRisk; |
116 | 181 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java
View file @
4a078f5
... | ... | @@ -310,6 +310,25 @@ |
310 | 310 | Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyEyeCheck)); |
311 | 311 | mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyEyeCheck.getId())), update, BabyEyeCheck.class); |
312 | 312 | |
313 | + //该儿童来源修改后需同步更新该儿童的所有检查纪录来源 | |
314 | + if(StringUtils.isNotEmpty(babyEyeCheck.getBabySource())|| | |
315 | + null!=babyEyeCheck.getHealthCheckType()|| | |
316 | + StringUtils.isNotEmpty(babyEyeCheck.getHealthCheckTypeScattered())|| | |
317 | + null!=babyEyeCheck.getHealthCheckTypeWhole()|| | |
318 | + null!=babyEyeCheck.getKindergarten()|| | |
319 | + null!=babyEyeCheck.getBasicOrganization() | |
320 | + ){ | |
321 | + Map<String,Object> map=new HashMap<>(); | |
322 | + map.put("babySource", StringUtils.isNotEmpty(babyEyeCheck.getBabySource())?babyEyeCheck.getBabySource():null); | |
323 | + map.put("healthCheckType", null!=babyEyeCheck.getHealthCheckType()?babyEyeCheck.getHealthCheckType():null); | |
324 | + map.put("healthCheckTypeScattered", StringUtils.isNotEmpty(babyEyeCheck.getHealthCheckTypeScattered())?babyEyeCheck.getHealthCheckTypeScattered():null); | |
325 | + map.put("healthCheckTypeWhole", null!=babyEyeCheck.getHealthCheckTypeWhole()?babyEyeCheck.getHealthCheckTypeWhole():null); | |
326 | + map.put("kindergarten", null!=babyEyeCheck.getKindergarten()?babyEyeCheck.getKindergarten():null); | |
327 | + map.put("basicOrganization", null!=babyEyeCheck.getBasicOrganization()?babyEyeCheck.getBasicOrganization():null); | |
328 | + Update update2=MongoConvertHelper.convertToNativeUpdate(map); | |
329 | + mongoTemplate.updateFirst(Query.query(Criteria.where("babyId").is(babyEyeCheck.getBabyId())), update2, BabyEyeCheck.class); | |
330 | + } | |
331 | + | |
313 | 332 | BabyModel babyModel = mongoTemplate.findById(babyEyeCheck.getBabyId(), BabyModel.class); |
314 | 333 | if (babyModel != null) { |
315 | 334 | redundancyBabyCheck(babyEyeCheck, babyModel, "UPDATE"); |
... | ... | @@ -453,12 +472,12 @@ |
453 | 472 | babyModel.setHealthCheckType(null==babyEyeCheck.getHealthCheckType()?null:babyEyeCheck.getHealthCheckType()); |
454 | 473 | //1:散居(手输) |
455 | 474 | babyModel.setHealthCheckTypeScattered(StringUtils.isEmpty(babyEyeCheck.getHealthCheckTypeScattered())?null:babyEyeCheck.getHealthCheckTypeScattered()); |
456 | - //2:整体(直接存选中的名字) | |
457 | - babyModel.setHealthCheckTypeWhole(StringUtils.isEmpty(babyEyeCheck.getHealthCheckTypeWhole())?null:babyEyeCheck.getHealthCheckTypeWhole()); | |
458 | - //2:幼儿园转诊--幼儿园机构(直接存选中的名字) | |
459 | - babyModel.setKindergarten(StringUtils.isEmpty(babyEyeCheck.getKindergarten())?null:babyEyeCheck.getKindergarten()); | |
460 | - //3:基层转诊--基层机构(直接存选中的名字) | |
461 | - babyModel.setBasicOrganization(StringUtils.isEmpty(babyEyeCheck.getBasicOrganization())?null:babyEyeCheck.getBasicOrganization()); | |
475 | + //2:整体 | |
476 | + babyModel.setHealthCheckTypeWhole( null==babyEyeCheck.getHealthCheckTypeWhole()?null:babyEyeCheck.getHealthCheckTypeWhole()); | |
477 | + //2:幼儿园转诊--幼儿园机构 | |
478 | + babyModel.setKindergarten(null== babyEyeCheck.getKindergarten()?null:babyEyeCheck.getKindergarten()); | |
479 | + //3:基层转诊--基层机构 | |
480 | + babyModel.setBasicOrganization(null== babyEyeCheck.getBasicOrganization()?null:babyEyeCheck.getBasicOrganization()); | |
462 | 481 | |
463 | 482 | Update update = MongoConvertHelper.convertToNativeUpdate(ReflectionUtils.getUpdateField(babyModel)); |
464 | 483 | mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(babyModel.getId())), update, BabyModel.class); |
... | ... | @@ -847,7 +866,6 @@ |
847 | 866 | |
848 | 867 | FilePathModel filePath = yunBookbuildingService.findFilePathByBabyId(babyEyeCheck.getId()); |
849 | 868 | map.put("filePath", filePath); |
850 | - // | |
851 | 869 | CollectionUtils.removeNullValue(map); |
852 | 870 | return map; |
853 | 871 | } |