1.疾病接口修改

2.指标接口修改

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

@@ -29,9 +29,9 @@ public class SerDiseaseController {
      */
     @PostMapping("disease/list")
     @Token
-    @ApiOperation("根据ID或者等级查询疾病信息")
+    @ApiOperation("根据疾病编码或者疾病等级查询疾病列表")
     public Object getDiseaseByLevel(@RequestBody Disease.DiseaseIDorLevel disease) throws InterruptedException {
-        List<DiseaseLevel> diseaseLevel = serDiseaseService.selectListByIdorLevel(disease.getDate(),disease.getDiseaseId(),disease.getLevel());
+        List<DiseaseLevel> diseaseLevel = serDiseaseService.selectListByIdorLevel(disease.getDate(),disease.getDisease(),disease.getLevel());
         return Result.success(diseaseLevel);
     }
 

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

@@ -14,12 +14,16 @@ public interface SerDiseaseMapper {
 
     SerDisease selectByPrimaryKey(Long id);
 
+    SerDisease selectByCode(String code,String date);
+
     List<SerDisease> selectAll();
 
     List<SerDisease> selectByMdcName(@Param("date") String date,@Param("mdcName") String mdcName);
 
     List<DiseaseLevel> selectByLevel(@Param("date") String date,@Param("level") Integer level);
 
+    List<DiseaseLevel> selectByParentId(@Param("date") String date,@Param("parentId") Integer parentId);
+
     DiseaseLevel selectParentById(@Param("date") String date, @Param("diseaseId") Integer diseaseId);
 
     List<DiseaseLevel> selectSonById(@Param("date") String date, @Param("diseaseId") Integer diseaseId);

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

@@ -12,22 +12,14 @@ public class Disease {
 
         @ApiModelProperty(value = "时间",required = true)
         private String date;
-        @ApiModelProperty(value = "疾病ID",required = false)
-        private Integer diseaseId;
+        @ApiModelProperty(value = "疾病编码",required = false)
+        private String disease;
         @ApiModelProperty(value = "等级",required = false)
         private Integer level;
         @ApiModelProperty(value = "科室编码",required = false)
-        private String docCode;
+        private String doctor;
         @ApiModelProperty(value = "医生编码",required = false)
-        private String deptCode;
-
-        public Integer getDiseaseId() {
-            return diseaseId;
-        }
-
-        public void setDiseaseId(Integer diseaseId) {
-            this.diseaseId = diseaseId;
-        }
+        private String dept;
 
         public String getDate() {
             return date;
@@ -37,6 +29,14 @@ public class Disease {
             this.date = date;
         }
 
+        public String getDisease() {
+            return disease;
+        }
+
+        public void setDisease(String disease) {
+            this.disease = disease;
+        }
+
         public Integer getLevel() {
             return level;
         }
@@ -45,22 +45,21 @@ public class Disease {
             this.level = level;
         }
 
-        public String getDocCode() {
-            return docCode;
+        public String getDoctor() {
+            return doctor;
         }
 
-        public void setDocCode(String docCode) {
-            this.docCode = docCode;
+        public void setDoctor(String doctor) {
+            this.doctor = doctor;
         }
 
-        public String getDeptCode() {
-            return deptCode;
+        public String getDept() {
+            return dept;
         }
 
-        public void setDeptCode(String deptCode) {
-            this.deptCode = deptCode;
+        public void setDept(String dept) {
+            this.dept = dept;
         }
-
     }
 
     /**

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

@@ -135,7 +135,7 @@ public class BlockValuesServiceImpl implements BlockValuesService {
         for (SerPageBlockRs data : pageBlocklist) {
             //获取表名
             Long blockId = data.getBlockId();
-            String tableName = "VAL_BLOCK_VALUES_" + blockId;
+            String tableName = "VAL_BLOCK_VALUES_" +pageCode+"_"+page.getId()+"_"+ blockId;
             asynBlockValuesServiceImpl.getBlockValues(list, blockId, tableName, whereClause, latch);
 
         }

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

@@ -15,10 +15,10 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
     private SerDiseaseMapper serDiseaseMapper;
 
     @Override
-    public List<DiseaseLevel> selectListByIdorLevel(String date, Integer diseaseId,Integer level){
+    public List<DiseaseLevel> selectListByIdorLevel(String date, String diseaseCode,Integer level){
         List<DiseaseLevel> list = new ArrayList<>();
-        if(diseaseId!=null){
-            list = selectById(date,diseaseId);
+        if(diseaseCode!=null){
+            list = selectById(date,diseaseCode);
         }else{
             list = selectByLevel(date,level);
         }
@@ -33,26 +33,26 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
     /**
      * 根据id查询父子级别列表
      * @param date 时间
-     * @param diseaseId ID
+     * @param diseaseCode ID
      * @return
      */
-    private List<DiseaseLevel> selectById(String date, Integer diseaseId){
-        SerDisease disease = serDiseaseMapper.selectByPrimaryKey(Long.valueOf(diseaseId));
+    private List<DiseaseLevel> selectById(String date, String diseaseCode){
+        SerDisease disease = serDiseaseMapper.selectByCode(diseaseCode,date);
         if(disease==null){
             return null;
         }
         //查询父级菜单对象
-        DiseaseLevel diseaseLevel = serDiseaseMapper.selectParentById(date,diseaseId);
+        DiseaseLevel diseaseLevel = serDiseaseMapper.selectParentById(date,disease.getId().intValue());
         List<DiseaseLevel> parentList = new ArrayList<>();
 
         //查询同级菜单列表
-        List<DiseaseLevel> serDiseaseList =  serDiseaseMapper.selectByLevel(date,disease.getLevel().intValue());
+        List<DiseaseLevel> serDiseaseList =  serDiseaseMapper.selectByParentId(date,disease.getParentId().intValue());
         List<DiseaseLevel> diseaseLevelList = new ArrayList<>();
         for (DiseaseLevel serDiseases: serDiseaseList) {
             DiseaseLevel diseaseLevel1 = new DiseaseLevel();
             //查询子级菜单列表
-            if(serDiseases.getId().intValue()==diseaseId){
-                List<DiseaseLevel> diseaseLevelList1 = serDiseaseMapper.selectSonById(date,diseaseId);
+            if(serDiseases.getMdcCode().equals(diseaseCode)){
+                List<DiseaseLevel> diseaseLevelList1 = serDiseaseMapper.selectSonById(date,disease.getId().intValue());
                 diseaseLevel1.setDiseaseLevelList(diseaseLevelList1);
             }
             diseaseLevel1.setDate(serDiseases.getDate());

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

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

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

@@ -60,6 +60,12 @@
     from LL.SER_DISEASE
     where ID = #{id,jdbcType=DECIMAL}
   </select>
+    <select id="selectByCode" resultMap="BaseResultMap">
+    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
+    where MDC_CODE = #{code,jdbcType=VARCHAR} and "DATE" = #{date,jdbcType=VARCHAR}
+  </select>
   <select id="selectAll" resultMap="BaseResultMap">
     select ID, CREATE_DATE, CREATE_USERID, STATE, MDC_CODE, MDC_NAME, DATE, MDC_NUM,
     PARENT_ID, LEVEL, ORG_ID, ORG_NAME
@@ -89,6 +95,18 @@
             and "LEVEL" = #{level,jdbcType=DECIMAL}
         </if>
   </select>
+  <select id="selectByParentId" 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
+      where 1 = 1 and STATE=1
+      <if test="date!=null">
+          and "DATE" = #{date,jdbcType=VARCHAR}
+      </if>
+      <if test="parentId!=null">
+          and PARENT_ID = #{parentId,jdbcType=DECIMAL}
+      </if>
+  </select>
   <select id="selectParentById" resultMap="DiseaseLevel">
         select *
         from SER_DISEASE

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

@@ -52,7 +52,7 @@
         SYS_MENU m on rmr.MENU_ID = m.ID
         LEFT JOIN
         SYS_USER_ROLE_RS urr on rmr.ROLE_ID = urr.Role_ID
-        where rmr.STATE=1 and m.STATE=1 and urr.STATE=1 and  urr.USER_ID = 2
+        where rmr.STATE=1 and m.STATE=1 and urr.STATE=1 and  urr.USER_ID = #{userId,jdbcType=DECIMAL}
 
         union