二次诊断添加修改

icss-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -21,6 +21,7 @@ import com.diagbot.dto.TranFieldInfoDTO;
 import com.diagbot.entity.DoctorInfo;
 import com.diagbot.entity.HospitalDept;
 import com.diagbot.entity.PatientInfo;
+import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.DoctorInfoVO;
 import com.diagbot.vo.HosCodeVO;
 import com.diagbot.vo.HospitalInfoVO;
@@ -114,13 +115,21 @@ public interface TranServiceClient {
     RespDTO<List<TranFieldInfoDTO>> getInfoByUuid(@RequestBody TranFieldInfoVO tranFieldInfoVO);
 
     /**
-     * 将问诊保存的一些相关信息发送到对接层
+     * 将问诊记录保存一份至对接层
      *
      * @param saveInquiryToHisVO
      * @return
      */
     @PostMapping("/inquiryInfo/saveInquiryToHis")
     RespDTO<Boolean> saveInquiryToHis(@RequestBody SaveInquiryToHisVO saveInquiryToHisVO);
+    
+    /**
+     * 急诊-添加二次诊断
+     * @param addDiagnoseSecondVO
+     * @return
+     */
+    @PostMapping("/inquiryInfo/addDiagnoseSecond")
+    RespDTO<Boolean> addDiagnoseSecond(@RequestBody AddDiagnoseSecondVO addDiagnoseSecondVO);
 
 
     /**

icss-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -22,6 +22,7 @@ import com.diagbot.dto.TranFieldInfoDTO;
 import com.diagbot.entity.DoctorInfo;
 import com.diagbot.entity.HospitalDept;
 import com.diagbot.entity.PatientInfo;
+import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.DoctorInfoVO;
 import com.diagbot.vo.HosCodeVO;
 import com.diagbot.vo.HospitalInfoVO;
@@ -97,15 +98,20 @@ public class TranServiceHystrix implements TranServiceClient {
         log.error("【hystrix】调用{}异常", "saveInquiryToHis");
         return null;
     }
-
-
+    
+    @Override
+	public RespDTO<Boolean> addDiagnoseSecond(AddDiagnoseSecondVO addDiagnoseSecondVO) {
+    	log.error("【hystrix】调用{}异常", "addDiagnoseSecond");
+		return null;
+	}
+    
     //    @Override
     //    public Response<ResponseData> bayesPageData(SearchData searchData) {
     //        log.error("【hystrix】调用{}异常", "bayesPageData");
     //        return null;
     //    }
 
-    /**
+	/**
      * 根据医院编码获取化验公表映射关系-itemName不为空
      *
      * @param hosCodeVO

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

@@ -26,6 +26,7 @@ import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
 import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.ReadInquiryDrugDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.entity.DoctorInfo;
 import com.diagbot.entity.HospitalDept;
@@ -45,6 +46,7 @@ import com.diagbot.util.DateUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
+import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.GetEvaluationScalesVO;
 import com.diagbot.vo.GetEvaluationsVO;
 import com.diagbot.vo.GetInquiryDetailVO;
@@ -505,5 +507,17 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         List<InquiryScale> inquiryScaleList = inquiryScaleFacade.list(queryWrapper);
         return BeanUtil.listCopyTo(inquiryScaleList, GetEvaluationScalesDTO.class);
     }
+    
+    /**
+     * 急诊-添加二次诊断
+     * 
+     * @param addDiagnoseSecondVO
+     * @return
+     */
+    public Boolean addDiagnoseSecond(AddDiagnoseSecondVO addDiagnoseSecondVO){
+    	RespDTO<Boolean> res = tranServiceClient.addDiagnoseSecond(addDiagnoseSecondVO);
+    	RespDTOUtil.respNGDeal(res, "添加二次诊断失败");
+    	return res.data;
+    }
 
 }

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

@@ -0,0 +1,40 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rengb
+ * @time 2019年3月12日下午2:29:43
+ */
+@Getter
+@Setter
+public class AddDiagnoseSecondVO {
+	
+	/**
+	 * 问诊记录id
+	 */
+	@ApiModelProperty(value="问诊记录id",required=true)
+	@NotNull(message="问诊记录id必传")
+	private Long inquiryId;
+	
+    /**
+     * 当前医生id
+     */
+	@ApiModelProperty(value="当前医生id",required=true)
+	@NotNull(message="当前医生id必传")
+    private Long doctorId;
+	
+	/**
+	 * 二次诊断
+	 */
+	@ApiModelProperty(value="二次诊断",required=true)
+	@NotBlank(message="二次诊断必传")
+	private String diagnoseSecond;
+
+}

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

