diff --git a/src/main/java/com/ccsens/carbasics/api/AccountManageController.java b/src/main/java/com/ccsens/carbasics/api/AccountManageController.java new file mode 100644 index 0000000..554ae00 --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/api/AccountManageController.java @@ -0,0 +1,107 @@ +package com.ccsens.carbasics.api; + +import com.ccsens.carbasics.bean.dto.AccountDto; +import com.ccsens.carbasics.bean.po.AccountManage; +import com.ccsens.carbasics.bean.vo.AccountVo; +import com.ccsens.carbasics.bean.vo.StatisticsVo; +import com.ccsens.carbasics.service.IAccountManageService; +import com.ccsens.cloudutil.annotation.MustLogin; +import com.ccsens.util.JsonResponse; +import com.ccsens.util.bean.dto.QueryDto; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + + +/** + * @author AUSU + */ +@Slf4j +@Api(tags = "账户管理相关") +@RestController +@RequestMapping("/account") +public class AccountManageController { + + @Resource + private IAccountManageService accountManageService; + + @MustLogin + @ApiOperation(value = "提交申请", notes = "") + @RequestMapping(value = "/submitAccount", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse submitAccount(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("提交申请开始{}",params); + accountManageService.submitAccount(params.getParam(),params.getUserId()); + log.info("提交申请结束"); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "修改审核状态", notes = "") + @RequestMapping(value = "/updateAccountStatus", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateAccountStatus(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("修改审核状态开始{}",params); + accountManageService.updateAccountStatus(params.getParam(),params.getUserId()); + log.info("修改审核状态结束"); + return JsonResponse.newInstance().ok(); + } + + @MustLogin + @ApiOperation(value = "查询医院列表", notes = "") + @RequestMapping(value = "/queryHospital", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse queryHospital(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查询医院列表开始{}",params); + List hospitalListList = accountManageService.queryHospital(params.getUserId()); + log.info("查询医院列表结束:{}",hospitalListList); + return JsonResponse.newInstance().ok(hospitalListList); + } + + @MustLogin + @ApiOperation(value = "查询部门与职位", notes = "") + @RequestMapping(value = "/queryDepartment", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse queryDepartment(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查询部门与职位开始{}",params); + List departmentList = accountManageService.queryDepartment(params.getUserId()); + log.info("查询部门与职位结束:{}",departmentList); + return JsonResponse.newInstance().ok(departmentList); + } + + @MustLogin + @ApiOperation(value = "查询医院下的申请", notes = "") + @RequestMapping(value = "/queryApplyOfHospital", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryApplyOfHospital(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查询医院下的申请开始{}",params); + List departmentList = accountManageService.queryApplyOfHospital(params.getParam(),params.getUserId()); + log.info("查询医院下的申请结束:{}",departmentList); + return JsonResponse.newInstance().ok(departmentList); + } + + @MustLogin + @ApiOperation(value = "查询申请列表", notes = "") + @RequestMapping(value = "/queryApplyList", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryApplyList(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查询申请列表开始{}",params); + List departmentList = accountManageService.queryApplyList(params.getParam(),params.getUserId()); + log.info("查询申请列表结束:{}",departmentList); + return JsonResponse.newInstance().ok(departmentList); + } + + @MustLogin + @ApiOperation(value = "查询我的申请列表", notes = "") + @RequestMapping(value = "/queryMyApply", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryMyApply(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + log.info("查询我的申请列表开始{}",params); + List departmentList = accountManageService.queryMyApply(params.getParam(),params.getUserId()); + log.info("查询我的申请列表结束:{}",departmentList); + return JsonResponse.newInstance().ok(departmentList); + } +} + diff --git a/src/main/java/com/ccsens/carbasics/api/OcrController.java b/src/main/java/com/ccsens/carbasics/api/OcrController.java index 7bf3531..fe74478 100644 --- a/src/main/java/com/ccsens/carbasics/api/OcrController.java +++ b/src/main/java/com/ccsens/carbasics/api/OcrController.java @@ -69,10 +69,11 @@ public class OcrController { @MustLogin @ApiOperation(value = "图片文字识别",notes = "") @RequestMapping(value="/general/basic",method = RequestMethod.POST,produces = {"application/json;charset=UTF-8"}) - public JsonResponse>> queryInpatient(QueryDto> params, Long projectId) throws Exception { + public JsonResponse>> queryInpatient(@ApiParam @Validated @RequestBody QueryDto params) throws Exception { log.info("图片文字识别请求：{}", params); - Map> words = ocrService.discernWords(params.getParam(), params.getUserId(),projectId); + Map> words = ocrService.discernWords(params.getParam(), params.getUserId()); log.info("图片文字识别结束：{}", words); return JsonResponse.newInstance().ok(words); } + } diff --git a/src/main/java/com/ccsens/carbasics/api/OrganizationController.java b/src/main/java/com/ccsens/carbasics/api/OrganizationController.java index 495e9a2..724fdba 100644 --- a/src/main/java/com/ccsens/carbasics/api/OrganizationController.java +++ b/src/main/java/com/ccsens/carbasics/api/OrganizationController.java @@ -108,4 +108,14 @@ public class OrganizationController { log.info("医院排名查询结果:{}", rank); return JsonResponse.newInstance().ok(rank); } + + @MustLogin + @ApiOperation(value = "查询医院排名规则", notes = "") + @RequestMapping(value = "/queryRankRule", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse> queryRankRule(@ApiParam @Validated @RequestBody QueryDto params) { + log.info("查询医院排名规则:{}", params); + List rankRuleList = organizationService.queryRankRule(params.getUserId()); + log.info("查询医院排名规则结果:{}", rankRuleList); + return JsonResponse.newInstance().ok(rankRuleList); + } } diff --git a/src/main/java/com/ccsens/carbasics/bean/dto/AccountDto.java b/src/main/java/com/ccsens/carbasics/bean/dto/AccountDto.java new file mode 100644 index 0000000..dbca8e2 --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/bean/dto/AccountDto.java @@ -0,0 +1,62 @@ +package com.ccsens.carbasics.bean.dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author AUSU + */ +public class AccountDto { + + @Data + @ApiModel("提交账户-入参") + public static class SubmitAccount{ + @ApiModelProperty("医院名称") + private String hospitalName; + @ApiModelProperty("部门名称") + private String departmentName; + @ApiModelProperty("部门code") + private String departmentCode; + @ApiModelProperty("职位名称") + private String positionName; + @ApiModelProperty("职位code") + private String positionCode; + @ApiModelProperty("提交人姓名") + private String submitter; + @ApiModelProperty("提交人手机号") + private String submitterPhone; + } + + @Data + @ApiModel("修改提交账户状态-入参") + public static class UpdateAccountStatus { + @ApiModelProperty("账户id") + private Long accountManageId; + @ApiModelProperty("审核状态(1-通过,2-拒绝)") + private Byte status; + } + + @Data + @ApiModel("查询医院下的申请-入参") + public static class QueryApplyOfHospital { + @NotNull + @ApiModelProperty("项目id") + private Long projectId; + @ApiModelProperty("审核状态(0-未审核,1-审核通过,2-审核拒绝)") + private Byte auditStatus; + @ApiModelProperty("申请人姓名") + private String name; + } + + @Data + @ApiModel("查询申请列表-入参") + public static class QueryApplyList { + @ApiModelProperty("审核状态(0-未审核,1-审核通过,2-审核拒绝)") + private Byte auditStatus; + @ApiModelProperty("申请人姓名") + private String name; + } +} diff --git a/src/main/java/com/ccsens/carbasics/bean/dto/OcrDto.java b/src/main/java/com/ccsens/carbasics/bean/dto/OcrDto.java index 77e98df..b4e9d5e 100644 --- a/src/main/java/com/ccsens/carbasics/bean/dto/OcrDto.java +++ b/src/main/java/com/ccsens/carbasics/bean/dto/OcrDto.java @@ -17,11 +17,11 @@ public class OcrDto { @Data public static class GeneralBasic{ @NotNull - @ApiModelProperty("急救id") - private Long firstAidId; + @ApiModelProperty("项目id") + private Long projectId; @NotEmpty @ApiModelProperty("图片") - private List fileList; + private List fileList; } } diff --git a/src/main/java/com/ccsens/carbasics/bean/po/AccountManage.java b/src/main/java/com/ccsens/carbasics/bean/po/AccountManage.java new file mode 100644 index 0000000..550a092 --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/bean/po/AccountManage.java @@ -0,0 +1,172 @@ +package com.ccsens.carbasics.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class AccountManage implements Serializable { + private Long id; + + private String hospitalName; + + private String departmentName; + + private String departmentCode; + + private String positionName; + + private String positionCode; + + private String submitter; + + private String submitterPhone; + + private Long submitterUserId; + + private Long aduitUserId; + + private Byte auditStatus; + + private Date createdAt; + + private Date updatedAt; + + private Byte recStatus; + + private static final long serialVersionUID = 1L; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getHospitalName() { + return hospitalName; + } + + public void setHospitalName(String hospitalName) { + this.hospitalName = hospitalName == null ? null : hospitalName.trim(); + } + + public String getDepartmentName() { + return departmentName; + } + + public void setDepartmentName(String departmentName) { + this.departmentName = departmentName == null ? null : departmentName.trim(); + } + + public String getDepartmentCode() { + return departmentCode; + } + + public void setDepartmentCode(String departmentCode) { + this.departmentCode = departmentCode == null ? null : departmentCode.trim(); + } + + public String getPositionName() { + return positionName; + } + + public void setPositionName(String positionName) { + this.positionName = positionName == null ? null : positionName.trim(); + } + + public String getPositionCode() { + return positionCode; + } + + public void setPositionCode(String positionCode) { + this.positionCode = positionCode == null ? null : positionCode.trim(); + } + + public String getSubmitter() { + return submitter; + } + + public void setSubmitter(String submitter) { + this.submitter = submitter == null ? null : submitter.trim(); + } + + public String getSubmitterPhone() { + return submitterPhone; + } + + public void setSubmitterPhone(String submitterPhone) { + this.submitterPhone = submitterPhone == null ? null : submitterPhone.trim(); + } + + public Long getSubmitterUserId() { + return submitterUserId; + } + + public void setSubmitterUserId(Long submitterUserId) { + this.submitterUserId = submitterUserId; + } + + public Long getAduitUserId() { + return aduitUserId; + } + + public void setAduitUserId(Long aduitUserId) { + this.aduitUserId = aduitUserId; + } + + public Byte getAuditStatus() { + return auditStatus; + } + + public void setAuditStatus(Byte auditStatus) { + this.auditStatus = auditStatus; + } + + public Date getCreatedAt() { + return createdAt; + } + + public void setCreatedAt(Date createdAt) { + this.createdAt = createdAt; + } + + public Date getUpdatedAt() { + return updatedAt; + } + + public void setUpdatedAt(Date updatedAt) { + this.updatedAt = updatedAt; + } + + public Byte getRecStatus() { + return recStatus; + } + + public void setRecStatus(Byte recStatus) { + this.recStatus = recStatus; + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append(getClass().getSimpleName()); + sb.append(" ["); + sb.append("Hash = ").append(hashCode()); + sb.append(", id=").append(id); + sb.append(", hospitalName=").append(hospitalName); + sb.append(", departmentName=").append(departmentName); + sb.append(", departmentCode=").append(departmentCode); + sb.append(", positionName=").append(positionName); + sb.append(", positionCode=").append(positionCode); + sb.append(", submitter=").append(submitter); + sb.append(", submitterPhone=").append(submitterPhone); + sb.append(", submitterUserId=").append(submitterUserId); + sb.append(", aduitUserId=").append(aduitUserId); + sb.append(", auditStatus=").append(auditStatus); + sb.append(", createdAt=").append(createdAt); + sb.append(", updatedAt=").append(updatedAt); + sb.append(", recStatus=").append(recStatus); + sb.append("]"); + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/carbasics/bean/po/AccountManageExample.java b/src/main/java/com/ccsens/carbasics/bean/po/AccountManageExample.java new file mode 100644 index 0000000..cac673d --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/bean/po/AccountManageExample.java @@ -0,0 +1,1111 @@ +package com.ccsens.carbasics.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class AccountManageExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public AccountManageExample() { + oredCriteria = new ArrayList(); + } + + public void setOrderByClause(String orderByClause) { + this.orderByClause = orderByClause; + } + + public String getOrderByClause() { + return orderByClause; + } + + public void setDistinct(boolean distinct) { + this.distinct = distinct; + } + + public boolean isDistinct() { + return distinct; + } + + public List getOredCriteria() { + return oredCriteria; + } + + public void or(Criteria criteria) { + oredCriteria.add(criteria); + } + + public Criteria or() { + Criteria criteria = createCriteriaInternal(); + oredCriteria.add(criteria); + return criteria; + } + + public Criteria createCriteria() { + Criteria criteria = createCriteriaInternal(); + if (oredCriteria.size() == 0) { + oredCriteria.add(criteria); + } + return criteria; + } + + protected Criteria createCriteriaInternal() { + Criteria criteria = new Criteria(); + return criteria; + } + + public void clear() { + oredCriteria.clear(); + orderByClause = null; + distinct = false; + } + + protected abstract static class GeneratedCriteria { + protected List criteria; + + protected GeneratedCriteria() { + super(); + criteria = new ArrayList(); + } + + public boolean isValid() { + return criteria.size() > 0; + } + + public List getAllCriteria() { + return criteria; + } + + public List getCriteria() { + return criteria; + } + + protected void addCriterion(String condition) { + if (condition == null) { + throw new RuntimeException("Value for condition cannot be null"); + } + criteria.add(new Criterion(condition)); + } + + protected void addCriterion(String condition, Object value, String property) { + if (value == null) { + throw new RuntimeException("Value for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value)); + } + + protected void addCriterion(String condition, Object value1, Object value2, String property) { + if (value1 == null || value2 == null) { + throw new RuntimeException("Between values for " + property + " cannot be null"); + } + criteria.add(new Criterion(condition, value1, value2)); + } + + public Criteria andIdIsNull() { + addCriterion("id is null"); + return (Criteria) this; + } + + public Criteria andIdIsNotNull() { + addCriterion("id is not null"); + return (Criteria) this; + } + + public Criteria andIdEqualTo(Long value) { + addCriterion("id =", value, "id"); + return (Criteria) this; + } + + public Criteria andIdNotEqualTo(Long value) { + addCriterion("id <>", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThan(Long value) { + addCriterion("id >", value, "id"); + return (Criteria) this; + } + + public Criteria andIdGreaterThanOrEqualTo(Long value) { + addCriterion("id >=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThan(Long value) { + addCriterion("id <", value, "id"); + return (Criteria) this; + } + + public Criteria andIdLessThanOrEqualTo(Long value) { + addCriterion("id <=", value, "id"); + return (Criteria) this; + } + + public Criteria andIdIn(List values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List values) { + addCriterion("id not in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdBetween(Long value1, Long value2) { + addCriterion("id between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andIdNotBetween(Long value1, Long value2) { + addCriterion("id not between", value1, value2, "id"); + return (Criteria) this; + } + + public Criteria andHospitalNameIsNull() { + addCriterion("hospital_name is null"); + return (Criteria) this; + } + + public Criteria andHospitalNameIsNotNull() { + addCriterion("hospital_name is not null"); + return (Criteria) this; + } + + public Criteria andHospitalNameEqualTo(String value) { + addCriterion("hospital_name =", value, "hospitalName"); + return (Criteria) this; + } + + public Criteria andHospitalNameNotEqualTo(String value) { + addCriterion("hospital_name <>", value, "hospitalName"); + return (Criteria) this; + } + + public Criteria andHospitalNameGreaterThan(String value) { + addCriterion("hospital_name >", value, "hospitalName"); + return (Criteria) this; + } + + public Criteria andHospitalNameGreaterThanOrEqualTo(String value) { + addCriterion("hospital_name >=", value, "hospitalName"); + return (Criteria) this; + } + + public Criteria andHospitalNameLessThan(String value) { + addCriterion("hospital_name <", value, "hospitalName"); + return (Criteria) this; + } + + public Criteria andHospitalNameLessThanOrEqualTo(String value) { + addCriterion("hospital_name <=", value, "hospitalName"); + return (Criteria) this; + } + + public Criteria andHospitalNameLike(String value) { + addCriterion("hospital_name like", value, "hospitalName"); + return (Criteria) this; + } + + public Criteria andHospitalNameNotLike(String value) { + addCriterion("hospital_name not like", value, "hospitalName"); + return (Criteria) this; + } + + public Criteria andHospitalNameIn(List values) { + addCriterion("hospital_name in", values, "hospitalName"); + return (Criteria) this; + } + + public Criteria andHospitalNameNotIn(List values) { + addCriterion("hospital_name not in", values, "hospitalName"); + return (Criteria) this; + } + + public Criteria andHospitalNameBetween(String value1, String value2) { + addCriterion("hospital_name between", value1, value2, "hospitalName"); + return (Criteria) this; + } + + public Criteria andHospitalNameNotBetween(String value1, String value2) { + addCriterion("hospital_name not between", value1, value2, "hospitalName"); + return (Criteria) this; + } + + public Criteria andDepartmentNameIsNull() { + addCriterion("department_name is null"); + return (Criteria) this; + } + + public Criteria andDepartmentNameIsNotNull() { + addCriterion("department_name is not null"); + return (Criteria) this; + } + + public Criteria andDepartmentNameEqualTo(String value) { + addCriterion("department_name =", value, "departmentName"); + return (Criteria) this; + } + + public Criteria andDepartmentNameNotEqualTo(String value) { + addCriterion("department_name <>", value, "departmentName"); + return (Criteria) this; + } + + public Criteria andDepartmentNameGreaterThan(String value) { + addCriterion("department_name >", value, "departmentName"); + return (Criteria) this; + } + + public Criteria andDepartmentNameGreaterThanOrEqualTo(String value) { + addCriterion("department_name >=", value, "departmentName"); + return (Criteria) this; + } + + public Criteria andDepartmentNameLessThan(String value) { + addCriterion("department_name <", value, "departmentName"); + return (Criteria) this; + } + + public Criteria andDepartmentNameLessThanOrEqualTo(String value) { + addCriterion("department_name <=", value, "departmentName"); + return (Criteria) this; + } + + public Criteria andDepartmentNameLike(String value) { + addCriterion("department_name like", value, "departmentName"); + return (Criteria) this; + } + + public Criteria andDepartmentNameNotLike(String value) { + addCriterion("department_name not like", value, "departmentName"); + return (Criteria) this; + } + + public Criteria andDepartmentNameIn(List values) { + addCriterion("department_name in", values, "departmentName"); + return (Criteria) this; + } + + public Criteria andDepartmentNameNotIn(List values) { + addCriterion("department_name not in", values, "departmentName"); + return (Criteria) this; + } + + public Criteria andDepartmentNameBetween(String value1, String value2) { + addCriterion("department_name between", value1, value2, "departmentName"); + return (Criteria) this; + } + + public Criteria andDepartmentNameNotBetween(String value1, String value2) { + addCriterion("department_name not between", value1, value2, "departmentName"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeIsNull() { + addCriterion("department_code is null"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeIsNotNull() { + addCriterion("department_code is not null"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeEqualTo(String value) { + addCriterion("department_code =", value, "departmentCode"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeNotEqualTo(String value) { + addCriterion("department_code <>", value, "departmentCode"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeGreaterThan(String value) { + addCriterion("department_code >", value, "departmentCode"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeGreaterThanOrEqualTo(String value) { + addCriterion("department_code >=", value, "departmentCode"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeLessThan(String value) { + addCriterion("department_code <", value, "departmentCode"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeLessThanOrEqualTo(String value) { + addCriterion("department_code <=", value, "departmentCode"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeLike(String value) { + addCriterion("department_code like", value, "departmentCode"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeNotLike(String value) { + addCriterion("department_code not like", value, "departmentCode"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeIn(List values) { + addCriterion("department_code in", values, "departmentCode"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeNotIn(List values) { + addCriterion("department_code not in", values, "departmentCode"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeBetween(String value1, String value2) { + addCriterion("department_code between", value1, value2, "departmentCode"); + return (Criteria) this; + } + + public Criteria andDepartmentCodeNotBetween(String value1, String value2) { + addCriterion("department_code not between", value1, value2, "departmentCode"); + return (Criteria) this; + } + + public Criteria andPositionNameIsNull() { + addCriterion("position_name is null"); + return (Criteria) this; + } + + public Criteria andPositionNameIsNotNull() { + addCriterion("position_name is not null"); + return (Criteria) this; + } + + public Criteria andPositionNameEqualTo(String value) { + addCriterion("position_name =", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameNotEqualTo(String value) { + addCriterion("position_name <>", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameGreaterThan(String value) { + addCriterion("position_name >", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameGreaterThanOrEqualTo(String value) { + addCriterion("position_name >=", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameLessThan(String value) { + addCriterion("position_name <", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameLessThanOrEqualTo(String value) { + addCriterion("position_name <=", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameLike(String value) { + addCriterion("position_name like", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameNotLike(String value) { + addCriterion("position_name not like", value, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameIn(List values) { + addCriterion("position_name in", values, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameNotIn(List values) { + addCriterion("position_name not in", values, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameBetween(String value1, String value2) { + addCriterion("position_name between", value1, value2, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionNameNotBetween(String value1, String value2) { + addCriterion("position_name not between", value1, value2, "positionName"); + return (Criteria) this; + } + + public Criteria andPositionCodeIsNull() { + addCriterion("position_code is null"); + return (Criteria) this; + } + + public Criteria andPositionCodeIsNotNull() { + addCriterion("position_code is not null"); + return (Criteria) this; + } + + public Criteria andPositionCodeEqualTo(String value) { + addCriterion("position_code =", value, "positionCode"); + return (Criteria) this; + } + + public Criteria andPositionCodeNotEqualTo(String value) { + addCriterion("position_code <>", value, "positionCode"); + return (Criteria) this; + } + + public Criteria andPositionCodeGreaterThan(String value) { + addCriterion("position_code >", value, "positionCode"); + return (Criteria) this; + } + + public Criteria andPositionCodeGreaterThanOrEqualTo(String value) { + addCriterion("position_code >=", value, "positionCode"); + return (Criteria) this; + } + + public Criteria andPositionCodeLessThan(String value) { + addCriterion("position_code <", value, "positionCode"); + return (Criteria) this; + } + + public Criteria andPositionCodeLessThanOrEqualTo(String value) { + addCriterion("position_code <=", value, "positionCode"); + return (Criteria) this; + } + + public Criteria andPositionCodeLike(String value) { + addCriterion("position_code like", value, "positionCode"); + return (Criteria) this; + } + + public Criteria andPositionCodeNotLike(String value) { + addCriterion("position_code not like", value, "positionCode"); + return (Criteria) this; + } + + public Criteria andPositionCodeIn(List values) { + addCriterion("position_code in", values, "positionCode"); + return (Criteria) this; + } + + public Criteria andPositionCodeNotIn(List values) { + addCriterion("position_code not in", values, "positionCode"); + return (Criteria) this; + } + + public Criteria andPositionCodeBetween(String value1, String value2) { + addCriterion("position_code between", value1, value2, "positionCode"); + return (Criteria) this; + } + + public Criteria andPositionCodeNotBetween(String value1, String value2) { + addCriterion("position_code not between", value1, value2, "positionCode"); + return (Criteria) this; + } + + public Criteria andSubmitterIsNull() { + addCriterion("submitter is null"); + return (Criteria) this; + } + + public Criteria andSubmitterIsNotNull() { + addCriterion("submitter is not null"); + return (Criteria) this; + } + + public Criteria andSubmitterEqualTo(String value) { + addCriterion("submitter =", value, "submitter"); + return (Criteria) this; + } + + public Criteria andSubmitterNotEqualTo(String value) { + addCriterion("submitter <>", value, "submitter"); + return (Criteria) this; + } + + public Criteria andSubmitterGreaterThan(String value) { + addCriterion("submitter >", value, "submitter"); + return (Criteria) this; + } + + public Criteria andSubmitterGreaterThanOrEqualTo(String value) { + addCriterion("submitter >=", value, "submitter"); + return (Criteria) this; + } + + public Criteria andSubmitterLessThan(String value) { + addCriterion("submitter <", value, "submitter"); + return (Criteria) this; + } + + public Criteria andSubmitterLessThanOrEqualTo(String value) { + addCriterion("submitter <=", value, "submitter"); + return (Criteria) this; + } + + public Criteria andSubmitterLike(String value) { + addCriterion("submitter like", value, "submitter"); + return (Criteria) this; + } + + public Criteria andSubmitterNotLike(String value) { + addCriterion("submitter not like", value, "submitter"); + return (Criteria) this; + } + + public Criteria andSubmitterIn(List values) { + addCriterion("submitter in", values, "submitter"); + return (Criteria) this; + } + + public Criteria andSubmitterNotIn(List values) { + addCriterion("submitter not in", values, "submitter"); + return (Criteria) this; + } + + public Criteria andSubmitterBetween(String value1, String value2) { + addCriterion("submitter between", value1, value2, "submitter"); + return (Criteria) this; + } + + public Criteria andSubmitterNotBetween(String value1, String value2) { + addCriterion("submitter not between", value1, value2, "submitter"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneIsNull() { + addCriterion("submitter_phone is null"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneIsNotNull() { + addCriterion("submitter_phone is not null"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneEqualTo(String value) { + addCriterion("submitter_phone =", value, "submitterPhone"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneNotEqualTo(String value) { + addCriterion("submitter_phone <>", value, "submitterPhone"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneGreaterThan(String value) { + addCriterion("submitter_phone >", value, "submitterPhone"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneGreaterThanOrEqualTo(String value) { + addCriterion("submitter_phone >=", value, "submitterPhone"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneLessThan(String value) { + addCriterion("submitter_phone <", value, "submitterPhone"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneLessThanOrEqualTo(String value) { + addCriterion("submitter_phone <=", value, "submitterPhone"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneLike(String value) { + addCriterion("submitter_phone like", value, "submitterPhone"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneNotLike(String value) { + addCriterion("submitter_phone not like", value, "submitterPhone"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneIn(List values) { + addCriterion("submitter_phone in", values, "submitterPhone"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneNotIn(List values) { + addCriterion("submitter_phone not in", values, "submitterPhone"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneBetween(String value1, String value2) { + addCriterion("submitter_phone between", value1, value2, "submitterPhone"); + return (Criteria) this; + } + + public Criteria andSubmitterPhoneNotBetween(String value1, String value2) { + addCriterion("submitter_phone not between", value1, value2, "submitterPhone"); + return (Criteria) this; + } + + public Criteria andSubmitterUserIdIsNull() { + addCriterion("submitter_user_id is null"); + return (Criteria) this; + } + + public Criteria andSubmitterUserIdIsNotNull() { + addCriterion("submitter_user_id is not null"); + return (Criteria) this; + } + + public Criteria andSubmitterUserIdEqualTo(Long value) { + addCriterion("submitter_user_id =", value, "submitterUserId"); + return (Criteria) this; + } + + public Criteria andSubmitterUserIdNotEqualTo(Long value) { + addCriterion("submitter_user_id <>", value, "submitterUserId"); + return (Criteria) this; + } + + public Criteria andSubmitterUserIdGreaterThan(Long value) { + addCriterion("submitter_user_id >", value, "submitterUserId"); + return (Criteria) this; + } + + public Criteria andSubmitterUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("submitter_user_id >=", value, "submitterUserId"); + return (Criteria) this; + } + + public Criteria andSubmitterUserIdLessThan(Long value) { + addCriterion("submitter_user_id <", value, "submitterUserId"); + return (Criteria) this; + } + + public Criteria andSubmitterUserIdLessThanOrEqualTo(Long value) { + addCriterion("submitter_user_id <=", value, "submitterUserId"); + return (Criteria) this; + } + + public Criteria andSubmitterUserIdIn(List values) { + addCriterion("submitter_user_id in", values, "submitterUserId"); + return (Criteria) this; + } + + public Criteria andSubmitterUserIdNotIn(List values) { + addCriterion("submitter_user_id not in", values, "submitterUserId"); + return (Criteria) this; + } + + public Criteria andSubmitterUserIdBetween(Long value1, Long value2) { + addCriterion("submitter_user_id between", value1, value2, "submitterUserId"); + return (Criteria) this; + } + + public Criteria andSubmitterUserIdNotBetween(Long value1, Long value2) { + addCriterion("submitter_user_id not between", value1, value2, "submitterUserId"); + return (Criteria) this; + } + + public Criteria andAduitUserIdIsNull() { + addCriterion("aduit_user_id is null"); + return (Criteria) this; + } + + public Criteria andAduitUserIdIsNotNull() { + addCriterion("aduit_user_id is not null"); + return (Criteria) this; + } + + public Criteria andAduitUserIdEqualTo(Long value) { + addCriterion("aduit_user_id =", value, "aduitUserId"); + return (Criteria) this; + } + + public Criteria andAduitUserIdNotEqualTo(Long value) { + addCriterion("aduit_user_id <>", value, "aduitUserId"); + return (Criteria) this; + } + + public Criteria andAduitUserIdGreaterThan(Long value) { + addCriterion("aduit_user_id >", value, "aduitUserId"); + return (Criteria) this; + } + + public Criteria andAduitUserIdGreaterThanOrEqualTo(Long value) { + addCriterion("aduit_user_id >=", value, "aduitUserId"); + return (Criteria) this; + } + + public Criteria andAduitUserIdLessThan(Long value) { + addCriterion("aduit_user_id <", value, "aduitUserId"); + return (Criteria) this; + } + + public Criteria andAduitUserIdLessThanOrEqualTo(Long value) { + addCriterion("aduit_user_id <=", value, "aduitUserId"); + return (Criteria) this; + } + + public Criteria andAduitUserIdIn(List values) { + addCriterion("aduit_user_id in", values, "aduitUserId"); + return (Criteria) this; + } + + public Criteria andAduitUserIdNotIn(List values) { + addCriterion("aduit_user_id not in", values, "aduitUserId"); + return (Criteria) this; + } + + public Criteria andAduitUserIdBetween(Long value1, Long value2) { + addCriterion("aduit_user_id between", value1, value2, "aduitUserId"); + return (Criteria) this; + } + + public Criteria andAduitUserIdNotBetween(Long value1, Long value2) { + addCriterion("aduit_user_id not between", value1, value2, "aduitUserId"); + return (Criteria) this; + } + + public Criteria andAuditStatusIsNull() { + addCriterion("audit_status is null"); + return (Criteria) this; + } + + public Criteria andAuditStatusIsNotNull() { + addCriterion("audit_status is not null"); + return (Criteria) this; + } + + public Criteria andAuditStatusEqualTo(Byte value) { + addCriterion("audit_status =", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusNotEqualTo(Byte value) { + addCriterion("audit_status <>", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusGreaterThan(Byte value) { + addCriterion("audit_status >", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("audit_status >=", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusLessThan(Byte value) { + addCriterion("audit_status <", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusLessThanOrEqualTo(Byte value) { + addCriterion("audit_status <=", value, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusIn(List values) { + addCriterion("audit_status in", values, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusNotIn(List values) { + addCriterion("audit_status not in", values, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusBetween(Byte value1, Byte value2) { + addCriterion("audit_status between", value1, value2, "auditStatus"); + return (Criteria) this; + } + + public Criteria andAuditStatusNotBetween(Byte value1, Byte value2) { + addCriterion("audit_status not between", value1, value2, "auditStatus"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNull() { + addCriterion("created_at is null"); + return (Criteria) this; + } + + public Criteria andCreatedAtIsNotNull() { + addCriterion("created_at is not null"); + return (Criteria) this; + } + + public Criteria andCreatedAtEqualTo(Date value) { + addCriterion("created_at =", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotEqualTo(Date value) { + addCriterion("created_at <>", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThan(Date value) { + addCriterion("created_at >", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("created_at >=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThan(Date value) { + addCriterion("created_at <", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtLessThanOrEqualTo(Date value) { + addCriterion("created_at <=", value, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtIn(List values) { + addCriterion("created_at in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotIn(List values) { + addCriterion("created_at not in", values, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtBetween(Date value1, Date value2) { + addCriterion("created_at between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andCreatedAtNotBetween(Date value1, Date value2) { + addCriterion("created_at not between", value1, value2, "createdAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNull() { + addCriterion("updated_at is null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIsNotNull() { + addCriterion("updated_at is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedAtEqualTo(Date value) { + addCriterion("updated_at =", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotEqualTo(Date value) { + addCriterion("updated_at <>", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThan(Date value) { + addCriterion("updated_at >", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtGreaterThanOrEqualTo(Date value) { + addCriterion("updated_at >=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThan(Date value) { + addCriterion("updated_at <", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtLessThanOrEqualTo(Date value) { + addCriterion("updated_at <=", value, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtIn(List values) { + addCriterion("updated_at in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotIn(List values) { + addCriterion("updated_at not in", values, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtBetween(Date value1, Date value2) { + addCriterion("updated_at between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andUpdatedAtNotBetween(Date value1, Date value2) { + addCriterion("updated_at not between", value1, value2, "updatedAt"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNull() { + addCriterion("rec_status is null"); + return (Criteria) this; + } + + public Criteria andRecStatusIsNotNull() { + addCriterion("rec_status is not null"); + return (Criteria) this; + } + + public Criteria andRecStatusEqualTo(Byte value) { + addCriterion("rec_status =", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotEqualTo(Byte value) { + addCriterion("rec_status <>", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThan(Byte value) { + addCriterion("rec_status >", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusGreaterThanOrEqualTo(Byte value) { + addCriterion("rec_status >=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThan(Byte value) { + addCriterion("rec_status <", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusLessThanOrEqualTo(Byte value) { + addCriterion("rec_status <=", value, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusIn(List values) { + addCriterion("rec_status in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotIn(List values) { + addCriterion("rec_status not in", values, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusBetween(Byte value1, Byte value2) { + addCriterion("rec_status between", value1, value2, "recStatus"); + return (Criteria) this; + } + + public Criteria andRecStatusNotBetween(Byte value1, Byte value2) { + addCriterion("rec_status not between", value1, value2, "recStatus"); + return (Criteria) this; + } + } + + public static class Criteria extends GeneratedCriteria { + + protected Criteria() { + super(); + } + } + + public static class Criterion { + private String condition; + + private Object value; + + private Object secondValue; + + private boolean noValue; + + private boolean singleValue; + + private boolean betweenValue; + + private boolean listValue; + + private String typeHandler; + + public String getCondition() { + return condition; + } + + public Object getValue() { + return value; + } + + public Object getSecondValue() { + return secondValue; + } + + public boolean isNoValue() { + return noValue; + } + + public boolean isSingleValue() { + return singleValue; + } + + public boolean isBetweenValue() { + return betweenValue; + } + + public boolean isListValue() { + return listValue; + } + + public String getTypeHandler() { + return typeHandler; + } + + protected Criterion(String condition) { + super(); + this.condition = condition; + this.typeHandler = null; + this.noValue = true; + } + + protected Criterion(String condition, Object value, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.typeHandler = typeHandler; + if (value instanceof List) { + this.listValue = true; + } else { + this.singleValue = true; + } + } + + protected Criterion(String condition, Object value) { + this(condition, value, null); + } + + protected Criterion(String condition, Object value, Object secondValue, String typeHandler) { + super(); + this.condition = condition; + this.value = value; + this.secondValue = secondValue; + this.typeHandler = typeHandler; + this.betweenValue = true; + } + + protected Criterion(String condition, Object value, Object secondValue) { + this(condition, value, secondValue, null); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java new file mode 100644 index 0000000..bbbb548 --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/bean/vo/AccountVo.java @@ -0,0 +1,61 @@ +package com.ccsens.carbasics.bean.vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @author AUSU + */ +public class AccountVo { + + @Data + @ApiModel("医院列表") + public static class HospitalList { + @ApiModelProperty("医院名称") + private String name; + } + + @Data + @ApiModel("部门与职位") + public static class DepartmentList { + @ApiModelProperty("部门名称") + private String departmentName; + @ApiModelProperty("部门code") + private String departmentCode; + @ApiModelProperty("部门下的职位") + private List positions; + } + + @Data + @ApiModel("职位") + public static class Position { + @ApiModelProperty("职位名称") + private String positionName; + @ApiModelProperty("职位code") + private String positionCode; + } + + @Data + @ApiModel("查询医院下的申请-返参") + public static class ApplyOfHospital { + @ApiModelProperty("申请人名称") + private String name; + @ApiModelProperty("电话号") + private String phone; + @ApiModelProperty("医院名称") + private String hospitalName; + @ApiModelProperty("部门名称") + private String department; + @ApiModelProperty("职务名称") + private String position; + @ApiModelProperty("部门code") + private String departmentCode; + @ApiModelProperty("职位code") + private String positionCode; + @ApiModelProperty("审核状态(0-未审核,1-审核通过,2-审核拒绝)") + private Byte auditStatus; + } +} diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java index 595b08f..f45eb30 100644 --- a/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java +++ b/src/main/java/com/ccsens/carbasics/bean/vo/OrganizationVo.java @@ -90,6 +90,22 @@ public class OrganizationVo { @ApiModelProperty("医院排名") private List list; } + @ApiModel("医院排名规则-返回") + @Data + public static class RankRule{ + @ApiModelProperty("序号") + private Integer ruleId; + @ApiModelProperty("指标") + private String value; + @ApiModelProperty("标注（前端切换指标显示）") + private String label; + + public RankRule(Integer ruleId, String value, String label) { + this.ruleId = ruleId; + this.value = value; + this.label = label; + } + } @ApiModel("医院排名项") @Data diff --git a/src/main/java/com/ccsens/carbasics/persist/dao/AccountManageDao.java b/src/main/java/com/ccsens/carbasics/persist/dao/AccountManageDao.java new file mode 100644 index 0000000..2507444 --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/persist/dao/AccountManageDao.java @@ -0,0 +1,24 @@ +package com.ccsens.carbasics.persist.dao; + +import com.ccsens.carbasics.bean.vo.AccountVo; +import com.ccsens.carbasics.persist.mapper.AccountManageMapper; +import org.apache.ibatis.annotations.Param; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** + * @author AUSU + */ +@Repository +public interface AccountManageDao extends AccountManageMapper { + /** + * 根据医院名称查询申请列表 + * @param hospitalName 医院名称 + * @param auditStatus 审核状态 + * @param name 申请姓名 + * @param userId 申请人userId + * @return 申请列表 + */ + List queryApply(@Param("hospitalName") String hospitalName,@Param("status")Byte auditStatus,@Param("name")String name,@Param("userId")Long userId); +} diff --git a/src/main/java/com/ccsens/carbasics/persist/mapper/AccountManageMapper.java b/src/main/java/com/ccsens/carbasics/persist/mapper/AccountManageMapper.java new file mode 100644 index 0000000..4515d85 --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/persist/mapper/AccountManageMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.carbasics.persist.mapper; + +import com.ccsens.carbasics.bean.po.AccountManage; +import com.ccsens.carbasics.bean.po.AccountManageExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface AccountManageMapper { + long countByExample(AccountManageExample example); + + int deleteByExample(AccountManageExample example); + + int deleteByPrimaryKey(Long id); + + int insert(AccountManage record); + + int insertSelective(AccountManage record); + + List selectByExample(AccountManageExample example); + + AccountManage selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") AccountManage record, @Param("example") AccountManageExample example); + + int updateByExample(@Param("record") AccountManage record, @Param("example") AccountManageExample example); + + int updateByPrimaryKeySelective(AccountManage record); + + int updateByPrimaryKey(AccountManage record); +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/carbasics/service/AccountManageService.java b/src/main/java/com/ccsens/carbasics/service/AccountManageService.java new file mode 100644 index 0000000..a49a32f --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/service/AccountManageService.java @@ -0,0 +1,176 @@ +package com.ccsens.carbasics.service; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.ObjectUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.ccsens.carbasics.bean.dto.AccountDto; +import com.ccsens.carbasics.bean.po.AccountManage; +import com.ccsens.carbasics.bean.po.AccountManageExample; +import com.ccsens.carbasics.bean.po.Organization; +import com.ccsens.carbasics.bean.vo.AccountVo; +import com.ccsens.carbasics.persist.dao.AccountManageDao; +import com.ccsens.carbasics.persist.dao.OrganizationDao; +import com.ccsens.carbasics.persist.dao.OrganizationPositionDao; +import com.ccsens.carbasics.persist.dao.OrganizationProjectDao; +import com.ccsens.carbasics.util.Constant; +import com.ccsens.carbasics.util.DefaultCodeError; +import com.ccsens.common.bean.po.ConstantExample; +import com.ccsens.common.persist.mapper.ConstantMapper; +import com.ccsens.util.RedisUtil; +import com.ccsens.util.exception.BaseException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.List; + + +@Slf4j +@Service +@Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class) +public class AccountManageService implements IAccountManageService { + + @Resource + private AccountManageDao accountManageDao; + @Resource + private QuestionnaireService questionnaireService; + @Resource + private OrganizationPositionDao positionDao; + @Resource + private RedisUtil redisUtil; + @Resource + private ConstantMapper constantMapper; + @Resource + private OrganizationProjectDao organizationProjectDao; + @Resource + private OrganizationDao organizationDao; + @Resource + private Snowflake snowflake; + @Override + public void submitAccount(AccountDto.SubmitAccount param, Long userId) { + AccountManage accountManage = new AccountManage(); + BeanUtil.copyProperties(param,accountManage); + accountManage.setId(snowflake.nextId()); + accountManage.setSubmitterUserId(userId); + accountManage.setAuditStatus((byte) 0); + accountManageDao.insertSelective(accountManage); + } + + + @Override + public void updateAccountStatus(AccountDto.UpdateAccountStatus param, Long userId) { + AccountManage accountManage = new AccountManage(); + accountManage.setId(param.getAccountManageId()); + if (2 == param.getStatus()) { + accountManage.setAuditStatus(param.getStatus()); + accountManage.setAduitUserId(userId); + accountManageDao.updateByPrimaryKeySelective(accountManage); + } + accountManage.setAuditStatus(param.getStatus()); + accountManage.setAduitUserId(userId); + accountManageDao.updateByPrimaryKeySelective(accountManage); + + //创建项目 + AccountManage accountManageInfo = accountManageDao.selectByPrimaryKey(param.getAccountManageId()); + //查询职位id + Long positionId = positionDao.queryByName(accountManageInfo.getPositionName()); + questionnaireService.createHospitalAndProject(accountManageInfo.getSubmitterPhone(),accountManageInfo.getSubmitterUserId(),"", + accountManage.getHospitalName(),accountManage.getDepartmentName(),accountManage.getSubmitter(),positionId,accountManage.getDepartmentCode()); + } + + + @Override + public List queryHospital(Long userId) { + List hospitalListList = new ArrayList<>(); + List objects = redisUtil.lGet(Constant.HOSPITAL_LIST_KEY, 0, -1); + log.info("redis获取到的医院信息{}",objects); + if (CollectionUtil.isNotEmpty(objects)) { + for (Object object : objects) { + String hospital = (String) object; + String[] split = hospital.split(","); + for (String hospitalName : split) { + AccountVo.HospitalList hospitalList = new AccountVo.HospitalList(); + hospitalList.setName(hospitalName); + hospitalListList.add(hospitalList); + } + } + return hospitalListList; + } + //查询常量 + ConstantExample constantExample = new ConstantExample(); + constantExample.createCriteria().andBusinessTypeEqualTo((byte) 2) + .andTKeyEqualTo(Constant.HOSPITAL_LIST_KEY); + List constantList = constantMapper.selectByExample(constantExample); + if (CollectionUtil.isNotEmpty(constantList)) { + String value = constantList.get(0).gettValue(); + String[] hospitalList = value.split(","); + for (String hospitalName : hospitalList) { + AccountVo.HospitalList hospital = new AccountVo.HospitalList(); + hospital.setName(hospitalName); + hospitalListList.add(hospital); + redisUtil.lSet(Constant.HOSPITAL_LIST_KEY,hospitalName); + } + } + return hospitalListList; + } + + + @Override + public List queryDepartment(Long userId) { + List departmentList = new ArrayList<>(); + List objects = redisUtil.lGet(Constant.DEPARTMENT_POSITION_KEY, 0, -1); + log.info("redis获取到的职位信息{}",objects); + if (CollectionUtil.isNotEmpty(objects)) { + for (Object object : objects) { + AccountVo.DepartmentList departmentListRedis = (AccountVo.DepartmentList) object; + departmentList.add(departmentListRedis); + } + return departmentList; + } + //查询常量 + ConstantExample constantExample = new ConstantExample(); + constantExample.createCriteria().andBusinessTypeEqualTo((byte) 2) + .andTKeyEqualTo(Constant.DEPARTMENT_POSITION_KEY); + List constantList = constantMapper.selectByExample(constantExample); + if (CollectionUtil.isNotEmpty(constantList)) { + JSONArray jsonArray = JSONObject.parseArray(constantList.get(0).gettValue()); + List departmentLists = jsonArray.toJavaList(AccountVo.DepartmentList.class); + for (AccountVo.DepartmentList list : departmentLists) { + redisUtil.lSet(Constant.DEPARTMENT_POSITION_KEY,list); + } + } + return departmentList; + } + + + @Override + public List queryApplyOfHospital(AccountDto.QueryApplyOfHospital param, Long userId) { + Long hospitalId = organizationProjectDao.queryByProjectId(param.getProjectId()); + if (ObjectUtil.isNull(hospitalId)) { + throw new BaseException(DefaultCodeError.PROJECT_ERROR); + } + Organization organization = organizationDao.selectByPrimaryKey(hospitalId); + return accountManageDao.queryApply(organization.getName(),param.getAuditStatus(),param.getName(),null); + } + + + @Override + public List queryApplyList(AccountDto.QueryApplyList param, Long userId) { + return accountManageDao.queryApply("",param.getAuditStatus(),param.getName(),null); + } + + + @Override + public List queryMyApply(AccountDto.QueryApplyList param, Long userId) { + return accountManageDao.queryApply("",null,"",userId); + } + + +} diff --git a/src/main/java/com/ccsens/carbasics/service/IAccountManageService.java b/src/main/java/com/ccsens/carbasics/service/IAccountManageService.java new file mode 100644 index 0000000..a9b3ea1 --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/service/IAccountManageService.java @@ -0,0 +1,61 @@ +package com.ccsens.carbasics.service; + +import com.ccsens.carbasics.bean.dto.AccountDto; +import com.ccsens.carbasics.bean.vo.AccountVo; + +import java.util.List; + +public interface IAccountManageService { + + /** + * 提交账户 + * @param param 入参 + * @param userId 用户id + */ + void submitAccount(AccountDto.SubmitAccount param, Long userId); + + /** + * 修改账户状态 + * @param param 入参 + * @param userId 用户id + */ + void updateAccountStatus(AccountDto.UpdateAccountStatus param, Long userId); + + /** + * 查询医院列表 + * @param userId 用户id + * @return 医院列表 + */ + List queryHospital(Long userId); + + /** + * 查询部门列表及职位 + * @param userId 用户id + * @return 部门列表及职位 + */ + List queryDepartment(Long userId); + + /** + * 查询医院下的申请 + * @param param 项目id + * @param userId 用户id + * @return 医院下的申请列表 + */ + List queryApplyOfHospital(AccountDto.QueryApplyOfHospital param, Long userId); + + /** + * 查询申请列表(后台管理) + * @param param 参数 + * @param userId 用户id + * @return 申请列表 + */ + List queryApplyList(AccountDto.QueryApplyList param, Long userId); + + /** + * 查询我的申请列表 + * @param param 入参 + * @param userId 用户id + * @return 我的申请列表 + */ + List queryMyApply(AccountDto.QueryApplyList param, Long userId); +} diff --git a/src/main/java/com/ccsens/carbasics/service/IOcrService.java b/src/main/java/com/ccsens/carbasics/service/IOcrService.java index 64619f6..aa8d450 100644 --- a/src/main/java/com/ccsens/carbasics/service/IOcrService.java +++ b/src/main/java/com/ccsens/carbasics/service/IOcrService.java @@ -33,5 +33,5 @@ public interface IOcrService { * @return 文字列表 * @throws IOException 异常 */ - Map> discernWords(List param, Long userId, Long firstAidId) throws IOException, ParseException; + Map> discernWords(OcrDto.GeneralBasic param, Long userId) throws IOException, ParseException; } diff --git a/src/main/java/com/ccsens/carbasics/service/IOrganizationService.java b/src/main/java/com/ccsens/carbasics/service/IOrganizationService.java index ea908de..b869f07 100644 --- a/src/main/java/com/ccsens/carbasics/service/IOrganizationService.java +++ b/src/main/java/com/ccsens/carbasics/service/IOrganizationService.java @@ -38,4 +38,11 @@ public interface IOrganizationService { * @return 返回医院排名 */ OrganizationVo.HospitalRank hospitalStatistical(OrganizationDto.RankNew param, Long userId); + + /** + * 查询医院排名规则 + * @param userId 用户id + * @return 规则列表 + */ + List queryRankRule(Long userId); } diff --git a/src/main/java/com/ccsens/carbasics/service/OcrService.java b/src/main/java/com/ccsens/carbasics/service/OcrService.java index aa70382..19b4e87 100644 --- a/src/main/java/com/ccsens/carbasics/service/OcrService.java +++ b/src/main/java/com/ccsens/carbasics/service/OcrService.java @@ -197,9 +197,9 @@ public class OcrService implements IOcrService { @Override - public Map> discernWords(List param, Long userId,Long projectId) throws IOException, ParseException { + public Map> discernWords(OcrDto.GeneralBasic param, Long userId) throws IOException, ParseException { // FirstAid firstAidInfo = firstAidDao.selectByPrimaryKey(firstAidId); - FirstAid firstAidInfo = firstAidDao.queryByProjectId(projectId); + FirstAid firstAidInfo = firstAidDao.queryByProjectId(param.getProjectId()); if (ObjectUtil.isNull(firstAidInfo)) { throw new BaseException("急救信息错误"); } @@ -226,19 +226,19 @@ public class OcrService implements IOcrService { List strList = new ArrayList<>(); Long startOcr = System.currentTimeMillis(); log.info("接收到的文件{}",param); - if (CollectionUtil.isNotEmpty(param)) { - if (param.get(param.size()-1).getOriginalFilename().equals(param.get(param.size()-2).getOriginalFilename())) { - log.info("已删除相同文件"); - param.remove(param.size()-1); - } - } +// if (CollectionUtil.isNotEmpty(param)) { +// if (param.get(param.size()-1).getOriginalFilename().equals(param.get(param.size()-2).getOriginalFilename())) { +// log.info("已删除相同文件"); +// param.remove(param.size()-1); +// } +// } - for (MultipartFile file : param) { - ByteArrayOutputStream out = new ByteArrayOutputStream(); - ImageUtil.scale(ImageIO.read(file.getInputStream()), out, 1); - String img = Base64.encode(out.toByteArray()); + for (String file : param.getFileList()) { +// ByteArrayOutputStream out = new ByteArrayOutputStream(); +// ImageUtil.scale(ImageIO.read(file.getInputStream()), out, 1); +// String img = Base64.encode(out.toByteArray()); BaiDuDto.GeneralBasic basic = new BaiDuDto.GeneralBasic(); - basic.setImage(img); + basic.setUrl(file); BaiDuVo.GeneralBasic words = BaiDuUtil.accurateBasic(Constant.BaiDu.APP_KEY, Constant.BaiDu.SECRET_KEY, basic); log.info("文字识别:{}", words); for (BaiDuVo.GeneralWord generalWord : words.getWordsResult()) { @@ -246,17 +246,17 @@ public class OcrService implements IOcrService { } //保存图片 - String extName = FileUtil.extName(file.getOriginalFilename()); - String dir = PropUtil.path + File.separator + Constant.OrcImg.FILE_DIR; - String extraPath = DateUtil.format(new Date(), "yyyyMMdd"); - String path = extraPath + File.separator+firstAidInfo.getId()+firstAidInfo.getName()+File.separator+ IdUtil.simpleUUID() + "." + extName; - //转成file - File saveFile = new File(dir + extraPath); - if (!saveFile.exists()) { - saveFile.mkdirs(); - } - String fullPath = dir + File.separator + path; - FileUtil.writeFromStream(file.getInputStream(), fullPath); +// String extName = FileUtil.extName(file.getOriginalFilename()); +// String dir = PropUtil.path + File.separator + Constant.OrcImg.FILE_DIR; +// String extraPath = DateUtil.format(new Date(), "yyyyMMdd"); +// String path = extraPath + File.separator+firstAidInfo.getId()+firstAidInfo.getName()+File.separator+ IdUtil.simpleUUID() + "." + extName; +// //转成file +// File saveFile = new File(dir + extraPath); +// if (!saveFile.exists()) { +// saveFile.mkdirs(); +// } +// String fullPath = dir + File.separator + path; +// FileUtil.writeFromStream(file.getInputStream(), fullPath); } Long ocrEnd = System.currentTimeMillis(); diff --git a/src/main/java/com/ccsens/carbasics/service/OrganizationService.java b/src/main/java/com/ccsens/carbasics/service/OrganizationService.java index 015f819..2f9084a 100644 --- a/src/main/java/com/ccsens/carbasics/service/OrganizationService.java +++ b/src/main/java/com/ccsens/carbasics/service/OrganizationService.java @@ -177,4 +177,10 @@ public class OrganizationService implements IOrganizationService { rank.setList(items); return rank; } + + + @Override + public List queryRankRule(Long userId) { + return new ArrayList<>(Constant.RANK_RULE); + } } diff --git a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java index 1d32486..b165b8b 100644 --- a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java +++ b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java @@ -336,6 +336,8 @@ public class QuestionnaireService implements IQuestionnaireService{ String memberName = codeAndAnswer.get(Constant.BasicInformation.person.code); //查询职位id Long positionId = positionDao.queryByName(codeAndAnswer.get(Constant.BasicInformation.position.code)); + //医院等级 + String hospitalLevel = codeAndAnswer.get(Constant.BasicInformation.hospitalLevel.code); //部门code String departmentCode = ""; @@ -349,16 +351,22 @@ public class QuestionnaireService implements IQuestionnaireService{ departmentCode = Constant.DepartmentAndCode.SHEN_WAI.code; } + return createHospitalAndProject(phone, userId, hospitalLevel, hospitalName, departmentName, memberName, positionId, departmentCode); + } + + public Long createHospitalAndProject(String phone, Long userId, String hospitalLevel, String hospitalName, String departmentName, String memberName, Long positionId, String departmentCode) { Organization organization = organizationDao.queryByName(hospitalName); if (ObjectUtil.isNull(organization)) { //创建医院 Organization newOrganization = new Organization(); newOrganization.setId(snowflake.nextId()); - newOrganization.setName(codeAndAnswer.get(Constant.BasicInformation.hospitalName.code)); - if (Constant.HospitalLevel.two.explain.equals(codeAndAnswer.get(Constant.BasicInformation.hospitalLevel.code))) { + newOrganization.setName(hospitalName); + if (Constant.HospitalLevel.two.explain.equals(hospitalLevel)) { newOrganization.setLevel(Constant.HospitalLevel.two.level); - }else { + }else if (Constant.HospitalLevel.three.explain.equals(hospitalLevel)){ newOrganization.setLevel(Constant.HospitalLevel.three.level); + }else { + newOrganization.setLevel(Constant.HospitalLevel.four.level); } newOrganization.setOrganizationType(Constant.OrganizationType.HOSPITAL.status); organizationDao.insertSelective(newOrganization); @@ -469,7 +477,6 @@ public class QuestionnaireService implements IQuestionnaireService{ } - public Long createProject(Long organizationId,String hospitalName,String memberName,String phone,Long userId) { OrganizationProject project = organizationProjectDao.queryByOrganizationId(organizationId); if (ObjectUtil.isNull(project)) { diff --git a/src/main/java/com/ccsens/carbasics/util/Constant.java b/src/main/java/com/ccsens/carbasics/util/Constant.java index 5ad9f00..2646000 100644 --- a/src/main/java/com/ccsens/carbasics/util/Constant.java +++ b/src/main/java/com/ccsens/carbasics/util/Constant.java @@ -1,5 +1,6 @@ package com.ccsens.carbasics.util; +import com.ccsens.carbasics.bean.vo.OrganizationVo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -241,7 +242,8 @@ public class Constant { /** * 部门与code */ - + CU_ZHONG_ZHONG_XIN("卒中中心","CuZhongZhongXin"), + CU_ZHONG_ZHONG_XIN_BAN_GONG_SHI("卒中中心办公室","CuZhongZhongXinBanGongShi"), JI_ZHEN("急诊","JiZhen"), SHEN_NEI("神经内科","ShenNei"), SHEN_WAI("神经外科","ShenWai"), @@ -287,8 +289,12 @@ public class Constant { public static final String ZHI_KONG = "ZhiKong"; /**科主任*/ public static final String KE_ZHU_REN = "KeZhuRen"; - /**副主任*/ + /**科副主任*/ public static final String FU_ZHU_REN = "FuZhuRen"; + /** 卒中中心主任 */ + public static final String CU_ZHONG_ZHONG_XIN_ZHU_REN = "CuZhongZhongXinZhuRen"; + /** 卒中中心办公室主任 */ + public static final String CU_ZHONG_ZHONG_XIN_BAN_GONG_SHI_ZHU_REN = "CuZhongZhongXinBanGongShiZhuRen"; public static boolean isYiSheng(List codes) { if (codes.contains(YI_SHENG) || codes.contains(ZHI_KONG) @@ -593,8 +599,9 @@ public class Constant { /** * 基本信息的code */ - two((byte)2,"医院名称"), - three((byte)3,"医院等级"), + two((byte)2,"二级"), + three((byte)3,"三级"), + four((byte)4,"暂无"), ; public Byte level; @@ -649,4 +656,26 @@ public class Constant { TIME_CODE.add("JMRSSJ"); } + public static final List RANK_RULE = new ArrayList<>(); + static { + RANK_RULE.add(new OrganizationVo.RankRule(1,"溶栓率（发病时间≦4.5小时）","溶栓率（发病时间≦4.5小时）=实际溶栓总数/AIS就诊患者总数")); + RANK_RULE.add(new OrganizationVo.RankRule(2,"DNT≦60min达标率","DNT≦60min达标率=DNT≦60min例数/DNT总例数")); + RANK_RULE.add(new OrganizationVo.RankRule(3,"DNT≦45min达标率","DNT≦45min达标率=DNT≦45min例数/DNT总例数")); + RANK_RULE.add(new OrganizationVo.RankRule(4,"sICH发生率","sICH发生率=溶栓后sICH例数/实际溶栓总数")); + RANK_RULE.add(new OrganizationVo.RankRule(5,"桥接血管内治疗率","桥接血管内治疗率=实际溶栓后血管内治疗总人数/溶栓后符合血管内治疗指征总人数")); + RANK_RULE.add(new OrganizationVo.RankRule(6,"非桥接血管内治疗率","非桥接血管内治疗率=实际血管内治疗总人数/符合血管内治疗指征总人数")); + RANK_RULE.add(new OrganizationVo.RankRule(7,"非桥接DPT≤90min比例","非桥接DPT≤90min比例=DPT≤90min例数/DPT总例数")); + RANK_RULE.add(new OrganizationVo.RankRule(8,"非桥接DPT≤60min比例","非桥接DPT≤60min比例=DPT≤60min例数/DPT总例数")); + RANK_RULE.add(new OrganizationVo.RankRule(9,"非桥接PRT≤60min比例","非桥接PRT≤60min比例=PRT≤60min例数/PRT总例数")); + RANK_RULE.add(new OrganizationVo.RankRule(10,"非桥接PRT≤30min比例","非桥接PRT≤30min比例=PRT≤30min例数/PRT总例数")); + } + + /** + * 创建病例:模板项目id神外 + */ + public static final String HOSPITAL_LIST_KEY = "hospital_list_key"; + /** + * 创建项目,机构项目 + */ + public static final String DEPARTMENT_POSITION_KEY = "department_position_key"; } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 5abf242..c3b11fb 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: prod - include: common, util-prod + active: test + include: common, util-test diff --git a/src/main/resources/mapper_dao/AccountManageDao.xml b/src/main/resources/mapper_dao/AccountManageDao.xml new file mode 100644 index 0000000..efb9f6c --- /dev/null +++ b/src/main/resources/mapper_dao/AccountManageDao.xml @@ -0,0 +1,34 @@ + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper_dao/OrganizationDao.xml b/src/main/resources/mapper_dao/OrganizationDao.xml index 2c17dfc..5a46b02 100644 --- a/src/main/resources/mapper_dao/OrganizationDao.xml +++ b/src/main/resources/mapper_dao/OrganizationDao.xml @@ -428,21 +428,47 @@ LEFT JOIN ( - + - + - + + + + + + + + + + + + + + + + + + + + + + )t on h.detail_id = t.detail_id LEFT JOIN t_qcp_questionnaire_detail d on h.detail_id = d.id and rec_status = 0 WHERE d.submit_status = 1 - ORDER BY `value` DESC + + ORDER BY `value` + + + ORDER BY `value` DESC + SELECT @@ -516,4 +542,277 @@ and a2.detail_id = a3.detail_id and a1.detail_id = a3.detail_id + + SELECT + a1.detail_id AS detail_id, + CONVERT ( + a1.answer * 100 / a2.answer, + DECIMAL (15, 0) + ) AS count + FROM + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'sICH-Nnt' + AND rec_status = 0 + ) AS a1, + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'actual-Nnt' + AND rec_status = 0 + ) AS a2 + WHERE + a1.detail_id = a2.detail_id + + + SELECT + a1.detail_id AS detail_id, + CONVERT ( + a1.answer * 100 / a2.answer, + DECIMAL (15, 0) + ) AS count + FROM + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-sICH-Nnt' + AND rec_status = 0 + ) AS a1, + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-RSH-Nnt' + AND rec_status = 0 + ) AS a2 + WHERE + a1.detail_id = a2.detail_id + + + SELECT + a1.detail_id AS detail_id, + CONVERT ( + a1.answer * 100 / a2.answer, + DECIMAL (15, 0) + ) AS count + FROM + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-actual-Nnt' + AND rec_status = 0 + ) AS a1, + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-FIT-Nnt' + AND rec_status = 0 + ) AS a2 + WHERE + a1.detail_id = a2.detail_id + + + SELECT + a1.detail_id AS detail_id, + CONVERT ( + a1.answer * 100 / ( + a1.answer + a2.answer + a3.answer + ), + DECIMAL (15, 0) + ) AS count + FROM + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-DPT-60' + AND rec_status = 0 + ) AS a1, + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-DPT-89' + AND rec_status = 0 + ) AS a2, + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-DPT-91' + AND rec_status = 0 + ) AS a3 + WHERE + a1.detail_id = a2.detail_id + and a2.detail_id = a3.detail_id + and a1.detail_id = a3.detail_id + + + SELECT + a1.detail_id AS detail_id, + CONVERT ( + (a1.answer + a2.answer) / ( + a1.answer + a2.answer + a3.answer + ) * 100, + DECIMAL (15, 0) + ) AS count + FROM + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-DPT-60' + AND rec_status = 0 + ) AS a1, + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-DPT-89' + AND rec_status = 0 + ) AS a2, + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-DPT-91' + AND rec_status = 0 + ) AS a3 + WHERE + a1.detail_id = a2.detail_id + and a2.detail_id = a3.detail_id + and a1.detail_id = a3.detail_id + + + SELECT + a1.detail_id AS detail_id, + CONVERT ( + (a1.answer + a2.answer) / ( + a1.answer + a2.answer + a3.answer + ) * 100, + DECIMAL (15, 0) + ) AS count + FROM + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-PRT-29' + AND rec_status = 0 + ) AS a1, + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-PRT-59' + AND rec_status = 0 + ) AS a2, + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-PRT-62' + AND rec_status = 0 + ) AS a3 + WHERE + a1.detail_id = a2.detail_id + and a2.detail_id = a3.detail_id + and a1.detail_id = a3.detail_id + + + SELECT + a1.detail_id AS detail_id, + CONVERT ( + a1.answer / ( + a1.answer + a2.answer + a3.answer + ) * 100, + DECIMAL (15, 0) + ) AS count + FROM + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-PRT-29' + AND rec_status = 0 + ) AS a1, + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-PRT-59' + AND rec_status = 0 + ) AS a2, + ( + SELECT + questionnaire_detail_id AS detail_id, + answer + FROM + `t_qcp_questionnaire_record` + WHERE + question_code = 'XGZL-PRT-62' + AND rec_status = 0 + ) AS a3 + WHERE + a1.detail_id = a2.detail_id + and a2.detail_id = a3.detail_id + and a1.detail_id = a3.detail_id + diff --git a/src/main/resources/mapper_raw/AccountManageMapper.xml b/src/main/resources/mapper_raw/AccountManageMapper.xml new file mode 100644 index 0000000..c6b6fa8 --- /dev/null +++ b/src/main/resources/mapper_raw/AccountManageMapper.xml @@ -0,0 +1,354 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + + + + + + + + and ${criterion.condition} + + + and ${criterion.condition} #{criterion.value} + + + and ${criterion.condition} #{criterion.value} and #{criterion.secondValue} + + + and ${criterion.condition} + + #{listItem} + + + + + + + + + + + id, hospital_name, department_name, department_code, position_name, position_code, + submitter, submitter_phone, submitter_user_id, aduit_user_id, audit_status, created_at, + updated_at, rec_status + + + + + delete from t_qcp_account_manage + where id = #{id,jdbcType=BIGINT} + + + delete from t_qcp_account_manage + + + + + + insert into t_qcp_account_manage (id, hospital_name, department_name, + department_code, position_name, position_code, + submitter, submitter_phone, submitter_user_id, + aduit_user_id, audit_status, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{hospitalName,jdbcType=VARCHAR}, #{departmentName,jdbcType=VARCHAR}, + #{departmentCode,jdbcType=VARCHAR}, #{positionName,jdbcType=VARCHAR}, #{positionCode,jdbcType=VARCHAR}, + #{submitter,jdbcType=VARCHAR}, #{submitterPhone,jdbcType=VARCHAR}, #{submitterUserId,jdbcType=BIGINT}, + #{aduitUserId,jdbcType=BIGINT}, #{auditStatus,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_qcp_account_manage + + + id, + + + hospital_name, + + + department_name, + + + department_code, + + + position_name, + + + position_code, + + + submitter, + + + submitter_phone, + + + submitter_user_id, + + + aduit_user_id, + + + audit_status, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{hospitalName,jdbcType=VARCHAR}, + + + #{departmentName,jdbcType=VARCHAR}, + + + #{departmentCode,jdbcType=VARCHAR}, + + + #{positionName,jdbcType=VARCHAR}, + + + #{positionCode,jdbcType=VARCHAR}, + + + #{submitter,jdbcType=VARCHAR}, + + + #{submitterPhone,jdbcType=VARCHAR}, + + + #{submitterUserId,jdbcType=BIGINT}, + + + #{aduitUserId,jdbcType=BIGINT}, + + + #{auditStatus,jdbcType=TINYINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_qcp_account_manage + + + id = #{record.id,jdbcType=BIGINT}, + + + hospital_name = #{record.hospitalName,jdbcType=VARCHAR}, + + + department_name = #{record.departmentName,jdbcType=VARCHAR}, + + + department_code = #{record.departmentCode,jdbcType=VARCHAR}, + + + position_name = #{record.positionName,jdbcType=VARCHAR}, + + + position_code = #{record.positionCode,jdbcType=VARCHAR}, + + + submitter = #{record.submitter,jdbcType=VARCHAR}, + + + submitter_phone = #{record.submitterPhone,jdbcType=VARCHAR}, + + + submitter_user_id = #{record.submitterUserId,jdbcType=BIGINT}, + + + aduit_user_id = #{record.aduitUserId,jdbcType=BIGINT}, + + + audit_status = #{record.auditStatus,jdbcType=TINYINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_qcp_account_manage + set id = #{record.id,jdbcType=BIGINT}, + hospital_name = #{record.hospitalName,jdbcType=VARCHAR}, + department_name = #{record.departmentName,jdbcType=VARCHAR}, + department_code = #{record.departmentCode,jdbcType=VARCHAR}, + position_name = #{record.positionName,jdbcType=VARCHAR}, + position_code = #{record.positionCode,jdbcType=VARCHAR}, + submitter = #{record.submitter,jdbcType=VARCHAR}, + submitter_phone = #{record.submitterPhone,jdbcType=VARCHAR}, + submitter_user_id = #{record.submitterUserId,jdbcType=BIGINT}, + aduit_user_id = #{record.aduitUserId,jdbcType=BIGINT}, + audit_status = #{record.auditStatus,jdbcType=TINYINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_qcp_account_manage + + + hospital_name = #{hospitalName,jdbcType=VARCHAR}, + + + department_name = #{departmentName,jdbcType=VARCHAR}, + + + department_code = #{departmentCode,jdbcType=VARCHAR}, + + + position_name = #{positionName,jdbcType=VARCHAR}, + + + position_code = #{positionCode,jdbcType=VARCHAR}, + + + submitter = #{submitter,jdbcType=VARCHAR}, + + + submitter_phone = #{submitterPhone,jdbcType=VARCHAR}, + + + submitter_user_id = #{submitterUserId,jdbcType=BIGINT}, + + + aduit_user_id = #{aduitUserId,jdbcType=BIGINT}, + + + audit_status = #{auditStatus,jdbcType=TINYINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_qcp_account_manage + set hospital_name = #{hospitalName,jdbcType=VARCHAR}, + department_name = #{departmentName,jdbcType=VARCHAR}, + department_code = #{departmentCode,jdbcType=VARCHAR}, + position_name = #{positionName,jdbcType=VARCHAR}, + position_code = #{positionCode,jdbcType=VARCHAR}, + submitter = #{submitter,jdbcType=VARCHAR}, + submitter_phone = #{submitterPhone,jdbcType=VARCHAR}, + submitter_user_id = #{submitterUserId,jdbcType=BIGINT}, + aduit_user_id = #{aduitUserId,jdbcType=BIGINT}, + audit_status = #{auditStatus,jdbcType=TINYINT}, + created_at = #{createdAt,jdbcType=TIMESTAMP}, + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{recStatus,jdbcType=TINYINT} + where id = #{id,jdbcType=BIGINT} + + \ No newline at end of file diff --git a/src/main/resources/mbg.xml b/src/main/resources/mbg.xml index eb08300..629e374 100644 --- a/src/main/resources/mbg.xml +++ b/src/main/resources/mbg.xml @@ -78,8 +78,10 @@ -
+ + +