接口返回格式修改

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 io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "疾病信息Api")
+@RestController
+public class SerDiseaseController {
+
+    /**
+     * 根据pageId查询板块数值
+     * @return
+     * @throws Exception
+     */
+    @GetMapping("disease")
+    @Token
+    @ApiOperation("根据条件查询疾病信息")
+    public  Object getBlockValuesByPageID(@RequestBody SerDisease blockValues) throws InterruptedException {
+        return null;
+    }
+}

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

+package com.bsoft.api.mapper;
+
+import com.bsoft.api.model.SerDiseaseDocRs;
+
+import java.util.List;
+
+public interface SerDiseaseDocRsMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(SerDiseaseDocRs record);
+
+    SerDiseaseDocRs selectByPrimaryKey(Long id);
+
+    List<SerDiseaseDocRs> selectAll();
+
+    int updateByPrimaryKey(SerDiseaseDocRs record);
+}

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

+package com.bsoft.api.mapper;
+
+import com.bsoft.api.model.SerDisease;
+
+import java.util.List;
+
+public interface SerDiseaseMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(SerDisease record);
+
+    SerDisease selectByPrimaryKey(Long id);
+
+    List<SerDisease> selectAll();
+
+    int updateByPrimaryKey(SerDisease record);
+
+}

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

@@ -7,6 +7,17 @@ import io.swagger.annotations.ApiModelProperty;
 public class BlockValues {
 
 
+    @ApiModelProperty(value = "pageCode",required = true)
+    private Integer pageCode;
+    @ApiModelProperty("病组")
+    private Integer disease;
+    @ApiModelProperty("科室")
+    private Integer department;
+    @ApiModelProperty("医生")
+    private Integer doctor;
+    @ApiModelProperty("时间")
+    private Integer time;
+
     public Integer getPageCode() {
         return pageCode;
     }
@@ -46,15 +57,4 @@ public class BlockValues {
     public void setTime(Integer time) {
         this.time = time;
     }
-
-    @ApiModelProperty(value = "pageCode",required = true)
-    private Integer pageCode;
-    @ApiModelProperty("病组")
-    private Integer disease;
-    @ApiModelProperty("科室")
-    private Integer department;
-    @ApiModelProperty("医生")
-    private Integer doctor;
-    @ApiModelProperty("时间")
-    private Integer time;
 }

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

+package com.bsoft.api.model.reqmodel;
+
+import java.math.BigDecimal;
+
+public class Disease {
+
+    private String mdcCode;
+    private String mdcName;
+    private BigDecimal date;
+}

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

@@ -28,7 +28,7 @@ public class AsynBlockValuesServiceImpl implements AsynBlockValuesService {
         List<Map<String, Object>> dataList = blockValuesMapper.selectByWhere(tableName, whereClause);
         Map<String, Object> map = new HashMap<String,Object>(){
             {
-                put(blockId, dataList);
+                put("mdl"+blockId, dataList);
             }
         };
         synchronized (obj){

bsoft-api/src/test/resources/generatorConfig.xml

@@ -42,8 +42,14 @@
 <!--            &lt;!&ndash; 主键生成方式 &ndash;&gt;-->
 <!--            <generatedKey column="id" sqlStatement="select SEQ_SYS_USER_ID.nextval from dual" identity="true" />-->
 <!--        </table>-->
-        <table tableName="DIC_DIM" schema="ll" >
-            <generatedKey column="id" sqlStatement="select SEQ_DIC_DIM_ID.nextval from dual" identity="true" />
+<!--        <table tableName="DIC_DIM" schema="ll" >-->
+<!--            <generatedKey column="id" sqlStatement="select SEQ_DIC_DIM_ID.nextval from dual" identity="true" />-->
+<!--        </table>-->
+        <table tableName="SER_DISEASE" schema="ll" >
+            <generatedKey column="id" sqlStatement="select SEQ_SER_DISEASE_ID.nextval from dual" identity="true" />
+        </table>
+        <table tableName="SER_DISEASE_DOC_RS" schema="ll" >
+            <generatedKey column="id" sqlStatement="select SEQ_SER_DISEASE_DOC_RS_ID.nextval from dual" identity="true" />
         </table>
 <!--        <table tableName="DIC_IND" schema="ll" >-->
 <!--            <generatedKey column="id" sqlStatement="select SEQ_DIC_IND_ID.nextval from dual" identity="true" />-->