jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8bd8859ee134d1058cd0f8b82a5533e74ed4b2cb

Authored by shiyang
1 parent 013e387e7a
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 9 additions and 9 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java View file @ 8bd8859
... ... @@ -104,7 +104,7 @@
104 104 BabyOralCheckQuery checkQuery=new BabyOralCheckQuery();
105 105 checkQuery.setYn(YnEnums.YES.getId());
106 106 checkQuery.setBabyId(babyOralCheck.getBabyId());
107   - List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.DESC,"oralCheckTime");
  107 + List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.DESC,"created");
108 108 //修改最新的记录才会同步儿童档案，新增也会同步到儿童档案
109 109 if( CollectionUtils.isNotEmpty(babyOralChecks) && babyOralChecks.get(0).getId().equals(babyOralCheck.getId())){
110 110 Update update = new Update();
... ... @@ -143,7 +143,7 @@
143 143 BabyOralCheckQuery checkQuery=new BabyOralCheckQuery();
144 144 checkQuery.setYn(YnEnums.YES.getId());
145 145 checkQuery.setBabyId(oralCheck.getBabyId());
146   - List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.DESC,"oralCheckTime");
  146 + List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.DESC,"created");
147 147 Update update = new Update();
148 148 //删除唯一的检查记录
149 149 if( CollectionUtils.isEmpty(babyOralChecks)){
... ... @@ -205,7 +205,7 @@
205 205 BabyOralCheckQuery checkQuery=new BabyOralCheckQuery();
206 206 checkQuery.setBabyId(babyId);
207 207 checkQuery.setYn(YnEnums.YES.getId());
208   - List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.ASC,"oralCheckTime");
  208 + List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.ASC,"created");
209 209 for (BabyOralCheck babyOralCheck : babyOralChecks) {
210 210 Map<String, Object> temp = new HashMap<>();
211 211 temp.put("id", babyOralCheck.getId());
... ... @@ -252,7 +252,7 @@
252 252 request.setBirthStart(DateUtil.getBirthStart(request.getQueryMonthAgeEnd()));
253 253 request.setBirthEnd(DateUtil.getBirthEnd(request.getQueryMonthAgeStart()));
254 254 }
255   - List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(request,Sort.Direction.DESC,"oralCheckTime");
  255 + List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(request,Sort.Direction.DESC,"created");
256 256 List<Map> result=new ArrayList<>();
257 257 for (BabyOralCheck babyOralCheck : babyOralChecks) {
258 258 Map<String,Object> map=ReflectionUtils.beanToMap(babyOralCheck);//对象转map
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java View file @ 8bd8859
... ... @@ -93,7 +93,7 @@
93 93 babyCheck.setOperaterId(userid+"");
94 94 babyCheck.setModified(new Date());
95 95 lhBabyEyeCheckService.update(babyCheck);
96   - BabyEyeCheck Check = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyCheck.getId())), BabyEyeCheck.class);
  96 + LhBabyEyeCheck Check = mongoTemplate.findOne(Query.query(Criteria.where("id").is(babyCheck.getId())), LhBabyEyeCheck.class);
97 97 if (null!=Check) {
98 98 operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), Check, OptActionEnums.UPDATE.getId(), "修改眼健康检查");
99 99 }
... ... @@ -103,7 +103,7 @@
103 103 LhBabyEyelCheckQuery checkQuery=new LhBabyEyelCheckQuery();
104 104 checkQuery.setYn(YnEnums.YES.getId());
105 105 checkQuery.setBabyId(babyCheck.getBabyId());
106   - List<LhBabyEyeCheck> babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.DESC,"eyeCheckTime");
  106 + List<LhBabyEyeCheck> babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.DESC,"created");
107 107 //修改最新的记录才会同步儿童档案，新增也会同步到儿童档案
108 108 if( CollectionUtils.isNotEmpty(babyChecks) && babyChecks.get(0).getId().equals(babyCheck.getId()) ){
109 109 Update update = new Update();
... ... @@ -139,7 +139,7 @@
139 139 LhBabyEyelCheckQuery checkQuery=new LhBabyEyelCheckQuery();
140 140 checkQuery.setYn(YnEnums.YES.getId());
141 141 checkQuery.setBabyId(babyCheck.getBabyId());
142   - List<LhBabyEyeCheck> babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.DESC,"eyeCheckTime");
  142 + List<LhBabyEyeCheck> babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.DESC,"created");
143 143 Update update = new Update();
144 144 //删除唯一的检查记录
145 145 if( CollectionUtils.isEmpty(babyChecks)){
... ... @@ -202,7 +202,7 @@
202 202 LhBabyEyelCheckQuery checkQuery=new LhBabyEyelCheckQuery();
203 203 checkQuery.setBabyId(babyId);
204 204 checkQuery.setYn(YnEnums.YES.getId());
205   - List<LhBabyEyeCheck> babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.ASC,"eyeCheckTime");
  205 + List<LhBabyEyeCheck> babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.ASC,"created");
206 206 for (LhBabyEyeCheck babyCheck : babyChecks) {
207 207 Map<String, Object> temp = new HashMap<>();
208 208 temp.put("id", babyCheck.getId());
... ... @@ -254,7 +254,7 @@
254 254 request.setChuPositiveType("2");
255 255 request.setPositiveType("1");
256 256 }
257   - List<LhBabyEyeCheck> babyEyeChecks=lhBabyEyeCheckService.queryList(request,Sort.Direction.DESC,"eyeCheckTime");
  257 + List<LhBabyEyeCheck> babyEyeChecks=lhBabyEyeCheckService.queryList(request,Sort.Direction.DESC,"created");
258 258 List<Map> result=new ArrayList<>();
259 259 for (LhBabyEyeCheck babyCheck : babyEyeChecks) {
260 260 Map<String,Object> map=ReflectionUtils.beanToMap(babyCheck);//对象转map