@@ -25,6 +25,7 @@ import com.diagbot.dto.ReadInquiryDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SaveInquiryDTO;
 import com.diagbot.facade.InquiryInfoFacade;
+import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.GetEvaluationScalesVO;
 import com.diagbot.vo.GetEvaluationsVO;
 import com.diagbot.vo.GetInquiryDetailVO;
@@ -116,6 +117,14 @@ public class InquiryInfoController {
     public RespDTO<List<GetEvaluationScalesDTO>> getEvaluationScales(@Valid @RequestBody GetEvaluationScalesVO getEvaluationScalesVO) {
         return RespDTO.onSuc(inquiryInfoFacade.getEvaluationScales(getEvaluationScalesVO));
     }
+    
+    @ApiOperation(value = "急诊-添加二次诊断[by:rengb]")
+    @PostMapping("/addDiagnoseSecond")
+    @SysLogger("addDiagnoseSecond")
+    public RespDTO<Boolean> addDiagnoseSecond(@Valid @RequestBody AddDiagnoseSecondVO addDiagnoseSecondVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.addDiagnoseSecond(addDiagnoseSecondVO));
+    }
+    
 
 
 }

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

@@ -14,6 +14,8 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.InquiryDetailServiceImpl;
 import com.diagbot.service.impl.InquiryInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.SaveInquiryToHisVO;
 
 /**
@@ -86,6 +88,32 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl{
 
         return true;
     }
+    
+    /**
+     * 急诊-添加二次诊断
+     * 
+     * @param addDiagnoseSecondVO
+     * @return
+     */
+    public Boolean addDiagnoseSecond(AddDiagnoseSecondVO addDiagnoseSecondVO){
+    	QueryWrapper<InquiryDetail> inquiryDetailQe = new QueryWrapper<>();
+    	inquiryDetailQe.eq("inquiry_id", addDiagnoseSecondVO.getInquiryId());
+    	inquiryDetailQe.eq("type", 9);
+    	inquiryDetailFacade.remove(inquiryDetailQe);
+    	
+    	Date now = DateUtil.now();
+    	
+    	InquiryDetail inquiryDetail = new InquiryDetail();
+    	inquiryDetail.setContentValue(addDiagnoseSecondVO.getDiagnoseSecond());
+    	inquiryDetail.setType(9);
+    	inquiryDetail.setInquiryId(addDiagnoseSecondVO.getInquiryId());
+    	inquiryDetail.setGmtCreate(now);
+    	inquiryDetail.setGmtModified(now);
+    	inquiryDetail.setCreator(addDiagnoseSecondVO.getDoctorId().toString());
+    	inquiryDetail.setModifier(addDiagnoseSecondVO.getDoctorId().toString());
+    	
+    	return inquiryDetailFacade.save(inquiryDetail);
+    }
 	
 
 

tran-service/src/main/java/com/diagbot/vo/AddDiagnoseSecondVO.java

@@ -0,0 +1,30 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rengb
+ * @time 2019年3月12日下午2:29:43
+ */
+@Getter
+@Setter
+public class AddDiagnoseSecondVO {
+	
+	/**
+	 * 问诊记录id
+	 */
+	private Long inquiryId;
+	
+    /**
+     * 医生id
+     */
+    private Long doctorId;
+	
+	/**
+	 * 二次诊断
+	 */
+	private String diagnoseSecond;
+
+}

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

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.InquiryInfoFacade;
+import com.diagbot.vo.AddDiagnoseSecondVO;
 import com.diagbot.vo.SaveInquiryToHisVO;
 
 import io.swagger.annotations.Api;
@@ -45,5 +46,19 @@ public class InquiryInfoController {
 	     return RespDTO.onSuc(inquiryInfoFacade.saveInquiryToHis(saveInquiryToHisVO));
 	 }
 	 
+	 /**
+	  * 急诊-添加二次诊断
+	  * @param addDiagnoseSecondVO
+	  * @return
+	  */
+	 @PostMapping("/addDiagnoseSecond")
+	 @SysLogger("addDiagnoseSecond")
+	 @Transactional
+	 @ApiIgnore
+	 public RespDTO<Boolean> addDiagnoseSecond(@RequestBody AddDiagnoseSecondVO addDiagnoseSecondVO) {
+		 return RespDTO.onSuc(inquiryInfoFacade.addDiagnoseSecond(addDiagnoseSecondVO));
+	 }
+	 
+	 
 
 }