修改命名

src/main/java/com/docus/demo/service/SyncBasicFileImpl.java

@@ -215,12 +215,12 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
             String admissId = fileUploadJpg.get(0).getAdmissId();
             Date disDate = fileUploadJpg.get(0).getDisDate();
             //组织基础数据
-            Tbasic tbasic = this.getTbasic(fileUploadJpg);
+            Tbasic addTbasic = this.getTbasic(fileUploadJpg);
             List<TbasicSub> tbasicSubList = this.getTbasicSubList(fileUploadJpg);
-            tbasics.add(tbasic);
+            tbasics.add(addTbasic);
             //查询是否存在更新，不存在新增
             Tbasic tBasic = basicMapper.getTbasicPatientId(admissId);
-            if (StringUtils.isNotBlank(tbasic.getPh())){
+            if (StringUtils.isNotBlank(tBasic.getPh())){
                 return CommonResult.success("存在盘号,保存成功");
             }
             if (ObjectUtil.isEmpty(tBasic)) {
@@ -358,52 +358,52 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
 
     private Tbasic getTbasic(List<FileUploadJpgDto> fileUploadJpg) {
         FileUploadJpgDto fileUploadJpgDto = fileUploadJpg.get(0);
-        Tbasic tbasic = new Tbasic();
-        tbasic.setPatientId(String.valueOf(SnowflakeIdWorker.idWorker.nextId()));
-        tbasic.setAdmissTimes(fileUploadJpgDto.getAdmissTimes());
-        tbasic.setInpatientNo(fileUploadJpgDto.getInpatientNo());
-        tbasic.setAdmissId(fileUploadJpgDto.getAdmissId());
-        tbasic.setName(fileUploadJpgDto.getName());
-        tbasic.setSex(fileUploadJpgDto.getSex());
-        tbasic.setAge(fileUploadJpgDto.getAge());
+        Tbasic addTbasic = new Tbasic();
+        addTbasic.setPatientId(String.valueOf(SnowflakeIdWorker.idWorker.nextId()));
+        addTbasic.setAdmissTimes(fileUploadJpgDto.getAdmissTimes());
+        addTbasic.setInpatientNo(fileUploadJpgDto.getInpatientNo());
+        addTbasic.setAdmissId(fileUploadJpgDto.getAdmissId());
+        addTbasic.setName(fileUploadJpgDto.getName());
+        addTbasic.setSex(fileUploadJpgDto.getSex());
+        addTbasic.setAge(fileUploadJpgDto.getAge());
         if (StringUtils.isNotBlank(fileUploadJpgDto.getIdCard())) {
-            tbasic.setIdCard(fileUploadJpgDto.getIdCard());
+            addTbasic.setIdCard(fileUploadJpgDto.getIdCard());
         }
-        tbasic.setAdmissDate(fileUploadJpgDto.getAdmissDate());
+        addTbasic.setAdmissDate(fileUploadJpgDto.getAdmissDate());
         if (StringUtils.isNotBlank(fileUploadJpgDto.getAdmissDept())) {
-            tbasic.setAdmissDept(fileUploadJpgDto.getAdmissDept());
+            addTbasic.setAdmissDept(fileUploadJpgDto.getAdmissDept());
         }
         if (StringUtils.isNotBlank(fileUploadJpgDto.getAdmissDeptName())) {
-            tbasic.setAdmissDeptName(fileUploadJpgDto.getAdmissDeptName());
+            addTbasic.setAdmissDeptName(fileUploadJpgDto.getAdmissDeptName());
         }
-        tbasic.setDisDate(fileUploadJpgDto.getDisDate());
+        addTbasic.setDisDate(fileUploadJpgDto.getDisDate());
         if (StringUtils.isNotBlank(fileUploadJpgDto.getDisDept())) {
-            tbasic.setDisDept(fileUploadJpgDto.getDisDept());
+            addTbasic.setDisDept(fileUploadJpgDto.getDisDept());
         }
         if (StringUtils.isNotBlank(fileUploadJpgDto.getDisDeptName())) {
-            tbasic.setDisDeptName(fileUploadJpgDto.getDisDeptName());
+            addTbasic.setDisDeptName(fileUploadJpgDto.getDisDeptName());
         }
         if (StringUtils.isNotBlank(fileUploadJpgDto.getMainDiagName())) {
-            tbasic.setMainDiagName(fileUploadJpgDto.getMainDiagName());
+            addTbasic.setMainDiagName(fileUploadJpgDto.getMainDiagName());
         }
         if (StringUtils.isNotBlank(fileUploadJpgDto.getMainDiagCode())) {
-            tbasic.setMainDiagCode(fileUploadJpgDto.getMainDiagCode());
+            addTbasic.setMainDiagCode(fileUploadJpgDto.getMainDiagCode());
         }
         if (StringUtils.isNotBlank(fileUploadJpgDto.getMainOperateName())) {
-            tbasic.setMainOperateName(fileUploadJpgDto.getMainOperateName());
+            addTbasic.setMainOperateName(fileUploadJpgDto.getMainOperateName());
         }
         if (StringUtils.isNotBlank(fileUploadJpgDto.getMainOperateCode())) {
-            tbasic.setMainOperateCode(fileUploadJpgDto.getMainOperateCode());
+            addTbasic.setMainOperateCode(fileUploadJpgDto.getMainOperateCode());
         }
-        tbasic.setBColumn8(1);
-        tbasic.setIsArchive(1);
-        tbasic.setArchiveFileStorageType(2);
-        tbasic.setCreateTime(new Date());
-        tbasic.setFileSource(2);
-        tbasic.setWardPalce(fileUploadJpgDto.getWardPalce());
-        tbasic.setScanSource("1");
-        tbasic.setScanUploadState(1);
-        return tbasic;
+        addTbasic.setBColumn8(1);
+        addTbasic.setIsArchive(1);
+        addTbasic.setArchiveFileStorageType(2);
+        addTbasic.setCreateTime(new Date());
+        addTbasic.setFileSource(2);
+        addTbasic.setWardPalce(fileUploadJpgDto.getWardPalce());
+        addTbasic.setScanSource("1");
+        addTbasic.setScanUploadState(1);
+        return addTbasic;
     }