Commit 199f10f63dc579bcf8e1f469c51042efd14ca1e8
1 parent
7c7e9b3d41
Exists in
master
and in
6 other branches
两癌
Showing 2 changed files with 10 additions and 2 deletions
platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineRecordModel.java
View file @
199f10f
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | public class CancerExamineRecordModel extends BaseModel { |
| 10 | 10 | private String id; |
| 11 | 11 | private String parentId;//CancerExamineModel对象的id |
| 12 | - private Integer examineLevel;// 审核级别 2 县 3 市 4 省 5 国家 | |
| 12 | + private Integer examineLevel;// 审核级别 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改 | |
| 13 | 13 | private String backReason; //驳回原因 |
| 14 | 14 | private Date examineDate;//审核时间/驳回时间 |
| 15 | 15 | private String hospitalId; |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java
View file @
199f10f
| ... | ... | @@ -998,7 +998,11 @@ |
| 998 | 998 | } |
| 999 | 999 | |
| 1000 | 1000 | public BaseResponse editCancerExamine(CancerExamineModel cancerExamineModel, Integer userId) { |
| 1001 | - cancerExamineModel.setYearQuarter(cancerExamineModel.getYear()+cancerExamineModel.getQuarter()); | |
| 1001 | + if (cancerExamineModel.getPosition() == 6) | |
| 1002 | + { | |
| 1003 | + cancerExamineModel.setPosition(7); | |
| 1004 | + } | |
| 1005 | + cancerExamineModel.setYearQuarter(Integer.parseInt(String.valueOf(cancerExamineModel.getYear())+cancerExamineModel.getQuarter())); | |
| 1002 | 1006 | Query query = Query.query(Criteria.where("id").is(cancerExamineModel.getId())); |
| 1003 | 1007 | Update update = MongoConvertHelper |
| 1004 | 1008 | .convertToNativeUpdate(ReflectionUtils.getUpdateField(cancerExamineModel)); |
| ... | ... | @@ -1113,6 +1117,10 @@ |
| 1113 | 1117 | mongoTemplate.save(recordModel); |
| 1114 | 1118 | |
| 1115 | 1119 | CancerExamineModel cancerExamineModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(recordModel.getParentId())), CancerExamineModel.class); |
| 1120 | + if (recordModel.getReasult() == 3) | |
| 1121 | + { | |
| 1122 | + cancerExamineModel.setPosition(6); | |
| 1123 | + } | |
| 1116 | 1124 | cancerExamineModel.setExamineDate(recordModel.getExamineDate()); |
| 1117 | 1125 | cancerExamineModel.setPosition(recordModel.getExamineLevel()); |
| 1118 | 1126 | Update update=MongoConvertHelper |