08 13 fix return

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

@@ -160,25 +160,35 @@ public class IncomeCollectionServiceImpl
 //                        responsibilityCode = "-";
 //                        afterIncomegroup.setResponsibilityName("-");
 //                    }
-                    // 开单中心的数据
-                    incomeCollection.setAmount(afterIncomegroup.getOpenDepartmentDecimal());
-                    incomeCollection.setDepartmentCode(afterIncomegroup.getOpenDepartmentCode());
-                    incomeCollection.setDepartmentName(afterIncomegroup.getOpenDepartmentName());
-                    incomeCollection.setResponsibilityCode(afterIncomegroup.getOpenResponsibilityCode());
-                    incomeCollection.setResponsibilityName(afterIncomegroup.getOpenResponsibilityName());
-
-                    list.add(incomeCollection);
-                    // 执行科室数据
-
-                    IncomeCollection startCollect = BeanUtil.convertObj(incomeCollection, IncomeCollection.class);
-                    startCollect.setAmount(afterIncomegroup.getStartDepartmentDecimal());
-                    startCollect.setDepartmentCode(afterIncomegroup.getStartDepartmentCode());
-                    startCollect.setDepartmentName(afterIncomegroup.getStartDepartmentName());
-                    startCollect.setResponsibilityCode(afterIncomegroup.getStartResponsibilityCode());
-                    startCollect.setResponsibilityName(afterIncomegroup.getStartResponsibilityName());
-                    log.info("start:{}", startCollect);
-                    log.info("open:{}", incomeCollection);
-                    list.add(startCollect);
+                    String responsibilityCode = afterIncomegroup.getResponsibilityCode();
+                    if (StrUtil.isNotBlank(responsibilityCode)) {
+                        incomeCollection.setDepartmentName(afterIncomegroup.getOpenDepartmentName() + "|" + afterIncomegroup.getStartDepartmentName());
+                        incomeCollection.setDepartmentCode(afterIncomegroup.getOpenDepartmentCode() + "|" + afterIncomegroup.getStartDepartmentCode());
+                        incomeCollection.setResponsibilityCode(responsibilityCode);
+                        incomeCollection.setResponsibilityName(afterIncomegroup.getResponsibilityName());
+                        incomeCollection.setAmount(afterIncomegroup.getOtherResponsibilityDecimal());
+                        list.add(incomeCollection);
+                    } else {
+                        // 开单中心的数据
+                        incomeCollection.setAmount(afterIncomegroup.getOpenDepartmentDecimal());
+                        incomeCollection.setDepartmentCode(afterIncomegroup.getOpenDepartmentCode());
+                        incomeCollection.setDepartmentName(afterIncomegroup.getOpenDepartmentName());
+                        incomeCollection.setResponsibilityCode(afterIncomegroup.getOpenResponsibilityCode());
+                        incomeCollection.setResponsibilityName(afterIncomegroup.getOpenResponsibilityName());
+
+                        list.add(incomeCollection);
+                        // 执行科室数据
+
+                        IncomeCollection startCollect = BeanUtil.convertObj(incomeCollection, IncomeCollection.class);
+                        startCollect.setAmount(afterIncomegroup.getStartDepartmentDecimal());
+                        startCollect.setDepartmentCode(afterIncomegroup.getStartDepartmentCode());
+                        startCollect.setDepartmentName(afterIncomegroup.getStartDepartmentName());
+                        startCollect.setResponsibilityCode(afterIncomegroup.getStartResponsibilityCode());
+                        startCollect.setResponsibilityName(afterIncomegroup.getStartResponsibilityName());
+                        log.info("start:{}", startCollect);
+                        log.info("open:{}", incomeCollection);
+                        list.add(startCollect);
+                    }
                 });