添加动态列数据类型及是否固定的字段返回

src/main/java/com/kcim/service/impl/StandardReportServiceImpl.java

@@ -346,6 +346,10 @@ public class StandardReportServiceImpl implements StandardReportService {
             title.setSort(dept.getResponsibilitySort());
             //添加子级标题
             addCommonResponsibilityChild(title);
+            //科室合计列需固定
+            if(dept.getResponsibilityCode().equals(subtotalVo.getResponsibilityCode())){
+                title.getChild().forEach(item -> item.setIsFixed(NumberConstant.ONE));
+            }
             titleList.add(title);
         }
 
@@ -1625,15 +1629,17 @@ public class StandardReportServiceImpl implements StandardReportService {
         amount.setDataTypeName("数值");
         amount.setDecimalPlace(NumberConstant.TWO);
         amount.setPermil(NumberConstant.ONE);
+        amount.setIsFixed(NumberConstant.ZERO);
         commonResponsibility.getChild().add( amount);
         CommonResponsibilityReportVo percent=new CommonResponsibilityReportVo();
         percent.setResponsibilityCode(getResponsibilityPercentCode(commonResponsibility.getResponsibilityCode()));
         percent.setResponsibilityName("占比");
         percent.setSort(NumberConstant.ONE);
-        amount.setDataType(NumberConstant.TWO);
-        amount.setDataTypeName("百分比");
-        amount.setDecimalPlace(NumberConstant.TWO);
-        amount.setPermil(NumberConstant.ZERO);
+        percent.setDataType(NumberConstant.TWO);
+        percent.setDataTypeName("百分比");
+        percent.setDecimalPlace(NumberConstant.TWO);
+        percent.setPermil(NumberConstant.ZERO);
+        percent.setIsFixed(NumberConstant.ZERO);
         commonResponsibility.getChild().add( percent);
     }
 

src/main/java/com/kcim/vo/CommonResponsibilityReportVo.java

@@ -39,5 +39,10 @@ public class CommonResponsibilityReportVo {
      */
     private Integer permil;
 
+    /**
+     * 是否固定 0不固定 1固定
+     */
+    private Integer isFixed;
+
     private List<CommonResponsibilityReportVo> child;
 }