Merge branch 'dev/icss' of http://192.168.2.153:81/diagbotcloud.git into dev/icss

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

@@ -3,6 +3,8 @@
  */
 package com.diagbot.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -11,6 +13,7 @@ import lombok.Setter;
  * @author rgb
  * @time 2018年11月19日下午4:57:43
  */
+@ApiModel(value="页面顶部病人医生科室信息查询接口出参")
 @Getter
 @Setter
 public class GetTopPatientInfoDTO {
@@ -18,77 +21,92 @@ public class GetTopPatientInfoDTO {
 	/**
 	 * 医院id
 	 */
+	@ApiModelProperty(value="医院id")
 	private Long hospitalId;
 	
 	/**
      * 医院编码
      */
+	@ApiModelProperty(value="医院编码")
     private String hospitalCode;
 
     /**
      * 医院名称
      */
+	@ApiModelProperty(value="医院名称")
     private String hospitalName;
     
     /**
 	 * 医院科室id
 	 */
+	@ApiModelProperty(value="医院科室id")
 	private Long hospitalDeptId;
     
     
     /**
      * 医院科室编码
      */
+	@ApiModelProperty(value="医院科室编码")
     private String hospitalDeptCode;
 
     /**
      * 医院科室名称
      */
+	@ApiModelProperty(value="医院科室名称")
     private String hospitalDeptName;
     
     /**
 	 * 医生id
 	 */
+	@ApiModelProperty(value="医生id")
 	private Long doctorId;
 	
 	/**
      * 医生编码
      */
+	@ApiModelProperty(value="医生编码")
     private String doctorCode;
 
     /**
      * 医生姓名
      */
+	@ApiModelProperty(value="医生姓名")
     private String doctorName;
     
     /**
    	 * 病人id
    	 */
+	@ApiModelProperty(value="病人id")
    	private Long patientId;
    	
    	/**
      * 病人编号
      */
+	@ApiModelProperty(value="病人编号")
     private String patientCode;
 
     /**
      * 病人姓名
      */
+	@ApiModelProperty(value="病人姓名")
     private String patientName;
 
     /**
      * 病人性别
      */
+	@ApiModelProperty(value="病人性别")
     private String patientSex;
     
     /**
      * 病人年龄
      */
+	@ApiModelProperty(value="病人年龄")
     private Integer patientAge;
     
     /**
      * 病人证件号码
      */
+	@ApiModelProperty(value="病人证件号码")
     private String patientIdNo;
 
 }

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

@@ -1,5 +1,7 @@
 package com.diagbot.dto;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -8,10 +10,15 @@ import lombok.Setter;
  * @author: rengb
  * @time: 2018/11/19 18:56
  */
+@ApiModel(value="问诊记录保存接口出参")
 @Getter
 @Setter
 public class SaveInquiryDTO{
 	
+	/**
+	 * 病历id
+	 */
+	@ApiModelProperty(value="病历id")
 	private Long inquiryId;
 		
 }

icss-service/src/main/java/com/diagbot/entity/DoctorInfo.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class DoctorInfo implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -114,18 +115,18 @@ public class DoctorInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

icss-service/src/main/java/com/diagbot/entity/HospitalDept.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class HospitalDept implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -99,18 +100,18 @@ public class HospitalDept implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

icss-service/src/main/java/com/diagbot/entity/HospitalInfo.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class HospitalInfo implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -99,18 +100,18 @@ public class HospitalInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

icss-service/src/main/java/com/diagbot/entity/InquiryDetail.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class InquiryDetail implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -84,18 +85,18 @@ public class InquiryDetail implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

icss-service/src/main/java/com/diagbot/entity/InquiryInfo.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class InquiryInfo implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -119,18 +120,18 @@ public class InquiryInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {

icss-service/src/main/java/com/diagbot/entity/PatientInfo.java

@@ -1,10 +1,11 @@
 package com.diagbot.entity;
 
-import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
-import java.io.Serializable;
+import com.baomidou.mybatisplus.annotation.TableName;
 
 /**
  * <p>
@@ -33,12 +34,12 @@ public class PatientInfo implements Serializable {
     /**
      * 记录创建时间
      */
-    private LocalDateTime gmtCreate;
+    private Date gmtCreate;
 
     /**
      * 记录修改时间,如果时间是1970年则表示纪录未修改
      */
-    private LocalDateTime gmtModified;
+    private Date gmtModified;
 
     /**
      * 创建人，0表示无创建人值
@@ -73,7 +74,7 @@ public class PatientInfo implements Serializable {
     /**
      * 出生日期
      */
-    private LocalDateTime birthday;
+    private Date birthday;
 
     /**
      * 证件类型
@@ -159,18 +160,18 @@ public class PatientInfo implements Serializable {
     public void setIsDeleted(String isDeleted) {
         this.isDeleted = isDeleted;
     }
-    public LocalDateTime getGmtCreate() {
+    public Date getGmtCreate() {
         return gmtCreate;
     }
 
-    public void setGmtCreate(LocalDateTime gmtCreate) {
+    public void setGmtCreate(Date gmtCreate) {
         this.gmtCreate = gmtCreate;
     }
-    public LocalDateTime getGmtModified() {
+    public Date getGmtModified() {
         return gmtModified;
     }
 
-    public void setGmtModified(LocalDateTime gmtModified) {
+    public void setGmtModified(Date gmtModified) {
         this.gmtModified = gmtModified;
     }
     public String getCreator() {
@@ -215,11 +216,11 @@ public class PatientInfo implements Serializable {
     public void setSex(String sex) {
         this.sex = sex;
     }
-    public LocalDateTime getBirthday() {
+    public Date getBirthday() {
         return birthday;
     }
 
-    public void setBirthday(LocalDateTime birthday) {
+    public void setBirthday(Date birthday) {
         this.birthday = birthday;
     }
     public String getIdType() {

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;
@@ -35,6 +36,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 	 */
 	public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO){
 		SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
+		Date now = new Date();
 		
 		QueryWrapper<InquiryInfo> queryWrapper = new QueryWrapper<InquiryInfo>();
 		queryWrapper.eq("hospital_id", saveInquiryVO.getHospitalId());
@@ -57,23 +59,25 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 		inquiryInfoSave.setSign(saveInquiryVO.getSign());
 		inquiryInfoSave.setDataJson(saveInquiryVO.getDataJson());
 		if(inquiryInfo==null){
+			inquiryInfoSave.setGmtCreate(now);
 			this.save(inquiryInfoSave);
 			inquiryId = inquiryInfoSave.getId();
 		}else{
 			inquiryId = inquiryInfo.getId();
 			inquiryInfoSave.setId(inquiryId);
+			inquiryInfoSave.setGmtModified(now);
 			this.updateById(inquiryInfoSave);
 			
 			inquiryDetailFacade.removeByInquiryId(inquiryId);
 		}
 		
-		
 		List<InquiryDetail> inquiryDetailList = new ArrayList<>();
 		for(InquiryDetailDTO i : saveInquiryVO.getDetailList()){
 			InquiryDetail inquiryDetail = new InquiryDetail();
 			inquiryDetail.setInquiryId(inquiryId);
 			inquiryDetail.setType(i.getType());
 			inquiryDetail.setContent(i.getContent());
+			inquiryDetail.setGmtCreate(now);
 			inquiryDetailList.add(inquiryDetail);
 		}
 		inquiryDetailFacade.saveInquiryDetails(inquiryDetailList);

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

@@ -5,6 +5,8 @@ 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;
 
@@ -13,6 +15,7 @@ import lombok.Setter;
  * @author rgb
  * @time 2018年11月19日下午4:58:37
  */
+@ApiModel(value="页面顶部病人医生科室信息查询接口传参")
 @Getter
 @Setter
 public class GetTopPatientInfoVO {
@@ -20,24 +23,28 @@ public class GetTopPatientInfoVO {
 	/**
 	 * 医院编号
 	 */
+	@ApiModelProperty(value="医院编号",required=true)
 	@NotBlank(message="医院编号必填")
 	private String hospitalCode;
 	
 	/**
 	 * 医院科室编号
 	 */
+	@ApiModelProperty(value="医院科室编号",required=true)
 	@NotBlank(message="医院科室编号必填")
 	private String hospitalDeptCode;
 	
 	/**
 	 * 医院医生编号
 	 */
+	@ApiModelProperty(value="医院医生编号",required=true)
 	@NotBlank(message="医院医生编号必填")
 	private String doctorCode;
 	
 	/**
 	 * 医院患者编号
 	 */
+	@ApiModelProperty(value="医院患者编号",required=true)
 	@NotBlank(message="医院患者编号必填")
 	private String patientCode;
 

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

@@ -9,6 +9,7 @@ import javax.validation.constraints.NotNull;
 
 import com.diagbot.dto.InquiryDetailDTO;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -18,6 +19,7 @@ import lombok.Setter;
  * @author: rengb
  * @time: 2018/11/19 18:58
  */
+@ApiModel(value="问诊记录保存接口传参")
 @Getter
 @Setter
 public class SaveInquiryVO {