瀏覽代碼

长兴同意书和告知书转化

rengb 5 年之前
父節點
當前提交
10a549bcfa

+ 2 - 2
public/src/main/java/com/lantone/qc/pub/model/InputInfo.java

@@ -73,9 +73,9 @@ public class InputInfo {
     //查房记录
     //查房记录
     private List<ThreeLevelWardDoc> threeLevelWardDocs = new ArrayList<>();
     private List<ThreeLevelWardDoc> threeLevelWardDocs = new ArrayList<>();
     //知情同意书
     //知情同意书
-    private List<InformedConsentDoc> informedConsentDocs = new ArrayList<>();
+    private InformedConsentDoc informedConsentDoc;
     //谈话告知书
     //谈话告知书
-    private List<NoticeOfConversationDoc> noticeOfConversationDocs = new ArrayList<>();
+    private NoticeOfConversationDoc noticeOfConversationDoc;
     //麻醉相关
     //麻醉相关
     private List<AnesthesiaRelatedDoc> anesthesiaRelatedDocs = new ArrayList<>();
     private List<AnesthesiaRelatedDoc> anesthesiaRelatedDocs = new ArrayList<>();
     //有创操作记录
     //有创操作记录

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

@@ -103,11 +103,11 @@ public class ChangxDocTrans extends DocTrans {
             }
             }
             if (i.getTitle().equals("知情同意书")) {
             if (i.getTitle().equals("知情同意书")) {
                 ChangxInformedConsentDocTrans informedConsentDocTrans = new ChangxInformedConsentDocTrans();
                 ChangxInformedConsentDocTrans informedConsentDocTrans = new ChangxInformedConsentDocTrans();
-                inputInfo.setInformedConsentDocs(informedConsentDocTrans.extract(i));
+                inputInfo.setInformedConsentDoc(informedConsentDocTrans.extract(i));
             }
             }
             if (i.getTitle().equals("谈话告知书")) {
             if (i.getTitle().equals("谈话告知书")) {
                 ChangxNoticeOfConversationDocTrans noticeOfConversationDocTrans = new ChangxNoticeOfConversationDocTrans();
                 ChangxNoticeOfConversationDocTrans noticeOfConversationDocTrans = new ChangxNoticeOfConversationDocTrans();
-                inputInfo.setNoticeOfConversationDocs(noticeOfConversationDocTrans.extract(i));
+                inputInfo.setNoticeOfConversationDoc(noticeOfConversationDocTrans.extract(i));
             }
             }
         }
         }
         pageDataHandle(inputInfo);
         pageDataHandle(inputInfo);

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

@@ -4,9 +4,6 @@ import com.lantone.qc.pub.model.doc.InformedConsentDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.ModelDocTrans;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
 /**
  * @Description: 知情同意书
  * @Description: 知情同意书
  * @author: wangyu
  * @author: wangyu
@@ -14,8 +11,8 @@ import java.util.List;
  */
  */
 public class ChangxInformedConsentDocTrans extends ModelDocTrans {
 public class ChangxInformedConsentDocTrans extends ModelDocTrans {
     @Override
     @Override
-    public List<InformedConsentDoc> extract(MedrecVo medrecVo) {
-        List<InformedConsentDoc> informedConsentDocs = new ArrayList<>();
-        return informedConsentDocs;
+    public InformedConsentDoc extract(MedrecVo medrecVo) {
+        InformedConsentDoc informedConsentDoc = new InformedConsentDoc();
+        return informedConsentDoc;
     }
     }
 }
 }

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

@@ -4,9 +4,6 @@ import com.lantone.qc.pub.model.doc.NoticeOfConversationDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.ModelDocTrans;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
 /**
  * @Description: 谈话告知书
  * @Description: 谈话告知书
  * @author: wangyu
  * @author: wangyu
@@ -14,8 +11,8 @@ import java.util.List;
  */
  */
 public class ChangxNoticeOfConversationDocTrans extends ModelDocTrans {
 public class ChangxNoticeOfConversationDocTrans extends ModelDocTrans {
     @Override
     @Override
-    public List<NoticeOfConversationDoc> extract(MedrecVo medrecVo) {
-        List<NoticeOfConversationDoc> noticeOfConversationDocs = new ArrayList<>();
-        return noticeOfConversationDocs;
+    public NoticeOfConversationDoc extract(MedrecVo medrecVo) {
+        NoticeOfConversationDoc noticeOfConversationDoc = new NoticeOfConversationDoc();
+        return noticeOfConversationDoc;
     }
     }
 }
 }

