diff --git a/src/main/java/com/ccsens/carbasics/api/CaseController.java b/src/main/java/com/ccsens/carbasics/api/CaseController.java index 764ab86..713d1de 100644 --- a/src/main/java/com/ccsens/carbasics/api/CaseController.java +++ b/src/main/java/com/ccsens/carbasics/api/CaseController.java @@ -101,6 +101,14 @@ public class CaseController { return JsonResponse.newInstance().ok(casePatient); } + @MustLogin + @ApiOperation(value = "修改病例信息", notes = "") + @RequestMapping(value = "/updateCase", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) + public JsonResponse updateCase(@ApiParam @Validated @RequestBody QueryDto params) throws Exception{ + CaseVo.CasePatient casePatient = caseService.updateCase(params.getUserId(),params.getParam()); + return JsonResponse.newInstance().ok(casePatient); + } + @MustLogin @ApiOperation(value = "查看病例的上传信息", notes = "") @RequestMapping(value = "/getCaseImg", method = RequestMethod.POST, produces = {"application/json;charset=UTF-8"}) diff --git a/src/main/java/com/ccsens/carbasics/bean/dto/CaseDto.java b/src/main/java/com/ccsens/carbasics/bean/dto/CaseDto.java index 371a9ab..35afca6 100644 --- a/src/main/java/com/ccsens/carbasics/bean/dto/CaseDto.java +++ b/src/main/java/com/ccsens/carbasics/bean/dto/CaseDto.java @@ -6,6 +6,7 @@ import lombok.Data; import javax.validation.constraints.Max; import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import java.util.List; /** @@ -61,14 +62,33 @@ public class CaseDto { @ApiModel("添加病例信息-请求") @Data public static class SaveCase{ - @ApiModelProperty("住院号") - private String hospitalNumber; +// @ApiModelProperty("住院号") +// private String hospitalNumber; + @ApiModelProperty("姓名") + private String name; + @ApiModelProperty("性别 0女 1男") + private byte gender; + @NotNull(message = "请填写年龄信息") + @ApiModelProperty("年龄") + private int age; +// @ApiModelProperty("身份证号") +// private String idcard; + } + + @ApiModel("添加病例信息-请求") + @Data + public static class UpdateCase{ + @ApiModelProperty("id") + private Long id; @ApiModelProperty("姓名") private String name; @ApiModelProperty("性别 0女 1男") private byte gender; - @ApiModelProperty("身份证号") - private String idcard; + @NotNull(message = "请填写年龄信息") + @ApiModelProperty("年龄") + private int age; +// @ApiModelProperty("身份证号") +// private String idcard; } @ApiModel("添加病例上传的图片信息-请求") diff --git a/src/main/java/com/ccsens/carbasics/bean/dto/NoticeDto.java b/src/main/java/com/ccsens/carbasics/bean/dto/NoticeDto.java index 74c6104..c21bde6 100644 --- a/src/main/java/com/ccsens/carbasics/bean/dto/NoticeDto.java +++ b/src/main/java/com/ccsens/carbasics/bean/dto/NoticeDto.java @@ -14,7 +14,7 @@ import javax.validation.constraints.Min; public class NoticeDto { @Data - @ApiModel("查看公告列表") + @ApiModel("查看新闻公告列表-请求") public static class QueryNotice{ @ApiModelProperty("第几页") @Min(value = 1) diff --git a/src/main/java/com/ccsens/carbasics/bean/po/BlCase.java b/src/main/java/com/ccsens/carbasics/bean/po/BlCase.java index 16f4530..fe7eb0d 100644 --- a/src/main/java/com/ccsens/carbasics/bean/po/BlCase.java +++ b/src/main/java/com/ccsens/carbasics/bean/po/BlCase.java @@ -16,6 +16,8 @@ public class BlCase implements Serializable { private String idcard; + private Integer age; + private Byte submitStatus; private Long submitTime; @@ -78,6 +80,14 @@ public class BlCase implements Serializable { this.idcard = idcard == null ? null : idcard.trim(); } + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + public Byte getSubmitStatus() { return submitStatus; } @@ -138,6 +148,7 @@ public class BlCase implements Serializable { sb.append(", name=").append(name); sb.append(", gender=").append(gender); sb.append(", idcard=").append(idcard); + sb.append(", age=").append(age); sb.append(", submitStatus=").append(submitStatus); sb.append(", submitTime=").append(submitTime); sb.append(", operator=").append(operator); diff --git a/src/main/java/com/ccsens/carbasics/bean/po/BlCaseExample.java b/src/main/java/com/ccsens/carbasics/bean/po/BlCaseExample.java index 1eb6755..9f46d63 100644 --- a/src/main/java/com/ccsens/carbasics/bean/po/BlCaseExample.java +++ b/src/main/java/com/ccsens/carbasics/bean/po/BlCaseExample.java @@ -495,6 +495,66 @@ public class BlCaseExample { return (Criteria) this; } + public Criteria andAgeIsNull() { + addCriterion("age is null"); + return (Criteria) this; + } + + public Criteria andAgeIsNotNull() { + addCriterion("age is not null"); + return (Criteria) this; + } + + public Criteria andAgeEqualTo(Integer value) { + addCriterion("age =", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeNotEqualTo(Integer value) { + addCriterion("age <>", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeGreaterThan(Integer value) { + addCriterion("age >", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeGreaterThanOrEqualTo(Integer value) { + addCriterion("age >=", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeLessThan(Integer value) { + addCriterion("age <", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeLessThanOrEqualTo(Integer value) { + addCriterion("age <=", value, "age"); + return (Criteria) this; + } + + public Criteria andAgeIn(List values) { + addCriterion("age in", values, "age"); + return (Criteria) this; + } + + public Criteria andAgeNotIn(List values) { + addCriterion("age not in", values, "age"); + return (Criteria) this; + } + + public Criteria andAgeBetween(Integer value1, Integer value2) { + addCriterion("age between", value1, value2, "age"); + return (Criteria) this; + } + + public Criteria andAgeNotBetween(Integer value1, Integer value2) { + addCriterion("age not between", value1, value2, "age"); + return (Criteria) this; + } + public Criteria andSubmitStatusIsNull() { addCriterion("submit_status is null"); return (Criteria) this; diff --git a/src/main/java/com/ccsens/carbasics/bean/po/BlHospital.java b/src/main/java/com/ccsens/carbasics/bean/po/BlHospital.java new file mode 100644 index 0000000..7eca444 --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/bean/po/BlHospital.java @@ -0,0 +1,106 @@ +package com.ccsens.carbasics.bean.po; + +import java.io.Serializable; +import java.util.Date; + +public class BlHospital implements Serializable { + private Long id; + + private String area; + + private String name; + + private String code; + + private Long operator; + + 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 getArea() { + return area; + } + + public void setArea(String area) { + this.area = area == null ? null : area.trim(); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name == null ? null : name.trim(); + } + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code == null ? null : code.trim(); + } + + public Long getOperator() { + return operator; + } + + public void setOperator(Long operator) { + this.operator = operator; + } + + 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(", area=").append(area); + sb.append(", name=").append(name); + sb.append(", code=").append(code); + sb.append(", operator=").append(operator); + 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/BlHospitalExample.java b/src/main/java/com/ccsens/carbasics/bean/po/BlHospitalExample.java new file mode 100644 index 0000000..5252bbb --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/bean/po/BlHospitalExample.java @@ -0,0 +1,711 @@ +package com.ccsens.carbasics.bean.po; + +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class BlHospitalExample { + protected String orderByClause; + + protected boolean distinct; + + protected List oredCriteria; + + public BlHospitalExample() { + 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 andAreaIsNull() { + addCriterion("area is null"); + return (Criteria) this; + } + + public Criteria andAreaIsNotNull() { + addCriterion("area is not null"); + return (Criteria) this; + } + + public Criteria andAreaEqualTo(String value) { + addCriterion("area =", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotEqualTo(String value) { + addCriterion("area <>", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaGreaterThan(String value) { + addCriterion("area >", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaGreaterThanOrEqualTo(String value) { + addCriterion("area >=", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaLessThan(String value) { + addCriterion("area <", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaLessThanOrEqualTo(String value) { + addCriterion("area <=", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaLike(String value) { + addCriterion("area like", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotLike(String value) { + addCriterion("area not like", value, "area"); + return (Criteria) this; + } + + public Criteria andAreaIn(List values) { + addCriterion("area in", values, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotIn(List values) { + addCriterion("area not in", values, "area"); + return (Criteria) this; + } + + public Criteria andAreaBetween(String value1, String value2) { + addCriterion("area between", value1, value2, "area"); + return (Criteria) this; + } + + public Criteria andAreaNotBetween(String value1, String value2) { + addCriterion("area not between", value1, value2, "area"); + return (Criteria) this; + } + + public Criteria andNameIsNull() { + addCriterion("name is null"); + return (Criteria) this; + } + + public Criteria andNameIsNotNull() { + addCriterion("name is not null"); + return (Criteria) this; + } + + public Criteria andNameEqualTo(String value) { + addCriterion("name =", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotEqualTo(String value) { + addCriterion("name <>", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThan(String value) { + addCriterion("name >", value, "name"); + return (Criteria) this; + } + + public Criteria andNameGreaterThanOrEqualTo(String value) { + addCriterion("name >=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThan(String value) { + addCriterion("name <", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLessThanOrEqualTo(String value) { + addCriterion("name <=", value, "name"); + return (Criteria) this; + } + + public Criteria andNameLike(String value) { + addCriterion("name like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameNotLike(String value) { + addCriterion("name not like", value, "name"); + return (Criteria) this; + } + + public Criteria andNameIn(List values) { + addCriterion("name in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameNotIn(List values) { + addCriterion("name not in", values, "name"); + return (Criteria) this; + } + + public Criteria andNameBetween(String value1, String value2) { + addCriterion("name between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andNameNotBetween(String value1, String value2) { + addCriterion("name not between", value1, value2, "name"); + return (Criteria) this; + } + + public Criteria andCodeIsNull() { + addCriterion("code is null"); + return (Criteria) this; + } + + public Criteria andCodeIsNotNull() { + addCriterion("code is not null"); + return (Criteria) this; + } + + public Criteria andCodeEqualTo(String value) { + addCriterion("code =", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotEqualTo(String value) { + addCriterion("code <>", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThan(String value) { + addCriterion("code >", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeGreaterThanOrEqualTo(String value) { + addCriterion("code >=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThan(String value) { + addCriterion("code <", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLessThanOrEqualTo(String value) { + addCriterion("code <=", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeLike(String value) { + addCriterion("code like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotLike(String value) { + addCriterion("code not like", value, "code"); + return (Criteria) this; + } + + public Criteria andCodeIn(List values) { + addCriterion("code in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotIn(List values) { + addCriterion("code not in", values, "code"); + return (Criteria) this; + } + + public Criteria andCodeBetween(String value1, String value2) { + addCriterion("code between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andCodeNotBetween(String value1, String value2) { + addCriterion("code not between", value1, value2, "code"); + return (Criteria) this; + } + + public Criteria andOperatorIsNull() { + addCriterion("operator is null"); + return (Criteria) this; + } + + public Criteria andOperatorIsNotNull() { + addCriterion("operator is not null"); + return (Criteria) this; + } + + public Criteria andOperatorEqualTo(Long value) { + addCriterion("operator =", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotEqualTo(Long value) { + addCriterion("operator <>", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThan(Long value) { + addCriterion("operator >", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorGreaterThanOrEqualTo(Long value) { + addCriterion("operator >=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThan(Long value) { + addCriterion("operator <", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorLessThanOrEqualTo(Long value) { + addCriterion("operator <=", value, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorIn(List values) { + addCriterion("operator in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotIn(List values) { + addCriterion("operator not in", values, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorBetween(Long value1, Long value2) { + addCriterion("operator between", value1, value2, "operator"); + return (Criteria) this; + } + + public Criteria andOperatorNotBetween(Long value1, Long value2) { + addCriterion("operator not between", value1, value2, "operator"); + 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/CaseVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/CaseVo.java index 3ec1a42..4ebe2b2 100644 --- a/src/main/java/com/ccsens/carbasics/bean/vo/CaseVo.java +++ b/src/main/java/com/ccsens/carbasics/bean/vo/CaseVo.java @@ -51,8 +51,8 @@ public class CaseVo { private Byte gender; @ApiModelProperty("年龄") private Integer age; - @JsonIgnore//身份证号 - private String idcard; +// @JsonIgnore//身份证号 +// private String idcard; @ApiModelProperty("住院号") private String hospitalNumber; @ApiModelProperty("保存时间") @@ -60,13 +60,13 @@ public class CaseVo { @ApiModelProperty("类型 0新建病例 1保存 2提交") private Byte submitStatus; - public Integer getAge() { - int a = age == null ? 0 : age; - if(StrUtil.isNotBlank(idcard)){ - a = IdcardUtil.getAgeByIdCard(idcard); - } - return a; - } +// public Integer getAge() { +// int a = age == null ? 0 : age; +// if(StrUtil.isNotBlank(idcard)){ +// a = IdcardUtil.getAgeByIdCard(idcard); +// } +// return a; +// } } @ApiModel("查找id和名称列表信息-返回") diff --git a/src/main/java/com/ccsens/carbasics/bean/vo/NoticeVo.java b/src/main/java/com/ccsens/carbasics/bean/vo/NoticeVo.java index 10e6dbe..67ff919 100644 --- a/src/main/java/com/ccsens/carbasics/bean/vo/NoticeVo.java +++ b/src/main/java/com/ccsens/carbasics/bean/vo/NoticeVo.java @@ -11,7 +11,7 @@ import lombok.Data; public class NoticeVo { @Data - @ApiModel("查看公告列表") + @ApiModel("查看公告列表-返回") public static class NoticeList{ @ApiModelProperty("id") private Long id; @@ -21,7 +21,12 @@ public class NoticeVo { private String content; @ApiModelProperty("发布时间") private Long publishTime; + @ApiModelProperty("发布者") + private String publishName; @ApiModelProperty("排序") private int sort; + @ApiModelProperty("文章链接") + private String articleUrl; + } } diff --git a/src/main/java/com/ccsens/carbasics/persist/dao/CaseDao.java b/src/main/java/com/ccsens/carbasics/persist/dao/CaseDao.java index f4d13b8..0156187 100644 --- a/src/main/java/com/ccsens/carbasics/persist/dao/CaseDao.java +++ b/src/main/java/com/ccsens/carbasics/persist/dao/CaseDao.java @@ -53,4 +53,12 @@ public interface CaseDao { * @return */ List getCaseImg(@Param("caseId")Long caseId, @Param("type")Byte type); + + /** + * 查找医院下的病人的最大住院号 + * @param hospital 医院名称 + * @return 返回当前最大的数量 + */ + String getMaxHospitalNumber(@Param("hospital")String hospital); + } diff --git a/src/main/java/com/ccsens/carbasics/persist/mapper/BlHospitalMapper.java b/src/main/java/com/ccsens/carbasics/persist/mapper/BlHospitalMapper.java new file mode 100644 index 0000000..51cd6f9 --- /dev/null +++ b/src/main/java/com/ccsens/carbasics/persist/mapper/BlHospitalMapper.java @@ -0,0 +1,30 @@ +package com.ccsens.carbasics.persist.mapper; + +import com.ccsens.carbasics.bean.po.BlHospital; +import com.ccsens.carbasics.bean.po.BlHospitalExample; +import java.util.List; +import org.apache.ibatis.annotations.Param; + +public interface BlHospitalMapper { + long countByExample(BlHospitalExample example); + + int deleteByExample(BlHospitalExample example); + + int deleteByPrimaryKey(Long id); + + int insert(BlHospital record); + + int insertSelective(BlHospital record); + + List selectByExample(BlHospitalExample example); + + BlHospital selectByPrimaryKey(Long id); + + int updateByExampleSelective(@Param("record") BlHospital record, @Param("example") BlHospitalExample example); + + int updateByExample(@Param("record") BlHospital record, @Param("example") BlHospitalExample example); + + int updateByPrimaryKeySelective(BlHospital record); + + int updateByPrimaryKey(BlHospital record); +} \ No newline at end of file diff --git a/src/main/java/com/ccsens/carbasics/service/CaseService.java b/src/main/java/com/ccsens/carbasics/service/CaseService.java index f9849d6..ce3ec82 100644 --- a/src/main/java/com/ccsens/carbasics/service/CaseService.java +++ b/src/main/java/com/ccsens/carbasics/service/CaseService.java @@ -6,16 +6,14 @@ import cn.hutool.core.io.FileUtil; import cn.hutool.core.lang.Snowflake; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.PinyinUtil; import cn.hutool.core.util.StrUtil; import com.ccsens.carbasics.bean.dto.CaseDto; import com.ccsens.carbasics.bean.dto.QuestionnaireDto; import com.ccsens.carbasics.bean.po.*; import com.ccsens.carbasics.bean.vo.CaseVo; import com.ccsens.carbasics.persist.dao.CaseDao; -import com.ccsens.carbasics.persist.mapper.BlCaseImgMapper; -import com.ccsens.carbasics.persist.mapper.BlCaseMapper; -import com.ccsens.carbasics.persist.mapper.BlDoctorMapper; -import com.ccsens.carbasics.persist.mapper.FileCommitMapper; +import com.ccsens.carbasics.persist.mapper.*; import com.ccsens.carbasics.util.Constant; import com.ccsens.carbasics.util.DefaultCodeError; import com.ccsens.util.PropUtil; @@ -55,6 +53,8 @@ public class CaseService implements ICaseService { private FileCommitMapper fileCommitMapper; @Resource private BlCaseImgMapper blCaseImgMapper; + @Resource + private BlHospitalMapper blHospitalMapper; @Override public List queryHospitalList(QuestionnaireDto.QueryHospitalList param) { @@ -106,15 +106,52 @@ public class CaseService implements ICaseService { blCase.setId(snowflake.nextId()); blCase.setName(param.getName()); blCase.setGender(param.getGender()); - blCase.setHospitalNumber(param.getHospitalNumber()); - blCase.setIdcard(param.getIdcard()); + + //查找医院下的最大的一个住院号 + String number = caseDao.getMaxHospitalNumber(doctor.getHospital()); + String num = ((Integer.parseInt(1 + number) + 1) + "").substring(1); + + //获取患者名称首字母 + String allFirstLetter = PinyinUtil.getAllFirstLetter(param.getName()); + //拼接住院号 + blCase.setHospitalNumber(num + allFirstLetter); +// blCase.setIdcard(param.getIdcard()); + blCase.setAge(param.getAge()); blCase.setDoctorId(doctor.getId()); blCase.setSubmitStatus((byte) 1); blCaseMapper.insertSelective(blCase); CaseVo.CasePatient casePatient = new CaseVo.CasePatient(); casePatient.setId(blCase.getId()); - casePatient.setIdcard(blCase.getIdcard()); +// casePatient.setIdcard(blCase.getIdcard()); + casePatient.setAge(blCase.getAge()); + casePatient.setGender(blCase.getGender()); + casePatient.setHospitalNumber(blCase.getHospitalNumber()); + casePatient.setName(blCase.getName()); + casePatient.setSubmitStatus(blCase.getSubmitStatus()); + return casePatient; + } + + @Override + public CaseVo.CasePatient updateCase(Long userId, CaseDto.UpdateCase param) { + BlCase blCase = blCaseMapper.selectByPrimaryKey(param.getId()); + if(ObjectUtil.isNull(blCase)){ + throw new BaseException(DefaultCodeError.NOT_DOCTOR_CASE); + } + if(StrUtil.isNotBlank(param.getName())){ + blCase.setName(param.getName()); + //获取患者名称首字母 + String allFirstLetter = PinyinUtil.getAllFirstLetter(param.getName()); + String substring = blCase.getHospitalNumber().substring(0, 7); + blCase.setHospitalNumber(substring + allFirstLetter); + } + blCase.setGender(param.getGender()); + blCase.setAge(param.getAge()); + blCaseMapper.updateByPrimaryKeySelective(blCase); + + CaseVo.CasePatient casePatient = new CaseVo.CasePatient(); + casePatient.setId(blCase.getId()); + casePatient.setAge(blCase.getAge()); casePatient.setGender(blCase.getGender()); casePatient.setHospitalNumber(blCase.getHospitalNumber()); casePatient.setName(blCase.getName()); @@ -216,4 +253,6 @@ public class CaseService implements ICaseService { blCase.setSubmitStatus((byte) 2); blCaseMapper.updateByPrimaryKeySelective(blCase); } + + } diff --git a/src/main/java/com/ccsens/carbasics/service/ICaseService.java b/src/main/java/com/ccsens/carbasics/service/ICaseService.java index da6a8a6..cec3eaa 100644 --- a/src/main/java/com/ccsens/carbasics/service/ICaseService.java +++ b/src/main/java/com/ccsens/carbasics/service/ICaseService.java @@ -73,4 +73,7 @@ public interface ICaseService { CaseVo.FileInfo uploadFile(MultipartFile f, Long userId) throws IOException; void submitCase(CaseDto.SubmitCase param); + + CaseVo.CasePatient updateCase(Long userId, CaseDto.UpdateCase param); + } diff --git a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java index a2fd57d..cfbfc86 100644 --- a/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java +++ b/src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java @@ -233,6 +233,12 @@ public class QuestionnaireService implements IQuestionnaireService{ accountManage.setAuditStatus((byte) 0); accountManage.setDataFrom((byte) 1); accountManageDao.insertSelective(accountManage); + + QuestionnaireDetail detail = new QuestionnaireDetail(); + detail.setId(param.getDetailId()); + detail.setSubmitStatus(Constant.SubmitStatus.submit.status); + questionnaireDetailDao.updateByPrimaryKeySelective(detail); + return new QuestionnaireVo.SubmitInfo(); // if (ObjectUtil.isNotNull(submitId)) { // //加入项目 diff --git a/src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java b/src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java index 88946cb..b1a069e 100644 --- a/src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java +++ b/src/main/java/com/ccsens/carbasics/util/DefaultCodeError.java @@ -63,6 +63,7 @@ public class DefaultCodeError extends CodeError { public static final Code NOT_DOCTOR = new Code(515,"未找到医生信息", true); public static final Code NOT_DOCTOR_CASE = new Code(516,"未找到病例信息", true); public static final Code NOT_FILE = new Code(525,"找不到文件", true); + public static final Code NOT_HOSPITAL = new Code(525,"医院信息不正确", true); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index c3b11fb..5abf242 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,4 +1,4 @@ spring: profiles: - active: test - include: common, util-test + active: prod + include: common, util-prod diff --git a/src/main/resources/mapper_dao/CaseDao.xml b/src/main/resources/mapper_dao/CaseDao.xml index 57e7e4a..c64a76b 100644 --- a/src/main/resources/mapper_dao/CaseDao.xml +++ b/src/main/resources/mapper_dao/CaseDao.xml @@ -30,14 +30,14 @@ + diff --git a/src/main/resources/mapper_dao/NoticeDao.xml b/src/main/resources/mapper_dao/NoticeDao.xml index 9ef96f5..7730e18 100644 --- a/src/main/resources/mapper_dao/NoticeDao.xml +++ b/src/main/resources/mapper_dao/NoticeDao.xml @@ -9,10 +9,13 @@ title, content, publish_time as publishTime, - sort + publish_name as publishName, + sort, + article_url as articleUrl FROM t_sys_notice WHERE rec_status = 0 + order by publish_time DESC diff --git a/src/main/resources/mapper_raw/BlCaseMapper.xml b/src/main/resources/mapper_raw/BlCaseMapper.xml index e08808a..4e0d999 100644 --- a/src/main/resources/mapper_raw/BlCaseMapper.xml +++ b/src/main/resources/mapper_raw/BlCaseMapper.xml @@ -8,6 +8,7 @@ + @@ -74,7 +75,7 @@ - id, doctor_id, hospital_number, name, gender, idcard, submit_status, submit_time, + id, doctor_id, hospital_number, name, gender, idcard, age, submit_status, submit_time, operator, created_at, updated_at, rec_status + select + + distinct + + + from t_bl_hospital + + + + + order by ${orderByClause} + + + + + delete from t_bl_hospital + where id = #{id,jdbcType=BIGINT} + + + delete from t_bl_hospital + + + + + + insert into t_bl_hospital (id, area, name, + code, operator, created_at, + updated_at, rec_status) + values (#{id,jdbcType=BIGINT}, #{area,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, + #{code,jdbcType=VARCHAR}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, + #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT}) + + + insert into t_bl_hospital + + + id, + + + area, + + + name, + + + code, + + + operator, + + + created_at, + + + updated_at, + + + rec_status, + + + + + #{id,jdbcType=BIGINT}, + + + #{area,jdbcType=VARCHAR}, + + + #{name,jdbcType=VARCHAR}, + + + #{code,jdbcType=VARCHAR}, + + + #{operator,jdbcType=BIGINT}, + + + #{createdAt,jdbcType=TIMESTAMP}, + + + #{updatedAt,jdbcType=TIMESTAMP}, + + + #{recStatus,jdbcType=TINYINT}, + + + + + + update t_bl_hospital + + + id = #{record.id,jdbcType=BIGINT}, + + + area = #{record.area,jdbcType=VARCHAR}, + + + name = #{record.name,jdbcType=VARCHAR}, + + + code = #{record.code,jdbcType=VARCHAR}, + + + operator = #{record.operator,jdbcType=BIGINT}, + + + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{record.recStatus,jdbcType=TINYINT}, + + + + + + + + update t_bl_hospital + set id = #{record.id,jdbcType=BIGINT}, + area = #{record.area,jdbcType=VARCHAR}, + name = #{record.name,jdbcType=VARCHAR}, + code = #{record.code,jdbcType=VARCHAR}, + operator = #{record.operator,jdbcType=BIGINT}, + created_at = #{record.createdAt,jdbcType=TIMESTAMP}, + updated_at = #{record.updatedAt,jdbcType=TIMESTAMP}, + rec_status = #{record.recStatus,jdbcType=TINYINT} + + + + + + update t_bl_hospital + + + area = #{area,jdbcType=VARCHAR}, + + + name = #{name,jdbcType=VARCHAR}, + + + code = #{code,jdbcType=VARCHAR}, + + + operator = #{operator,jdbcType=BIGINT}, + + + created_at = #{createdAt,jdbcType=TIMESTAMP}, + + + updated_at = #{updatedAt,jdbcType=TIMESTAMP}, + + + rec_status = #{recStatus,jdbcType=TINYINT}, + + + where id = #{id,jdbcType=BIGINT} + + + update t_bl_hospital + set area = #{area,jdbcType=VARCHAR}, + name = #{name,jdbcType=VARCHAR}, + code = #{code,jdbcType=VARCHAR}, + operator = #{operator,jdbcType=BIGINT}, + 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 a55b6a1..6421d19 100644 --- a/src/main/resources/mbg.xml +++ b/src/main/resources/mbg.xml @@ -90,13 +90,14 @@ + - +
-
-
+ +