Merge remote-tracking branch 'origin/dev-1.2' into dev-1.2

kernel/src/main/java/com/lantone/qc/kernel/catalogue/behospitalized/BEH02903.java

@@ -0,0 +1,40 @@
+package com.lantone.qc.kernel.catalogue.behospitalized;
+
+import com.lantone.qc.kernel.catalogue.QCCatalogue;
+import com.lantone.qc.pub.model.InputInfo;
+import com.lantone.qc.pub.model.OutputInfo;
+import com.lantone.qc.pub.model.entity.Pacs;
+import com.lantone.qc.pub.model.label.PacsLabel;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @ClassName : BEH02903
+ * @Description : 辅助检查未注明时间
+ * @Author : 胡敬
+ * @Date: 2020-05-28 09:56
+ */
+@Component
+public class BEH02903 extends QCCatalogue {
+    @Override
+    protected void start(InputInfo inputInfo, OutputInfo outputInfo) {
+        status.set("0");
+        if (inputInfo.getBeHospitalizedDoc() == null) {
+            return;
+        }
+
+        PacsLabel pacsLabel = inputInfo.getBeHospitalizedDoc().getPacsLabel();
+        if (pacsLabel == null) {
+            return;
+        }
+
+        List<Pacs> pacses = pacsLabel.getPacses();
+        for (Pacs pacs : pacses) {
+            if (pacs.getName() == null && pacs.getPd() == null) {
+                status.set("-1");
+                return;
+            }
+        }
+    }
+}

kernel/src/main/java/com/lantone/qc/kernel/structure/ai/process/EntityProcessPacs.java

@@ -5,6 +5,7 @@ import com.lantone.qc.kernel.structure.ai.model.EntityEnum;
 import com.lantone.qc.kernel.structure.ai.model.Lemma;
 import com.lantone.qc.pub.model.entity.BodyPart;
 import com.lantone.qc.pub.model.entity.OuterCourtyard;
+import com.lantone.qc.pub.model.entity.PD;
 import com.lantone.qc.pub.model.entity.Pacs;
 import com.lantone.qc.pub.model.entity.PacsValue;
 
@@ -33,6 +34,15 @@ public class EntityProcessPacs extends EntityProcess {
             }
             pacses.add(pacs);
         }
+        //辅检时间(不是辅检具体项目时间)
+        List<Lemma> pdLemmas = createEntityTree(aiOut, EntityEnum.TIME.toString());
+        for (Lemma lemma : pdLemmas) {
+            PD pd = new PD();
+            pd.setName(lemma.getText());
+            Pacs pacs = new Pacs();
+            pacs.setPd(pd);
+            pacses.add(pacs);
+        }
         return pacses;
     }
 
@@ -80,4 +90,5 @@ public class EntityProcessPacs extends EntityProcess {
         }
         return outerCourtyard;
     }
+
 }

trans/src/main/java/com/lantone/qc/trans/changx/ChangxOperationDocTrans.java

@@ -227,10 +227,10 @@ public class ChangxOperationDocTrans extends ModelDocTrans {
             "++++器官手术=",
             "++++空隙手术=",
             "++++术中送检无=术中送检",
-            "++++术中送检有=",
+            "++++术中送检有=术中送检",
             "冰冻切片结果=",
-            "++++并发症无=",
-            "++++并发症有=",
+            "++++并发症无=手术并发症",
+            "++++并发症有=手术并发症",
             "手术并发症=",
             "失血量=",
             "手术经过=",