|
@@ -587,7 +587,7 @@ public class CaseFrontSheetMainService {
|
|
|
obj.put("inputParam", inputParam);
|
|
|
try {
|
|
|
JSONObject result = srvc.setlQualityControl(obj);
|
|
|
- log.info("病案质控接口:\n参数:{}\n结果:{}", obj, result);
|
|
|
+ log.info("\n病案质控接口:\n参数:{}\n结果:{}", obj, result);
|
|
|
return result;
|
|
|
} catch (Exception e) {
|
|
|
log.error("创智诊断校验访问失败:http://172.16.32.183:8917/mmg-transceiver/interfaceFactory/call");
|
|
@@ -675,7 +675,11 @@ public class CaseFrontSheetMainService {
|
|
|
return ResultVoUtil.fail(ExceptionEnum.NO_DATA_EXIST, "没有查询到病案数据。");
|
|
|
}
|
|
|
Map<String, List<CodeName>> warnings = beginAnalyzeSheet(sheet, 4);
|
|
|
- if (warnings.get("force").isEmpty()) {
|
|
|
+ List<CodeName> forces = warnings.get("force");
|
|
|
+ if (view.getInOutFlag() == 1) {
|
|
|
+ forces.removeIf(item -> Objects.equals(item.getCode(), "dismissDate"));
|
|
|
+ }
|
|
|
+ if (forces.isEmpty()) {
|
|
|
Integer status = dao.selectFileStatus(sheet.getBah(), sheet.getAdmissTimes());
|
|
|
status = null == status ? -1 : status;
|
|
|
if (status == 0) {
|