ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonatebaseinfo.java
@@ -543,5 +543,17 @@ @ApiModelProperty("案例序号") private String donateno; @ApiModelProperty("当前医疗机构") private String currentMedicalInstitution; } @ApiModelProperty("首次医疗机构") private String firstMedicalInstitution; @ApiModelProperty("当前医疗机构科室") private String currentDept; @ApiModelProperty("首次医疗机构科室") private String firstDept; } ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonationwitness.java
@@ -1,6 +1,7 @@ package com.ruoyi.project.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -12,184 +13,277 @@ /** * 捐献见证对象 service_donationwitness * * * @author ruoyi * @date 2021-11-17 */ @Data @ApiModel("捐献见证") public class ServiceDonationwitness extends BaseEntity { public class ServiceDonationwitness extends BaseEntity { private static final long serialVersionUID = 1L; /** $column.columnComment */ /** * $column.columnComment */ @ApiModelProperty("$column.columnComment") //数据库自增改成@TableId(type = IdType.AUTO) @TableId(type = IdType.AUTO) private Long id; /** */ /** * */ @ApiModelProperty("") private Long infoid; /** 捐献者编号 */ /** * 捐献者编号 */ @ApiModelProperty("捐献者编号") @Excel(name = "捐献者编号") private String donorno; /** 器官获取机构编号 */ /** * 器官获取机构编号 */ @ApiModelProperty("器官获取机构编号") private String gainhospitalno; /** 器官获取机构名称 */ /** * 器官获取机构名称 */ @ApiModelProperty("器官获取机构名称") @Excel(name = "器官获取机构名称") private String gainhospitalname; /** 死亡时间 */ /** * 死亡时间 */ @ApiModelProperty("死亡时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "死亡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date deathtime; /** 死亡原因 */ /** * 死亡原因 */ @ApiModelProperty("死亡原因") @Excel(name = "死亡原因") private String deathreason; /** 死亡判定医生一 */ /** * 死亡判定医生一 */ @ApiModelProperty("死亡判定医生一") @Excel(name = "死亡判定医生一") private String deathjudgedocto; /** 死亡判定医生二 */ /** * 死亡判定医生二 */ @ApiModelProperty("死亡判定医生二") @Excel(name = "死亡判定医生二") private String deathjudgedoctt; /** 死亡证明附件路径 */ /** * 死亡证明附件路径 */ @ApiModelProperty("死亡证明附件路径") private String deathjudgeannex; /** 手术开始时间 */ /** * 手术开始时间 */ @ApiModelProperty("手术开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "手术开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date operationbegtime; /** 手术结束时间 */ /** * 手术结束时间 */ @ApiModelProperty("手术结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "手术结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date operationendtime; /** 手术医生 */ /** * 手术医生 */ @ApiModelProperty("手术医生") @Excel(name = "手术医生") private String operationdoctor; /** 是否默哀缅怀仪式 */ /** * 是否默哀缅怀仪式 */ @ApiModelProperty("是否默哀缅怀仪式") @Excel(name = "是否默哀缅怀仪式") private Integer isspendremember; /** 是否恢复遗体仪容 */ /** * 是否恢复遗体仪容 */ @ApiModelProperty("是否恢复遗体仪容") @Excel(name = "是否恢复遗体仪容") private Integer isrestoreremains; /** 缅怀仪式附件路径 */ /** * 缅怀仪式附件路径 */ @ApiModelProperty("缅怀仪式附件路径") private String rememberannex; /** 负责人编号 */ /** * 负责人编号 */ @ApiModelProperty("负责人编号") private String responsibleuserid; /** 负责人姓名 */ /** * 负责人姓名 */ @ApiModelProperty("负责人姓名") @Excel(name = "负责人姓名") private String responsibleusername; /** 联络人一编号 */ /** * 联络人一编号 */ @ApiModelProperty("联络人一编号") private String coordinateduserido; /** 联络人一姓名 */ /** * 联络人一姓名 */ @ApiModelProperty("联络人一姓名") private String coordinatedusernameo; /** 联络人二编号 */ /** * 联络人二编号 */ @ApiModelProperty("联络人二编号") private String coordinateduseridt; /** 联络人二姓名 */ /** * 联络人二姓名 */ @ApiModelProperty("联络人二姓名") private String coordinatedusernamet; /** 腹主动脉插管时间 */ /** * 腹主动脉插管时间 */ @ApiModelProperty("腹主动脉插管时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "腹主动脉插管时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date abdominalaortacannulatime; /** 腹主动脉灌注时间 */ /** * 腹主动脉灌注时间 */ @ApiModelProperty("腹主动脉灌注时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "腹主动脉灌注时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date abdominalaortaperfusiontime; /** 门静脉插管时间 */ /** * 门静脉插管时间 */ @ApiModelProperty("门静脉插管时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "门静脉插管时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date portalveincannulatime; /** 门静脉灌注时间 */ /** * 门静脉灌注时间 */ @ApiModelProperty("门静脉灌注时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "门静脉灌注时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date portalveinperfusiontime; /** 肺动脉插管时间 */ /** * 肺动脉插管时间 */ @ApiModelProperty("肺动脉插管时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "肺动脉插管时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date pulmonaryarterycannulatime; /** 肺动脉灌注时间 */ /** * 肺动脉灌注时间 */ @ApiModelProperty("肺动脉灌注时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "肺动脉灌注时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date pulmonaryarteryperfusiontime; /** 主动脉插管时间 */ /** * 主动脉插管时间 */ @ApiModelProperty("主动脉插管时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "主动脉插管时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date aortacannulatime; /** 主动脉灌注时间 */ /** * 主动脉灌注时间 */ @ApiModelProperty("主动脉灌注时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Excel(name = "主动脉灌注时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date aortaperfusiontime; /** 捐献器官 */ /** * 捐献器官 */ @ApiModelProperty("捐献器官") @Excel(name = "捐献器官") private String organdonation; /** 捐献器官 其他 */ /** * 捐献器官 其他 */ @ApiModelProperty("捐献器官 其他") @Excel(name = "捐献器官 其他") private String organdonationOther; /** 捐献类别 */ /** * 捐献类别 */ @ApiModelProperty("捐献类别") @Excel(name = "捐献类别") private String donationcategory; /** * 协调员进手术室时间 */ @ApiModelProperty("协调员进手术室时间") @Excel(name = "协调员进手术室时间") private Date coordinatorInOperating; /** * 协调员出手术室时间 */ @ApiModelProperty("协调员出手术室时间") @Excel(name = "协调员出手术室时间") private Date coordinatorOutOperating; /** * 协调员签字 */ @ApiModelProperty("协调员签字") @Excel(name = "协调员签字") private String coorinatorSign; /** * 协调员签字时间 */ @ApiModelProperty("协调员签字时间") @Excel(name = "协调员签字时间") private Date coorinatorSignTime; }
@@ -12,7 +12,7 @@ /** * 捐献亲属确认对象 service_relativesconfirmation * * * @author ruoyi * @date 2021-11-15 */ @@ -185,5 +185,22 @@ @Excel(name = "签署日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date signdate; /** 民族 */ @ApiModelProperty("民族") private String nation; /** 学历 */ @ApiModelProperty("学历") private String education; /** 职业 */ @ApiModelProperty("职业") private String work; }
@@ -107,6 +107,10 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date endtime; private String city; private Date coordinatorInOperating; private Date coordinatorOutOperating; private String coorinatorSign; private Date coorinatorSignTime; private Integer workflow; private Integer terminationCase; } ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/RelativeConfirmationVO.java
@@ -107,6 +107,7 @@ private String city; private String operatorno; private String operatorname; private String work; private Integer workflow; private Integer terminationCase; } ruoyi-project/src/main/resources/mapper/project/ServiceDonatebaseinfoMapper.xml
@@ -81,6 +81,10 @@ <result property="workflow" column="workflow"/> <result property="donatetime" column="donatetime"/> <result property="donateno" column="donateno"/> <result property="currentMedicalInstitution" column="current_medical_institution"/> <result property="firstMedicalInstitution" column="first_medical_institution"/> <result property="currentDept" column="current_dept"/> <result property="firstDept" column="first_dept"/> </resultMap> <sql id="selectServiceDonatebaseinfoVo"> ruoyi-project/src/main/resources/mapper/project/ServiceDonationwitnessMapper.xml
@@ -43,11 +43,19 @@ <result property="organdonation" column="OrganDonation"/> <result property="organdonationOther" column="OrganDonation_Other"/> <result property="donationcategory" column="DonationCategory"/> <result property="coordinatorInOperating" column="coordinator_in_operating"/> <result property="coordinatorOutOperating" column="coordinator_out_operating"/> <result property="coorinatorSign" column="coorinator_sign"/> <result property="coorinatorSignTime" column="coorinator_sign_time"/> </resultMap> <sql id="selectServiceDonationwitnessVo"> select ID, InfoID, coordinator_in_operating, coordinator_out_operating, coorinator_sign, coorinator_sign_time, DonorNo, GainHospitalNo, GainHospitalName, @@ -160,6 +168,10 @@ `service_donationwitness`.`create_time` AS `createtime`, `service_donationwitness`.`update_by` AS `updateby`, `service_donationwitness`.`update_time` AS `updatetime` `service_donationwitness`.`coordinator_in_operating` AS `coordinatorInOperating` `service_donationwitness`.`coordinator_out_operating` AS `coordinatorOutOperating` `service_donationwitness`.`coorinator_sign` AS `coorinatorSign` `service_donationwitness`.`coorinator_sign_time` AS `coorinatorSignTime` FROM `service_donatebaseinfo` LEFT JOIN `service_donationwitness` ON ruoyi-project/src/main/resources/mapper/project/ServiceRelativesconfirmationMapper.xml
@@ -47,10 +47,13 @@ <result property="updateTime" column="update_time" /> <result property="operatorno" column="operatorno" /> <result property="operatorname" column="operatorname" /> <result property="nation" column="nation" /> <result property="education" column="education" /> <result property="work" column="work" /> </resultMap> <sql id="selectServiceRelativesconfirmationVo"> select ID, InfoID, DonorNo, Name, IDCardType, IDCardNo, Phone, ResidenceAddress, ResidenceProvince, ResidenceProvinceName, ResidenceCity, ResidenceCityName, ResidenceTown, ResidenceTownName, ResidenceCommunity, ResidenceCommunityName, ResidenceCountyCode, ResidenceCountyName, Kinship, Kinship_ChildrenNum, SignFamilyRelations, KinshipConfirmationSign, OrganDecision, OrganDecision_Other, RelativeConfirmationSign, FamilyRelations, AcquisitionTissueNo, AcquisitionTissueName, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, SignDate, del_flag, create_by, create_time, update_by, update_time,operatorname,operatorno from service_relativesconfirmation select ID, InfoID,nation,education,work, DonorNo, Name, IDCardType, IDCardNo, Phone, ResidenceAddress, ResidenceProvince, ResidenceProvinceName, ResidenceCity, ResidenceCityName, ResidenceTown, ResidenceTownName, ResidenceCommunity, ResidenceCommunityName, ResidenceCountyCode, ResidenceCountyName, Kinship, Kinship_ChildrenNum, SignFamilyRelations, KinshipConfirmationSign, OrganDecision, OrganDecision_Other, RelativeConfirmationSign, FamilyRelations, AcquisitionTissueNo, AcquisitionTissueName, ResponsibleUserID, ResponsibleUserName, CoordinatedUserIDO, CoordinatedUserNameO, CoordinatedUserIDT, CoordinatedUserNameT, SignDate, del_flag, create_by, create_time, update_by, update_time,operatorname,operatorno from service_relativesconfirmation </sql> <select id="selectServiceRelativesconfirmationList" parameterType="com.ruoyi.project.domain.ServiceRelativesconfirmation" resultMap="ServiceRelativesconfirmationResult"> @@ -149,6 +152,9 @@ `service_relativesconfirmation`.`update_time` AS `updateTime`, `service_relativesconfirmation`.`operatorno` AS `operatorno`, `service_relativesconfirmation`.`operatorname` AS `operatorname` `service_relativesconfirmation`.`nation` AS `nation` `service_relativesconfirmation`.`education` AS `education` `service_relativesconfirmation`.`work` AS `work` FROM `service_donatebaseinfo`
