Commit d55571b09cd7db2d3abe6adf6e7bf75c7c3a8b79
1 parent
284d4a2a52
Exists in
master
and in
6 other branches
隆化-妊娠结局记录表接口优化
Showing 6 changed files with 187 additions and 31 deletions
- platform-dal/src/main/java/com/lyms/platform/pojo/LhBabyGravidityEndingTabModel.java
- platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyBirthDefectTabController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyGravidityEndingTabController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyBirthDefectTabFacade.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyGravidityEndingTabFacade.java
platform-dal/src/main/java/com/lyms/platform/pojo/LhBabyGravidityEndingTabModel.java
View file @
d55571b
... | ... | @@ -100,11 +100,10 @@ |
100 | 100 | //婴儿42天存活情况(LhSurvivalCaseEnum) |
101 | 101 | private String survivalCase; |
102 | 102 | |
103 | - //随访者签名 | |
104 | - private String visitSign; | |
105 | - | |
106 | 103 | //填表日期 |
107 | 104 | private Date writeDate; |
105 | + //随访者签名 | |
106 | + private String visitSign; | |
108 | 107 | |
109 | 108 | |
110 | 109 | public String getBuildId() { |
platform-dal/src/main/java/com/lyms/platform/pojo/PreEugenicsBaseModel.java
View file @
d55571b
... | ... | @@ -417,6 +417,39 @@ |
417 | 417 | */ |
418 | 418 | private String doctorSign; |
419 | 419 | |
420 | + /** | |
421 | + * 2021-10-27隆化需求 | |
422 | + */ | |
423 | + //隆化-出生缺陷儿登记表 | |
424 | + private Map<String, Object> lhBabyBirthDefectTab; | |
425 | + //隆化-妊娠结局记录表 | |
426 | + private Map<String, Object> lhBabyGravidityEndingTab; | |
427 | + //隆化-早孕随访记录表 | |
428 | + private Map<String, Object> lhBabyPregnancyFollowTab; | |
429 | + | |
430 | + public Map<String, Object> getLhBabyBirthDefectTab() { | |
431 | + return lhBabyBirthDefectTab; | |
432 | + } | |
433 | + | |
434 | + public void setLhBabyBirthDefectTab(Map<String, Object> lhBabyBirthDefectTab) { | |
435 | + this.lhBabyBirthDefectTab = lhBabyBirthDefectTab; | |
436 | + } | |
437 | + | |
438 | + public Map<String, Object> getLhBabyGravidityEndingTab() { | |
439 | + return lhBabyGravidityEndingTab; | |
440 | + } | |
441 | + | |
442 | + public void setLhBabyGravidityEndingTab(Map<String, Object> lhBabyGravidityEndingTab) { | |
443 | + this.lhBabyGravidityEndingTab = lhBabyGravidityEndingTab; | |
444 | + } | |
445 | + | |
446 | + public Map<String, Object> getLhBabyPregnancyFollowTab() { | |
447 | + return lhBabyPregnancyFollowTab; | |
448 | + } | |
449 | + | |
450 | + public void setLhBabyPregnancyFollowTab(Map<String, Object> lhBabyPregnancyFollowTab) { | |
451 | + this.lhBabyPregnancyFollowTab = lhBabyPregnancyFollowTab; | |
452 | + } | |
420 | 453 | |
421 | 454 | public static long getSerialVersionUID() { |
422 | 455 | return serialVersionUID; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyBirthDefectTabController.java
View file @
d55571b
... | ... | @@ -9,6 +9,7 @@ |
9 | 9 | import com.lyms.platform.pojo.LhBabyBirthDefectTabModel; |
10 | 10 | import com.lyms.platform.pojo.QhdDischargedDiagnose; |
11 | 11 | import com.lyms.platform.query.LhBabyBirthDefectTabQuery; |
12 | +import com.lyms.platform.query.LhBabyGravidityEndingTabQuery; | |
12 | 13 | import org.springframework.beans.factory.annotation.Autowired; |
13 | 14 | import org.springframework.stereotype.Controller; |
14 | 15 | import org.springframework.web.bind.annotation.*; |
... | ... | @@ -41,6 +42,14 @@ |
41 | 42 | public BaseResponse queryLhBabyBirthDefectTab(LhBabyBirthDefectTabQuery lhBabyBirthDefectTabQuery, HttpServletRequest request) { |
42 | 43 | |
43 | 44 | return lhBabyBirthDefectTabFacade.queryLhBabyBirthDefectTab(lhBabyBirthDefectTabQuery); |
45 | + } | |
46 | + //查询-隆化-出生缺陷儿登记表-多胎列表 | |
47 | + @RequestMapping(method = RequestMethod.GET, value = "/queryLhBabyBirthDefectTabList") | |
48 | + @ResponseBody | |
49 | + @TokenRequired | |
50 | + public BaseResponse queryLhBabyBirthDefectTabList(LhBabyBirthDefectTabQuery lhBabyBirthDefectTabQuery, HttpServletRequest request) { | |
51 | + | |
52 | + return lhBabyBirthDefectTabFacade.queryLhBabyBirthDefectTabList(lhBabyBirthDefectTabQuery); | |
44 | 53 | } |
45 | 54 | |
46 | 55 | //增加/修改-隆化-出生缺陷儿登记表 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LhBabyGravidityEndingTabController.java
View file @
d55571b
... | ... | @@ -43,6 +43,14 @@ |
43 | 43 | |
44 | 44 | return lhBabyGravidityEndingTabFacade.queryLhBabyGravidityEndingTab(lhBabyGravidityEndingTabQuery); |
45 | 45 | } |
46 | + //查询-隆化-妊娠结局记录表-多胎列表 | |
47 | + @RequestMapping(method = RequestMethod.GET, value = "/queryLhBabyGravidityEndingTabList") | |
48 | + @ResponseBody | |
49 | + @TokenRequired | |
50 | + public BaseResponse queryLhBabyGravidityEndingTabList(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery, HttpServletRequest request) { | |
51 | + | |
52 | + return lhBabyGravidityEndingTabFacade.queryLhBabyGravidityEndingTabList(lhBabyGravidityEndingTabQuery); | |
53 | + } | |
46 | 54 | |
47 | 55 | //增加/修改-隆化-妊娠结局记录表 |
48 | 56 | @RequestMapping(method = RequestMethod.POST, value = "/addOrUpdateLhBabyGravidityEndingTab") |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyBirthDefectTabFacade.java
View file @
d55571b
... | ... | @@ -6,21 +6,39 @@ |
6 | 6 | import com.lyms.platform.common.dao.operator.MongoCondition; |
7 | 7 | import com.lyms.platform.common.dao.operator.MongoOper; |
8 | 8 | import com.lyms.platform.common.dao.operator.MongoQuery; |
9 | +import com.lyms.platform.common.dao.operator.Page; | |
9 | 10 | import com.lyms.platform.common.enums.OptActionEnums; |
10 | 11 | import com.lyms.platform.common.enums.YnEnums; |
11 | 12 | import com.lyms.platform.common.result.BaseObjectResponse; |
13 | +import com.lyms.platform.common.result.BaseResponse; | |
14 | +import com.lyms.platform.common.utils.DateUtil; | |
15 | +import com.lyms.platform.common.utils.MongoConvertHelper; | |
16 | +import com.lyms.platform.common.utils.ReflectionUtils; | |
12 | 17 | import com.lyms.platform.common.utils.StringUtils; |
18 | +import com.lyms.platform.operate.web.request.PreEugenicsBaseRequest; | |
13 | 19 | import com.lyms.platform.operate.web.result.LhBabyBirthDefectTabResult; |
20 | +import com.lyms.platform.operate.web.result.LhBabyGravidityEndingTabResult; | |
21 | +import com.lyms.platform.operate.web.utils.CollectionUtils; | |
14 | 22 | import com.lyms.platform.permission.service.OrganizationService; |
15 | 23 | import com.lyms.platform.permission.service.UsersService; |
16 | 24 | import com.lyms.platform.pojo.LhBabyBirthDefectTabModel; |
25 | +import com.lyms.platform.pojo.LhBabyGravidityEndingTabModel; | |
26 | +import com.lyms.platform.pojo.PreEugenicsBaseModel; | |
17 | 27 | import com.lyms.platform.pojo.QhdDischargedDiagnose; |
18 | 28 | import com.lyms.platform.query.LhBabyBirthDefectTabQuery; |
29 | +import com.lyms.platform.query.LhBabyGravidityEndingTabQuery; | |
19 | 30 | import org.springframework.beans.factory.annotation.Autowired; |
31 | +import org.springframework.data.domain.Sort; | |
32 | +import org.springframework.data.mongodb.core.query.Criteria; | |
20 | 33 | import org.springframework.data.mongodb.core.query.Query; |
34 | +import org.springframework.data.mongodb.core.query.Update; | |
21 | 35 | import org.springframework.stereotype.Component; |
22 | 36 | |
23 | 37 | import javax.servlet.http.HttpServletRequest; |
38 | +import java.util.ArrayList; | |
39 | +import java.util.HashMap; | |
40 | +import java.util.List; | |
41 | +import java.util.Map; | |
24 | 42 | |
25 | 43 | @Component |
26 | 44 | public class LhBabyBirthDefectTabFacade extends BaseMongoDAOImpl<LhBabyBirthDefectTabModel> { |
... | ... | @@ -45,8 +63,8 @@ |
45 | 63 | BaseObjectResponse br = new BaseObjectResponse(); |
46 | 64 | lhBabyBirthDefectTabQuery.setYn(YnEnums.YES.getId());//查询有效数据(删除状态) |
47 | 65 | MongoQuery query = lhBabyBirthDefectTabQuery.convertToQuery(); |
48 | - LhBabyBirthDefectTabModel babyBirthDefectTab=findOne(query.convertToMongoQuery()); | |
49 | - br.setData(babyBirthDefectTab); | |
66 | + LhBabyBirthDefectTabModel model=findOne(query.convertToMongoQuery()); | |
67 | + br.setData(model); | |
50 | 68 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
51 | 69 | br.setErrormsg("成功"); |
52 | 70 | return br; |
53 | 71 | |
54 | 72 | |
55 | 73 | |
56 | 74 | |
57 | 75 | |
58 | 76 | |
... | ... | @@ -60,36 +78,79 @@ |
60 | 78 | BaseObjectResponse br = new BaseObjectResponse(); |
61 | 79 | lhBabyBirthDefectTabQuery.setYn(YnEnums.YES.getId());//查询有效数据(删除状态) |
62 | 80 | MongoQuery query = lhBabyBirthDefectTabQuery.convertToQuery(); |
63 | - LhBabyBirthDefectTabModel babyBirthDefectTabModel=findOne(query.convertToMongoQuery()); | |
81 | + LhBabyBirthDefectTabModel model=findOne(query.convertToMongoQuery()); | |
64 | 82 | //整理返回数据 |
65 | - LhBabyBirthDefectTabResult lhBabyBirthDefectTabResult=null; | |
66 | - if(null!=babyBirthDefectTabModel) { | |
67 | - lhBabyBirthDefectTabResult= new LhBabyBirthDefectTabResult().convertToResult(babyBirthDefectTabModel, | |
83 | + LhBabyBirthDefectTabResult result=null; | |
84 | + if(null!=model) { | |
85 | + result= new LhBabyBirthDefectTabResult().convertToResult(model, | |
68 | 86 | basicConfigService, |
69 | 87 | usersService, |
70 | 88 | organizationService); |
71 | 89 | } |
72 | - br.setData(lhBabyBirthDefectTabResult); | |
90 | + br.setData(result); | |
73 | 91 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
74 | 92 | br.setErrormsg("成功"); |
75 | 93 | return br; |
76 | 94 | } |
77 | 95 | |
78 | 96 | /** |
97 | + * 查询-隆化-出生缺陷儿登记表-多胎列表 | |
98 | + * @param lhBabyBirthDefectTabQuery | |
99 | + * @return | |
100 | + */ | |
101 | + public BaseObjectResponse queryLhBabyBirthDefectTabList(LhBabyBirthDefectTabQuery lhBabyBirthDefectTabQuery) { | |
102 | + BaseObjectResponse br = new BaseObjectResponse(); | |
103 | + lhBabyBirthDefectTabQuery.setYn(YnEnums.YES.getId());//查询有效数据(删除状态) | |
104 | + MongoQuery query = lhBabyBirthDefectTabQuery.convertToQuery(); | |
105 | + query.addOrder(Sort.Direction.DESC,"writeDate"); | |
106 | + List<LhBabyBirthDefectTabModel> modelList=find(query.convertToMongoQuery()); | |
107 | + //整理返回数据 | |
108 | + List<LhBabyBirthDefectTabResult> resultList=new ArrayList<>(); | |
109 | + if(CollectionUtils.isNotEmpty(modelList)){ | |
110 | + LhBabyBirthDefectTabResult result=new LhBabyBirthDefectTabResult(); | |
111 | + for (LhBabyBirthDefectTabModel model : modelList) { | |
112 | + resultList.add(result.convertToResult(model, | |
113 | + basicConfigService, | |
114 | + usersService, | |
115 | + organizationService)); | |
116 | + } | |
117 | + } | |
118 | + br.setData(resultList); | |
119 | + br.setErrorcode(ErrorCodeConstants.SUCCESS); | |
120 | + br.setErrormsg("成功"); | |
121 | + return br; | |
122 | + } | |
123 | + | |
124 | + /** | |
79 | 125 | * 增加/修改-隆化-出生缺陷儿登记表 |
80 | 126 | * @param lhBabyBirthDefectTabModel |
81 | 127 | * @return |
82 | 128 | */ |
83 | - public BaseObjectResponse addOrUpdateLhBabyBirthDefectTab(LhBabyBirthDefectTabModel lhBabyBirthDefectTabModel) { | |
129 | + public BaseResponse addOrUpdateLhBabyBirthDefectTab(LhBabyBirthDefectTabModel lhBabyBirthDefectTabModel) { | |
130 | + BaseResponse br = new BaseResponse(); | |
84 | 131 | //修改 |
85 | 132 | if(StringUtils.isNotEmpty(lhBabyBirthDefectTabModel.getId())){ |
86 | 133 | update(new MongoQuery(new MongoCondition("id", lhBabyBirthDefectTabModel.getId(), MongoOper.IS)).convertToMongoQuery(),lhBabyBirthDefectTabModel); |
87 | 134 | }else { |
88 | 135 | //新增 |
136 | + if (StringUtils.isEmpty(lhBabyBirthDefectTabModel.getBuildId())) { | |
137 | + return br.setErrormsg("参数缺失").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); | |
138 | + } | |
89 | 139 | lhBabyBirthDefectTabModel.setYn(YnEnums.YES.getId());//设置增加数据为有效数据(删除状态) |
90 | 140 | save(lhBabyBirthDefectTabModel); |
91 | 141 | } |
92 | - BaseObjectResponse br = new BaseObjectResponse(); | |
142 | + //同步到孕前优生信息 实体类(便于检查信息页面获取) | |
143 | + if(null==lhBabyBirthDefectTabModel.getWriteDate()||StringUtils.isEmpty(lhBabyBirthDefectTabModel.getId())||StringUtils.isEmpty(lhBabyBirthDefectTabModel.getBuildId())){ | |
144 | + return br.setErrormsg("同步参数缺失").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); | |
145 | + } | |
146 | + Map<String, Object> map= new HashMap<>(); | |
147 | + map.put("id", lhBabyBirthDefectTabModel.getId()); | |
148 | + map.put("writeDate", DateUtil.getyyyy_MM_dd(lhBabyBirthDefectTabModel.getWriteDate())); | |
149 | + Query query = Query.query(Criteria.where("id").is(lhBabyBirthDefectTabModel.getBuildId())); | |
150 | + Update update = new Update(); | |
151 | + update.set("lhBabyBirthDefectTab", map); | |
152 | + mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class); | |
153 | + | |
93 | 154 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
94 | 155 | br.setErrormsg("成功"); |
95 | 156 | return br; |
96 | 157 | |
97 | 158 | |
... | ... | @@ -103,13 +164,13 @@ |
103 | 164 | public void delLhBabyBirthDefectTab(String id,Integer userId) { |
104 | 165 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
105 | 166 | //查询出要删除的数据操作日志用 |
106 | - LhBabyBirthDefectTabModel lhBabyBirthDefectTabModel= findById(id); | |
167 | + LhBabyBirthDefectTabModel delModel= findById(id); | |
107 | 168 | //删除 |
108 | - LhBabyBirthDefectTabModel babyBirthDefectTabModel= new LhBabyBirthDefectTabModel(); | |
109 | - babyBirthDefectTabModel.setYn(YnEnums.NO.getId());//设置为无效数据(删除状态) | |
110 | - update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), babyBirthDefectTabModel); | |
169 | + LhBabyBirthDefectTabModel model= new LhBabyBirthDefectTabModel(); | |
170 | + model.setYn(YnEnums.NO.getId());//设置为无效数据(删除状态) | |
171 | + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), model); | |
111 | 172 | //存入操作日志 |
112 | - operateLogFacade.addDeleteOptLog(userId, Integer.valueOf(hospitalId), lhBabyBirthDefectTabModel, OptActionEnums.DELETE.getId(), "删除出生缺陷儿登记表"); | |
173 | + operateLogFacade.addDeleteOptLog(userId, Integer.valueOf(hospitalId), delModel, OptActionEnums.DELETE.getId(), "删除出生缺陷儿登记表"); | |
113 | 174 | } |
114 | 175 | |
115 | 176 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyGravidityEndingTabFacade.java
View file @
d55571b
... | ... | @@ -6,21 +6,31 @@ |
6 | 6 | import com.lyms.platform.common.dao.operator.MongoCondition; |
7 | 7 | import com.lyms.platform.common.dao.operator.MongoOper; |
8 | 8 | import com.lyms.platform.common.dao.operator.MongoQuery; |
9 | +import com.lyms.platform.common.dao.operator.Page; | |
9 | 10 | import com.lyms.platform.common.enums.OptActionEnums; |
10 | 11 | import com.lyms.platform.common.enums.YnEnums; |
11 | 12 | import com.lyms.platform.common.result.BaseObjectResponse; |
13 | +import com.lyms.platform.common.utils.DateUtil; | |
12 | 14 | import com.lyms.platform.common.utils.StringUtils; |
13 | 15 | import com.lyms.platform.operate.web.result.LhBabyBirthDefectTabResult; |
14 | 16 | import com.lyms.platform.operate.web.result.LhBabyGravidityEndingTabResult; |
17 | +import com.lyms.platform.operate.web.utils.CollectionUtils; | |
15 | 18 | import com.lyms.platform.permission.service.OrganizationService; |
16 | 19 | import com.lyms.platform.permission.service.UsersService; |
17 | 20 | import com.lyms.platform.pojo.LhBabyBirthDefectTabModel; |
18 | 21 | import com.lyms.platform.pojo.LhBabyGravidityEndingTabModel; |
22 | +import com.lyms.platform.pojo.PreEugenicsBaseModel; | |
19 | 23 | import com.lyms.platform.query.LhBabyBirthDefectTabQuery; |
20 | 24 | import com.lyms.platform.query.LhBabyGravidityEndingTabQuery; |
21 | 25 | import org.springframework.beans.factory.annotation.Autowired; |
26 | +import org.springframework.data.domain.Sort; | |
27 | +import org.springframework.data.mongodb.core.query.Criteria; | |
28 | +import org.springframework.data.mongodb.core.query.Query; | |
29 | +import org.springframework.data.mongodb.core.query.Update; | |
22 | 30 | import org.springframework.stereotype.Component; |
23 | 31 | |
32 | +import java.util.*; | |
33 | + | |
24 | 34 | @Component |
25 | 35 | public class LhBabyGravidityEndingTabFacade extends BaseMongoDAOImpl<LhBabyGravidityEndingTabModel> { |
26 | 36 | |
... | ... | @@ -40,8 +50,8 @@ |
40 | 50 | BaseObjectResponse br = new BaseObjectResponse(); |
41 | 51 | lhBabyGravidityEndingTabQuery.setYn(YnEnums.YES.getId());//查询有效数据(删除状态) |
42 | 52 | MongoQuery query = lhBabyGravidityEndingTabQuery.convertToQuery(); |
43 | - LhBabyGravidityEndingTabModel lhBabyGravidityEndingTabModel=findOne(query.convertToMongoQuery()); | |
44 | - br.setData(lhBabyGravidityEndingTabModel); | |
53 | + LhBabyGravidityEndingTabModel model=findOne(query.convertToMongoQuery()); | |
54 | + br.setData(model); | |
45 | 55 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
46 | 56 | br.setErrormsg("成功"); |
47 | 57 | return br; |
48 | 58 | |
49 | 59 | |
50 | 60 | |
51 | 61 | |
... | ... | @@ -55,26 +65,51 @@ |
55 | 65 | BaseObjectResponse br = new BaseObjectResponse(); |
56 | 66 | lhBabyGravidityEndingTabQuery.setYn(YnEnums.YES.getId());//查询有效数据(删除状态) |
57 | 67 | MongoQuery query = lhBabyGravidityEndingTabQuery.convertToQuery(); |
58 | - LhBabyGravidityEndingTabModel lhBabyGravidityEndingTabModel=findOne(query.convertToMongoQuery()); | |
68 | + LhBabyGravidityEndingTabModel model=findOne(query.convertToMongoQuery()); | |
59 | 69 | //整理返回数据 |
60 | - LhBabyGravidityEndingTabResult lhBabyGravidityEndingTabResult=null; | |
61 | - if(null!=lhBabyGravidityEndingTabModel){ | |
62 | - lhBabyGravidityEndingTabResult=new LhBabyGravidityEndingTabResult().convertToResult(lhBabyGravidityEndingTabModel, | |
70 | + LhBabyGravidityEndingTabResult result=null; | |
71 | + if(null!=model){ | |
72 | + result=new LhBabyGravidityEndingTabResult().convertToResult(model, | |
63 | 73 | basicConfigService); |
64 | 74 | } |
65 | - br.setData(lhBabyGravidityEndingTabResult); | |
75 | + br.setData(result); | |
66 | 76 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
67 | 77 | br.setErrormsg("成功"); |
68 | 78 | return br; |
69 | 79 | } |
70 | 80 | |
71 | 81 | /** |
82 | + * 查询-隆化-妊娠结局记录表-多胎列表 | |
83 | + * @param lhBabyGravidityEndingTabQuery | |
84 | + * @return | |
85 | + */ | |
86 | + public BaseObjectResponse queryLhBabyGravidityEndingTabList(LhBabyGravidityEndingTabQuery lhBabyGravidityEndingTabQuery) { | |
87 | + BaseObjectResponse br = new BaseObjectResponse(); | |
88 | + lhBabyGravidityEndingTabQuery.setYn(YnEnums.YES.getId());//查询有效数据(删除状态) | |
89 | + MongoQuery query = lhBabyGravidityEndingTabQuery.convertToQuery(); | |
90 | + query.addOrder(Sort.Direction.DESC,"writeDate"); | |
91 | + List<LhBabyGravidityEndingTabModel> modelList=find(query.convertToMongoQuery()); | |
92 | + //整理返回数据 | |
93 | + List<LhBabyGravidityEndingTabResult> resultList=new ArrayList<>(); | |
94 | + if(CollectionUtils.isNotEmpty(modelList)){ | |
95 | + LhBabyGravidityEndingTabResult result=new LhBabyGravidityEndingTabResult(); | |
96 | + for (LhBabyGravidityEndingTabModel model : modelList) { | |
97 | + resultList.add(result.convertToResult(model,basicConfigService)); | |
98 | + } | |
99 | + } | |
100 | + br.setData(resultList); | |
101 | + br.setErrorcode(ErrorCodeConstants.SUCCESS); | |
102 | + br.setErrormsg("成功"); | |
103 | + return br; | |
104 | + } | |
105 | + | |
106 | + /** | |
72 | 107 | * 增加/修改-隆化-妊娠结局记录表 |
73 | 108 | * @param lhBabyGravidityEndingTabModel |
74 | 109 | * @return |
75 | 110 | */ |
76 | 111 | public BaseObjectResponse addOrUpdateLhBabyGravidityEndingTab(LhBabyGravidityEndingTabModel lhBabyGravidityEndingTabModel) { |
77 | - | |
112 | + BaseObjectResponse br = new BaseObjectResponse(); | |
78 | 113 | //修改 |
79 | 114 | if(StringUtils.isNotEmpty(lhBabyGravidityEndingTabModel.getId())){ |
80 | 115 | update(new MongoQuery(new MongoCondition("id", lhBabyGravidityEndingTabModel.getId(), MongoOper.IS)).convertToMongoQuery(),lhBabyGravidityEndingTabModel); |
... | ... | @@ -83,7 +118,18 @@ |
83 | 118 | lhBabyGravidityEndingTabModel.setYn(YnEnums.YES.getId());//设置增加数据为有效数据(删除状态) |
84 | 119 | save(lhBabyGravidityEndingTabModel); |
85 | 120 | } |
86 | - BaseObjectResponse br = new BaseObjectResponse(); | |
121 | + //同步到孕前优生信息 实体类(便于检查信息页面获取) | |
122 | + if(null==lhBabyGravidityEndingTabModel.getWriteDate()||StringUtils.isEmpty(lhBabyGravidityEndingTabModel.getId())||StringUtils.isEmpty(lhBabyGravidityEndingTabModel.getBuildId())){ | |
123 | + return br.setErrormsg("同步参数缺失").setErrorcode(ErrorCodeConstants.PARAMETER_ERROR); | |
124 | + } | |
125 | + Map<String, Object> map= new HashMap<>(); | |
126 | + map.put("id", lhBabyGravidityEndingTabModel.getId()); | |
127 | + map.put("writeDate", DateUtil.getyyyy_MM_dd(lhBabyGravidityEndingTabModel.getWriteDate())); | |
128 | + Query query = Query.query(Criteria.where("id").is(lhBabyGravidityEndingTabModel.getBuildId())); | |
129 | + Update update = new Update(); | |
130 | + update.set("lhBabyGravidityEndingTab", map); | |
131 | + mongoTemplate.updateFirst(query, update, PreEugenicsBaseModel.class); | |
132 | + | |
87 | 133 | br.setErrorcode(ErrorCodeConstants.SUCCESS); |
88 | 134 | br.setErrormsg("成功"); |
89 | 135 | return br; |
90 | 136 | |
91 | 137 | |
... | ... | @@ -97,13 +143,13 @@ |
97 | 143 | public void delLhBabyGravidityEndingTab(String id,Integer userId) { |
98 | 144 | String hospitalId = autoMatchFacade.getHospitalId(userId); |
99 | 145 | //查询出要删除的数据操作日志用 |
100 | - LhBabyGravidityEndingTabModel lhBabyGravidityEndingTabModel= findById(id); | |
146 | + LhBabyGravidityEndingTabModel delModel= findById(id); | |
101 | 147 | //删除 |
102 | - LhBabyGravidityEndingTabModel babyGravidityEndingTabModel= new LhBabyGravidityEndingTabModel(); | |
103 | - babyGravidityEndingTabModel.setYn(YnEnums.NO.getId());//设置为无效数据(删除状态) | |
104 | - update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), babyGravidityEndingTabModel); | |
148 | + LhBabyGravidityEndingTabModel model= new LhBabyGravidityEndingTabModel(); | |
149 | + model.setYn(YnEnums.NO.getId());//设置为无效数据(删除状态) | |
150 | + update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), model); | |
105 | 151 | //存入操作日志 |
106 | - operateLogFacade.addDeleteOptLog(userId, Integer.valueOf(hospitalId), lhBabyGravidityEndingTabModel, OptActionEnums.DELETE.getId(), "删除出生缺陷儿登记表"); | |
152 | + operateLogFacade.addDeleteOptLog(userId, Integer.valueOf(hospitalId), delModel, OptActionEnums.DELETE.getId(), "删除妊娠结局记录表"); | |
107 | 153 | } |
108 | 154 | |
109 | 155 |