|
@@ -184,6 +184,7 @@ public class CaseFrontSheetService {
|
|
|
}
|
|
|
if (param.getFileStatus() == 0) {
|
|
|
list = basDao.selectPatientsForBasByFileStatus(param);
|
|
|
+ log.info("list: {}", list);
|
|
|
} else {
|
|
|
list = basDao.selectPatientsForBasByFileStatus2(param);
|
|
|
}
|
|
@@ -278,7 +279,7 @@ public class CaseFrontSheetService {
|
|
|
|
|
|
private List<CaseFrontsheetDisdiag> getSheetDisDiags(String bah, int times, int status) {
|
|
|
List<CaseFrontsheetDisdiag> disdiags = status == 1 ?
|
|
|
- dao.selectSignedSheetDiags(bah, times) : dao.getDisdiags(bah, times);
|
|
|
+ dao.selectSignedSheetDiags(bah, times) : dao.getDisdiags(bah, times);
|
|
|
if (disdiags == null) {
|
|
|
disdiags = new ArrayList<>();
|
|
|
}
|
|
@@ -527,8 +528,11 @@ public class CaseFrontSheetService {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- if (force.isEmpty() && advice.isEmpty()) {
|
|
|
- return ResultVoUtil.success();
|
|
|
+ if (force.isEmpty()) {
|
|
|
+ saveSheet(sheet);
|
|
|
+ if (advice.isEmpty()) {
|
|
|
+ return ResultVoUtil.success();
|
|
|
+ }
|
|
|
}
|
|
|
Map<String, List<PureCodeName>> map = new HashMap<>();
|
|
|
map.put("force", force);
|