ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceRelativesconfirmation.java
@@ -288,6 +288,18 @@ * 家属意见备注 */ @ApiModelProperty("家属意见备注") private String relativeconfirmationsignname; /** * 亲属姓名 */ @ApiModelProperty("亲属姓名") private String relativeRemark; /** * 亲属证件号 */ @ApiModelProperty("亲属证件号") private String relativeidcardno; }
@@ -280,4 +280,16 @@ */ @ApiModelProperty("家属意见备注") private String relativeRemark; /** * 家属意见备注 */ @ApiModelProperty("亲属姓名") private String relativeconfirmationsignname; /** * 家属意见备注 */ @ApiModelProperty("亲属证件号") private String relativeidcardno; } ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportFileServiceImpl.java
@@ -103,6 +103,7 @@ // 添加新的记录 for (ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile : serviceDonatebaseinfoReportFiles) { if (StringUtils.isNotEmpty(serviceDonatebaseinfoReportFile.getFileName()) ) { serviceDonatebaseinfoReportFile.setId(null); serviceDonatebaseinfoReportFile.setUpdateBy(updateName); serviceDonatebaseinfoReportFile.setUpdateTime(new Date()); serviceDonatebaseinfoReportFile.setCaseNo(caseNo); ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonatebaseinfoReportServiceImpl.java
@@ -121,10 +121,13 @@ //将report数据复制到serviceDonatebaseinfo中 ServiceDonatebaseinfo serviceDonatebaseinfo1 = DtoConversionUtils.sourceToTarget(serviceDonatebaseinfoReport, ServiceDonatebaseinfo.class); serviceDonatebaseinfo1.setId(null); serviceDonatebaseinfo1.setReportId(serviceDonatebaseinfoReport.getId()); serviceDonatebaseinfo1.setReporterno(serviceDonatebaseinfoReport.getCoordinatorNo()); serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName()); serviceDonatebaseinfo1.setCurrentHospital(serviceDonatebaseinfoReport.getToHospital()); serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName()); serviceDonatebaseinfo1.setBloodtype(serviceDonatebaseinfoReport.getBloodType()); serviceDonatebaseinfo1.setRhyin(serviceDonatebaseinfoReport.getRhYin()); //先通过caseNo查询是否存在 ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo(); serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo()); ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceTransportServiceImpl.java
@@ -57,7 +57,7 @@ for (ServiceTransport serviceTransport1 : list) { ServiceTransportFile serviceTransportFile = new ServiceTransportFile(); serviceTransportFile.setDelFlag(0); serviceTransportFile.setTransportId(serviceTransport1.getReportId()); serviceTransportFile.setTransportId(serviceTransport1.getId()); serviceTransportFile.setCaseNo(serviceTransport1.getCaseNo()); List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);
@@ -52,6 +52,8 @@ <result property="occupation" column="occupation"/> <result property="assessannex" column="assessannex"/> <result property="relativeRemark" column="relative_remark"/> <result property="relativeconfirmationsignname" column="relativeconfirmationsignname"/> <result property="relativeidcardno" column="relativeidcardno"/> </resultMap> <sql id="selectServiceRelativesconfirmationVo"> @@ -303,7 +305,9 @@ sr.occupation as occupation, sr.relative_remark as relativeRemark, sr.assessannex as assessannex, sr.education as education sr.education as education, sr.relativeconfirmationsignname, sr.relativeidcardno FROM service_donatebaseinfo sd LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0 AND sr.del_flag = 0
