wangyu 5 роки тому
батько
коміт
c7f398c219

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/firstpagerecord/FIRP0737.java

@@ -16,7 +16,7 @@ import java.util.Map;
  * @Date: 2020-05-08 16:00
  */
 @Component
-public class FIRP0737 extends QCCatalogue {
+public class FIRP02883 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         if (inputInfo.getFirstPageRecordDoc() != null && inputInfo.getFirstPageRecordDoc().getStructureMap() != null) {

+ 2 - 2
kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH0738.java

@@ -1,4 +1,4 @@
-package com.lantone.qc.kernel.catalogue.behospitalized;
+package com.lantone.qc.kernel.catalogue.medicalwriting;
 
 import com.lantone.qc.kernel.catalogue.QCCatalogue;
 import com.lantone.qc.kernel.util.CatalogueUtil;
@@ -22,7 +22,7 @@ import java.util.stream.Collectors;
  * @time: 2020-05-08 16:45
  */
 @Component
-public class BEH0738 extends QCCatalogue {
+public class MEDI02884 extends QCCatalogue {
 
     @Override
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/noticeinformedconsent/NOT0736.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Component;
  * @desc 患者拒绝治疗,缺少相关告知书
  **/
 @Component
-public class NOT0736 extends QCCatalogue {
+public class MEDI02882 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         status.set("0");
         Boolean ref = false;

+ 6 - 3
kernel/src/main/java/com/lantone/qc/kernel/catalogue/noticeinformedconsent/NOT0720.java

@@ -21,14 +21,17 @@ import java.util.stream.Collectors;
 @Component
 public class NOT0720 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
         NoticeOfConversationDoc noticeOfConversationDoc = inputInfo.getNoticeOfConversationDoc();
         if (noticeOfConversationDoc == null){
-            status.set("0");
+            return;
+        }
+        if(inputInfo.getOperationDocs() != null && inputInfo.getOperationDocs().size() != 0){//手术患者可以没无72
             return;
         }
         Map<String, String> structureMap = noticeOfConversationDoc.getStructureMap();
-        if (structureMap.containsKey("入院72小时内谈话记录")){
-            status.set("0");
+        if (!structureMap.containsKey("入院72小时内谈话记录")){
+            status.set("-1");
         }
     }
 }

+ 1 - 1
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR0702.java

@@ -21,7 +21,7 @@ import java.util.List;
  * @Date: 2020-04-20 16:38
  */
 @Component
-public class THR0702 extends QCCatalogue {
+public class THR02880 extends QCCatalogue {
     public void start(InputInfo inputInfo, OutputInfo outputInfo) {
         if (inputInfo.getThreeLevelWardDocs().size() == 0 || inputInfo.getFirstCourseRecordDoc() == null) {
             status.set("0");

+ 20 - 0
kernel/src/main/java/com/lantone/qc/kernel/catalogue/threelevelward/THR02881.java

@@ -0,0 +1,20 @@
+package com.lantone.qc.kernel.catalogue.threelevelward;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author 王宇
+ * @create 2020-05-08 16:56
+ * @desc 检验检查结果未及时记录
+ **/
+@Component
+public class THR02881 extends QCCatalogue {
+    public void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+
+    }
+
+}