Merge branch 'master' into innerDevelop

src/main/java/com/diagbot/entity/relationship/PacsOralMedicine.java

@@ -1,18 +0,0 @@
-package com.diagbot.entity.relationship;
-
-import com.diagbot.entity.node.PacsName;
-import com.diagbot.entity.node.OralMedicine;
-import com.diagbot.entity.relationship.base.BaseRelation;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.*;
-
-@Getter
-@Setter@RelationshipEntity(type = "辅助检查名称禁忌服用药品")
-public class PacsOralMedicine extends BaseRelation {
-    @StartNode
-    private PacsName pacsName;
-
-    @EndNode
-    private OralMedicine oralMedicine;
-}

src/main/java/com/diagbot/entity/relationship/PacsPacsDescribe.java

@@ -1,18 +0,0 @@
-package com.diagbot.entity.relationship;
-
-import com.diagbot.entity.node.PacsName;
-import com.diagbot.entity.node.PacsDescribe;
-import com.diagbot.entity.relationship.base.BaseRelation;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.*;
-
-@Getter
-@Setter@RelationshipEntity(type = "辅助检查名称禁忌辅助检查名称描述")
-public class PacsPacsDescribe extends BaseRelation {
-    @StartNode
-    private PacsName pacsName;
-
-    @EndNode
-    private PacsDescribe pacsDescribe;
-}

src/main/java/com/diagbot/entity/relationship/PacsPacsSubName.java

@@ -1,18 +0,0 @@
-package com.diagbot.entity.relationship;
-
-import com.diagbot.entity.node.PacsName;
-import com.diagbot.entity.node.PacsSubName;
-import com.diagbot.entity.relationship.base.BaseRelation;
-import lombok.Getter;
-import lombok.Setter;
-import org.neo4j.ogm.annotation.*;
-
-@Getter
-@Setter@RelationshipEntity(type = "辅助检查名称包含辅助检查子项目名称")
-public class PacsPacsSubName extends BaseRelation {
-    @StartNode
-    private PacsName pacsName;
-
-    @EndNode
-    private PacsSubName pacsSubName;
-}

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

@@ -1046,6 +1046,8 @@ public class NeoFacade {
                     } else {
                         redisUtil.updateValue(type + "Conv:" + s, s);
                     }
+                } else {
+                    redisUtil.updateValue(type + "Conv:" + s, s);
                 }
                 typeMap.put(s, lastS);
             }

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

@@ -1,6 +1,5 @@
 package com.diagbot.facade;
 
-import cn.afterturn.easypoi.excel.annotation.Excel;
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.biz.push.entity.Pacs;
@@ -11,7 +10,11 @@ import com.diagbot.dto.StandConvertCrfDTO;
 import com.diagbot.enums.RedisEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.util.*;
+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.vo.Drug;
 import com.diagbot.vo.IndicationPushVO;
 import com.diagbot.vo.ItemExt;
@@ -24,7 +27,6 @@ import io.github.lvyahui8.spring.facade.DataFacade;
 import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.FileItemFactory;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
@@ -35,7 +37,12 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -66,6 +73,7 @@ public class TestFacade {
         List<TestExport> testExportList = new ArrayList<>();
         TestExport testExport = new TestExport();
         testExport.setName("名称1");
+        testExport.setSex("女性");
         testExportList.add(testExport);
         ExcelUtils.exportExcel(testExportList, null, "sheet1", TestExport.class, "名称.xls", response, 12.8f);
         // ExcelUtils.exportExcel(lisList, "化验导出名称", "导出", TestExport.class, "名称", response);

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

@@ -18,6 +18,9 @@ public class TestExport implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @Excel(name="名称", width = 40, orderNum = "1", isImportField = "true")
+    @Excel(name="名称", width = 40, orderNum = "10")
     private String name;
+
+    @Excel(name="性别", width = 40, orderNum = "2")
+    private String sex;
 }

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

@@ -46,9 +46,8 @@ public class TestController {
     @ApiOperation(value = "导出[zhoutg]",
             notes = "导出")
     @PostMapping("/testExport")
-    public RespDTO<Map<String, Object>> testExport(HttpServletResponse response) {
+    public void testExport(HttpServletResponse response) {
         testFacade.exportExcel(response);
-        return RespDTO.onSuc(null);
     }
 
     @ApiOperation(value = "开单合理性【输血】测试API[zhoutg]",