疾病接口合并、修改

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

@@ -27,11 +27,11 @@ public class SerDiseaseController {
      * @return
      * @throws Exception
      */
-    @PostMapping("disease/level")
+    @PostMapping("disease/list")
     @Token
-    @ApiOperation("根据等级查询疾病信息")
-    public Object getDiseaseByLevel(@RequestBody Disease.DiseaseLevel disease) throws InterruptedException {
-        List<DiseaseLevel> diseaseLevel = serDiseaseService.selectListByLevel(disease.getDate(),disease.getDiseaseId());
+    @ApiOperation("根据ID或者等级查询疾病信息")
+    public Object getDiseaseByLevel(@RequestBody Disease.DiseaseIDorLevel disease) throws InterruptedException {
+        List<DiseaseLevel> diseaseLevel = serDiseaseService.selectListByIdorLevel(disease.getDate(),disease.getDiseaseId(),disease.getLevel());
         return Result.success(diseaseLevel);
     }
 
@@ -43,12 +43,4 @@ public class SerDiseaseController {
         return Result.success(list);
     }
 
-    @PostMapping("disease/level/info")
-    @Token
-    @ApiOperation("查询特定等级下所有数据")
-    public  Object getDiseaseByLevelSon(@RequestBody Disease.DiseaseLevelSon disease) throws InterruptedException {
-        List<SerDisease> list = serDiseaseService.selectByLevel(disease.getDate(),disease.getLevel().intValue());
-        return Result.success(list);
-    }
-
 }

bsoft-api/src/main/java/com/bsoft/api/mapper/SerDiseaseMapper.java

@@ -18,7 +18,7 @@ public interface SerDiseaseMapper {
 
     List<SerDisease> selectByMdcName(@Param("date") String date,@Param("mdcName") String mdcName);
 
-    List<SerDisease> selectByLevel(@Param("date") String date,@Param("level") Integer level);
+    List<DiseaseLevel> selectByLevel(@Param("date") String date,@Param("level") Integer level);
 
     DiseaseLevel selectParentById(@Param("date") String date, @Param("diseaseId") Integer diseaseId);
 

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

@@ -6,14 +6,20 @@ import java.math.BigDecimal;
 
 public class Disease {
     /**
-     * 等级查询疾病实体
+     * ID或者等级查询疾病实体
      */
-    public static class DiseaseLevel {
+    public static class DiseaseIDorLevel {
 
-        @ApiModelProperty(value = "疾病ID",required = true)
-        private Integer diseaseId;
         @ApiModelProperty(value = "时间",required = true)
         private String date;
+        @ApiModelProperty(value = "疾病ID",required = false)
+        private Integer diseaseId;
+        @ApiModelProperty(value = "等级",required = false)
+        private Integer level;
+        @ApiModelProperty(value = "科室编码",required = false)
+        private Integer docCode;
+        @ApiModelProperty(value = "医生编码",required = false)
+        private Integer deptCode;
 
         public Integer getDiseaseId() {
             return diseaseId;
@@ -31,6 +37,30 @@ public class Disease {
             this.date = date;
         }
 
+        public Integer getLevel() {
+            return level;
+        }
+
+        public void setLevel(Integer level) {
+            this.level = level;
+        }
+
+        public Integer getDocCode() {
+            return docCode;
+        }
+
+        public void setDocCode(Integer docCode) {
+            this.docCode = docCode;
+        }
+
+        public Integer getDeptCode() {
+            return deptCode;
+        }
+
+        public void setDeptCode(Integer deptCode) {
+            this.deptCode = deptCode;
+        }
+
     }
 
     /**
@@ -59,34 +89,6 @@ public class Disease {
             this.mdcName = mdcName;
         }
     }
-
-    /**
-     * 特定等级下所有数据以及子数据实体
-     */
-    public static class DiseaseLevelSon {
-        @ApiModelProperty(value = "等级",required = true)
-        private BigDecimal level;
-        @ApiModelProperty(value = "时间",required = true)
-        private String date;
-
-        public String getDate() {
-            return date;
-        }
-
-        public void setDate(String date) {
-            this.date = date;
-        }
-        public BigDecimal getLevel() {
-            return level;
-        }
-
-        public void setLevel(BigDecimal level) {
-            this.level = level;
-        }
-
-    }
-
-
 }
 
 

bsoft-api/src/main/java/com/bsoft/api/service/Impl/SerDiseaseServiceImpl.java

@@ -2,7 +2,6 @@ package com.bsoft.api.service.Impl;
 
 import com.bsoft.api.mapper.SerDiseaseMapper;
 import com.bsoft.api.model.SerDisease;
-import com.bsoft.api.model.reqmodel.Disease;
 import com.bsoft.api.model.respmodel.DiseaseLevel;
 import com.bsoft.api.service.SerDiseaseService;
 import org.springframework.stereotype.Service;
@@ -16,7 +15,28 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
     private SerDiseaseMapper serDiseaseMapper;
 
     @Override
-    public List<DiseaseLevel> selectListByLevel(String date, Integer diseaseId){
+    public List<DiseaseLevel> selectListByIdorLevel(String date, Integer diseaseId,Integer level){
+        List<DiseaseLevel> list = new ArrayList<>();
+        if(diseaseId!=null){
+            list = selectById(date,diseaseId);
+        }else{
+            list = selectByLevel(date,level);
+        }
+        return list;
+    }
+
+    @Override
+    public List<SerDisease> selectByMdcName(String date, String mdcName) {
+        return serDiseaseMapper.selectByMdcName(date,mdcName);
+    }
+
+    /**
+     * 根据id查询父子级别列表
+     * @param date 时间
+     * @param diseaseId ID
+     * @return
+     */
+    private List<DiseaseLevel> selectById(String date, Integer diseaseId){
         SerDisease disease = serDiseaseMapper.selectByPrimaryKey(Long.valueOf(diseaseId));
         if(disease==null){
             return null;
@@ -26,9 +46,9 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
         List<DiseaseLevel> parentList = new ArrayList<>();
 
         //查询同级菜单列表
-        List<SerDisease> serDiseaseList =  serDiseaseMapper.selectByLevel(date,disease.getLevel().intValue());
+        List<DiseaseLevel> serDiseaseList =  serDiseaseMapper.selectByLevel(date,disease.getLevel().intValue());
         List<DiseaseLevel> diseaseLevelList = new ArrayList<>();
-        for (SerDisease serDiseases: serDiseaseList) {
+        for (DiseaseLevel serDiseases: serDiseaseList) {
             DiseaseLevel diseaseLevel1 = new DiseaseLevel();
             //查询子级菜单列表
             if(serDiseases.getId().intValue()==diseaseId){
@@ -55,15 +75,16 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
         }
     }
 
-    @Override
-    public List<SerDisease> selectByMdcName(String date, String mdcName) {
-        return serDiseaseMapper.selectByMdcName(date,mdcName);
-    }
-
-    @Override
-    public List<SerDisease> selectByLevel(String date, Integer level) {
+    /**
+     * 根据等级查询所有该等级数据
+     * @param date
+     * @param level
+     * @return
+     */
+    private List<DiseaseLevel> selectByLevel(String date, Integer level) {
+        if(level==null){
+            level=0;
+        }
         return serDiseaseMapper.selectByLevel(date,level);
-
-
     }
 }

bsoft-api/src/main/java/com/bsoft/api/service/SerDiseaseService.java

@@ -8,6 +8,5 @@ import java.util.List;
 public interface SerDiseaseService {
 
     List<SerDisease> selectByMdcName(String date,String mdcName);
-    List<SerDisease> selectByLevel(String date,Integer level);
-    List<DiseaseLevel> selectListByLevel(String date,Integer diseaseId);
+    List<DiseaseLevel> selectListByIdorLevel(String date,Integer diseaseId,Integer level);
 }

bsoft-api/src/main/resources/mapper/SerDiseaseMapper.xml

@@ -14,7 +14,6 @@
   </resultMap>
   <resultMap id="DiseaseLevel" type="com.bsoft.api.model.respmodel.DiseaseLevel">
       <id column="ID" jdbcType="DECIMAL" property="id" />
-      <result column="STATE" jdbcType="DECIMAL" property="state" />
       <result column="MDC_CODE" jdbcType="VARCHAR" property="mdcCode" />
       <result column="MDC_NAME" jdbcType="VARCHAR" property="mdcName" />
       <result column="DATE" jdbcType="DECIMAL" property="date" />
@@ -78,7 +77,7 @@
           and MDC_NAME like '%'||#{mdcName,jdbcType=VARCHAR}||'%'
       </if>
   </select>
-  <select id="selectByLevel" resultMap="BaseResultMap">
+  <select id="selectByLevel" resultMap="DiseaseLevel">
         select ID, CREATE_DATE, CREATE_USERID, STATE, MDC_CODE, MDC_NAME, "DATE", MDC_NUM,
         PARENT_ID,"LEVEL", ORG_ID, ORG_NAME
         from LL.SER_DISEASE

bsoft-api/src/main/resources/templates/ind.html

@@ -58,7 +58,7 @@
 <body>
 <div style="text-align: center">
     <h1 th:text="${indModel.title}">指标查询</h1>
-    <form action="http://localhost:8080/ind" method="get">
+    <form action="./ind" method="get">
         <input type = "text" name="filter" class="filterTxt" th:value="${indModel.filter}"/>
         <input type="submit" class="subBtn" value="提交">
     </form>