diff --git a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java index 9f3f46e..77d9351 100644 --- a/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java +++ b/src/main/java/com/ann/demo/interfaces/impl/HomepageDictionaryImpl.java @@ -101,6 +101,20 @@ public class HomepageDictionaryImpl implements HomepageDictionary { } } //----------------单独处理出院记录 + + //----------------单独处理重症单中“首次护理记录单” + List list2 = new ArrayList(); + list2.add("7"); + String huliResult = archiveDetailService.getTypeNotExits(list2, masterId); + if (huliResult != null){ + //缺失首次护理记录单(来源V6护士) + //再判断重症单中是否有首次护理记录单 + Integer result = archiveDetailService.countFirstNursingRecord(masterId, "121"); + if (result==0){ + //重症单中没有首次护理记录单 + sb.append("缺失首次护理记录单"); + } + } } // 检验申请单 @@ -124,7 +138,7 @@ public class HomepageDictionaryImpl implements HomepageDictionary { }catch (Exception e){ sb.setLength(0); sb.append("服务器正忙"); - logger.error("出错了:",e); + logger.error("出错了:",e.getMessage()); } return sb + ""; } diff --git a/src/main/java/com/ann/demo/repository/ArchiveDetailRepository.java b/src/main/java/com/ann/demo/repository/ArchiveDetailRepository.java index 40fe762..9b6b545 100644 --- a/src/main/java/com/ann/demo/repository/ArchiveDetailRepository.java +++ b/src/main/java/com/ann/demo/repository/ArchiveDetailRepository.java @@ -21,7 +21,7 @@ public interface ArchiveDetailRepository extends JpaRepository type, String masterId); @@ -109,5 +109,14 @@ public interface ArchiveDetailRepository extends JpaRepository types, String masterId) { return archiveDetailRepository.getCheckReportNotExits1( types,masterId); } + + @Override + public Integer countFirstNursingRecord(String masterId, String s) { + return archiveDetailRepository.countFirstNursingRecord(masterId,s,"0"); + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b6f45bf..fcf06b3 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -39,7 +39,8 @@ spring: #完整性核查 必查项,填类型id #9月 增加大类的校验 -mustCheckData: 3,9,20,122,123,5,7,2 +#mustCheckData: 3,9,20,122,123,5,7,2 +mustCheckData: 3,9,20,122,123,5,2 #2020-9-23 1、新增60、110 核医学以及其他报告 2、将检查检验校验合并(因超声会有合并报告) inspectionReportType: 54,59,52,57,60,110,10 checkReportType: 54,59,52,57