Merge branch 'dev' of http://192.168.18.110:8880/bsoft/sv-springboot into dev

# Conflicts:
#	bsoft-api/src/main/java/com/bsoft/api/controller/SerDiseaseController.java
#	bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/Disease.java

bsoft-api/src/main/java/com/bsoft/api/controller/SerDiseaseController.java

 package com.bsoft.api.controller;
 
 import com.bsoft.api.common.annotations.Token;
-//import com.bsoft.api.model.SerDisease;
+import com.bsoft.api.model.reqmodel.Disease;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -17,10 +17,18 @@ public class SerDiseaseController {
      * @return
      * @throws Exception
      */
-//    @GetMapping("disease")
-//    @Token
-//    @ApiOperation("根据条件查询疾病信息")
-//    public  Object getBlockValuesByPageID(@RequestBody SerDisease blockValues) throws InterruptedException {
-//        return null;
-//    }
+    @GetMapping("disease/level")
+    @Token
+    @ApiOperation("根据等级查询疾病信息")
+    public  Object getDiseaseByLevel(@RequestBody Disease disease) throws InterruptedException {
+        return null;
+    }
+
+    @GetMapping("disease/level")
+    @Token
+    @ApiOperation("根据疾病名称查询疾病信息")
+    public  Object getDiseaseByName(@RequestBody Disease disease) throws InterruptedException {
+        return null;
+    }
+
 }

bsoft-api/src/main/java/com/bsoft/api/model/SerDisease.java

+package com.bsoft.api.model;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+public class SerDisease {
+    private BigDecimal id;
+
+    private Date createDate;
+
+    private BigDecimal createUserid;
+
+    private BigDecimal state;
+
+    private String mdcCode;
+
+    private String mdcName;
+
+    private BigDecimal date;
+
+    private BigDecimal mdcNum;
+
+    private BigDecimal parentId;
+
+    private BigDecimal level;
+
+    private BigDecimal orgId;
+
+    private String orgName;
+
+    public BigDecimal getId() {
+        return id;
+    }
+
+    public void setId(BigDecimal id) {
+        this.id = id;
+    }
+
+    public Date getCreateDate() {
+        return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+        this.createDate = createDate;
+    }
+
+    public BigDecimal getCreateUserid() {
+        return createUserid;
+    }
+
+    public void setCreateUserid(BigDecimal createUserid) {
+        this.createUserid = createUserid;
+    }
+
+    public BigDecimal getState() {
+        return state;
+    }
+
+    public void setState(BigDecimal state) {
+        this.state = state;
+    }
+
+    public String getMdcCode() {
+        return mdcCode;
+    }
+
+    public void setMdcCode(String mdcCode) {
+        this.mdcCode = mdcCode;
+    }
+
+    public String getMdcName() {
+        return mdcName;
+    }
+
+    public void setMdcName(String mdcName) {
+        this.mdcName = mdcName;
+    }
+
+    public BigDecimal getDate() {
+        return date;
+    }
+
+    public void setDate(BigDecimal date) {
+        this.date = date;
+    }
+
+    public BigDecimal getMdcNum() {
+        return mdcNum;
+    }
+
+    public void setMdcNum(BigDecimal mdcNum) {
+        this.mdcNum = mdcNum;
+    }
+
+    public BigDecimal getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(BigDecimal parentId) {
+        this.parentId = parentId;
+    }
+
+    public BigDecimal getLevel() {
+        return level;
+    }
+
+    public void setLevel(BigDecimal level) {
+        this.level = level;
+    }
+
+    public BigDecimal getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(BigDecimal orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getOrgName() {
+        return orgName;
+    }
+
+    public void setOrgName(String orgName) {
+        this.orgName = orgName;
+    }
+}
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/SerDiseaseDocRs.java

+package com.bsoft.api.model;
+
+import java.math.BigDecimal;
+
+public class SerDiseaseDocRs {
+    private BigDecimal id;
+
+    private BigDecimal orgId;
+
+    private String docCode;
+
+    private String docName;
+
+    private String mdcCode;
+
+    private BigDecimal date;
+
+    private String deptCode;
+
+    private String deptName;
+
+    public BigDecimal getId() {
+        return id;
+    }
+
+    public void setId(BigDecimal id) {
+        this.id = id;
+    }
+
+    public BigDecimal getOrgId() {
+        return orgId;
+    }
+
+    public void setOrgId(BigDecimal orgId) {
+        this.orgId = orgId;
+    }
+
+    public String getDocCode() {
+        return docCode;
+    }
+
+    public void setDocCode(String docCode) {
+        this.docCode = docCode;
+    }
+
+    public String getDocName() {
+        return docName;
+    }
+
+    public void setDocName(String docName) {
+        this.docName = docName;
+    }
+
+    public String getMdcCode() {
+        return mdcCode;
+    }
+
+    public void setMdcCode(String mdcCode) {
+        this.mdcCode = mdcCode;
+    }
+
+    public BigDecimal getDate() {
+        return date;
+    }
+
+    public void setDate(BigDecimal date) {
+        this.date = date;
+    }
+
+    public String getDeptCode() {
+        return deptCode;
+    }
+
+    public void setDeptCode(String deptCode) {
+        this.deptCode = deptCode;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+}
\ No newline at end of file

bsoft-api/src/main/java/com/bsoft/api/model/reqmodel/Disease.java

+package com.bsoft.api.model.reqmodel;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.math.BigDecimal;
+
+public class Disease {
+
+    public class DiseaseByLevel{
+        @ApiModelProperty(value = "等级",required = true)
+        private BigDecimal level;
+        @ApiModelProperty(value = "时间",required = true)
+        private BigDecimal date;
+        @ApiModelProperty("编码")
+        private String mdcCode;
+
+        public BigDecimal getLevel() {
+            return level;
+        }
+
+        public void setLevel(BigDecimal level) {
+            this.level = level;
+        }
+
+        public BigDecimal getDate() {
+            return date;
+        }
+
+        public void setDate(BigDecimal date) {
+            this.date = date;
+        }
+
+        public String getMdcCode() {
+            return mdcCode;
+        }
+
+        public void setMdcCode(String mdcCode) {
+            this.mdcCode = mdcCode;
+        }
+    }
+}
+
+