Merge remote-tracking branch 'origin/dev_2.0.0' into dev_2.0.0

virtual-patient-manage/src/main/java/com/supervision/manage/pojo/vo/MedicalRecInfoVO.java

@@ -15,6 +15,9 @@ import java.util.List;
 @ApiModel(value = "病历管理详细信息", parent = MedicalRecManageVO.class)
 public class MedicalRecInfoVO extends MedicalRecManageVO {
 
+    @ApiModelProperty("疾病名称")
+    private  String diseaseName;
+
     @ApiModelProperty("辅助检查")
     private List<DiseaseAncillaryResVo> ancillaryList;
 

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/MedicalRecManageServiceImpl.java

@@ -193,6 +193,7 @@ public class MedicalRecManageServiceImpl implements MedicalRecManageService {
     public MedicalRecInfoVO queryMedicalRecInfo(String id) {
         MedicalRec medicalRec = medicalRecService.getById(id);
         MedicalRecInfoVO medicalRecInfoVO = BeanUtil.toBean(medicalRec, MedicalRecInfoVO.class);
+        medicalRecInfoVO.setDiseaseName(diseaseService.getById(medicalRec.getDiseaseId()).getDiseaseName());
         // 病人基本信息
         medicalRecInfoVO.setPatient(patientService.getById(medicalRec.getPatientId()));
         // 辅助检查