电子病历评级-推理

tran-service/src/main/java/com/diagbot/facade/EMRPushFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.EMRPushVO;
 import com.diagbot.vo.LisResult;
+import com.diagbot.vo.EMRLisResultVO;
 import com.diagbot.vo.LisResultVO;
 import com.diagbot.vo.PushVO;
 import com.google.common.collect.Lists;
@@ -42,22 +43,22 @@ public class EMRPushFacade {
         //化验项转公表内容,参数处理
         if (emrPushVO.getLis() != null && emrPushVO.getLis().size() > 0) {
             Map<String, Map<String, String>> lisConfigMap = tranLisConfigFacade.getLisConfigByHosCode(emrPushVO.getHosCode());
-            List<LisResultVO> lisResultVOList = emrPushVO.getLis();
-            List<LisResult> lisResultList = Lists.newLinkedList();
-            for (LisResultVO lisResultVO : lisResultVOList) {
-                if (StringUtil.isNotBlank(lisResultVO.getMealName()) && StringUtil.isNotBlank(lisResultVO.getItemName())) {
-                    lisResultVO.setUniqueName(lisConfigMap.get(lisResultVO.getMealName()).get(lisResultVO.getItemName()));
+            List<EMRLisResultVO> emrLisResultVOList = emrPushVO.getLis();
+            List<LisResultVO> lisResultVOList = Lists.newLinkedList();
+            for (EMRLisResultVO emrLisResultVO : emrLisResultVOList) {
+                if (StringUtil.isNotBlank(emrLisResultVO.getMealName()) && StringUtil.isNotBlank(emrLisResultVO.getItemName())) {
+                    emrLisResultVO.setUniqueName(lisConfigMap.get(emrLisResultVO.getMealName()).get(emrLisResultVO.getItemName()));
                 }
-                LisResult lisResult = new LisResult();
-                BeanUtil.copyProperties(lisResultVO, lisResult);
-                lisResult.setName(lisResultVO.getMealName());
-                lisResult.setDetailName(lisResultVO.getItemName());
-                lisResultList.add(lisResult);
+                LisResultVO lisResultVO = new LisResultVO();
+                BeanUtil.copyProperties(emrLisResultVO, lisResultVO);
+                lisResultVO.setName(emrLisResultVO.getMealName());
+                lisResultVO.setDetailName(emrLisResultVO.getItemName());
+                lisResultVO.setSource(1);
+                lisResultVOList.add(lisResultVO);
             }
-            pushVO.setLis(lisResultList);
+            pushVO.setLis(lisResultVOList);
         }
 
-        BeanUtil.copyProperties(emrPushVO, pushVO);
         RespDTO<ICSSPushDTO> respDTO = icssServiceClient.pushEMR(pushVO);
         return respDTO.data;
     }

tran-service/src/main/java/com/diagbot/vo/EMRLisResultVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/3/11 17:02
+ */
+@Getter
+@Setter
+public class EMRLisResultVO {
+    private String mealName;//套餐名称
+    private String itemName;//化验项名称
+    private String uniqueName;//公表名称
+    private Double value;//值
+    private Double maxValue;//最大值
+    private Double minValue;//最小值
+    private String units;//单位
+    private String otherValue;//其他结果，包括阴性阳性，文字描述等
+}

tran-service/src/main/java/com/diagbot/vo/EMRPushVO.java

@@ -26,7 +26,7 @@ public class EMRPushVO {
     private String symptom;
     private String diag;
     private String vital;
-    private List<LisResultVO> lis;
+    private List<EMRLisResultVO> lis;
     private String pacs;
     private String past;
     private String other;

tran-service/src/main/java/com/diagbot/vo/LisResultVO.java

@@ -6,17 +6,10 @@ import lombok.Setter;
 /**
  * @Description:
  * @Author:zhaops
- * @time: 2019/3/11 17:02
+ * @time: 2019/3/11 17:55
  */
 @Getter
 @Setter
-public class LisResultVO {
-    private String mealName;//套餐名称
-    private String itemName;//化验项名称
-    private String uniqueName;//公表名称
-    private Double value;//值
-    private Double maxValue;//最大值
-    private Double minValue;//最小值
-    private String units;//单位
-    private String otherValue;//其他结果，包括阴性阳性，文字描述等
+public class LisResultVO extends LisResult {
+    private Integer source;
 }

tran-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -24,7 +24,7 @@ public class PushVO {
     private String symptom;
     private String diag;
     private String vital;
-    private List<LisResult> lis;
+    private List<LisResultVO> lis;
     private String pacs;
     private String past;
     private String other;