回显药品信息添加

icss-service/src/main/java/com/diagbot/dto/ReadInquiryDTO.java

@@ -33,4 +33,11 @@ public class ReadInquiryDTO{
 	
 	private List<InquiryDetail> detailList;
 	
+	
+	/**
+     * 问诊记录用药明细
+     */
+	@ApiModelProperty(value="问诊记录用药明细")
+	private List<ReadInquiryDrugDTO> drugList;
+	
 }

icss-service/src/main/java/com/diagbot/dto/ReadInquiryDrugDTO.java

@@ -0,0 +1,29 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2019/3/14 11:36
+ */
+@Getter
+@Setter
+public class ReadInquiryDrugDTO{
+	
+	
+	/**
+     * 药品标签id
+     */
+	@ApiModelProperty(value="药品标签id")
+    private Long questionId;
+
+    /**
+     * 药品标签名
+     */
+	@ApiModelProperty(value="药品标签名")
+    private String tagName;
+	
+}

icss-service/src/main/java/com/diagbot/facade/InquiryDrugFacade.java

@@ -38,5 +38,19 @@ public class InquiryDrugFacade extends InquiryDrugServiceImpl {
            super.saveBatch(inquiryDrugList);
         }
     }
+    
+    /**
+     * 根据问诊记录id获取问诊记录处方用药明细
+     *
+     * @param inquiryId
+     */
+    public List<InquiryDrug> getInquiryDrugs(Long inquiryId) {
+        QueryWrapper<InquiryDrug> queryWrapper = new QueryWrapper<InquiryDrug>();
+        queryWrapper.eq("inquiry_id", inquiryId);
+        return this.list(queryWrapper);
+    }
+    
+    
+    
 
 }

icss-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -20,6 +20,7 @@ import com.diagbot.dto.HisInquiryDTO;
 import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.ReadInquiryDTO;
+import com.diagbot.dto.ReadInquiryDrugDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.entity.DoctorInfo;
 import com.diagbot.entity.HospitalDept;
@@ -190,6 +191,11 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
             inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
             readInquiryDTO.setDetailList(inquiryDetailFacade.list(inquiryDetailQe).stream().sorted((a,b)->a.getType()-b.getType()).collect(Collectors.toList()));
+            
+            List<InquiryDrug> inquiryDrugList = inquiryDrugFacade.getInquiryDrugs(inquiryInfo.getId());
+            
+            List<ReadInquiryDrugDTO> drugList = BeanUtil.listCopyTo(inquiryDrugList,ReadInquiryDrugDTO.class);
+            readInquiryDTO.setDrugList(drugList);
         }
 
         return readInquiryDTO;