Merge remote-tracking branch 'origin/dev/mapping20210603' into debug

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

@@ -426,6 +426,12 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
             return retList;
         }
 
+        //重复数据去重
+        dataList = dataList.stream().distinct().collect(Collectors.toList());
+        if (ListUtil.isEmpty(dataList)) {
+            return retList;
+        }
+
         //标准词匹配
         List<String> nameList = dataList.stream()
                 .filter(i -> StringUtil.isBlank(i.getHisDetailName()))
@@ -667,7 +673,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
      * @param hospitalId
      * @param type
      */
-    public void importExcel(MultipartFile file, Long hospitalId, Integer type, String userId) {
+    public Boolean importExcel(MultipartFile file, Long hospitalId, Integer type, String userId) {
         if (hospitalId == null) {
             hospitalId = Long.valueOf(SysUserUtils.getCurrentHospitalID());
         }
@@ -681,7 +687,8 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
         if (ListUtil.isEmpty(originList)) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "校验失败，导入数据不能为空");
         }
-        importDataProcess(originList, hospitalId, type, userId);
+        Boolean data = importDataProcess(originList, hospitalId, type, userId);
+        return data;
     }
 
     /**
@@ -691,7 +698,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
      * @param hospitalId
      * @param type
      */
-    public boolean importDataProcess(List<MappingConfigWrapper> originList, Long hospitalId, Integer type, String userId) {
+    public Boolean importDataProcess(List<MappingConfigWrapper> originList, Long hospitalId, Integer type, String userId) {
         List<MappingConfigWrapper> tempList = Lists.newLinkedList();
 
         Date now = DateUtil.now();
@@ -743,6 +750,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
             } else {
                 item.setCode("");
             }
+            rowId++;
         }
 
         //医院术语名称不允许为空

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

@@ -91,11 +91,12 @@ public class MappingConfigController {
     @PostMapping(value = "/importExcel", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     @SysLogger("importExcel")
     @Transactional
-    public void importExcel(@RequestParam("file") MultipartFile file,
+    public RespDTO<Boolean> importExcel(@RequestParam("file") MultipartFile file,
                             @RequestParam("hospitalId") Long hospitalId,
                             @RequestParam("type") Integer type,
                             @RequestParam("uesrId") String userId) {
-        mappingConfigFacade.importExcel(file, hospitalId, type, userId);
+        Boolean data = mappingConfigFacade.importExcel(file, hospitalId, type, userId);
+        return RespDTO.onSuc(data);
     }
 
 

src/main/resources/mapper/MappingConfigMapper.xml

@@ -111,7 +111,7 @@
                 t1.his_detail_name asc,
             </if>
         </if>
-        t1.is_match asc,t1.gmt_modified desc
+        t1.is_match desc,t1.gmt_modified desc
     </select>
 
     <select id="hisNameIndex" resultType="com.diagbot.entity.MappingConfig"