病历保存修改

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

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

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

@@ -1,10 +1,18 @@
 package com.diagbot.dto;
 
+import java.io.Serializable;
+
+import lombok.Getter;
+import lombok.Setter;
+
 /**
  * @Description:
  * @author: rengb
  * @time: 2018/11/19 18:56
  */
-public class SaveInquiryDTO{
+@SuppressWarnings("serial")
+@Getter
+@Setter
+public class SaveInquiryDTO implements Serializable{
 		
 }

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

@@ -4,6 +4,7 @@
 package com.diagbot.facade;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,6 +61,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 			this.save(inquiryInfoSave);
 			inquiryId = inquiryInfoSave.getId();
 		}else{
+			inquiryId = inquiryInfo.getId();
 			inquiryInfoSave.setId(inquiryId);
 			this.updateById(inquiryInfoSave);
 			

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

@@ -5,9 +5,11 @@ import java.util.List;
 import javax.validation.Valid;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 
 import com.diagbot.dto.InquiryDetailDTO;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -23,62 +25,73 @@ public class SaveInquiryVO {
 	/**
      * 医院id
      */
-	@NotBlank(message="医院id必传")
+	@ApiModelProperty(value="医院id",required=true)
+	@NotNull(message="医院id必传")
     private Long hospitalId;
 
     /**
      * 科室id
      */
-	@NotBlank(message="科室id必传")
+	@ApiModelProperty(value="科室id",required=true)
+	@NotNull(message="科室id必传")
     private Long hospitalDeptId;
 
     /**
      * 医生id
      */
-	@NotBlank(message="医生id必传")
+	@ApiModelProperty(value="医生id",required=true)
+	@NotNull(message="医生id必传")
     private Long doctorId;
 
     /**
      * 患者id
      */
-	@NotBlank(message="患者id必传")
+	@ApiModelProperty(value="患者id",required=true)
+	@NotNull(message="患者id必传")
     private Long patientId;
 
     /**
      * 就诊序列号
      */
+	@ApiModelProperty(value="就诊序列号",required=true)
 	@NotBlank(message="就诊序列号必传")
     private String inquiryCode;
 
     /**
-     * 就诊状态（0待接诊，1接诊中，2完成接诊）
+     * 就诊状态(0待接诊，1接诊中，2完成接诊)
      */
+	@ApiModelProperty(value="就诊状态(0待接诊，1接诊中，2完成接诊)")
     private Integer regVisitedState=1;
 
     /**
      * 分类(1:门诊,2:住院)
      */
+	@ApiModelProperty(value="分类(1:门诊,2:住院)")
     private Integer type=1;
 
     /**
      * 诊断
      */
+	@ApiModelProperty(value="诊断",required=true)
     @NotBlank(message="诊断必传")
     private String diagnose;
 
     /**
      * 类型：1：结构化 2：文本模式
      */
+	@ApiModelProperty(value="类型：1：结构化 2：文本模式")
     private Integer sign=1;
 
     /**
      * 内容JSON字符串
      */
+	@ApiModelProperty(value="内容JSON字符串",required=true)
     @NotBlank(message="内容JSON字符串必传")
     private String dataJson;
     
     @Valid
-    @NotEmpty
+    @ApiModelProperty(value="问诊明细",required=true)
+    @NotEmpty(message="问诊明细不能为空")
     private List<InquiryDetailDTO> detailList;
    
 }

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

@@ -30,15 +30,15 @@ import io.swagger.annotations.ApiOperation;
 public class InquiryInfoController {
 	
 	@Autowired
-    private InquiryInfoFacade inquiryInfoFacade;
+	private InquiryInfoFacade inquiryInfoFacade;
 	
-	 @ApiOperation(value = "问诊记录保存[by:rengb]")
-	 @PostMapping("/getTopPatientInfo")
-	 @SysLogger("getTopPatientInfo")
-	 @Transactional
-	 public RespDTO<SaveInquiryDTO> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
-		 return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
-	 }
+	@ApiOperation(value = "问诊记录保存[by:rengb]")
+	@PostMapping("/saveInquiry")
+	@SysLogger("saveInquiry")
+	@Transactional
+	public RespDTO<SaveInquiryDTO> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
+		return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
+	}