diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineModel.java index 62e49bd..d90e5b7 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerExamineModel.java @@ -4,6 +4,7 @@ import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; +import java.util.Map; @Document(collection = "lyms_cancer_examine") public class CancerExamineModel extends BaseModel { @@ -12,25 +13,89 @@ public class CancerExamineModel extends BaseModel { private String provinceId; private String cityId; private String areaId; + private Integer yearQuarter; + private Integer year; //上报年份 private Integer quarter; //季度 - - private Integer yearQuarter; - private String inHospital;//填报单位 private String inUser;//填报人 private Date inDate;//填报日期 private String optHospital; //录入单位 private String optUser; //录入用户 private Date optDate; //录入时间 - private Integer type;//1 宫颈癌 2 乳腺癌 + private Map data; + + private Integer yn; private Date examineDate;//审核时间/驳回时间 - private Integer position;//1 机构 2 县 3 市 - private Integer status; // 0 录入 1 审核中 2 审核通过 3 驳回 + private Integer position;// 审核级别 1 录入 2 县 3 市 4 省 5 国家 6 驳回待修改 7 驳回已修改 + + public Date getExamineDate() { + return examineDate; + } + + public void setExamineDate(Date examineDate) { + this.examineDate = examineDate; + } + + public Integer getPosition() { + return position; + } + public void setPosition(Integer position) { + this.position = position; + } + + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + + public Integer getYearQuarter() { + return yearQuarter; + } + + public void setYearQuarter(Integer yearQuarter) { + this.yearQuarter = yearQuarter; + } + + public String getInHospital() { + return inHospital; + } + + public void setInHospital(String inHospital) { + this.inHospital = inHospital; + } + + public String getInUser() { + return inUser; + } + + public void setInUser(String inUser) { + this.inUser = inUser; + } + + public Date getInDate() { + return inDate; + } + + public void setInDate(Date inDate) { + this.inDate = inDate; + } + + public Map getData() { + return data; + } + + public void setData(Map data) { + this.data = data; + } public String getId() { return id; @@ -112,30 +177,6 @@ public class CancerExamineModel extends BaseModel { this.optDate = optDate; } - public Date getExamineDate() { - return examineDate; - } - - public void setExamineDate(Date examineDate) { - this.examineDate = examineDate; - } - - public Integer getPosition() { - return position; - } - - public void setPosition(Integer position) { - this.position = position; - } - - public Integer getStatus() { - return status; - } - - public void setStatus(Integer status) { - this.status = status; - } - public Integer getType() { return type; } 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 5acc1dd..e9fc75b 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 市 + private Integer examineLevel;// 审核级别 2 县 3 市 4 省 5 国家 private String backReason; //驳回原因 private Date examineDate;//审核时间/驳回时间 private String hospitalId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java index efde957..b555a31 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java @@ -201,40 +201,37 @@ public class CancerScreeningController extends BaseController { return cancerScreenService.queryCancerScreeningCount(cancerScreeningRequest, loginState.getId()); } + @ResponseBody - @RequestMapping(method = RequestMethod.POST,value = "/addCancersConfig") + @RequestMapping(method = RequestMethod.POST,value = "/addCancerExamine") @TokenRequired - public BaseResponse addCancersConfig(@RequestBody CancersConfig config, HttpServletRequest request) { + public BaseResponse addCancerExamine(@RequestBody CancerExamineModel config, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return cancerScreenService.addCancersConfig(config, loginState.getId()); + return cancerScreenService.addCancerExamine(config, loginState.getId()); } @ResponseBody - @RequestMapping(method = RequestMethod.GET,value = "/queryCancersConfigs") + @RequestMapping(method = RequestMethod.POST,value = "/editCancerExamine") @TokenRequired - public BaseResponse queryCancersConfigs(HttpServletRequest request) { + public BaseResponse editCancerExamine(@RequestBody CancerExamineModel config, HttpServletRequest request) { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return cancerScreenService.queryCancersConfigs(loginState.getId()); + return cancerScreenService.editCancerExamine(config, loginState.getId()); } @ResponseBody - @RequestMapping(method = RequestMethod.DELETE,value = "/delCancersConfig/{id}") + @RequestMapping(method = RequestMethod.DELETE,value = "/deleteCancerExamine/{id}") @TokenRequired - public BaseResponse delCancersConfig(@PathVariable String id, HttpServletRequest request) { - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return cancerScreenService.delCancersConfig(id, loginState.getId()); + public BaseResponse deleteCancerExamine(@PathVariable String id, HttpServletRequest request) { + return cancerScreenService.deleteCancerExamine(id); } - @ResponseBody - @RequestMapping(method = RequestMethod.POST,value = "/addCancerExamine") + @RequestMapping(method = RequestMethod.GET,value = "/getCancerExamine/{id}") @TokenRequired - public BaseResponse addCancerExamine(@RequestBody CancerExamineModel config, HttpServletRequest request) { - LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); - return cancerScreenService.addCancerExamine(config, loginState.getId()); + public BaseResponse getCancerExamine(@PathVariable String id, HttpServletRequest request) { + return cancerScreenService.getCancerExamine(id); } - @ResponseBody @RequestMapping(method = RequestMethod.GET,value = "/queryCancerExamines") @TokenRequired @@ -244,6 +241,12 @@ public class CancerScreeningController extends BaseController { } + /** + * 添加审核记录 + * @param config + * @param request + * @return + */ @ResponseBody @RequestMapping(method = RequestMethod.POST,value = "/addCancerExamineRecord") @TokenRequired 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 2933db6..f64a259 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 @@ -997,52 +997,15 @@ public class CancerScreeningFacade { return new BaseObjectResponse().setData(result).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public BaseResponse addCancersConfig(CancersConfig config, Integer id) { - - if (StringUtils.isNotEmpty(config.getId())) - { - Update update=MongoConvertHelper - .convertToNativeUpdate(ReflectionUtils.getUpdateField(config)); - mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(config.getId())), update, CancersConfig.class); - } - else - { - mongoTemplate.save(config); - } - return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); - } - - public BaseResponse delCancersConfig(String id, Integer userId) { - mongoTemplate.remove(Query.query(Criteria.where("id").is(id)),CancersConfig.class); + public BaseResponse editCancerExamine(CancerExamineModel cancerExamineModel, Integer userId) { + cancerExamineModel.setYearQuarter(cancerExamineModel.getYear()+cancerExamineModel.getQuarter()); + Query query = Query.query(Criteria.where("id").is(cancerExamineModel.getId())); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(cancerExamineModel)); + mongoTemplate.updateFirst(query, update, CancerExamineModel.class); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } - public BaseResponse queryCancersConfigs(Integer id) { - List list = mongoTemplate.find(Query.query(Criteria.where("id").exists(true)), CancersConfig.class); - List datas = new ArrayList<>(); - if (CollectionUtils.isNotEmpty(list)) - { - for (CancersConfig config : list) - { - Map data = new HashMap(); - data.put("id",config.getId()); - data.put("year",config.getYear()); - data.put("num",config.getNum()); - data.put("quarter",config.getQuarter()); - data.put("type",config.getType()); - data.put("areaName",basicConfigService.getOneBasicConfigById(config.getAreaId()).getName()); - data.put("cityName",basicConfigService.getOneBasicConfigById(config.getCityId()).getName()); - data.put("provinceName",basicConfigService.getOneBasicConfigById(config.getProvinceId()).getName()); - data.put("areaId",config.getAreaId()); - data.put("cityId",config.getCityId()); - data.put("provinceId",config.getProvinceId()); - datas.add(data); - } - } - - return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(datas); - } - public BaseResponse addCancerExamine(CancerExamineModel cancerExamineModel, Integer userId) { String hospitalId = autoMatchFacade.getHospitalId(userId); Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); @@ -1050,8 +1013,8 @@ public class CancerScreeningFacade { cancerExamineModel.setProvinceId(organization.getProvinceId()); cancerExamineModel.setCityId(organization.getCityId()); cancerExamineModel.setAreaId(organization.getAreaId()); - cancerExamineModel.setPosition(1); - cancerExamineModel.setStatus(0); + cancerExamineModel.setYearQuarter(cancerExamineModel.getYear()+cancerExamineModel.getQuarter()); + cancerExamineModel.setYn(YnEnums.YES.getId()); mongoTemplate.save(cancerExamineModel); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } @@ -1120,9 +1083,10 @@ public class CancerScreeningFacade { query.addCriteria(c); } - Criteria c = Criteria.where("type").is(request.getType()); query.addCriteria(c); + Criteria c1 = Criteria.where("yn").is(YnEnums.YES.getId()); + query.addCriteria(c1); List list = mongoTemplate.find(query, CancerExamineModel.class); List datas = new ArrayList<>(); if (CollectionUtils.isNotEmpty(list)) @@ -1144,7 +1108,6 @@ public class CancerScreeningFacade { data.put("cityId",cancer.getCityId()); data.put("areaId",cancer.getAreaId()); data.put("position",cancer.getPosition()); - data.put("status",cancer.getStatus()); datas.add(data); } } @@ -1159,7 +1122,6 @@ public class CancerScreeningFacade { CancerExamineModel cancerExamineModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(recordModel.getParentId())), CancerExamineModel.class); cancerExamineModel.setExamineDate(recordModel.getExamineDate()); - cancerExamineModel.setStatus(recordModel.getReasult()); cancerExamineModel.setPosition(recordModel.getExamineLevel()); Update update=MongoConvertHelper .convertToNativeUpdate(ReflectionUtils.getUpdateField(cancerExamineModel)); @@ -1195,7 +1157,6 @@ public class CancerScreeningFacade { CancerExamineModel cancerExamineModel = mongoTemplate.findOne(Query.query(Criteria.where("id").is(id)), CancerExamineModel.class); cancerExamineModel.setPosition(position); - cancerExamineModel.setStatus(1); Update update=MongoConvertHelper .convertToNativeUpdate(ReflectionUtils.getUpdateField(cancerExamineModel)); mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(cancerExamineModel.getId())), update, CancerExamineModel.class); @@ -1433,4 +1394,20 @@ public class CancerScreeningFacade { mongoTemplate.remove(query, CancerScreeningModel.class); return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); } + + public BaseResponse deleteCancerExamine(String id) { + Query query = Query.query(Criteria.where("id").is(id)); + CancerExamineModel cancerExamineModel = mongoTemplate.findOne(query,CancerExamineModel.class); + cancerExamineModel.setYn(YnEnums.NO.getId()); + Update update = MongoConvertHelper + .convertToNativeUpdate(ReflectionUtils.getUpdateField(cancerExamineModel)); + mongoTemplate.updateFirst(query, update, CancerExamineModel.class); + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + + public BaseResponse getCancerExamine(String id) { + Query query = Query.query(Criteria.where("id").is(id)); + CancerExamineModel cancerExamineModel = mongoTemplate.findOne(query,CancerExamineModel.class); + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(cancerExamineModel); + } }