zhoutg преди 5 години
родител
ревизия
69b2fd3822
променени са 1 файла, в които са добавени 10 реда и са изтрити 14 реда
  1. 10 14
      trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouBeHospitalizedDocTrans.java

+ 10 - 14
trans/src/main/java/com/lantone/qc/trans/taizhou/TaiZhouBeHospitalizedDocTrans.java

@@ -14,8 +14,6 @@ import com.lantone.qc.pub.model.label.PresentLabel;
 import com.lantone.qc.pub.model.label.VitalLabel;
 import com.lantone.qc.pub.model.label.VitalLabelSpecial;
 import com.lantone.qc.pub.model.vo.MedrecVo;
-import com.lantone.qc.pub.util.DateUtil;
-import com.lantone.qc.pub.util.StringUtil;
 import com.lantone.qc.trans.ModelDocTrans;
 import com.lantone.qc.trans.comsis.OrdinaryAssistant;
 import com.lantone.qc.trans.taizhou.util.TzXmlUtil;
@@ -31,7 +29,6 @@ import java.util.Map;
 public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
 
     /**
-     * CRF规则:主诉、现病史
      *
      * @param medrecVo
      * @return
@@ -42,11 +39,7 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
 
         Map<String, String> sourceMap = TzXmlUtil.getXmlToMapForTZ(content); // xml原始数据给华卓
         Map<String, String> structureMap = OrdinaryAssistant.mapKeyContrast(sourceMap, keyContrasts);
-        // 年龄从生日转换
-        if (StringUtil.isBlank(structureMap.get("年龄")) && StringUtil.isNotBlank(structureMap.get("出生日期"))) {
-            int age = DateUtil.getAge(structureMap.get("出生日期"));
-            structureMap.put("年龄", String.valueOf(age));
-        }
+
         BeHospitalizedDoc beHospitalizedDoc = beHospitalizedDocGen(structureMap); // 不走共用
         beHospitalizedDoc.setText(content);
         beHospitalizedDoc.setPageData((Map)sourceMap);
@@ -396,7 +389,7 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
 
 
     /**
-     * 入院记录不走CRF
+     * 入院记录
      *
      * @param structureMap
      * @return
@@ -404,15 +397,17 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
     public static BeHospitalizedDoc beHospitalizedDocGen(Map<String, String> structureMap) {
         BeHospitalizedDoc beHospitalizedDoc = new BeHospitalizedDoc();
 
+        // 走模型
         ChiefLabel chiefLabel = new ChiefLabel();
         chiefLabel.setText(structureMap.get("主诉"));
         beHospitalizedDoc.setChiefLabel(chiefLabel);
-        structureMap.remove("主诉");
+//        structureMap.remove("主诉");
 
+        // 走模型
         PresentLabel presentLabel = new PresentLabel();
         presentLabel.setText(structureMap.get("现病史"));
         beHospitalizedDoc.setPresentLabel(presentLabel);
-        structureMap.remove("现病史");
+//        structureMap.remove("现病史");
 
         PastLabel pastLabel = new PastLabel();
         pastLabel.setCrfLabel(false);
@@ -456,26 +451,27 @@ public class TaiZhouBeHospitalizedDocTrans extends ModelDocTrans {
         beHospitalizedDoc.setVitalLabelSpecial(vitalLabelSpecial);
 //        structureMap.remove("专科体格检查");
 
+        // 走模型
         PacsLabel pacsLabel = new PacsLabel();
         pacsLabel.setCrfLabel(false);
         pacsLabel.setText(structureMap.get("辅助检查"));
         beHospitalizedDoc.setPacsLabel(pacsLabel);
 //        structureMap.remove("辅助检查");
 
+        // 走模型
         DiagLabel initialDiagLabel = new DiagLabel();
-        initialDiagLabel.setCrfLabel(false);
         initialDiagLabel.setText(structureMap.get("初步诊断"));
         beHospitalizedDoc.setInitialDiagLabel(initialDiagLabel);
 //        structureMap.remove("初步诊断");
 
+        // 走模型
         DiagLabel revisedDiagLabel = new DiagLabel();
-        revisedDiagLabel.setCrfLabel(false);
         revisedDiagLabel.setText(structureMap.get("修正诊断"));
         beHospitalizedDoc.setRevisedDiagLabel(revisedDiagLabel);
 //        structureMap.remove("修正诊断");
 
+        // 走模型
         DiagLabel suppleDiagLabel = new DiagLabel();
-        suppleDiagLabel.setCrfLabel(false);
         suppleDiagLabel.setText(structureMap.get("补充诊断"));
         beHospitalizedDoc.setSuppleDiagLabel(suppleDiagLabel);
 //        structureMap.remove("补充诊断");