Merge remote-tracking branch 'origin/dev/icssNCD' into dev/icssNCD

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

@@ -3,6 +3,8 @@ package com.diagbot.dto;
 import java.util.List;
 
 import com.diagbot.entity.InquiryDetail;
+import com.diagbot.entity.InquiryEvaluation;
+import com.diagbot.entity.InquiryScale;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -40,4 +42,16 @@ public class ReadInquiryDTO{
 	@ApiModelProperty(value="问诊记录用药明细")
 	private List<ReadInquiryDrugDTO> drugList;
 	
+	/**
+     * 问诊记录评估结果
+     */
+	@ApiModelProperty(value="问诊记录评估结果")
+	private InquiryEvaluation inquiryEvaluation;
+	
+	/**
+     * 问诊记录评估结果量表明细
+     */
+	@ApiModelProperty(value="问诊记录评估结果量表明细")
+	private List<InquiryScale> InquiryScaleList;
+	
 }

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

@@ -228,6 +228,14 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
             List<ReadInquiryDrugDTO> drugList = BeanUtil.listCopyTo(inquiryDrugList, ReadInquiryDrugDTO.class);
             readInquiryDTO.setDrugList(drugList);
+            
+            QueryWrapper<InquiryEvaluation> inquiryEvaluationQe = new QueryWrapper<>();
+            inquiryEvaluationQe.eq("inquiry_id", inquiryInfo.getId());
+            readInquiryDTO.setInquiryEvaluation(inquiryEvaluationFacade.getOne(inquiryEvaluationQe));
+            
+            QueryWrapper<InquiryScale> inquiryScaleQe = new QueryWrapper<>();
+            inquiryScaleQe.eq("inquiry_id", inquiryInfo.getId());
+            readInquiryDTO.setInquiryScaleList(inquiryScaleFacade.list(inquiryScaleQe));
         }
 
         return readInquiryDTO;

icss-service/src/main/java/com/diagbot/vo/SaveInquiryEvaluationVO.java

@@ -34,8 +34,7 @@ public class SaveInquiryEvaluationVO {
 	 * 评估量表明细
 	 */
 	@Valid
-    @ApiModelProperty(value="评估量表明细",required=true)
-    @NotEmpty(message="评估量表明细不能为空")
+    @ApiModelProperty(value="评估量表明细")
     private List<SaveInquiryScaleVO> scaleList;
 
 }

icssman-service/src/main/java/com/diagbot/facade/QuestionFacade.java

@@ -21,7 +21,6 @@ import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.QuestionMapping;
 import com.diagbot.entity.RetrievalMapping;
 import com.diagbot.entity.ScaleContent;
-import com.diagbot.entity.VitalOrder;
 import com.diagbot.entity.wrapper.QuestionInfoWrapper;
 import com.diagbot.entity.wrapper.QuestionMappingWrapper;
 import com.diagbot.entity.wrapper.QuestionWrapper;
@@ -494,12 +493,6 @@ public class QuestionFacade extends QuestionInfoServiceImpl {
             //删除映射关系
             questionMappingFacade.deleteByIdsFac(paramMap);
             //删除查体模板
-            vitalOrderFacade.update(new VitalOrder(), new UpdateWrapper<VitalOrder>()
-                    .eq("question_id", id)
-                    .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .set("gmt_modified", now)
-                    .set("modifier", person)
-                    .set("is_deleted", IsDeleteEnum.Y.getKey()));
             deptVitalFacade.update(new DeptVital(), new UpdateWrapper<DeptVital>()
                     .eq("vital_id", id)
                     .eq("is_deleted", IsDeleteEnum.N.getKey())