Merge branch 'master' into innerDevelop

src/main/java/com/diagbot/facade/CommonFacade.java

@@ -253,8 +253,8 @@ public class CommonFacade {
         CoreUtil.setPropertyList(wordCrfDTO.getDrugOrder(),"name", "uniqueName", map.get(StandConvertEnum.drug.toString()));
         CoreUtil.setPropertyList(wordCrfDTO.getDrug(),"name", "uniqueName", map.get(StandConvertEnum.drug.toString()));
         //化验回填
-        CoreUtil.setPropertyList(lis, "name", "detailName", "uniqueName", map.get(StandConvertEnum.lis.toString()));
-        CoreUtil.setPropertyList(wordCrfDTO.getLisOrder(), "name", "detailName", "uniqueName", map.get(StandConvertEnum.lis.toString()));
+        CoreUtil.setPropertyList(lis,"detailName", "uniqueName", map.get(StandConvertEnum.lis.toString()));
+        CoreUtil.setPropertyList(wordCrfDTO.getLisOrder(), "name", "uniqueName", map.get(StandConvertEnum.lis.toString()));
         //辅助检查回填
         CoreUtil.setPropertyList(pacsList, "name", "uniqueName", map.get(StandConvertEnum.pacs.toString()));
         CoreUtil.setPropertyList(wordCrfDTO.getPacs(), "name", "uniqueName", map.get(StandConvertEnum.pacs.toString()));

src/main/java/com/diagbot/facade/OtherTipFacade.java

@@ -10,7 +10,6 @@ import com.diagbot.vo.IndicationPushVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -155,6 +154,9 @@ public class OtherTipFacade {
         // otherTipPacsNeoDTOList.add(otherTipPacsNeoDTO);
         // TODO 测试数据结束
         otherTipProcess.processPacs(otherTipPacsNeoDTOList, res);
+
+        // 结果去重处理
+        commonFacade.dealMsg(res.getOtherList());
     }
 
 }

src/main/java/com/diagbot/facade/TestFacade.java

@@ -10,11 +10,7 @@ import com.diagbot.dto.StandConvertCrfDTO;
 import com.diagbot.enums.RedisEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.ExcelUtils;
-import com.diagbot.util.ListUtil;
-import com.diagbot.util.RedisUtil;
-import com.diagbot.util.StringUtil;
+import com.diagbot.util.*;
 import com.diagbot.vo.Drug;
 import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.ItemExt;
@@ -37,11 +33,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -1192,4 +1184,50 @@ public class TestFacade {
 
         return list;
     }
+
+
+    public Map importBill(MultipartFile file, TestLineVO testLineVO) {
+        List<TestIndicationVO> data = ExcelUtils.importExcelMultiSheets(file, 0, 1, testLineVO.getSheetIndex(), TestIndicationVO.class);
+
+        Map<String, Object> res = new HashMap<>();
+        Map<String, Map<String, Object>> content = new HashMap<>();
+
+        String xg = "修改";
+        String sc = "删除";
+        String idnum = "3";
+
+        if (StringUtil.isNotBlank(testLineVO.getIdNum())) {
+            idnum = testLineVO.getIdNum();
+        }
+
+        for (TestIndicationVO bean : data) {
+            content.put(bean.getIdNum(), new HashMap<>());
+            Map<String, Object> item = content.get(bean.getIdNum());
+            item.put("item", bean);
+
+            if (null!=bean.getOrderType() && null!=bean.getNeoName()) {
+                if (bean.getOrderType().contains(xg) || bean.getNeoName().contains(xg)) {
+                    item.put("status", xg);
+                } else if (bean.getOrderType().contains(sc) || bean.getNeoName().contains(sc)) {
+                    item.put("status", sc);
+                }
+            }
+        }
+
+        for (String id : content.keySet()) {
+            Map<String, Object> item = content.get(id);
+            if (null!=item.get("status")) {
+                Map<String, String> detail = new HashMap<>();
+                detail.put("stdname", ((TestIndicationVO)item.get("item")).getStandName());
+                detail.put("orderType", ((TestIndicationVO)item.get("item")).getOrderType());
+                detail.put("neoName", ((TestIndicationVO)item.get("item")).getNeoName());
+                detail.put("neoType", ((TestIndicationVO)item.get("item")).getNeoType());
+                res.put(id, detail);
+            }
+        }
+
+        res.put("lines", res.size());
+
+        return res;
+    }
 }

src/main/java/com/diagbot/vo/TestIndicationVO.java

@@ -247,6 +247,7 @@ public class TestIndicationVO implements Serializable {
     private String ruleText;
     @Excel(name="药品类型")
     private String drugType;
+
     @Excel(name="状态")
     private String status;
 }

src/main/java/com/diagbot/web/TestController.java

@@ -140,5 +140,11 @@ public class TestController {
     public RespDTO<Map<String, Object>> testAll(TestAllVO testAllVO) {
         return RespDTO.onSuc(testFacade.testAll(testAllVO));
     }
+
+    @ApiOperation(value = "导入开单合理性文档[Mark]", notes = "")
+    @PostMapping("/importBill")
+    public RespDTO<Map<String, Object>> importBill(@RequestParam("file") MultipartFile file, TestLineVO testLineVO) {
+        return RespDTO.onSuc(testFacade.importBill(file, testLineVO));
+    }
 }