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

prec-service/src/main/java/com/diagbot/dto/RecordCheckDTO.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 RecordCheckDTO{
+	
+	/**
+	 * 结果类型：1-未做过；3-只做过问诊；4-只做过体质辨识；6-都做过
+	 */
+	@ApiModelProperty(value="结果类型：1-未做过；3-只做过问诊；4-只做过体质辨识；6-都做过")
+	private Integer type;
+		
+}

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

@@ -1,9 +1,17 @@
 package com.diagbot.facade;
 
+import java.util.Date;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.GetInquiryDetailImgDTO;
 import com.diagbot.dto.HisInquiryDTO;
+import com.diagbot.dto.RecordCheckDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.entity.InquiryDetail;
 import com.diagbot.entity.InquiryEvaluator;
@@ -22,13 +30,8 @@ import com.diagbot.util.ListUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.HisInquirysVO;
+import com.diagbot.vo.RecordCheckVO;
 import com.diagbot.vo.SaveInquiryVO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Component;
-
-import java.util.Date;
-import java.util.List;
 
 /**
  * @author: zhoutg
@@ -108,6 +111,43 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
 
         return saveInquiryDTO;
     }
+    
+    /**
+     * 问诊记录检查确认
+     * 
+     * @param recordCheckVO
+     * @return
+     */
+    public RecordCheckDTO recordCheck(RecordCheckVO recordCheckVO){
+    	RecordCheckDTO recordCheckDTO = new RecordCheckDTO();
+    	int type = 1;
+    	
+    	QueryWrapper<InquiryInfo> inquiryInfoQe = new QueryWrapper<>();
+        inquiryInfoQe.eq("is_deleted", IsDeleteEnum.N.getKey());
+        inquiryInfoQe.eq("hospital_id", recordCheckVO.getHospitalId());
+        inquiryInfoQe.eq("hospital_dept_id", recordCheckVO.getHospitalDeptId());
+        inquiryInfoQe.eq("doctor_id", recordCheckVO.getDoctorId());
+        inquiryInfoQe.eq("patient_id", recordCheckVO.getPatientId());
+        inquiryInfoQe.eq("inquiry_code", recordCheckVO.getInquiryCode());
+        InquiryInfo inquiryInfo = this.getOne(inquiryInfoQe);
+        
+        if(inquiryInfo!=null){
+        	QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
+            inquiryDetailQe.eq("inquiry_id", inquiryInfo.getId());
+            if(inquiryDetailFacade.count(inquiryDetailQe)>0){
+            	type = type + 2;
+            }
+        	
+            QueryWrapper<InquiryEvaluator> inquiryEvaluatorQe = new QueryWrapper<>();
+            inquiryEvaluatorQe.eq("inquiry_id", inquiryInfo.getId());
+            if(inquiryEvaluatorFacade.count(inquiryEvaluatorQe)>0){
+            	type = type + 3;
+            }
+        }
+    	
+        recordCheckDTO.setType(type);
+    	return recordCheckDTO;
+    }
 
     /**
      * 历史病历列表

prec-service/src/main/java/com/diagbot/vo/RecordCheckVO.java

@@ -0,0 +1,56 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+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 RecordCheckVO {
+	
+	/**
+     * 医院id
+     */
+	@ApiModelProperty(value="医院id",required=true)
+	@NotNull(message="医院id必传")
+    private Long hospitalId;
+	
+    /**
+     * 医院科室id
+     */
+	@ApiModelProperty(value="科室id",required=true)
+	@NotNull(message="科室id必传")
+    private Long hospitalDeptId;
+
+    /**
+     * 医生id
+     */
+	@ApiModelProperty(value="医生id",required=true)
+	@NotNull(message="医生id必传")
+    private Long doctorId;
+
+    /**
+     * 患者id
+     */
+	@ApiModelProperty(value="患者id",required=true)
+	@NotNull(message="患者id必传")
+    private Long patientId;
+	
+    /**
+     * 就诊序列号
+     */
+	@ApiModelProperty(value="就诊序列号",required=true)
+	@NotBlank(message="就诊序列号必传")
+    private String inquiryCode;
+    
+}

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

@@ -1,25 +1,30 @@
 package com.diagbot.web;
 
+import java.util.List;
+
+import javax.validation.Valid;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetInquiryDetailDTO;
 import com.diagbot.dto.HisInquiryDTO;
+import com.diagbot.dto.RecordCheckDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.facade.InquiryInfoFacade;
 import com.diagbot.vo.GetInquiryDetailVO;
 import com.diagbot.vo.HisInquirysVO;
+import com.diagbot.vo.RecordCheckVO;
 import com.diagbot.vo.SaveInquiryVO;
+
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.bind.annotation.PostMapping;
-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 java.util.List;
 
 /**
  * @author rengb
@@ -41,6 +46,13 @@ public class InquiryInfoController {
     public RespDTO<SaveInquiryDTO> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
         return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
     }
+    
+    @ApiOperation(value = "问诊记录检查确认[by:rengb]")
+    @PostMapping("/recordCheck")
+    @SysLogger("recordCheck")
+    public RespDTO<RecordCheckDTO> recordCheck(@Valid @RequestBody RecordCheckVO recordCheckVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.recordCheck(recordCheckVO));
+    }
 
     @ApiOperation(value = "历史病历列表[by:rengb]")
     @PostMapping("/hisInquirys")