jiangjiazhi / regional-platform

Download as
Browse Code »

Commit c8f3637009a3e38aef31ed5e27fef003590bc290

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

update

Showing 3 changed files with 16 additions and 26 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/LhBabyEyeCheckService.java View file @ c8f3637
... ... @@ -21,8 +21,9 @@
21 21 @Service("LhBabyEyeCheckService")
22 22 public class LhBabyEyeCheckService extends BaseMongoDAOImpl<LhBabyEyeCheck> {
23 23  
24   - public LhBabyEyeCheck add(LhBabyEyeCheck model) {
25   - return save(model);
  24 + public String add(LhBabyEyeCheck model) {
  25 + mongoTemplate.insert(model);
  26 + return model.getId();
26 27 }
27 28  
28 29 /**
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyOralCheckFacade.java View file @ c8f3637
... ... @@ -86,10 +86,9 @@
86 86 return RespBuilder.buildSuccess(ResponseCode.NEED_BUILD);
87 87 }
88 88 //添加
89   - BabyOralCheck add=new BabyOralCheck();
90 89 if (StringUtils.isEmpty(babyOralCheck.getId())) {
91   - add = babyOralCheckService.add(babyOralCheck);
92   - operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), add, OptActionEnums.ADD.getId(), "添加口腔检查");
  90 + babyOralCheckService.add(babyOralCheck);
  91 + operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), babyOralCheck, OptActionEnums.ADD.getId(), "添加口腔检查");
93 92 }else {//修改
94 93 babyOralCheck.setOperaterId(userid+"");
95 94 babyOralCheck.setModified(new Date());
96 95  
... ... @@ -106,15 +105,11 @@
106 105 checkQuery.setBabyId(babyOralCheck.getBabyId());
107 106 List<BabyOralCheck> babyOralChecks=babyOralCheckService.queryList(checkQuery,Sort.Direction.DESC,"oralCheckTime");
108 107 //修改最新的记录才会同步儿童档案，新增也会同步到儿童档案
109   - if( (CollectionUtils.isNotEmpty(babyOralChecks) && babyOralChecks.get(0).getId().equals(babyOralCheck.getId())) ||
110   - StringUtils.isEmpty(babyOralCheck.getId())){
  108 + if( CollectionUtils.isNotEmpty(babyOralChecks) && babyOralChecks.get(0).getId().equals(babyOralCheck.getId())){
111 109 Update update = new Update();
112   - if(StringUtils.isEmpty(babyOralCheck.getId())){
113   - update.set("oralCheckId",add.getId());
114   - update.set("oralCheckYn",babyOralCheck.getYn());
115   - }else{
116   - update.set("oralCheckId",babyOralCheck.getId());
117   - }
  110 + update.set("oralCheckId",babyOralCheck.getId());
  111 + update.set("oralCheckYn",YnEnums.YES.getId());
  112 +
118 113 update.set("positiveType",babyOralCheck.getPositiveType() );
119 114 update.set("oralCheckTime",babyOralCheck.getOralCheckTime() );
120 115 update.set("nextOralCheckTime",babyOralCheck.getNextOralCheckTime() );
... ... @@ -133,7 +128,7 @@
133 128 BaseObjectResponse br = new BaseObjectResponse();
134 129 br.setErrorcode(ErrorCodeConstants.SUCCESS);
135 130 br.setErrormsg("成功");
136   - br.setData(StringUtils.isNotEmpty(add.getId())?add.getId():babyOralCheck.getId());
  131 + br.setData(babyOralCheck.getId());
137 132 return br;
138 133 }
139 134  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LhBabyEyeCheckFacade.java View file @ c8f3637
... ... @@ -86,10 +86,9 @@
86 86 return RespBuilder.buildSuccess(ResponseCode.NEED_BUILD);
87 87 }
88 88 //添加
89   - LhBabyEyeCheck add=new LhBabyEyeCheck();
90 89 if (StringUtils.isEmpty(babyCheck.getId())) {
91   - add = lhBabyEyeCheckService.add(babyCheck);
92   - operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), add, OptActionEnums.ADD.getId(), "添加眼健康检查");
  90 + lhBabyEyeCheckService.add(babyCheck);
  91 + operateLogFacade.addDeleteOptLog(userid, Integer.parseInt(hospitalId), babyCheck, OptActionEnums.ADD.getId(), "添加眼健康检查");
93 92 }else {//修改
94 93 babyCheck.setOperaterId(userid+"");
95 94 babyCheck.setModified(new Date());
96 95  
... ... @@ -106,15 +105,10 @@
106 105 checkQuery.setBabyId(babyCheck.getBabyId());
107 106 List<LhBabyEyeCheck> babyChecks=lhBabyEyeCheckService.queryList(checkQuery,Sort.Direction.DESC,"eyeCheckTime");
108 107 //修改最新的记录才会同步儿童档案，新增也会同步到儿童档案
109   - if( (CollectionUtils.isNotEmpty(babyChecks) && babyChecks.get(0).getId().equals(babyCheck.getId())) ||
110   - StringUtils.isEmpty(babyCheck.getId())){
  108 + if( CollectionUtils.isNotEmpty(babyChecks) && babyChecks.get(0).getId().equals(babyCheck.getId()) ){
111 109 Update update = new Update();
112   - if(StringUtils.isEmpty(babyCheck.getId())){
113   - update.set("lhEyeCheckId",add.getId());
114   - update.set("lheyeCheckYn",YnEnums.YES.getId());
115   - }else{
116   - update.set("lhEyeCheckId",babyCheck.getId());
117   - }
  110 + update.set("lhEyeCheckId",babyCheck.getId());
  111 + update.set("lheyeCheckYn",YnEnums.YES.getId());
118 112 update.set("lhEyePositiveType",babyCheck.getPositiveType() );
119 113 if(StringUtils.isNotEmpty(babyCheck.getChuPositiveType())){
120 114 update.set("lhChuEyePositiveType",babyCheck.getChuPositiveType() );
... ... @@ -131,7 +125,7 @@
131 125 BaseObjectResponse br = new BaseObjectResponse();
132 126 br.setErrorcode(ErrorCodeConstants.SUCCESS);
133 127 br.setErrormsg("成功");
134   - br.setData(StringUtils.isNotEmpty(add.getId())?add.getId():babyCheck.getId());
  128 + br.setData(babyCheck.getId());
135 129 return br;
136 130 }
137 131