市一同步联众数据

src/main/java/com/docus/demo/dto/FileUploadJpgDto.java

@@ -59,4 +59,7 @@ public class FileUploadJpgDto {
     @ApiModelProperty(value = "院区")
     private String wardPalce;
 
+    @ApiModelProperty(value = "出生年月")
+    private Date birthday;
+
 }

src/main/java/com/docus/demo/entity/Tbasic.java

@@ -44,6 +44,9 @@ public class Tbasic {
     @ApiModelProperty(value = "身份证")
     private String idCard;
 
+    @ApiModelProperty(value = "是否扫描")
+    private String scanSource;
+
     @ApiModelProperty(value = "手机号码")
     private String telphone;
 

src/main/java/com/docus/demo/mapper/mysql/BasicMapper.java

@@ -35,6 +35,8 @@ public interface BasicMapper {
 
     void insertOrUpdateTbasicSub(@Param("list") List<TbasicSub> tbasicSubList);
 
+    void delTbasicSub(@Param("patientId")String patientId);
+
     String getTbasicPatientId(@Param("admissId")String admissId);
 
     Boolean delTbasicByPatientId(@Param("admissId")String admissId);

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

@@ -210,11 +210,13 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
             Date disDate = fileUploadJpg.get(0).getDisDate();
             //组织基础数据
             Tbasic tbasic = this.getTbasic(fileUploadJpg);
+            List<TbasicSub> tbasicSubList = this.getTbasicSubList(fileUploadJpg);
             tbasics.add(tbasic);
             //查询是否存在更新，不存在新增
             String basicPatientId = basicMapper.getTbasicPatientId(admissId);
             if (StringUtils.isBlank(basicPatientId)) {
                 if (!basicMapper.addBasic(tbasics)) {
+                    basicMapper.insertOrUpdateTbasicSub(tbasicSubList);
                     log.info("新增PatientId为:" + patientId + "的基础数据失败");
                     return CommonResult.failed("新增PatientId为:" + patientId + "的基础数据失败");
                 } else {
@@ -223,6 +225,10 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
             } else {
                 //存在时先删除基础数据图像数据，后新增
                 if (basicMapper.delTbasicByPatientId(admissId)) {
+                    //删除tbasic拓展表
+                    basicMapper.delTbasicSub(basicPatientId);
+                    //薪资拓展表
+                    basicMapper.insertOrUpdateTbasicSub(tbasicSubList);
                     //删除路径图像
                     List<ScanAssort> scanAssort = scanAssortMapper.getScanAssort(basicPatientId);
                     if (!CollectionUtils.isEmpty(scanAssort)) {
@@ -304,6 +310,16 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
         return filePathdir;
     }
 
+
+    private List<TbasicSub> getTbasicSubList(List<FileUploadJpgDto> tbasicList) {
+        return tbasicList.stream().map(m->{
+            TbasicSub tbasicSub = new TbasicSub();
+            tbasicSub.setBirthday(m.getBirthday());
+            tbasicSub.setPatientId(m.getPatientId());
+            return tbasicSub;
+        }).collect(Collectors.toList());
+    }
+
     private ScanAssort addScanAssort(String patientId, String filePathdir, MultipartFile file, FileUploadJpgDto dto, int[] sort) {
         //文件保存地址
         String toJpgFilePath = filePathdir + File.separatorChar + dto.getUploadFileName();
@@ -376,6 +392,8 @@ public class SyncBasicFileImpl implements ISyncBasicFileService {
         tbasic.setCreateTime(new Date());
         tbasic.setFileSource(2);
         tbasic.setWardPalce(fileUploadJpgDto.getWardPalce());
+        tbasic.setScanSource("1");
+        tbasic.setScanUploadState(1);
         return tbasic;
     }
 

src/main/resources/mapper/mysql/BasicMapper.xml

@@ -50,7 +50,7 @@
         dis_dept,dis_dept_name,main_diag_code,main_diag_name,
         main_operate_code,main_operate_name,create_time,is_archive,
         file_source,b_column5,b_column8,archive_file_storage_type,
-        scan_upload_state,ward_palce
+        scan_upload_state,ward_palce,scan_source
         )
         values
         <foreach collection="list" item="item" separator=",">
@@ -60,7 +60,7 @@
             #{item.disDept},#{item.disDeptName},#{item.mainDiagCode},#{item.mainDiagName},
             #{item.mainOperateCode},#{item.mainOperateName},#{item.createTime},#{item.isArchive},
             #{item.fileSource},#{item.bColumn5},#{item.bColumn8},#{item.archiveFileStorageType},
-            #{item.scanUploadState}, #{item.wardPalce}
+            #{item.scanUploadState}, #{item.wardPalce},#{item.scanSource}
             )
         </foreach>
     </insert>
@@ -74,6 +74,9 @@
     <delete id="delTbasicByPatientId">
         delete from docus_medicalrecord.t_basic where admiss_id=#{admissId}
     </delete>
+    <delete id="delTbasicSub">
+        delete from docus_medicalrecord.t_basic_sub where patient_id=#{patientId}
+    </delete>
 
 
     <select id="getBasicVoList" resultType="com.docus.demo.vo.BasicVo">