病历回显

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

@@ -3,9 +3,10 @@
  */
 package com.diagbot.dto;
 
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
+import org.hibernate.validator.constraints.Range;
+
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -24,13 +25,13 @@ public class InquiryDetailDTO {
      */
 	@ApiModelProperty(value="类型（1:主诉，2现病史，3其他史，4查体，5化验，6辅检，7诊断，8医嘱）",required=true)
 	@NotNull(message="问诊明细-类型必传")
+	@Range(min=1,max=8,message="问诊明细-类型必须是1-8")
     private Integer type;
 
     /**
      * 内容字符串
      */
-    @ApiModelProperty(value="内容字符串",required=true)
-    @NotBlank(message="问诊明细-内容字符串必传")
+    @ApiModelProperty(value="内容字符串")
     private String content;
 
 }

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

@@ -0,0 +1,24 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:56
+ */
+@ApiModel(value="问诊记录回显接口出参")
+@Getter
+@Setter
+public class ReadInquiryDTO{
+	
+	/**
+	 * 内容JSON字符串
+	 */
+	@ApiModelProperty(value="内容JSON字符串")
+	private String dataJson;
+	
+}

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

@@ -9,10 +9,13 @@ import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.InquiryDetailDTO;
+import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.entity.InquiryInfo;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
+import com.diagbot.util.StringUtil;
+import com.diagbot.vo.ReadInquiryVO;
 import com.diagbot.vo.SaveInquiryVO;
 
 /**
@@ -70,6 +73,9 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 		
 		List<InquiryDetail> inquiryDetailList = new ArrayList<>();
 		for(InquiryDetailDTO i : saveInquiryVO.getDetailList()){
+			if(StringUtil.isBlank(i.getContent())){
+				continue;
+			}
 			InquiryDetail inquiryDetail = new InquiryDetail();
 			inquiryDetail.setInquiryId(inquiryId);
 			inquiryDetail.setType(i.getType());
@@ -77,10 +83,23 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 			inquiryDetail.setGmtCreate(now);
 			inquiryDetailList.add(inquiryDetail);
 		}
-		inquiryDetailFacade.saveInquiryDetails(inquiryDetailList);
+		if(inquiryDetailList.size()>0){
+			inquiryDetailFacade.saveInquiryDetails(inquiryDetailList);
+		}
 		
 		saveInquiryDTO.setInquiryId(inquiryId);
 		return saveInquiryDTO;
 	}
+	
+	/**
+	 * 问诊记录回显
+	 * @param readInquiryVO
+	 * @return
+	 */
+	public ReadInquiryDTO readInquiry(ReadInquiryVO readInquiryVO){
+		ReadInquiryDTO readInquiryDTO = new ReadInquiryDTO();
+		
+		return readInquiryDTO;
+	}
 
 }

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

@@ -0,0 +1,35 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: rengb
+ * @time: 2018/11/19 18:58
+ */
+@ApiModel(value="问诊记录回显接口传参")
+@Getter
+@Setter
+public class ReadInquiryVO {
+	
+	/**
+	 * 医院编号
+	 */
+	@ApiModelProperty(value="医院编号",required=true)
+	@NotBlank(message="医院编号必填")
+	private String hospitalCode;
+	
+	/**
+	 * 医院患者编号
+	 */
+	@ApiModelProperty(value="医院患者编号",required=true)
+	@NotBlank(message="医院患者编号必填")
+	private String patientCode;
+	
+	   
+}

icss-service/src/main/java/com/diagbot/web/InquiryInfoController.java

@@ -1,13 +1,8 @@
 package com.diagbot.web;
 
 
-import com.diagbot.annotation.SysLogger;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.SaveInquiryDTO;
-import com.diagbot.facade.InquiryInfoFacade;
-import com.diagbot.vo.SaveInquiryVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import javax.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -15,7 +10,16 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.validation.Valid;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.ReadInquiryDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.dto.SaveInquiryDTO;
+import com.diagbot.facade.InquiryInfoFacade;
+import com.diagbot.vo.ReadInquiryVO;
+import com.diagbot.vo.SaveInquiryVO;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
 /**
  * @author rengb
@@ -37,4 +41,14 @@ public class InquiryInfoController {
     public RespDTO<SaveInquiryDTO> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
         return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
     }
+    
+    @ApiOperation(value = "问诊记录回显[by:rengb]")
+	@PostMapping("/readInquiry")
+	@SysLogger("readInquiry")
+	public RespDTO<ReadInquiryDTO> readInquiry(@Valid @RequestBody ReadInquiryVO readInquiryVO) {
+		return RespDTO.onSuc(inquiryInfoFacade.readInquiry(readInquiryVO));
+	}
+    
+    
+    
 }