Merge remote-tracking branch 'origin/master'

src/main/java/com/imed/costaccount/model/dto/CollectDTO.java

@@ -18,7 +18,7 @@ public class CollectDTO {
 
     private String  responsibilityCode;
 
-    private String product;
+    private String productCode;
 
     private Long hospId;
 }

src/main/java/com/imed/costaccount/service/impl/IncomeCollectionServiceImpl.java

@@ -149,24 +149,24 @@ public class IncomeCollectionServiceImpl
                         afterIncomegroup.setDirectStatus(0);
                     }
                     incomeCollection.setIsDirectIncome(afterIncomegroup.getDirectStatus());
-                    String responsibilityCode = afterIncomegroup.getResponsibilityCode();
-                    if (StrUtil.isBlank(responsibilityCode)) {
-                        responsibilityCode = "-";
-                        afterIncomegroup.setResponsibilityName("-");
-                    }
+//                    String responsibilityCode = afterIncomegroup.getResponsibilityCode();
+//                    if (StrUtil.isBlank(responsibilityCode)) {
+//                        responsibilityCode = "-";
+//                        afterIncomegroup.setResponsibilityName("-");
+//                    }
                     // 开单中心的数据
                     incomeCollection.setDepartmentCode(afterIncomegroup.getOpenDepartmentCode());
                     incomeCollection.setDepartmentName(afterIncomegroup.getOpenDepartmentName());
-                    incomeCollection.setResponsibilityCode(responsibilityCode);
-                    incomeCollection.setResponsibilityName(afterIncomegroup.getResponsibilityName());
+                    incomeCollection.setResponsibilityCode(afterIncomegroup.getOpenResponsibilityCode());
+                    incomeCollection.setResponsibilityName(afterIncomegroup.getOpenResponsibilityName());
 
                     list.add(incomeCollection);
                     // 执行科室数据
                     String startDepartmentCode = afterIncomegroup.getStartDepartmentCode();
                     incomeCollection.setDepartmentCode(startDepartmentCode);
                     incomeCollection.setDepartmentName(afterIncomegroup.getStartDepartmentName());
-                    incomeCollection.setResponsibilityCode(responsibilityCode);
-                    incomeCollection.setResponsibilityName(afterIncomegroup.getResponsibilityName());
+                    incomeCollection.setResponsibilityCode(afterIncomegroup.getStartResponsibilityCode());
+                    incomeCollection.setResponsibilityName(afterIncomegroup.getStartResponsibilityName());
                     list.add(incomeCollection);
                 });
 
@@ -248,7 +248,7 @@ public class IncomeCollectionServiceImpl
         }
 
         // 所有的数据格式
-        List<CodeAndNameVO> realData = this.baseMapper.getAccount(hospId, collectDTO.getProduct(), date);
+        List<CodeAndNameVO> realData = this.baseMapper.getAccount(hospId, collectDTO.getProductCode(), date);
         if (realData.isEmpty()) {
             return new CollectDataFormVO();
         }