+ 2 - 2
trans/src/main/java/com/lantone/qc/trans/taizhou/TaizhouDocTrans.java

@@ -114,11 +114,11 @@ public class TaizhouDocTrans extends DocTrans {
                     break;
                     break;
                 case "知情同意书":
                 case "知情同意书":
                     TaizhouInformedConsentDocTrans taizhouInformedConsentDocTrans = new TaizhouInformedConsentDocTrans();
                     TaizhouInformedConsentDocTrans taizhouInformedConsentDocTrans = new TaizhouInformedConsentDocTrans();
-                    inputInfo.setInformedConsentDocs(taizhouInformedConsentDocTrans.extract(i));
+                    inputInfo.setInformedConsentDoc(taizhouInformedConsentDocTrans.extract(i));
                     break;
                     break;
                 case "谈话告知书":
                 case "谈话告知书":
                     TaizhouNoticeOfConversationDocTrans taizhouNoticeOfConversationDocTrans = new TaizhouNoticeOfConversationDocTrans();
                     TaizhouNoticeOfConversationDocTrans taizhouNoticeOfConversationDocTrans = new TaizhouNoticeOfConversationDocTrans();
-                    inputInfo.setNoticeOfConversationDocs(taizhouNoticeOfConversationDocTrans.extract(i));
+                    inputInfo.setNoticeOfConversationDoc(taizhouNoticeOfConversationDocTrans.extract(i));
                     break;
                     break;
                 default:
                 default:
                     break;
                     break;

+ 3 - 6
trans/src/main/java/com/lantone/qc/trans/taizhou/TaizhouInformedConsentDocTrans.java

@@ -4,9 +4,6 @@ import com.lantone.qc.pub.model.doc.InformedConsentDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.ModelDocTrans;
 
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
 /**
  * @Description: 知情同意书
  * @Description: 知情同意书
  * @author: wangyu
  * @author: wangyu
@@ -14,8 +11,8 @@ import java.util.List;
  */
  */
 public class TaizhouInformedConsentDocTrans extends ModelDocTrans {
 public class TaizhouInformedConsentDocTrans extends ModelDocTrans {
     @Override
     @Override
-    public List<InformedConsentDoc> extract(MedrecVo medrecVo) {
-        List<InformedConsentDoc> informedConsentDocs = new ArrayList<>();
-        return informedConsentDocs;
+    public InformedConsentDoc extract(MedrecVo medrecVo) {
+        InformedConsentDoc informedConsentDoc = new InformedConsentDoc();
+        return informedConsentDoc;
     }
     }
 }
 }

+ 6 - 4
trans/src/main/java/com/lantone/qc/trans/taizhou/TaizhouNoticeOfConversationDocTrans.java

@@ -4,8 +4,8 @@ import com.lantone.qc.pub.model.doc.NoticeOfConversationDoc;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.pub.model.vo.MedrecVo;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.ModelDocTrans;
 
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
+import java.util.Map;
 
 
 /**
 /**
  * @Description: 谈话告知书
  * @Description: 谈话告知书
@@ -14,8 +14,10 @@ import java.util.List;
  */
  */
 public class TaizhouNoticeOfConversationDocTrans extends ModelDocTrans {
 public class TaizhouNoticeOfConversationDocTrans extends ModelDocTrans {
     @Override
     @Override
-    public List<NoticeOfConversationDoc> extract(MedrecVo medrecVo) {
-        List<NoticeOfConversationDoc> noticeOfConversationDocs = new ArrayList<>();
-        return noticeOfConversationDocs;
+    public NoticeOfConversationDoc extract(MedrecVo medrecVo) {
+        NoticeOfConversationDoc noticeOfConversationDoc = new NoticeOfConversationDoc();
+        Map<String, List<String>> map = (Map)medrecVo.getContent().get("content");
+        noticeOfConversationDoc.getStructureMap().put("","");
+        return noticeOfConversationDoc;
     }
     }
 }
 }