Commit 88816185dd43bd42f7396d68b24791c625b44e24
1 parent
10984d8dab
Exists in
master
and in
6 other branches
update
Showing 3 changed files with 7 additions and 4 deletions
- platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BreastAfterVisitDaoImpl.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/BreastAfterVisitDaoImpl.java
View file @
8881618
... | ... | @@ -36,7 +36,7 @@ |
36 | 36 | * @param breastAfterVisitModel |
37 | 37 | */ |
38 | 38 | @Override |
39 | - public void updateOneBreastAfterVisit(BreastAfterVisitModel breastAfterVisitModel) { | |
39 | + public void updateOneBreastAfterVisit2(BreastAfterVisitModel breastAfterVisitModel) { | |
40 | 40 | update(new MongoQuery(new MongoCondition("parentId", breastAfterVisitModel.getParentId(), MongoOper.IS)).convertToMongoQuery(), breastAfterVisitModel); |
41 | 41 | } |
42 | 42 | /** |
... | ... | @@ -44,7 +44,7 @@ |
44 | 44 | * @param breastAfterVisitModel |
45 | 45 | */ |
46 | 46 | @Override |
47 | - public void updateOneBreastAfterVisit2(BreastAfterVisitModel breastAfterVisitModel) { | |
47 | + public void updateOneBreastAfterVisit(BreastAfterVisitModel breastAfterVisitModel) { | |
48 | 48 | update(new MongoQuery(new MongoCondition("id", breastAfterVisitModel.getId(), MongoOper.IS)).convertToMongoQuery(), breastAfterVisitModel); |
49 | 49 | } |
50 | 50 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java
View file @
8881618
... | ... | @@ -11,6 +11,7 @@ |
11 | 11 | import com.lyms.platform.pojo.BreastAfterVisitRecordModel; |
12 | 12 | import com.lyms.platform.pojo.CancerScreeningModel; |
13 | 13 | import com.lyms.platform.pojo.ResidentsArchiveModel; |
14 | +import org.apache.ibatis.annotations.Param; | |
14 | 15 | import org.springframework.beans.factory.annotation.Autowired; |
15 | 16 | import org.springframework.stereotype.Controller; |
16 | 17 | import org.springframework.web.bind.annotation.*; |
... | ... | @@ -175,7 +176,7 @@ |
175 | 176 | @ResponseBody |
176 | 177 | @RequestMapping(method = RequestMethod.GET ,value = "/breastAfterVisitRecordList") |
177 | 178 | @TokenRequired |
178 | - public BaseResponse breastAfterVisitRecordList(@RequestBody String id, HttpServletRequest request) { | |
179 | + public BaseResponse breastAfterVisitRecordList(@RequestParam(required = false) String id, HttpServletRequest request) { | |
179 | 180 | LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); |
180 | 181 | return cancerScreenService.breastAfterVisitRecordList(id, loginState.getId()); |
181 | 182 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
View file @
8881618
... | ... | @@ -786,6 +786,7 @@ |
786 | 786 | if(null!=RecordModel.getNextAfterVisitTime()){ |
787 | 787 | model.setNextAfterVisitTime(RecordModel.getNextAfterVisitTime()); |
788 | 788 | } |
789 | + model.setType(1); | |
789 | 790 | breastAfterVisitService.updateOneBreastAfterVisit(model,1); |
790 | 791 | |
791 | 792 | return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); |
792 | 793 | |
... | ... | @@ -823,8 +824,9 @@ |
823 | 824 | map.put("afterVisitResult", recordModel.getAfterVisitResult()); |
824 | 825 | map.put("afterVisitFlowPath", recordModel.getAfterVisitFlowPath()); |
825 | 826 | map.put("nextAfterVisitTime", DateUtil.getyyyy_MM_dd(recordModel.getNextAfterVisitTime())); |
827 | + list.add(map); | |
826 | 828 | } |
827 | - return new BaseListResponse().setData(RecordModels).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); | |
829 | + return new BaseListResponse().setData(list).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); | |
828 | 830 | } |
829 | 831 | } |