Procházet zdrojové kódy

手术对接修改

rengb před 5 roky
rodič
revize
88da9e56f6

+ 0 - 2
public/src/main/java/com/lantone/qc/pub/model/label/GeneralLabel.java

@@ -16,8 +16,6 @@ import java.util.Map;
 @Setter
 @Getter
 public class GeneralLabel {
-    //结构化信息存储
-    private Map<String, String> labelStructureMap = Maps.newHashMap();
     private String text;
     protected  <T> void add(List<T> list, T obj) {
         list.add(obj);

+ 3 - 3
trans/src/main/java/com/lantone/qc/trans/changx/ChangxDocTrans.java

@@ -169,7 +169,7 @@ public class ChangxDocTrans extends DocTrans {
                     inputInfo.getOperationDocs()
                             .stream()
                             .filter(operationDoc -> operationDoc != null && operationDoc.getOperationDiscussionDoc() != null)
-                            .map(operationDoc -> operationDoc.getOperationDiscussionDoc())
+                            .map(operationDoc -> operationDoc.getOperationDiscussionDoc().getPageData())
                             .collect(Collectors.toList())
             );
             inputInfo.getPageData().put(
@@ -177,7 +177,7 @@ public class ChangxDocTrans extends DocTrans {
                     inputInfo.getOperationDocs()
                             .stream()
                             .filter(operationDoc -> operationDoc != null && operationDoc.getOperationRecordDoc() != null)
-                            .map(operationDoc -> operationDoc.getOperationRecordDoc())
+                            .map(operationDoc -> operationDoc.getOperationRecordDoc().getPageData())
                             .collect(Collectors.toList())
             );
             inputInfo.getPageData().put(
@@ -185,7 +185,7 @@ public class ChangxDocTrans extends DocTrans {
                     inputInfo.getOperationDocs()
                             .stream()
                             .filter(operationDoc -> operationDoc != null && operationDoc.getPreoperativeDiscussionDoc() != null)
-                            .map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc())
+                            .map(operationDoc -> operationDoc.getPreoperativeDiscussionDoc().getPageData())
                             .collect(Collectors.toList())
             );
         }