修改接口sql查询表关联结构,添加新表

src/main/java/com/ccsens/carbasics/bean/po/OrganizationLevel.java

@@ -0,0 +1,95 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class OrganizationLevel implements Serializable {
+    private Long id;
+
+    private Long parentId;
+
+    private String name;
+
+    private Byte sort;
+
+    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 Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public Byte getSort() {
+        return sort;
+    }
+
+    public void setSort(Byte sort) {
+        this.sort = sort;
+    }
+
+    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(", parentId=").append(parentId);
+        sb.append(", name=").append(name);
+        sb.append(", sort=").append(sort);
+        sb.append(", createdAt=").append(createdAt);
+        sb.append(", updatedAt=").append(updatedAt);
+        sb.append(", recStatus=").append(recStatus);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/ccsens/carbasics/bean/po/OrganizationLevelExample.java

@@ -0,0 +1,631 @@
+package com.ccsens.carbasics.bean.po;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+public class OrganizationLevelExample {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public OrganizationLevelExample() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    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<Criteria> 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<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> 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<Long> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Long> 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 andParentIdIsNull() {
+            addCriterion("parent_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIsNotNull() {
+            addCriterion("parent_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdEqualTo(Long value) {
+            addCriterion("parent_id =", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotEqualTo(Long value) {
+            addCriterion("parent_id <>", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdGreaterThan(Long value) {
+            addCriterion("parent_id >", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("parent_id >=", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdLessThan(Long value) {
+            addCriterion("parent_id <", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdLessThanOrEqualTo(Long value) {
+            addCriterion("parent_id <=", value, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdIn(List<Long> values) {
+            addCriterion("parent_id in", values, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotIn(List<Long> values) {
+            addCriterion("parent_id not in", values, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdBetween(Long value1, Long value2) {
+            addCriterion("parent_id between", value1, value2, "parentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andParentIdNotBetween(Long value1, Long value2) {
+            addCriterion("parent_id not between", value1, value2, "parentId");
+            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<String> values) {
+            addCriterion("name in", values, "name");
+            return (Criteria) this;
+        }
+
+        public Criteria andNameNotIn(List<String> 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 andSortIsNull() {
+            addCriterion("sort is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortIsNotNull() {
+            addCriterion("sort is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortEqualTo(Byte value) {
+            addCriterion("sort =", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotEqualTo(Byte value) {
+            addCriterion("sort <>", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortGreaterThan(Byte value) {
+            addCriterion("sort >", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortGreaterThanOrEqualTo(Byte value) {
+            addCriterion("sort >=", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortLessThan(Byte value) {
+            addCriterion("sort <", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortLessThanOrEqualTo(Byte value) {
+            addCriterion("sort <=", value, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortIn(List<Byte> values) {
+            addCriterion("sort in", values, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotIn(List<Byte> values) {
+            addCriterion("sort not in", values, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortBetween(Byte value1, Byte value2) {
+            addCriterion("sort between", value1, value2, "sort");
+            return (Criteria) this;
+        }
+
+        public Criteria andSortNotBetween(Byte value1, Byte value2) {
+            addCriterion("sort not between", value1, value2, "sort");
+            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<Date> values) {
+            addCriterion("created_at in", values, "createdAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andCreatedAtNotIn(List<Date> 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<Date> values) {
+            addCriterion("updated_at in", values, "updatedAt");
+            return (Criteria) this;
+        }
+
+        public Criteria andUpdatedAtNotIn(List<Date> 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<Byte> values) {
+            addCriterion("rec_status in", values, "recStatus");
+            return (Criteria) this;
+        }
+
+        public Criteria andRecStatusNotIn(List<Byte> 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);
+        }
+    }
+}

src/main/java/com/ccsens/carbasics/bean/po/OrganizationPosition.java

@@ -10,6 +10,8 @@ public class OrganizationPosition implements Serializable {
 
     private String roleName;
 
+    private Long departmentId;
+
     private Long operator;
 
     private Date createdAt;
@@ -44,6 +46,14 @@ public class OrganizationPosition implements Serializable {
         this.roleName = roleName == null ? null : roleName.trim();
     }
 
+    public Long getDepartmentId() {
+        return departmentId;
+    }
+
+    public void setDepartmentId(Long departmentId) {
+        this.departmentId = departmentId;
+    }
+
     public Long getOperator() {
         return operator;
     }
@@ -85,6 +95,7 @@ public class OrganizationPosition implements Serializable {
         sb.append(", id=").append(id);
         sb.append(", name=").append(name);
         sb.append(", roleName=").append(roleName);
+        sb.append(", departmentId=").append(departmentId);
         sb.append(", operator=").append(operator);
         sb.append(", createdAt=").append(createdAt);
         sb.append(", updatedAt=").append(updatedAt);

src/main/java/com/ccsens/carbasics/bean/po/OrganizationPositionExample.java

@@ -305,6 +305,66 @@ public class OrganizationPositionExample {
             return (Criteria) this;
         }
 
+        public Criteria andDepartmentIdIsNull() {
+            addCriterion("department_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIdIsNotNull() {
+            addCriterion("department_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIdEqualTo(Long value) {
+            addCriterion("department_id =", value, "departmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIdNotEqualTo(Long value) {
+            addCriterion("department_id <>", value, "departmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIdGreaterThan(Long value) {
+            addCriterion("department_id >", value, "departmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIdGreaterThanOrEqualTo(Long value) {
+            addCriterion("department_id >=", value, "departmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIdLessThan(Long value) {
+            addCriterion("department_id <", value, "departmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIdLessThanOrEqualTo(Long value) {
+            addCriterion("department_id <=", value, "departmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIdIn(List<Long> values) {
+            addCriterion("department_id in", values, "departmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIdNotIn(List<Long> values) {
+            addCriterion("department_id not in", values, "departmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIdBetween(Long value1, Long value2) {
+            addCriterion("department_id between", value1, value2, "departmentId");
+            return (Criteria) this;
+        }
+
+        public Criteria andDepartmentIdNotBetween(Long value1, Long value2) {
+            addCriterion("department_id not between", value1, value2, "departmentId");
+            return (Criteria) this;
+        }
+
         public Criteria andOperatorIsNull() {
             addCriterion("operator is null");
             return (Criteria) this;

src/main/java/com/ccsens/carbasics/persist/dao/OrganizationDepartmentDao.java

@@ -1,6 +1,7 @@
 package com.ccsens.carbasics.persist.dao;
 
 import com.ccsens.carbasics.bean.po.OrganizationDepartment;
+import com.ccsens.carbasics.bean.po.OrganizationDepartmentTemplate;
 import com.ccsens.carbasics.persist.mapper.OrganizationDepartmentMapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -9,10 +10,23 @@ import java.util.List;
 public interface OrganizationDepartmentDao extends OrganizationDepartmentMapper {
 
     /**
-     * 根据机构id和部门code查询机构下的所有部门
+     * 根据机构id和医院名称查询部门是否存在
      * @param organizationId 机构id
      * @param name 医院名称
      * @return 部门列表
      */
     OrganizationDepartment queryByOrganization(@Param("organizationId") Long organizationId,@Param("name")String name);
+
+    /**
+     * 查询部门的模板(一级部门)
+     * @return 部门的模板(一级部门)
+     */
+    List<OrganizationDepartmentTemplate> queryTemplate();
+
+    /**
+     * 查询机构下所有一级部门
+     * @param oid 机构id
+     * @return 机构下所有一级部门
+     */
+    List<OrganizationDepartment> queryAllByOid(@Param("oid") Long oid);
 }

src/main/java/com/ccsens/carbasics/persist/dao/OrganizationPositionDao.java

@@ -1,5 +1,6 @@
 package com.ccsens.carbasics.persist.dao;
 
+import com.ccsens.carbasics.bean.po.OrganizationPosition;
 import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
 import com.ccsens.carbasics.persist.mapper.OrganizationPositionMapper;
 import org.apache.ibatis.annotations.Param;
@@ -17,9 +18,10 @@ public interface OrganizationPositionDao extends OrganizationPositionMapper {
     /**
      * 根据code查询职位id
      * @param code 职位职位code
+     * @param hospitalName 医院名称
      * @return 职位id
      */
-    Long queryByCode(@Param("code") String code);
+    Long queryByCode(@Param("code") String code,@Param("hospitalName") String hospitalName);
 
     /**
      * 根据名称查询职务
@@ -27,4 +29,13 @@ public interface OrganizationPositionDao extends OrganizationPositionMapper {
      * @return 职务id
      */
     Long queryByName(@Param("name")String name);
+
+    /**
+     * 查询职位是否存在
+     * @param positionName 职位名称
+     * @param positionCode 职位code
+     * @param did  部门id
+     * @return 职位信息
+     */
+    OrganizationPosition queryIsExist(@Param("positionName") String positionName,@Param("positionCode") String positionCode,@Param("did") Long did);
 }

src/main/java/com/ccsens/carbasics/persist/dao/OrganizationPositionTypeDao.java

@@ -0,0 +1,16 @@
+package com.ccsens.carbasics.persist.dao;
+
+import com.ccsens.carbasics.bean.po.OrganizationPositionType;
+import com.ccsens.carbasics.persist.mapper.OrganizationPositionTypeMapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface OrganizationPositionTypeDao extends OrganizationPositionTypeMapper {
+    /**
+     * 根据code查询职位类型
+     * @param positionCode 职位code
+     * @return 职位类型
+     */
+    OrganizationPositionType queryByCode(@Param("positionCode") String positionCode);
+}

src/main/java/com/ccsens/carbasics/persist/mapper/OrganizationLevelMapper.java

@@ -0,0 +1,30 @@
+package com.ccsens.carbasics.persist.mapper;
+
+import com.ccsens.carbasics.bean.po.OrganizationLevel;
+import com.ccsens.carbasics.bean.po.OrganizationLevelExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface OrganizationLevelMapper {
+    long countByExample(OrganizationLevelExample example);
+
+    int deleteByExample(OrganizationLevelExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(OrganizationLevel record);
+
+    int insertSelective(OrganizationLevel record);
+
+    List<OrganizationLevel> selectByExample(OrganizationLevelExample example);
+
+    OrganizationLevel selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") OrganizationLevel record, @Param("example") OrganizationLevelExample example);
+
+    int updateByExample(@Param("record") OrganizationLevel record, @Param("example") OrganizationLevelExample example);
+
+    int updateByPrimaryKeySelective(OrganizationLevel record);
+
+    int updateByPrimaryKey(OrganizationLevel record);
+}

src/main/java/com/ccsens/carbasics/service/AccountManageService.java

@@ -47,14 +47,10 @@ public class AccountManageService implements IAccountManageService {
     @Resource
     private ConstantMapper constantMapper;
     @Resource
-    private OrganizationProjectDao organizationProjectDao;
-    @Resource
     private OrganizationDao organizationDao;
     @Resource
     private QuestionnaireDetailDao questionnaireDetailDao;
     @Resource
-    private CodeNameDao codeNameDao;
-    @Resource
     private Snowflake snowflake;
     @Override
     public void submitAccount(AccountDto.SubmitAccount param, Long userId) {
@@ -98,7 +94,7 @@ public class AccountManageService implements IAccountManageService {
             }
         }
         //2.校验是否已经有提交
-        Long submitId = questionnaireDetailDao.queryIsSubmit(accountManage.getHospitalName(),System.currentTimeMillis());
+        Long submitId = questionnaireDetailDao.queryIsSubmit(accountManageInfo.getHospitalName(),System.currentTimeMillis());
         if (ObjectUtil.isNotNull(submitId)) {
             flag = false;
         }
@@ -111,9 +107,11 @@ public class AccountManageService implements IAccountManageService {
         }
 
         //查询职位id
-        Long positionId = positionDao.queryByCode(accountManageInfo.getPositionCode());
-        questionnaireService.createHospitalAndProject(accountManageInfo.getSubmitterPhone(),accountManageInfo.getSubmitterUserId(),"",
-                accountManageInfo.getHospitalName(),accountManageInfo.getDepartmentName(),accountManageInfo.getSubmitter(),positionId,accountManageInfo.getDepartmentCode());
+        Long positionId = positionDao.queryByCode(accountManageInfo.getPositionCode(),accountManageInfo.getHospitalName());
+        questionnaireService.createOrganization(accountManageInfo.getHospitalName(),accountManageInfo.getDepartmentName(),userId,
+                accountManageInfo.getSubmitter(),accountManageInfo.getSubmitterPhone(),positionId,accountManage.getPositionName(),accountManage.getPositionCode());
+//        questionnaireService.createHospitalAndProject(accountManageInfo.getSubmitterPhone(),accountManageInfo.getSubmitterUserId(),"",
+//                accountManageInfo.getHospitalName(),accountManageInfo.getDepartmentName(),accountManageInfo.getSubmitter(),positionId,accountManageInfo.getDepartmentCode());
     }
 
 
@@ -207,11 +205,12 @@ public class AccountManageService implements IAccountManageService {
 
     @Override
     public List<AccountVo.ApplyOfHospital> queryApplyOfHospital(AccountDto.QueryApplyOfHospital param, Long userId) {
-        Long hospitalId = organizationProjectDao.queryByProjectId(param.getProjectId());
-        if (ObjectUtil.isNull(hospitalId)) {
+//        Long hospitalId = organizationProjectDao.queryByProjectId(param.getProjectId());
+        Organization organization = organizationDao.selectByPrimaryKey(param.getProjectId());
+        if (ObjectUtil.isNull(organization)) {
             throw new BaseException(DefaultCodeError.PROJECT_ERROR);
         }
-        Organization organization = organizationDao.selectByPrimaryKey(hospitalId);
+//        Organization organization = organizationDao.selectByPrimaryKey(hospitalId);
         return accountManageDao.queryApply(organization.getName(),param.getAuditStatus(),param.getName(),null);
     }
 

src/main/java/com/ccsens/carbasics/service/FirstAidService.java

@@ -53,23 +53,12 @@ public class FirstAidService implements IFirstAidService{
     private OrganizationMemberDao organizationMemberDao;
     @Resource
     private Snowflake snowflake;
-
     @Resource
     private FirstAidMemberDao firstAidMemberDao;
     @Resource
-    private IProjectService projectService;
-    @Resource
-    private OrganizationTemplateMapper templateMapper;
-    @Resource
     private FirstAidRecordMapper firstAidRecordMapper;
     @Resource
     private FirstAidRecordLogMapper firstAidRecordLogMapper;
-    @Resource
-    private PatientDao patientDao;
-    @Resource
-    private OrganizationProjectDao organizationProjectDao;
-    @Resource
-    private RedisUtil redisUtil;
 
 
     @Override

src/main/java/com/ccsens/carbasics/service/OcrService.java

@@ -51,8 +51,7 @@ import java.util.stream.Collectors;
 @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
 public class OcrService implements IOcrService {
 
-    @Resource
-    private QuestionOcrDao questionOcrDao;
+
     @Resource
     private OcrKeywordDao ocrKeywordDao;
     @Resource

src/main/java/com/ccsens/carbasics/service/QuestionnaireService.java

@@ -5,7 +5,6 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.lang.Snowflake;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import com.ccsens.carbasics.bean.dto.PatientDto;
 import com.ccsens.carbasics.bean.dto.QuestionnaireDto;
 import com.ccsens.carbasics.bean.po.*;
 import com.ccsens.carbasics.bean.vo.ButtonVO;
@@ -13,19 +12,17 @@ import com.ccsens.carbasics.bean.vo.CodeVo;
 import com.ccsens.carbasics.bean.vo.OrganizationMemberVo;
 import com.ccsens.carbasics.bean.vo.QuestionnaireVo;
 import com.ccsens.carbasics.persist.dao.*;
+import com.ccsens.carbasics.persist.mapper.OrganizationDepartmentTemplateMapper;
+import com.ccsens.carbasics.persist.mapper.OrganizationPositionTypeRelationMapper;
 import com.ccsens.carbasics.util.Constant;
 import com.ccsens.carbasics.util.DefaultCodeError;
 import com.ccsens.cloudutil.bean.tall.dto.ProjectDto;
 import com.ccsens.cloudutil.feign.Tall3FeignClient;
-import com.ccsens.common.bean.dto.CMemberDto;
-import com.ccsens.common.bean.dto.CProjectDto;
-import com.ccsens.common.bean.vo.CProjectVo;
-import com.ccsens.common.service.IMemberService;
-import com.ccsens.common.service.IProjectService;
 import com.ccsens.util.PoiUtil;
 import com.ccsens.util.PropUtil;
 import com.ccsens.util.RedisUtil;
 import com.ccsens.util.exception.BaseException;
+import com.itextpdf.text.pdf.PdfDiv;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
@@ -36,6 +33,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 @Slf4j
@@ -56,8 +54,6 @@ public class QuestionnaireService implements IQuestionnaireService{
     @Resource
     private OrganizationDao organizationDao;
     @Resource
-    private IAsyncService asyncService;
-    @Resource
     private OrganizationPositionDao positionDao;
     @Resource
     private QuestionnaireRecordDao recordDao;
@@ -66,18 +62,10 @@ public class QuestionnaireService implements IQuestionnaireService{
     @Resource
     private OrganizationMemberDao organizationMemberDao;
     @Resource
-    private IProjectService projectService;
-    @Resource
-    private IMemberService memberService;
-    @Resource
-    private OrganizationProjectDao organizationProjectDao;
-    @Resource
     private OrganizationMemberPositionDao organizationMemberPositionDao;
     @Resource
     private QuestionnaireRecordDao questionnaireRecordDao;
     @Resource
-    private IFirstAidService firstAidService;
-    @Resource
     private CodeDictionariesDao codeDictionariesDao;
     @Resource
     private ButtonConfigDao buttonConfigDao;
@@ -88,7 +76,9 @@ public class QuestionnaireService implements IQuestionnaireService{
     @Resource
     private AccountManageDao accountManageDao;
     @Resource
-    private CodeNameDao codeNameDao;
+    private OrganizationPositionTypeDao positionTypeDao;
+    @Resource
+    private OrganizationPositionTypeRelationMapper positionTypeRelationMapper;
 
     @Override
     public List<QuestionnaireVo.AreaInfo> queryArea(QuestionnaireDto.QueryArea param, Long userId) {
@@ -359,202 +349,128 @@ public class QuestionnaireService implements IQuestionnaireService{
 
     /**
      * 提交问卷后的后续操作
-     * @param phone 手机号
-     * @param userId 用户id
-     * @throws Exception 异常
      */
-    public Long createHospitalOfNotExit(String phone, Long userId) throws Exception {
-        //查询基本信息的code与答案
-        HashMap<String, String> codeAndAnswer = new HashMap<>();
-        List<QuestionnaireVo.QuestionnaireInfo> infoList = questionnaireRecordDao.queryInfo(userId);
-        if (CollectionUtil.isNotEmpty(infoList)) {
-            for (QuestionnaireVo.QuestionnaireInfo questionnaireInfo : infoList) {
-                codeAndAnswer.put(questionnaireInfo.getCode(),questionnaireInfo.getAnswer());
-            }
-        }
-        //医院名称
-        String hospitalName = codeAndAnswer.get(Constant.BasicInformation.hospitalName.code);
-        //部门名称
-        String departmentName = codeAndAnswer.get(Constant.BasicInformation.department.code);
-        //成员名称
-        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 = "";
-        if (Constant.DepartmentAndCode.SHEN_NEI.name.equals(departmentName)) {
-            departmentCode = Constant.DepartmentAndCode.SHEN_NEI.code;
-        }
-        if (Constant.DepartmentAndCode.NEI_KE.name.equals(departmentName)) {
-            departmentCode = Constant.DepartmentAndCode.NEI_KE.code;
-        }
-        if (Constant.DepartmentAndCode.SHEN_WAI.name.equals(departmentName)) {
-            departmentCode = Constant.DepartmentAndCode.SHEN_WAI.code;
-        }
-
-        return createHospitalAndProject(phone, userId, hospitalLevel, hospitalName, departmentName, memberName, positionId, departmentCode);
-    }
+//    public Long createHospitalOfNotExit(String phone, Long userId) throws Exception {
+//        //查询基本信息的code与答案
+//        HashMap<String, String> codeAndAnswer = new HashMap<>();
+//        List<QuestionnaireVo.QuestionnaireInfo> infoList = questionnaireRecordDao.queryInfo(userId);
+//        if (CollectionUtil.isNotEmpty(infoList)) {
+//            for (QuestionnaireVo.QuestionnaireInfo questionnaireInfo : infoList) {
+//                codeAndAnswer.put(questionnaireInfo.getCode(),questionnaireInfo.getAnswer());
+//            }
+//        }
+//        //医院名称
+//        String hospitalName = codeAndAnswer.get(Constant.BasicInformation.hospitalName.code);
+//        //部门名称
+//        String departmentName = codeAndAnswer.get(Constant.BasicInformation.department.code);
+//        //成员名称
+//        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 = "";
+//        if (Constant.DepartmentAndCode.SHEN_NEI.name.equals(departmentName)) {
+//            departmentCode = Constant.DepartmentAndCode.SHEN_NEI.code;
+//        }
+//        if (Constant.DepartmentAndCode.NEI_KE.name.equals(departmentName)) {
+//            departmentCode = Constant.DepartmentAndCode.NEI_KE.code;
+//        }
+//        if (Constant.DepartmentAndCode.SHEN_WAI.name.equals(departmentName)) {
+//            departmentCode = Constant.DepartmentAndCode.SHEN_WAI.code;
+//        }
+//        return createOrganization(hospitalName,departmentName,userId,memberName,phone,positionId);
+////        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);
+    public Long createOrganization(String organizationName,String departmentName,Long userId,String memberName,String memberPhone,Long positionId
+                                    ,String positionName,String positionCode) {
+        //机构创建
+        boolean create = false;
+        Organization organization = organizationDao.queryByName(organizationName);
         if (ObjectUtil.isNull(organization)) {
-            //创建医院
-            Organization newOrganization = new Organization();
-            newOrganization.setId(snowflake.nextId());
-            newOrganization.setName(hospitalName);
-            if (Constant.HospitalLevel.two.explain.equals(hospitalLevel)) {
-                newOrganization.setLevel(Constant.HospitalLevel.two.level);
-            }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);
-            //创建部门
-            OrganizationDepartment department = new OrganizationDepartment();
-            department.setId(snowflake.nextId());
-            department.setName(departmentName);
-            department.setCode(departmentCode);
-            department.setOrganizationId(newOrganization.getId());
-            departmentDao.insertSelective(department);
-            //创建用户
-            //查询用户是否存在
-            OrganizationMember organizationMember = organizationMemberDao.queryExistByUserId(userId);
-            Long memberId = 0L;
-            if (ObjectUtil.isNull(organizationMember)) {
-                OrganizationMember member = new OrganizationMember();
-                member.setId(snowflake.nextId());
-                member.setUserId(userId);
-                member.setName(memberName);
-                member.setContact(phone);
-                organizationMemberDao.insertSelective(member);
-                memberId = member.getId();
-            }else {
-                memberId = organizationMember.getId();
-            }
-            //添加成员职位
-            //判断成员职位是否存在
-            Long isExist = organizationMemberPositionDao.queryByExistByMember(memberId,positionId,department.getId());
-            if (isExist == 0) {
-                OrganizationMemberPosition position = new OrganizationMemberPosition();
-                position.setId(snowflake.nextId());
-                position.setPositionId(positionId);
-                position.setDepartmentId(department.getId());
-                position.setMemberId(memberId);
-                organizationMemberPositionDao.insertSelective(position);
-            }
-            //创建项目
-            return createProject(newOrganization.getId(), hospitalName, memberName, phone, userId,positionId,departmentCode);
-        }else {
+            log.info("创建机构:{}",organizationName);
+            create = true;
+            Organization organizationNew = new Organization();
+            organizationNew.setId(snowflake.nextId());
+            organization.setOrganizationType(Constant.OrganizationType.HOSPITAL.status);
+            organizationNew.setName(organizationName);
+            //TODO 医院等级
+            //organization.setLevelId();
+            organizationDao.insertSelective(organization);
+            organization = organizationNew;
+        }
+        //部门创建
         OrganizationDepartment department = departmentDao.queryByOrganization(organization.getId(),departmentName);
         if (ObjectUtil.isNull(department)) {
-                //创建部门
-                OrganizationDepartment newDepartment = new OrganizationDepartment();
-                newDepartment.setId(snowflake.nextId());
-                newDepartment.setCode(departmentCode);
-                newDepartment.setName(departmentName);
-                newDepartment.setOrganizationId(organization.getId());
-                departmentDao.insertSelective(newDepartment);
-                //创建用户
-                //查询用户是否存在
-                OrganizationMember organizationMember = organizationMemberDao.queryExistByUserId(userId);
-                Long memberId = 0L;
-                if (ObjectUtil.isNull(organizationMember)) {
-                    OrganizationMember member = new OrganizationMember();
-                    member.setId(snowflake.nextId());
-                    member.setUserId(userId);
-                    member.setName(memberName);
-                    member.setContact(phone);
-                    organizationMemberDao.insertSelective(member);
-                    memberId = member.getId();
-                }else {
-                    memberId = organizationMember.getId();
-                }
-                //添加成员职位
-                //判断成员职位是否存在
-                Long isExist = organizationMemberPositionDao.queryByExistByMember(memberId,positionId,newDepartment.getId());
-                if (isExist == 0) {
-                    OrganizationMemberPosition position = new OrganizationMemberPosition();
-                    position.setId(snowflake.nextId());
-                    position.setPositionId(positionId);
-                    position.setDepartmentId(newDepartment.getId());
-                    position.setMemberId(memberId);
-                    organizationMemberPositionDao.insertSelective(position);
-                }
-                //创建项目
-                return createProject(organization.getId(),hospitalName,memberName,phone,userId,positionId,departmentCode);
-            }else {
-                //创建用户
-                //查询用户是否存在
+            log.info("创建一级部门:{},不存在的部门名:{}",organizationName,departmentName);
+            List<OrganizationDepartmentTemplate> departmentTemplateList = departmentDao.queryTemplate();
+            List<OrganizationDepartment> departmentList = departmentDao.queryAllByOid(organization.getId());
+            List<String> departmentNameList = departmentList.stream().map(OrganizationDepartment::getName).collect(Collectors.toList());
+            for (OrganizationDepartmentTemplate departmentTemplate : departmentTemplateList) {
+                if (departmentNameList.contains(departmentTemplate.getName())) {
+                    continue;
+                }
+                OrganizationDepartment departmentOne = new OrganizationDepartment();
+                departmentOne.setId(snowflake.nextId());
+                departmentOne.setOrganizationId(organization.getId());
+                departmentOne.setCode(departmentTemplate.getCode());
+                departmentOne.setName(departmentTemplate.getName());
+                departmentDao.insertSelective(departmentOne);
+                if (departmentName.equals(departmentTemplate.getName())) {
+                    department = departmentOne;
+                }
+            }
+        }
+        //创建职位
+        OrganizationPosition position = positionDao.queryIsExist(positionName,positionCode,department.getId());
+        if (ObjectUtil.isNull(position)) {
+            OrganizationPosition positionNew = new OrganizationPosition();
+            positionNew.setId(snowflake.nextId());
+            positionNew.setName(positionName);
+            positionNew.setRoleName(positionName);
+            positionNew.setDepartmentId(department.getId());
+            positionDao.insertSelective(positionNew);
+            //绑定职位类型
+            OrganizationPositionType positionType = positionTypeDao.queryByCode(positionCode);
+            if (ObjectUtil.isNotNull(positionType)) {
+                OrganizationPositionTypeRelation positionTypeRelation = new OrganizationPositionTypeRelation();
+                positionTypeRelation.setId(snowflake.nextId());
+                positionTypeRelation.setPositionId(positionNew.getId());
+                positionTypeRelation.setPositionTypeId(positionType.getId());
+                positionTypeRelationMapper.insertSelective(positionTypeRelation);
+            }
+        }
+        //成员创建
         OrganizationMember organizationMember = organizationMemberDao.queryExistByUserId(userId);
-                Long memberId = 0L;
         if (ObjectUtil.isNull(organizationMember)) {
+            log.info("添加成员:{}",userId);
             OrganizationMember member = new OrganizationMember();
             member.setId(snowflake.nextId());
             member.setUserId(userId);
             member.setName(memberName);
-                    member.setContact(phone);
+            member.setContact(memberPhone);
             organizationMemberDao.insertSelective(member);
-                    memberId = member.getId();
-                }else {
-                    memberId = organizationMember.getId();
+            organizationMember = member;
         }
-                //添加成员职位
-                //判断成员职位是否存在
-                Long isExist = organizationMemberPositionDao.queryByExistByMember(memberId,positionId,department.getId());
+        Long isExist = organizationMemberPositionDao.queryByExistByMember(organizationMember.getId(),positionId,department.getId());
         if (isExist == 0) {
-                    OrganizationMemberPosition position = new OrganizationMemberPosition();
-                    position.setId(snowflake.nextId());
-                    position.setPositionId(positionId);
-                    position.setDepartmentId(department.getId());
-                    position.setMemberId(memberId);
-                    organizationMemberPositionDao.insertSelective(position);
-                }
-                //创建项目
-                return createProject(organization.getId(), hospitalName, memberName, phone, userId,positionId,departmentCode);
-            }
-        }
-    }
-
-
-    public Long createProject(Long organizationId,String hospitalName,String memberName,String phone,Long userId,Long positionId,String departmentCode) {
-        OrganizationProject project = organizationProjectDao.queryByOrganizationId(organizationId);
-        if (ObjectUtil.isNull(project)) {
-            //创建项目
-            CProjectDto.CopyProject copyProject = new CProjectDto.CopyProject();
-            log.info("模板项目id:{}",redisUtil.get(Constant.TEMPLATE_PROJECT_KEY_ORGANIZATION));
-            copyProject.setProjectId((Long) redisUtil.get(Constant.TEMPLATE_PROJECT_KEY_ORGANIZATION));
-            copyProject.setProjectName(hospitalName);
-            CProjectVo.CopyProjectInfo copyProjectInfo = projectService.copyProject(copyProject, userId);
-            //添加角色
-            CMemberDto.SaveMember saveMember = new CMemberDto.SaveMember();
-            saveMember.setProjectId(copyProjectInfo.getId());
-            //查询角色code
-            OrganizationPosition position = positionDao.selectByPrimaryKey(positionId);
-            String roleName = codeNameDao.queryRoleName(position.getCode(),departmentCode);
-            saveMember.setRoleName(roleName);
-//            saveMember.setRoleName(Constant.RoleName.SHEN_NEI);
-            saveMember.setName(memberName);
-            saveMember.setPhone(phone);
-            saveMember.setUserId(userId);
-            memberService.addMemberForProject(saveMember);
-            //绑定机构和项目
-            OrganizationProject organizationProject = new OrganizationProject();
-            organizationProject.setId(snowflake.nextId());
-            organizationProject.setOrganizationId(organizationId);
-            organizationProject.setProjectId(copyProjectInfo.getId());
-            organizationProjectDao.insertSelective(organizationProject);
-            //创建病例
-            PatientDto.SavePatient savePatient = new PatientDto.SavePatient();
-            firstAidService.getFirstAid(savePatient,userId,(byte)1,organizationId, (byte) 0);
-            //tall3添加项目,关联项目
+            log.info("添加成员职位:{}",organizationMember.getId());
+            OrganizationMemberPosition memberPosition = new OrganizationMemberPosition();
+            memberPosition.setId(snowflake.nextId());
+            memberPosition.setPositionId(positionId);
+            memberPosition.setDepartmentId(department.getId());
+            memberPosition.setMemberId(organizationMember.getId());
+            organizationMemberPositionDao.insertSelective(memberPosition);
+        }
+        //调用tall3 方法  TODO 待处理异常
+        if (create) {
+            log.info("tall3创建项目:{}",organization.getId());
             ProjectDto.SaveProjectDto saveProjectDto = new ProjectDto.SaveProjectDto();
-            saveProjectDto.setId(copyProjectInfo.getId());
-            saveProjectDto.setName(copyProject.getProjectName());
+            saveProjectDto.setId(organization.getId());
+            saveProjectDto.setName(organization.getName());
             saveProjectDto.setStartTime(System.currentTimeMillis());
             saveProjectDto.setEndTime(System.currentTimeMillis()+315360000000L);
             saveProjectDto.setUrl(PropUtil.domain);
@@ -562,34 +478,215 @@ public class QuestionnaireService implements IQuestionnaireService{
             userIds.add(userId);
             saveProjectDto.setUserIdList(userIds);
             tall3FeignClient.saveProjectList(saveProjectDto);
-            return copyProjectInfo.getId();
         }else {
-            CMemberDto.SaveMember saveMember = new CMemberDto.SaveMember();
-            saveMember.setProjectId(project.getProjectId());
-            //查询角色code
-            OrganizationPosition position = positionDao.selectByPrimaryKey(positionId);
-            String roleName = codeNameDao.queryRoleName(position.getCode(),departmentCode);
-            saveMember.setRoleName(roleName);
-//            saveMember.setRoleName(Constant.RoleName.SHEN_NEI);
-            saveMember.setName(memberName);
-            saveMember.setPhone(phone);
-            saveMember.setUserId(userId);
-            memberService.addMemberForProject(saveMember);
-
+            log.info("tall3添加成员:{}",organization.getId());
             //tall3 用户关联项目
             ProjectDto.SaveUserProject saveUserProject = new ProjectDto.SaveUserProject();
             ArrayList<Long> projectIds = new ArrayList<>();
             ArrayList<Long> userIds = new ArrayList<>();
-            projectIds.add(project.getProjectId());
+            projectIds.add(organization.getId());
             userIds.add(userId);
             saveUserProject.setProjectId(projectIds);
             saveUserProject.setUserId(userIds);
             tall3FeignClient.saveUserProject(saveUserProject);
-            return project.getProjectId();
         }
+        return organization.getId();
     }
 
 
+
+//    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(hospitalName);
+//            if (Constant.HospitalLevel.two.explain.equals(hospitalLevel)) {
+//                newOrganization.setLevel(Constant.HospitalLevel.two.level);
+//            }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);
+//            //创建部门
+//            OrganizationDepartment department = new OrganizationDepartment();
+//            department.setId(snowflake.nextId());
+//            department.setName(departmentName);
+//            department.setCode(departmentCode);
+//            department.setOrganizationId(newOrganization.getId());
+//            departmentDao.insertSelective(department);
+//            //创建用户
+//            //查询用户是否存在
+//            OrganizationMember organizationMember = organizationMemberDao.queryExistByUserId(userId);
+//            Long memberId = 0L;
+//            if (ObjectUtil.isNull(organizationMember)) {
+//                OrganizationMember member = new OrganizationMember();
+//                member.setId(snowflake.nextId());
+//                member.setUserId(userId);
+//                member.setName(memberName);
+//                member.setContact(phone);
+//                organizationMemberDao.insertSelective(member);
+//                memberId = member.getId();
+//            }else {
+//                memberId = organizationMember.getId();
+//            }
+//            //添加成员职位
+//            //判断成员职位是否存在
+//            Long isExist = organizationMemberPositionDao.queryByExistByMember(memberId,positionId,department.getId());
+//            if (isExist == 0) {
+//                OrganizationMemberPosition position = new OrganizationMemberPosition();
+//                position.setId(snowflake.nextId());
+//                position.setPositionId(positionId);
+//                position.setDepartmentId(department.getId());
+//                position.setMemberId(memberId);
+//                organizationMemberPositionDao.insertSelective(position);
+//            }
+//            //创建项目
+//            return createProject(newOrganization.getId(), hospitalName, memberName, phone, userId,positionId,departmentCode);
+//        }else {
+//            OrganizationDepartment department = departmentDao.queryByOrganization(organization.getId(),departmentName);
+//            if (ObjectUtil.isNull(department)) {
+//                //创建部门
+//                OrganizationDepartment newDepartment = new OrganizationDepartment();
+//                newDepartment.setId(snowflake.nextId());
+//                newDepartment.setCode(departmentCode);
+//                newDepartment.setName(departmentName);
+//                newDepartment.setOrganizationId(organization.getId());
+//                departmentDao.insertSelective(newDepartment);
+//                //创建用户
+//                //查询用户是否存在
+//                OrganizationMember organizationMember = organizationMemberDao.queryExistByUserId(userId);
+//                Long memberId = 0L;
+//                if (ObjectUtil.isNull(organizationMember)) {
+//                    OrganizationMember member = new OrganizationMember();
+//                    member.setId(snowflake.nextId());
+//                    member.setUserId(userId);
+//                    member.setName(memberName);
+//                    member.setContact(phone);
+//                    organizationMemberDao.insertSelective(member);
+//                    memberId = member.getId();
+//                }else {
+//                    memberId = organizationMember.getId();
+//                }
+//                //添加成员职位
+//                //判断成员职位是否存在
+//                Long isExist = organizationMemberPositionDao.queryByExistByMember(memberId,positionId,newDepartment.getId());
+//                if (isExist == 0) {
+//                    OrganizationMemberPosition position = new OrganizationMemberPosition();
+//                    position.setId(snowflake.nextId());
+//                    position.setPositionId(positionId);
+//                    position.setDepartmentId(newDepartment.getId());
+//                    position.setMemberId(memberId);
+//                    organizationMemberPositionDao.insertSelective(position);
+//                }
+//                //创建项目
+//                return createProject(organization.getId(),hospitalName,memberName,phone,userId,positionId,departmentCode);
+//            }else {
+//                //创建用户
+//                //查询用户是否存在
+//                OrganizationMember organizationMember = organizationMemberDao.queryExistByUserId(userId);
+//                Long memberId = 0L;
+//                if (ObjectUtil.isNull(organizationMember)) {
+//                    OrganizationMember member = new OrganizationMember();
+//                    member.setId(snowflake.nextId());
+//                    member.setUserId(userId);
+//                    member.setName(memberName);
+//                    member.setContact(phone);
+//                    organizationMemberDao.insertSelective(member);
+//                    memberId = member.getId();
+//                }else {
+//                    memberId = organizationMember.getId();
+//                }
+//                //添加成员职位
+//                //判断成员职位是否存在
+//                Long isExist = organizationMemberPositionDao.queryByExistByMember(memberId,positionId,department.getId());
+//                if (isExist == 0) {
+//                    OrganizationMemberPosition position = new OrganizationMemberPosition();
+//                    position.setId(snowflake.nextId());
+//                    position.setPositionId(positionId);
+//                    position.setDepartmentId(department.getId());
+//                    position.setMemberId(memberId);
+//                    organizationMemberPositionDao.insertSelective(position);
+//                }
+//                //创建项目
+//                return createProject(organization.getId(), hospitalName, memberName, phone, userId,positionId,departmentCode);
+//            }
+//        }
+//    }
+
+
+//    public Long createProject(Long organizationId,String hospitalName,String memberName,String phone,Long userId,Long positionId,String departmentCode) {
+//        OrganizationProject project = organizationProjectDao.queryByOrganizationId(organizationId);
+//        if (ObjectUtil.isNull(project)) {
+//            //创建项目
+//            CProjectDto.CopyProject copyProject = new CProjectDto.CopyProject();
+//            log.info("模板项目id:{}",redisUtil.get(Constant.TEMPLATE_PROJECT_KEY_ORGANIZATION));
+//            copyProject.setProjectId((Long) redisUtil.get(Constant.TEMPLATE_PROJECT_KEY_ORGANIZATION));
+//            copyProject.setProjectName(hospitalName);
+//            CProjectVo.CopyProjectInfo copyProjectInfo = projectService.copyProject(copyProject, userId);
+//            //添加角色
+//            CMemberDto.SaveMember saveMember = new CMemberDto.SaveMember();
+//            saveMember.setProjectId(copyProjectInfo.getId());
+//            //查询角色code
+//            OrganizationPosition position = positionDao.selectByPrimaryKey(positionId);
+//            String roleName = codeNameDao.queryRoleName(position.getCode(),departmentCode);
+//            saveMember.setRoleName(roleName);
+////            saveMember.setRoleName(Constant.RoleName.SHEN_NEI);
+//            saveMember.setName(memberName);
+//            saveMember.setPhone(phone);
+//            saveMember.setUserId(userId);
+//            memberService.addMemberForProject(saveMember);
+//            //绑定机构和项目
+//            OrganizationProject organizationProject = new OrganizationProject();
+//            organizationProject.setId(snowflake.nextId());
+//            organizationProject.setOrganizationId(organizationId);
+//            organizationProject.setProjectId(copyProjectInfo.getId());
+//            organizationProjectDao.insertSelective(organizationProject);
+//            //创建病例
+//            PatientDto.SavePatient savePatient = new PatientDto.SavePatient();
+//            firstAidService.getFirstAid(savePatient,userId,(byte)1,organizationId, (byte) 0);
+//            //tall3添加项目,关联项目
+//            ProjectDto.SaveProjectDto saveProjectDto = new ProjectDto.SaveProjectDto();
+//            saveProjectDto.setId(copyProjectInfo.getId());
+//            saveProjectDto.setName(copyProject.getProjectName());
+//            saveProjectDto.setStartTime(System.currentTimeMillis());
+//            saveProjectDto.setEndTime(System.currentTimeMillis()+315360000000L);
+//            saveProjectDto.setUrl(PropUtil.domain);
+//            Set<Long> userIds = new HashSet<>();
+//            userIds.add(userId);
+//            saveProjectDto.setUserIdList(userIds);
+//            tall3FeignClient.saveProjectList(saveProjectDto);
+//            return copyProjectInfo.getId();
+//        }else {
+//            CMemberDto.SaveMember saveMember = new CMemberDto.SaveMember();
+//            saveMember.setProjectId(project.getProjectId());
+//            //查询角色code
+//            OrganizationPosition position = positionDao.selectByPrimaryKey(positionId);
+//            String roleName = codeNameDao.queryRoleName(position.getCode(),departmentCode);
+//            saveMember.setRoleName(roleName);
+////            saveMember.setRoleName(Constant.RoleName.SHEN_NEI);
+//            saveMember.setName(memberName);
+//            saveMember.setPhone(phone);
+//            saveMember.setUserId(userId);
+//            memberService.addMemberForProject(saveMember);
+//
+//            //tall3 用户关联项目
+//            ProjectDto.SaveUserProject saveUserProject = new ProjectDto.SaveUserProject();
+//            ArrayList<Long> projectIds = new ArrayList<>();
+//            ArrayList<Long> userIds = new ArrayList<>();
+//            projectIds.add(project.getProjectId());
+//            userIds.add(userId);
+//            saveUserProject.setProjectId(projectIds);
+//            saveUserProject.setUserId(userIds);
+//            tall3FeignClient.saveUserProject(saveUserProject);
+//            return project.getProjectId();
+//        }
+//    }
+
+
     @Override
     public List<ButtonVO.ButtonInfo> queryButton(Long userId) {
         return buttonConfigDao.queryButtonInfo(System.currentTimeMillis());

src/main/java/com/ccsens/carbasics/service/StatisticalService.java

@@ -298,7 +298,8 @@ public class StatisticalService implements IStatisticalService {
      */
     private List<Long> getHospitalIds(Long projectId) {
         // 判断机构是否存在
-        Organization organization = organizationDao.getByProjectId(projectId);
+//        Organization organization = organizationDao.getByProjectId(projectId);
+        Organization organization = organizationDao.selectByPrimaryKey(projectId);
         if (organization == null) {
             throw new BaseException(DefaultCodeError.NOT_ORGANIZATION);
         }

src/main/resources/mapper_dao/OrganizationDao.xml

@@ -853,19 +853,19 @@
     </select>
 
     <select id="queryDepartmentByUser" resultType="java.lang.Long">
-        SELECT
+        SELECT DISTINCT
             d.id
         FROM
-            t_organization_member m,
-            t_organization_member_position p,
-            t_organization_department d
+            t_organization_member_position AS mp
+        LEFT JOIN t_organization_position AS p ON mp.position_id = p.id
+        LEFT JOIN t_organization_member AS m ON m.id = mp.member_id
+        LEFT JOIN t_organization_department AS d ON p.department_id = d.id
         WHERE
-            m.id = p.member_id
-        AND p.department_id = d.id
-        AND m.rec_status = 0
+            mp.rec_status = 0
         AND p.rec_status = 0
+        AND m.rec_status = 0
         AND d.rec_status = 0
-        AND m.user_id = #{userId}
         AND d.organization_id = #{projectId}
+        AND m.user_id = #{userId}
     </select>
 </mapper>

src/main/resources/mapper_dao/OrganizationDepartmentDao.xml

@@ -5,18 +5,47 @@
 
     <select id="queryByOrganization" resultType="com.ccsens.carbasics.bean.po.OrganizationDepartment">
         SELECT
-            id,
-            `code`,
-            `name`,
-            introduce,
-            parent_id,
-            organization_id,
-            operator
+            od.id,
+            od.`code`,
+            od.`name`,
+            od.introduce,
+            od.organization_id
         FROM
-            t_organization_department
+            t_organization_department AS od
+        LEFT JOIN t_organization_department_parent AS dp ON od.id = dp.department_id
         WHERE
-            rec_status = 0
-        AND organization_id = #{organizationId}
-        AND `name` = #{name}
+            od.rec_status = 0
+        AND od.organization_id = #{organizationId}
+        AND od.`name` = #{name}
+        ORDER BY dp.id IS NULL
+        LIMIT 1
+    </select>
+
+    <select id="queryTemplate" resultType="com.ccsens.carbasics.bean.po.OrganizationDepartmentTemplate">
+        SELECT
+            id,`name`,`code`
+        FROM
+            t_organization_department_template
+        WHERE
+            rec_status = 0;
+    </select>
+
+    <select id="queryAllByOid" resultType="com.ccsens.carbasics.bean.po.OrganizationDepartment">
+        SELECT
+            od.id,
+            od.`code`,
+            od.`name`,
+            od.introduce,
+            od.organization_id
+        FROM
+            t_organization_department AS od
+        LEFT JOIN t_organization_department_parent AS dp ON od.id = dp.department_id
+        WHERE
+            od.rec_status = 0
+        AND od.organization_id = #{oid}
+        AND (
+            dp.parent_id IS NULL
+            OR dp.parent_id = 0
+        )
     </select>
 </mapper>

src/main/resources/mapper_dao/OrganizationMemberDao.xml

@@ -38,7 +38,7 @@
             m.user_id = #{userId}
         AND m.id = mp.member_id
         AND mp.position_id = p.id
-        AND mp.department_id = d.id
+        AND p.department_id = d.id
         AND d.organization_id = o.id
         AND o.id = #{projectId}
         AND m.rec_status = 0
@@ -50,30 +50,34 @@
     <select id="getHospital" resultType="com.ccsens.carbasics.bean.vo.OrganizationMemberVo$Organization">
         SELECT
             o.id,
-        o.name,
-        p.project_id as projectId
+            o. NAME,
+            o.id AS projectId
         FROM
             t_organization_member m,
             t_organization_member_position mp,
             t_organization_department d,
             t_organization o,
-        t_organization_project p,
-        t_organization_position po
+            t_organization_position po,
+						t_organization_position_type AS pt,
+						t_organization_position_type_relation AS ptr
         WHERE
             m.user_id = #{userId}
-        and m.id = mp.member_id
-        and mp.department_id = d.id
-        and d.organization_id = o.id
-        and o.id = p.organization_id
-        and po.id = mp.position_id
-		and po.rec_status = 0
-        and m.rec_status = 0
-        and d.rec_status = 0
-        and o.rec_status = 0
-        and p.rec_status = 0
-        AND po.`code` = 'ZhiKong'
-        order by o.id
-        limit 1
+        AND m.id = mp.member_id
+        AND po.department_id = d.id
+        AND d.organization_id = o.id
+        AND po.id = mp.position_id
+        AND po.rec_status = 0
+        AND m.rec_status = 0
+        AND d.rec_status = 0
+        AND o.rec_status = 0
+				AND pt.rec_status = 0
+				AND ptr.rec_status = 0
+				AND pt.id = ptr.position_type_id
+				AND po.id = ptr.position_id
+        AND pt.`code` = 'ZhiKong'
+        ORDER BY
+            o.id
+        LIMIT 1
     </select>
 
     <select id="queryExistByUserId" resultType="com.ccsens.carbasics.bean.po.OrganizationMember">
@@ -93,15 +97,27 @@
         SELECT DISTINCT
             m.user_id
         FROM
-            t_organization_department d,
-            t_organization_member_position p,
-            t_organization_member m
+            t_organization_member_position AS mp
+        LEFT JOIN t_organization_member AS m ON mp.member_id = m.id
         WHERE
-            d.id = p.department_id
-            AND p.member_id = m.id
-            AND d.organization_id = #{organizationId}
-            AND d.rec_status = 0
-            AND p.rec_status = 0
+            mp.rec_status = 0
         AND m.rec_status = 0
+        AND mp.position_id IN (
+            SELECT
+                p.id
+            FROM
+                t_organization_position AS p
+            WHERE
+                rec_status = 0
+            AND department_id IN (
+                SELECT
+                    od.id
+                FROM
+                    t_organization_department AS od
+                WHERE
+                    od.rec_status = 0
+                AND od.organization_id = #{organizationId}
+            )
+        )
     </select>
 </mapper>

src/main/resources/mapper_dao/OrganizationMemberPositionDao.xml

@@ -5,14 +5,16 @@
 
     <select id="queryByExistByMember" resultType="java.lang.Long">
         SELECT
-            COUNT(id)
+            COUNT(omp.id)
         FROM
-            t_organization_member_position
+            t_organization_member_position AS omp
+        LEFT JOIN t_organization_position AS op ON omp.position_id = op.id
         WHERE
-            rec_status = 0
-        AND position_id = #{positonId}
-        AND member_id = #{memberId}
-        AND department_id = #{departmentId}
+            omp.rec_status = 0
+        AND	op.rec_status = 0
+        AND omp.position_id = #{positonId}
+        AND omp.member_id = #{memberId}
+        AND op.department_id = #{departmentId}
     </select>
 
     <select id="queryRole" resultType="com.ccsens.common.bean.po.ProRole">
@@ -22,10 +24,10 @@
             o.id AS projectId
         FROM
             `t_organization_member_position` AS omp
-        LEFT JOIN t_organization_department AS od ON omp.department_id = od.id
         LEFT JOIN t_organization AS o ON o.id = od.organization_id
         LEFT JOIN t_organization_position AS op ON omp.position_id = op.id
         LEFT JOIN t_organization_member AS om ON omp.member_id = om.id
+        LEFT JOIN t_organization_department AS od ON op.department_id = od.id
         WHERE
             omp.rec_status = 0 AND od.rec_status = 0 AND o.rec_status = 0 AND op.rec_status = 0 AND om.rec_status = 0
         AND om.user_id = #{uid}

src/main/resources/mapper_dao/OrganizationPositionDao.xml

@@ -7,7 +7,7 @@
             id,
             `name`
         FROM
-            t_organization_position
+            t_organization_position_type
         WHERE
             rec_status = 0
         AND `code` IN (
@@ -20,12 +20,21 @@
 
     <select id="queryByCode" resultType="java.lang.Long">
         SELECT
-            id
+            p.id
         FROM
-            t_organization_position
+            t_organization_position_type AS pt
+        LEFT JOIN t_organization_position_type_relation AS ptr ON pt.id = ptr.position_type_id
+        LEFT JOIN t_organization_position AS p ON p.id = ptr.position_id
+        LEFT JOIN t_organization_department AS od ON od.id = p.department_id
+        LEFT JOIN t_organization AS o ON od.organization_id = o.id
         WHERE
-            rec_status = 0
-        AND `code` = #{code}
+            pt.rec_status = 0
+        AND ptr.rec_status = 0
+        AND p.rec_status = 0
+        AND od.rec_status = 0
+        AND o.rec_status = 0
+        AND pt.`code` = #{code}
+        AND o.`name` = #{hospitalName}
     </select>
 
     <select id="queryByName" resultType="java.lang.Long">
@@ -38,4 +47,23 @@
         AND `name` = #{name}
     </select>
 
+    <select id="queryIsExist" resultType="com.ccsens.carbasics.bean.po.OrganizationPosition">
+        SELECT
+            p.id,
+            p.`name`,
+            p.role_name,
+            p.department_id
+        FROM
+            `t_organization_position` AS p
+        LEFT JOIN t_organization_position_type_relation AS ptr ON p.id = ptr.position_id
+        LEFT JOIN t_organization_position_type AS pt ON pt.id = ptr.position_type_id
+        WHERE
+            p.rec_status = 0
+        AND ptr.rec_status = 0
+        AND pt.rec_status = 0
+        AND p.`name` = #{positionName}
+        AND pt.`code` = #{positionCode}
+        AND p.department_id = #{did}
+    </select>
+
 </mapper>

src/main/resources/mapper_dao/OrganizationPositionTypeDao.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.carbasics.persist.dao.OrganizationPositionTypeDao">
+
+    <select id="queryByCode" resultType="com.ccsens.carbasics.bean.po.OrganizationPositionType">
+        SELECT
+            id,
+            `code`,
+            `name`,
+            introduce,
+            type
+        FROM
+            t_organization_position_type
+        WHERE
+            rec_status = 0
+        AND `code` = #{positionCode}
+    </select>
+
+</mapper>

src/main/resources/mapper_dao/PatientDao.xml

@@ -34,7 +34,7 @@
                 t_qcp_first_aid a
             WHERE
                 r.first_aid_id = a.id
-                AND a.project_id = #{projectId}
+                AND a.id = #{projectId}
                 AND a.rec_status = 0
             AND r.rec_status = 0
             ) r ON p.question_code = r.question_code

src/main/resources/mapper_raw/OrganizationLevelMapper.xml

@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ccsens.carbasics.persist.mapper.OrganizationLevelMapper">
+  <resultMap id="BaseResultMap" type="com.ccsens.carbasics.bean.po.OrganizationLevel">
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="parent_id" jdbcType="BIGINT" property="parentId" />
+    <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="sort" jdbcType="TINYINT" property="sort" />
+    <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
+    <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
+    <result column="rec_status" jdbcType="TINYINT" property="recStatus" />
+  </resultMap>
+  <sql id="Example_Where_Clause">
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Update_By_Example_Where_Clause">
+    <where>
+      <foreach collection="example.oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <sql id="Base_Column_List">
+    id, parent_id, name, sort, created_at, updated_at, rec_status
+  </sql>
+  <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.OrganizationLevelExample" resultMap="BaseResultMap">
+    select
+    <if test="distinct">
+      distinct
+    </if>
+    <include refid="Base_Column_List" />
+    from t_organization_level
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+    <if test="orderByClause != null">
+      order by ${orderByClause}
+    </if>
+  </select>
+  <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+    select 
+    <include refid="Base_Column_List" />
+    from t_organization_level
+    where id = #{id,jdbcType=BIGINT}
+  </select>
+  <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+    delete from t_organization_level
+    where id = #{id,jdbcType=BIGINT}
+  </delete>
+  <delete id="deleteByExample" parameterType="com.ccsens.carbasics.bean.po.OrganizationLevelExample">
+    delete from t_organization_level
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </delete>
+  <insert id="insert" parameterType="com.ccsens.carbasics.bean.po.OrganizationLevel">
+    insert into t_organization_level (id, parent_id, name, 
+      sort, created_at, updated_at, 
+      rec_status)
+    values (#{id,jdbcType=BIGINT}, #{parentId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, 
+      #{sort,jdbcType=TINYINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
+      #{recStatus,jdbcType=TINYINT})
+  </insert>
+  <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.OrganizationLevel">
+    insert into t_organization_level
+    <trim prefix="(" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        id,
+      </if>
+      <if test="parentId != null">
+        parent_id,
+      </if>
+      <if test="name != null">
+        name,
+      </if>
+      <if test="sort != null">
+        sort,
+      </if>
+      <if test="createdAt != null">
+        created_at,
+      </if>
+      <if test="updatedAt != null">
+        updated_at,
+      </if>
+      <if test="recStatus != null">
+        rec_status,
+      </if>
+    </trim>
+    <trim prefix="values (" suffix=")" suffixOverrides=",">
+      <if test="id != null">
+        #{id,jdbcType=BIGINT},
+      </if>
+      <if test="parentId != null">
+        #{parentId,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        #{sort,jdbcType=TINYINT},
+      </if>
+      <if test="createdAt != null">
+        #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        #{recStatus,jdbcType=TINYINT},
+      </if>
+    </trim>
+  </insert>
+  <select id="countByExample" parameterType="com.ccsens.carbasics.bean.po.OrganizationLevelExample" resultType="java.lang.Long">
+    select count(*) from t_organization_level
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <update id="updateByExampleSelective" parameterType="map">
+    update t_organization_level
+    <set>
+      <if test="record.id != null">
+        id = #{record.id,jdbcType=BIGINT},
+      </if>
+      <if test="record.parentId != null">
+        parent_id = #{record.parentId,jdbcType=BIGINT},
+      </if>
+      <if test="record.name != null">
+        name = #{record.name,jdbcType=VARCHAR},
+      </if>
+      <if test="record.sort != null">
+        sort = #{record.sort,jdbcType=TINYINT},
+      </if>
+      <if test="record.createdAt != null">
+        created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.updatedAt != null">
+        updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="record.recStatus != null">
+        rec_status = #{record.recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByExample" parameterType="map">
+    update t_organization_level
+    set id = #{record.id,jdbcType=BIGINT},
+      parent_id = #{record.parentId,jdbcType=BIGINT},
+      name = #{record.name,jdbcType=VARCHAR},
+      sort = #{record.sort,jdbcType=TINYINT},
+      created_at = #{record.createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{record.recStatus,jdbcType=TINYINT}
+    <if test="_parameter != null">
+      <include refid="Update_By_Example_Where_Clause" />
+    </if>
+  </update>
+  <update id="updateByPrimaryKeySelective" parameterType="com.ccsens.carbasics.bean.po.OrganizationLevel">
+    update t_organization_level
+    <set>
+      <if test="parentId != null">
+        parent_id = #{parentId,jdbcType=BIGINT},
+      </if>
+      <if test="name != null">
+        name = #{name,jdbcType=VARCHAR},
+      </if>
+      <if test="sort != null">
+        sort = #{sort,jdbcType=TINYINT},
+      </if>
+      <if test="createdAt != null">
+        created_at = #{createdAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="updatedAt != null">
+        updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      </if>
+      <if test="recStatus != null">
+        rec_status = #{recStatus,jdbcType=TINYINT},
+      </if>
+    </set>
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+  <update id="updateByPrimaryKey" parameterType="com.ccsens.carbasics.bean.po.OrganizationLevel">
+    update t_organization_level
+    set parent_id = #{parentId,jdbcType=BIGINT},
+      name = #{name,jdbcType=VARCHAR},
+      sort = #{sort,jdbcType=TINYINT},
+      created_at = #{createdAt,jdbcType=TIMESTAMP},
+      updated_at = #{updatedAt,jdbcType=TIMESTAMP},
+      rec_status = #{recStatus,jdbcType=TINYINT}
+    where id = #{id,jdbcType=BIGINT}
+  </update>
+</mapper>

src/main/resources/mapper_raw/OrganizationPositionMapper.xml

@@ -5,6 +5,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
     <result column="role_name" jdbcType="VARCHAR" property="roleName" />
+    <result column="department_id" jdbcType="BIGINT" property="departmentId" />
     <result column="operator" jdbcType="BIGINT" property="operator" />
     <result column="created_at" jdbcType="TIMESTAMP" property="createdAt" />
     <result column="updated_at" jdbcType="TIMESTAMP" property="updatedAt" />
@@ -69,7 +70,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, name, role_name, operator, created_at, updated_at, rec_status
+    id, name, role_name, department_id, operator, created_at, updated_at, rec_status
   </sql>
   <select id="selectByExample" parameterType="com.ccsens.carbasics.bean.po.OrganizationPositionExample" resultMap="BaseResultMap">
     select
@@ -103,11 +104,11 @@
   </delete>
   <insert id="insert" parameterType="com.ccsens.carbasics.bean.po.OrganizationPosition">
     insert into t_organization_position (id, name, role_name, 
-      operator, created_at, updated_at, 
-      rec_status)
+      department_id, operator, created_at, 
+      updated_at, rec_status)
     values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{roleName,jdbcType=VARCHAR}, 
-      #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, #{updatedAt,jdbcType=TIMESTAMP}, 
-      #{recStatus,jdbcType=TINYINT})
+      #{departmentId,jdbcType=BIGINT}, #{operator,jdbcType=BIGINT}, #{createdAt,jdbcType=TIMESTAMP}, 
+      #{updatedAt,jdbcType=TIMESTAMP}, #{recStatus,jdbcType=TINYINT})
   </insert>
   <insert id="insertSelective" parameterType="com.ccsens.carbasics.bean.po.OrganizationPosition">
     insert into t_organization_position
@@ -121,6 +122,9 @@
       <if test="roleName != null">
         role_name,
       </if>
+      <if test="departmentId != null">
+        department_id,
+      </if>
       <if test="operator != null">
         operator,
       </if>
@@ -144,6 +148,9 @@
       <if test="roleName != null">
         #{roleName,jdbcType=VARCHAR},
       </if>
+      <if test="departmentId != null">
+        #{departmentId,jdbcType=BIGINT},
+      </if>
       <if test="operator != null">
         #{operator,jdbcType=BIGINT},
       </if>
@@ -176,6 +183,9 @@
       <if test="record.roleName != null">
         role_name = #{record.roleName,jdbcType=VARCHAR},
       </if>
+      <if test="record.departmentId != null">
+        department_id = #{record.departmentId,jdbcType=BIGINT},
+      </if>
       <if test="record.operator != null">
         operator = #{record.operator,jdbcType=BIGINT},
       </if>
@@ -198,6 +208,7 @@
     set id = #{record.id,jdbcType=BIGINT},
       name = #{record.name,jdbcType=VARCHAR},
       role_name = #{record.roleName,jdbcType=VARCHAR},
+      department_id = #{record.departmentId,jdbcType=BIGINT},
       operator = #{record.operator,jdbcType=BIGINT},
       created_at = #{record.createdAt,jdbcType=TIMESTAMP},
       updated_at = #{record.updatedAt,jdbcType=TIMESTAMP},
@@ -215,6 +226,9 @@
       <if test="roleName != null">
         role_name = #{roleName,jdbcType=VARCHAR},
       </if>
+      <if test="departmentId != null">
+        department_id = #{departmentId,jdbcType=BIGINT},
+      </if>
       <if test="operator != null">
         operator = #{operator,jdbcType=BIGINT},
       </if>
@@ -234,6 +248,7 @@
     update t_organization_position
     set name = #{name,jdbcType=VARCHAR},
       role_name = #{roleName,jdbcType=VARCHAR},
+      department_id = #{departmentId,jdbcType=BIGINT},
       operator = #{operator,jdbcType=BIGINT},
       created_at = #{createdAt,jdbcType=TIMESTAMP},
       updated_at = #{updatedAt,jdbcType=TIMESTAMP},

src/main/resources/mbg.xml

@@ -83,21 +83,23 @@
 <!--        <table tableName="t_qcp_first_aid_record" domainObjectName="FirstAidRecord"></table>-->
 <!--        <table tableName="t_constant" domainObjectName="ConstantDB"></table>-->
 <!--        <table tableName="t_qcp_last_role_choose" domainObjectName="LastRoleChoose"></table>-->
-        <table tableName="t_qcp_code_name" domainObjectName="CodeName"></table>
+<!--        <table tableName="t_qcp_code_name" domainObjectName="CodeName"></table>-->
 <!--        <table tableName="t_qcp_first_aid_record_log" domainObjectName="FirstAidRecordLog"></table>-->
 <!--        <table tableName="t_qcp_first_aid_record_log" domainObjectName="FirstAidRecordLog"></table>-->
 <!--        <table tableName="t_step" domainObjectName="Step"></table>-->
 <!--        <table tableName="t_question_ocr" domainObjectName="QuestionOcr"></table>-->
-            <table tableName="t_organization" domainObjectName="Organization"></table>
-            <table tableName="t_organization_department" domainObjectName="OrganizationDepartment"></table>
-            <table tableName="t_organization_department_parent" domainObjectName="OrganizationDepartmentParent"></table>
+<!--            <table tableName="t_organization" domainObjectName="Organization"></table>-->
+<!--            <table tableName="t_organization_department" domainObjectName="OrganizationDepartment"></table>-->
+<!--            <table tableName="t_organization_department_parent" domainObjectName="OrganizationDepartmentParent"></table>-->
+<!--            <table tableName="t_organization_position" domainObjectName="OrganizationPosition"></table>-->
+<!--            <table tableName="t_organization_position_type" domainObjectName="OrganizationPositionType"></table>-->
+<!--            <table tableName="t_organization_position_type_relation" domainObjectName="OrganizationPositionTypeRelation"></table>-->
+<!--            <table tableName="t_organization_department_template" domainObjectName="OrganizationDepartmentTemplate"></table>-->
+<!--            <table tableName="t_qcp_menu_power" domainObjectName="MenuPower"></table>-->
+<!--            <table tableName="t_qcp_position_power" domainObjectName="PositionPower"></table>-->
+<!--            <table tableName="t_qcp_menu_plugin" domainObjectName="MenuPlugin"></table>-->
+<!--            <table tableName="t_organization_level" domainObjectName="OrganizationLevel"></table>-->
             <table tableName="t_organization_position" domainObjectName="OrganizationPosition"></table>
-            <table tableName="t_organization_position_type" domainObjectName="OrganizationPositionType"></table>
-            <table tableName="t_organization_position_type_relation" domainObjectName="OrganizationPositionTypeRelation"></table>
-            <table tableName="t_organization_department_template" domainObjectName="OrganizationDepartmentTemplate"></table>
-            <table tableName="t_qcp_menu_power" domainObjectName="MenuPower"></table>
-            <table tableName="t_qcp_position_power" domainObjectName="PositionPower"></table>
-            <table tableName="t_qcp_menu_plugin" domainObjectName="MenuPlugin"></table>