1.老人家属列表添加姓名

hmit-api/src/main/java/io/hmit/modules/serviceOrder/dto/PensionOldFamilyDTO.java

@@ -31,6 +31,9 @@ public class PensionOldFamilyDTO implements Serializable {
 	@ApiModelProperty(value = "家属id")
 	private Long familyMemberId;
 
+	@ApiModelProperty(value = "家属姓名")
+	private String familyMemberName;
+
 	@ApiModelProperty(value = "家属与老人的关系")
 	private String familyMemberRole;
 
@@ -40,7 +43,4 @@ public class PensionOldFamilyDTO implements Serializable {
 	@ApiModelProperty(value = "身份证号")
 	private String idCardNo;
 
-	@ApiModelProperty(value = "备注")
-	private String remark;
-
 }
\ No newline at end of file

hmit-api/src/main/resources/mapper/serviceOrder/PensionOldFamilyDao.xml

@@ -17,7 +17,9 @@
     </resultMap>
 
     <select id="findByOldId" resultType="io.hmit.modules.serviceOrder.dto.PensionOldFamilyDTO">
-        SELECT * FROM pension_old_family pof, tb_user tu
+        SELECT tu.id, pof.old_id, pof.parent_role, pof.family_member_id, tu.username AS familyMemberName,
+               pof.family_member_role, tu.mobile, tu.id_card_no
+        FROM pension_old_family pof, tb_user tu
         WHERE pof.family_member_id = tu.id and pof.old_id = #{oldId}
     </select>