1.0病组相关修改迁移

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

@@ -35,6 +35,8 @@ public interface SerDiseaseMapper {
 
     DiseaseLevel selectParentById(@Param("date") String date, @Param("diseaseId") Integer diseaseId);
 
+    DiseaseLevel selectParentByIdNoZbz(@Param("date") String date, @Param("diseaseId") Integer diseaseId);
+
     List<DiseaseLevel> selectSonById(@Param("date") String date, @Param("diseaseId") Integer diseaseId,
                                      @Param("docCode") String docCode, @Param("deptCode") String deptCode);
 }

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

@@ -30,6 +30,8 @@ public class SerDisease {
 
     private String parentCode;
 
+    private Integer groupType;
+
     public BigDecimal getId() {
         return id;
     }
@@ -126,6 +128,14 @@ public class SerDisease {
         this.orgName = orgName;
     }
 
+    public Integer getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(Integer groupType) {
+        this.groupType = groupType;
+    }
+
     public String getParentCode() {
         return parentCode;
     }

bsoft-api/src/main/java/com/bsoft/api/model/respmodel/DiseaseLevel.java

@@ -14,6 +14,8 @@ public class DiseaseLevel {
     private BigDecimal level;
     private String orgId;
     private String orgName;
+    private Integer groupType;
+    private BigDecimal zls;
     private List<DiseaseLevel> diseaseLevelList;
 
     public BigDecimal getId() {
@@ -88,6 +90,22 @@ public class DiseaseLevel {
         this.orgName = orgName;
     }
 
+    public Integer getGroupType() {
+        return groupType;
+    }
+
+    public void setGroupType(Integer groupType) {
+        this.groupType = groupType;
+    }
+
+    public BigDecimal getZls() {
+        return zls;
+    }
+
+    public void setZls(BigDecimal zls) {
+        this.zls = zls;
+    }
+
     public List<DiseaseLevel> getDiseaseLevelList() {
         return diseaseLevelList;
     }
@@ -103,11 +121,13 @@ public class DiseaseLevel {
                 ", mdcCode='" + mdcCode + '\'' +
                 ", mdcName='" + mdcName + '\'' +
                 ", date=" + date +
-                ", mdcNum=" + mdcNum +
+                ", mdcNum='" + mdcNum + '\'' +
                 ", parentId=" + parentId +
                 ", level=" + level +
-                ", orgId=" + orgId +
+                ", orgId='" + orgId + '\'' +
                 ", orgName='" + orgName + '\'' +
+                ", groupType=" + groupType +
+                ", zls=" + zls +
                 ", diseaseLevelList=" + diseaseLevelList +
                 '}';
     }

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

@@ -79,7 +79,12 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
         Integer diseaseId = disease.getId().intValue();
         //查询父级菜单对象(直到查询到顶级)
         while (isParent) {
-            DiseaseLevel diseaseLevel = serDiseaseMapper.selectParentById(date, diseaseId);
+            DiseaseLevel diseaseLevel = null;
+            if (disease.getLevel().intValue() == 0) {
+                diseaseLevel = serDiseaseMapper.selectParentById(date, diseaseId);
+            } else {
+                diseaseLevel = serDiseaseMapper.selectParentByIdNoZbz(date, diseaseId);
+            }
             if (diseaseLevel != null) {
                 List<DiseaseLevel> sonList = new ArrayList<>();
                 if (diseaseLevelResult != null) {
@@ -118,6 +123,8 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
             diseaseLevel1.setOrgId(serDiseases.getOrgId());
             diseaseLevel1.setOrgName(serDiseases.getOrgName());
             diseaseLevel1.setParentId(serDiseases.getParentId());
+            diseaseLevel1.setGroupType(serDiseases.getGroupType());
+            diseaseLevel1.setZls(serDiseases.getZls());
             diseaseLevelList.add(diseaseLevel1);
         }
         if (diseaseLevelResult != null) {
@@ -165,3 +172,4 @@ public class SerDiseaseServiceImpl implements SerDiseaseService {
         }
     }
 }
+

bsoft-api/src/main/resources/application-test.properties

 #### \u6D4B\u8BD5\u73AF\u5883 ###################################################
-spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_sy_test2.0?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
+spring.datasource.url=jdbc:mysql://192.168.18.176:3306/scml_sy2.0?useUnicode=true&characterEncoding=utf8&useSSL=false&autoReconnect=true&rewriteBatchedStatements=TRUE&serverTimezone=UTC
 spring.datasource.username=root
 spring.datasource.password=Suvalue2016
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver

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

@@ -15,6 +15,7 @@
         <result column="ORG_ID" jdbcType="VARCHAR" property="orgId"/>
         <result column="ORG_NAME" jdbcType="VARCHAR" property="orgName"/>
         <result column="PARENT_CODE" jdbcType="VARCHAR" property="parentCode"/>
+        <result column="GROUP_TYPE" jdbcType="VARCHAR" property="groupType"/>
     </resultMap>
     <resultMap id="DiseaseLevel" type="com.bsoft.api.model.respmodel.DiseaseLevel">
         <id column="ID" jdbcType="DECIMAL" property="id"/>
@@ -26,6 +27,8 @@
         <result column="LEVEL" jdbcType="DECIMAL" property="level"/>
         <result column="ORG_ID" jdbcType="VARCHAR" property="orgId"/>
         <result column="ORG_NAME" jdbcType="VARCHAR" property="orgName"/>
+        <result column="GROUP_TYPE" jdbcType="VARCHAR" property="groupType"/>
+        <result column="ZLS" jdbcType="VARCHAR" property="zls"/>
     </resultMap>
     <insert id="insert" parameterType="com.bsoft.api.model.SerDisease">
         <selectKey keyProperty="id" order="AFTER" resultType="java.math.BigDecimal">
@@ -34,12 +37,13 @@
         insert into dic_disease (CREATE_DATE, CREATE_USERID, `STATE`,
         MDC_CODE, MDC_NAME, `DATE`,
         MDC_NUM, PARENT_ID, `LEVEL`,
-        ORG_ID, ORG_NAME, PARENT_CODE
+        ORG_ID, ORG_NAME, PARENT_CODE,GROUP_TYPE
         )
         values (#{createDate,jdbcType=TIMESTAMP}, #{createUserid,jdbcType=DECIMAL}, #{state,jdbcType=DECIMAL},
         #{mdcCode,jdbcType=VARCHAR}, #{mdcName,jdbcType=VARCHAR}, #{date,jdbcType=DECIMAL},
         #{mdcNum,jdbcType=VARCHAR}, #{parentId,jdbcType=DECIMAL}, #{level,jdbcType=DECIMAL},
-        #{orgId,jdbcType=DECIMAL}, #{orgName,jdbcType=VARCHAR}, #{parentCode,jdbcType=VARCHAR}
+        #{orgId,jdbcType=DECIMAL}, #{orgName,jdbcType=VARCHAR}, #{parentCode,jdbcType=VARCHAR},
+        #{groupType,jdbcType=VARCHAR}
         )
     </insert>
     <select id="selectAll" resultMap="BaseResultMap">
@@ -55,18 +59,19 @@
                `LEVEL`,
                ORG_ID,
                ORG_NAME,
-               PARENT_CODE
+               PARENT_CODE,
+               GROUP_TYPE
         from dic_disease
     </select>
     <select id="selectByCode" resultMap="BaseResultMap">
         select *
         from dic_disease d
         where d.STATE = 1
-          and MDC_CODE = #{code,jdbcType=VARCHAR}
+          and d.MDC_CODE = #{code,jdbcType=VARCHAR}
     </select>
     <select id="selectByMdcName" resultMap="BaseResultMap">
         select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
-        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
+        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
         from dic_disease d
         where 1 = 1 and STATE=1
         <if test="mdcName!=null">
@@ -76,19 +81,19 @@
     </select>
     <select id="selectByLevel" resultMap="DiseaseLevel">
         select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
-        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
+        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
         from dic_disease d
         <if test="deptCode!=null">
             join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
             from val_block_values_1_2_2
-            where TIME=#{date} and ZLS>0
+            where `TIME`=#{date} and ZLS>0
             and KSBM=#{deptCode,jdbcType=VARCHAR}
             group by ZBZBM,KSBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         <if test="deptCode==null">
             join (select ZBZBM,SUM(ZLS) as ZLS
             from val_block_values_1_1_2
-            where TIME=#{date} and ZLS>0
+            where `TIME`=#{date} and ZLS>0
             group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         where 1 = 1 and STATE=1
@@ -99,7 +104,7 @@
     </select>
     <select id="selectByLevelNoZBZ" resultMap="DiseaseLevel">
         select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
-        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
+        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE
         from dic_disease d
         where 1 = 1 and STATE=1
         <if test="level!=null">
@@ -109,19 +114,19 @@
     </select>
     <select id="selectByParentId" resultMap="DiseaseLevel">
         select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
-        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
+        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
         from dic_disease d
         <if test="deptCode!=null">
             join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
             from val_block_values_1_2_2
-            where TIME=#{date} and ZLS>0
+            where `TIME`=#{date} and ZLS>0
             and KSBM=#{deptCode,jdbcType=VARCHAR}
             group by ZBZBM,KSBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         <if test="deptCode==null">
             join (select ZBZBM,SUM(ZLS) as ZLS
             from val_block_values_1_1_2
-            where TIME=#{date} and ZLS>0
+            where `TIME`=#{date} and ZLS>0
             group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         where 1 = 1 and STATE=1 and STATE=1
@@ -132,19 +137,19 @@
     </select>
     <select id="selectByParentIdNoZbz" resultMap="DiseaseLevel">
         select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.`STATE`, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
-        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
+        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
         from dic_disease d
         <if test="deptCode!=null">
             join (select ZBZBM,KSBM,SUM(ZLS) as ZLS
             from val_block_values_1_5_2
-            where TIME=#{date}
+            where `TIME`=#{date}
             and KSBM=#{deptCode,jdbcType=VARCHAR}
             group by ZBZBM,KSBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         <if test="deptCode==null">
             join (select ZBZBM,SUM(ZLS) as ZLS
             from val_block_values_1_3_2
-            where TIME=#{date}
+            where `TIME`=#{date}
             group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
         </if>
         where 1 = 1 and STATE=1 and STATE=1
@@ -154,31 +159,32 @@
         order by val.ZLS desc
     </select>
     <select id="selectParentById" resultMap="DiseaseLevel">
-        select *
-        from dic_disease
-        where 1 = 1 and STATE=1
+        select d.*,val.ZLS
+        from dic_disease d
+        join (select ZBZBM,SUM(ZLS) as ZLS
+        from val_block_values_1_1_2
+        where `TIME`=#{date} and ZLS>0
+        group by ZBZBM) val on val.ZBZBM = d.MDC_CODE
+        where 1 = 1 and d.STATE=1
+        <if test="diseaseId!=null">
+            and d.id=(select PARENT_ID from dic_disease where id = #{diseaseId,jdbcType=DECIMAL} )
+        </if>
+    </select>
+    <select id="selectParentByIdNoZbz" resultMap="DiseaseLevel">
+        select d.*,val.ZLS
+        from dic_disease d
+        join val_block_values_1_3_1 val on val.ZBZBM = d.MDC_CODE and val.`TIME`=#{date}
+        where 1 = 1 and d.STATE=1
         <if test="diseaseId!=null">
-            and id=(select PARENT_ID from dic_disease where id = #{diseaseId,jdbcType=DECIMAL} )
+            and d.id=(select PARENT_ID from dic_disease where id = #{diseaseId,jdbcType=DECIMAL} )
         </if>
     </select>
-    <!--    <select id="selectSonById" resultMap="DiseaseLevel">-->
-    <!--        select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,-->
-    <!--        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME-->
-    <!--        from SER_DISEASE d,SER_DISEASE_DOC_RS rs-->
-    <!--        where 1 = 1 and STATE=1 and STATE=1 and rs.MDC_CODE=d.MDC_CODE-->
-    <!--        <if test="diseaseId!=null">-->
-    <!--            and d.PARENT_ID=#{diseaseId,jdbcType=DECIMAL}-->
-    <!--        </if>-->
-    <!--        <if test="deptCode!=null">-->
-    <!--            and rs.DEPT_CODE=#{deptCode,jdbcType=VARCHAR}-->
-    <!--        </if>-->
-    <!--        order by d.MDC_NUM-->
-    <!--    </select>    -->
     <select id="selectSonById" resultMap="DiseaseLevel">
         select DISTINCT d.ID, d.CREATE_DATE, d.CREATE_USERID, d.STATE, d.MDC_CODE, d.MDC_NAME, d.`DATE`,d.MDC_NUM,
-        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME
+        d.PARENT_ID, d.`LEVEL`, d.ORG_ID, d.ORG_NAME,d.GROUP_TYPE,val.ZLS
         from dic_disease d
-        where 1 = 1 and STATE=1 and STATE=1
+        left join val_block_values_1_3_1 val on val.ZBZBM = d.MDC_CODE and val.time=#{date}
+        where 1 = 1 and d.STATE=1
         <if test="diseaseId!=null">
             and d.PARENT_ID=#{diseaseId,jdbcType=DECIMAL}
         </if>

bsoft-api/src/main/resources/更新日志.txt

-时间：2020.07.09		版本号：1.02.0709001
-时间：2020.07.09		版本号：1.02.0709001
+时间：2020.07.16		版本号：2.02.0716001
+时间：2020.07.16		版本号：2.02.0716001
 后端更新说明：
-		1.value表名读取配置
+		1.病组目录添加总例数字段
+		2.病组接口性能优化
+前端更新说明：
+        综合病组列表点击下钻逻辑
+        488 pc模式下的无点击事件未生效，事件目前只出现两次，再次点击不生效，需要优化；只能点两个病组的无；滚动病组时， “无”相同方向移动
+        484 全院病组层的医保界面缺0%的基准线，以及两个指标亮，以及出现折线
+        483 医保的图下钻到科室内的三级病组层，然后点“上一页”界面异常，不显示数据
+        482 科室账号登录，一直点下钻，科室内医保界面点下钻没反应。成本图界面显示不全
+        478 绩效全院的主病组列表，点击“转图表”，界面未显示全
+        476 医保的全院主病组列表点转图表，界面空白
+        475 科室能级的二级病组列表，三级病组列表，点转图表，再点“上一页”，再点病组列表左上角的返回上一层病组标识，界面空白。医保，成本，费用，绩效模块都要看一下
+        490 科室内二级病组列表的转图表界面未显示左下病组目录
+        458  能效下，全院的三级病组层转图表，应该到该三级病组的上一级病组层分析
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
+时间：2020.07.09		版本号：2.02.0709001
+后端更新说明：
+		1.value表名读取配置
 
---------------------------------------------------------------------------
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 
-时间：2020.07.07		版本号：1.01.0707001
+时间：2020.07.07		版本号：2.01.0707001
 后端更新说明：
 		1.登录添加病案信息
\ No newline at end of file