diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineRecordModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineRecordModel.java index e9fc75b..f28c892 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineRecordModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineRecordModel.java @@ -9,7 +9,7 @@ import java.util.Date; public class CancerExamineRecordModel extends BaseModel { private String id; private String parentId;//CancerExamineModel对象的id - private Integer examineLevel;// 审核级别 2 县 3 市 4 省 5 国家 + private Integer examineLevel;// 审核级别 1 录入 2 县(行政审核) 3 市(行政审核) 4 省(行政审核) 5 国家(行政审核) 6 驳回待修改 7 驳回已修改 private String backReason; //驳回原因 private Date examineDate;//审核时间/驳回时间 private String hospitalId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index ddfe06a..f020b1d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -998,7 +998,11 @@ public class CancerScreeningFacade { } public BaseResponse editCancerExamine(CancerExamineModel cancerExamineModel, Integer userId) { - cancerExamineModel.setYearQuarter(cancerExamineModel.getYear()+cancerExamineModel.getQuarter()); + if (cancerExamineModel.getPosition() == 6) + { + cancerExamineModel.setPosition(7); + } + cancerExamineModel.setYearQuarter(Integer.parseInt(String.valueOf(cancerExamineModel.getYear())+cancerExamineModel.getQuarter())); Query query = Query.query(Criteria.where("id").is(cancerExamineModel.getId())); Update update = MongoConvertHelper .convertToNativeUpdate(ReflectionUtils.getUpdateField(cancerExamineModel)); @@ -1113,6 +1117,10 @@ public class CancerScreeningFacade { mongoTemplate.save(recordModel); CancerExamineModel cancerExamineModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(recordModel.getParentId())), CancerExamineModel.class); + if (recordModel.getReasult() == 3) + { + cancerExamineModel.setPosition(6); + } cancerExamineModel.setExamineDate(recordModel.getExamineDate()); cancerExamineModel.setPosition(recordModel.getExamineLevel()); Update update=MongoConvertHelper