Merge branch 'dev/icss' into debug

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/QuestionUsualDTO.java

@@ -11,6 +11,6 @@ import lombok.Setter;
 @Getter
 @Setter
 public class QuestionUsualDTO{
-
+    private Long questionId;
     private String name;
 }

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/DeptInfoFacade.java

@@ -1,10 +1,10 @@
 package com.diagbot.facade;
 
 import com.diagbot.dto.DeptInfoDTO;
-import com.diagbot.dto.RespDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.DeptInfoServiceImpl;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.DeptInfoVO;
 import org.springframework.stereotype.Component;
 
@@ -25,7 +25,7 @@ public class DeptInfoFacade extends DeptInfoServiceImpl {
      */
     public List<DeptInfoDTO> getDeptInfo(DeptInfoVO deptInfoVO) {
         List<DeptInfoDTO> deptInfoDTOList = this.getDeptInfos(deptInfoVO.getDeptCode(),deptInfoVO.getHosptialCode());
-        if(deptInfoDTOList == null || deptInfoDTOList.size() == 0){
+        if(ListUtil.isEmpty(deptInfoDTOList)){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取科室信息失败");
         }

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

@@ -4,6 +4,7 @@ import com.diagbot.dto.DoctorInfoDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.DoctorInfoServiceImpl;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.DoctorInfoVO;
 import org.springframework.stereotype.Component;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -25,7 +26,7 @@ public class DoctorInfoFacade extends DoctorInfoServiceImpl {
      */
     public List<DoctorInfoDTO> getDoctorInfo(@RequestBody DoctorInfoVO doctorInfoVo) {
         List<DoctorInfoDTO> doctorInfoDTOList = this.getDoctorInfos(doctorInfoVo.getDoctorCode(),doctorInfoVo.getHosptialCode(),doctorInfoVo.getDeptCode());
-        if(doctorInfoDTOList == null || doctorInfoDTOList.size() == 0){
+        if(ListUtil.isEmpty(doctorInfoDTOList)){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取医生信息失败");
         }

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

@@ -4,6 +4,7 @@ import com.diagbot.dto.HospitalInfoDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.HospitalInfoServiceImpl;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.HospitalInfoVO;
 import org.springframework.stereotype.Component;
 
@@ -24,7 +25,7 @@ public class HospitalInfoFacade extends HospitalInfoServiceImpl {
      */
     public List<HospitalInfoDTO> getHospitalInfo(HospitalInfoVO hospitalInfoVO) {
         List<HospitalInfoDTO> hospitalInfoDTOList = this.getHospitalInfos(hospitalInfoVO);
-        if(hospitalInfoDTOList == null || hospitalInfoDTOList.size() == 0){
+        if(ListUtil.isEmpty(hospitalInfoDTOList)){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取医院信息失败");
         }

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

@@ -1,10 +1,8 @@
-/**
- * 
- */
 package com.diagbot.facade;
 
 import java.util.List;
 
+import com.diagbot.util.ListUtil;
 import org.springframework.stereotype.Component;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -24,8 +22,7 @@ public class InquiryDetailFacade extends InquiryDetailServiceImpl {
 	 * @param inquiryDetailList
 	 */
 	public void saveInquiryDetails(List<InquiryDetail> inquiryDetailList){
-		if(inquiryDetailList!=null
-				&&inquiryDetailList.size()>0){
+		if(ListUtil.isNotEmpty(inquiryDetailList)){
 			baseMapper.saveInquiryDetails(inquiryDetailList);
 		}
 	}

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

@@ -1,6 +1,3 @@
-/**
- * 
- */
 package com.diagbot.facade;
 
 import java.util.ArrayList;
@@ -12,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;
 
 /**
@@ -73,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());
@@ -80,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/facade/IntroduceDetailFacade.java

@@ -1,7 +1,6 @@
 package com.diagbot.facade;
 
 import com.diagbot.service.impl.IntroduceDetailServiceImpl;
-import com.diagbot.web.IntroduceDetailController;
 import org.springframework.stereotype.Component;
 
 /**

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

@@ -1,18 +1,17 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.RequestBody;
-
 import com.diagbot.dto.GetTopPatientInfoDTO;
 import com.diagbot.dto.PatientInfoDTO;
-import com.diagbot.dto.RespDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.PatientInfoServiceImpl;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.PatientInfoVO;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * @Description: 患者业务逻辑
@@ -29,7 +28,7 @@ public class PatientInfoFacade extends PatientInfoServiceImpl {
      */
     public List<PatientInfoDTO> getPatientInfo(@RequestBody PatientInfoVO patientInfoVO) {
         List<PatientInfoDTO> patientInfoDTOList = this.getPatientInfos(patientInfoVO.getPatientCode(),patientInfoVO.getHosptialCode());
-        if(patientInfoDTOList == null || patientInfoDTOList.size() == 0){
+        if(ListUtil.isEmpty(patientInfoDTOList)){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取患者信息失败");
         }

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

@@ -14,14 +14,17 @@ import com.diagbot.entity.DeptVital;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.VitalOrder;
 import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.enums.QuantitativeTypeEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.StringUtil;
 import com.diagbot.vo.LisKYJVO;
 import com.diagbot.vo.PushKYJVO;
 import com.diagbot.vo.PushVO;
 import com.diagbot.vo.QuestionVO;
+import com.google.common.collect.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -139,8 +142,12 @@ public class PushFacade {
             pushDTO.setSymptomMap(symptomMap);
         }
         //查体 返回模板
-        else if (featureTypeSet.contains(QuestionTypeEnum.Vital.getKey()) && dis != null && dis.size() > 0) {
-            String deptName = dis.get(0).getExtraProperty();
+        else if (featureTypeSet.contains(QuestionTypeEnum.Vital.getKey())) {
+            //没有推送信息时，默认取全科模板
+            String deptName = "全科";
+            if (dis != null && dis.size() > 0) {
+                deptName = dis.get(0).getExtraProperty();
+            }
             QueryWrapper<DeptInfo> deptInfoQueryWrapper = new QueryWrapper<>();
             deptInfoQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
                     eq("name", deptName);
@@ -163,20 +170,14 @@ public class PushFacade {
                 List<VitalOrder> vitalOrderList = vitalOrderFacade.list(vitalOrderQueryWrapper);
                 Map<Long, VitalOrder> vitalOrderMap = EntityUtil.makeEntityMap(vitalOrderList, "question_id");
                 //标签列表
-                /*QueryWrapper<QuestionInfo> vitalQueryWrapper = new QueryWrapper<>();
-                vitalQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey()).
-                        in("id", deptVitalMap.keySet());
-                List<QuestionInfo> vitalList = questionFacade.list(vitalQueryWrapper);
-                Map<Long, QuestionInfo> vitalQuestionMap = EntityUtil.makeEntityMap(vitalList, "id");*/
                 for (Map.Entry<Long, VitalOrder> entry : vitalOrderMap.entrySet()) {
                     QuestionVO questionVO = new QuestionVO();
                     questionVO.setAge(pushVO.getAge());
                     questionVO.setSexType(pushVO.getSex());
                     questionVO.setId(entry.getKey());
                     QuestionDTO questionDTO = questionFacade.getById(questionVO);
-                    //QuestionInfo vitalQuestion = vitalQuestionMap.get(entry.getKey());
                     if (questionDTO != null) {
-                        vitalMap.put(questionDTO.getTagName(), questionDTO);
+                        vitalMap.put(questionDTO.getName(), questionDTO);
                     }
                 }
                 pushDTO.setVitalMap(vitalMap);
@@ -188,6 +189,7 @@ public class PushFacade {
 
     /**
      * 推理接口-快易检
+     *
      * @param pushKYJVO
      * @return
      */
@@ -197,16 +199,14 @@ public class PushFacade {
         pushVO.setSex(pushKYJVO.getSex());
 
         //参数预处理
-        String lis="";
-        for(LisKYJVO lisKYJVO:pushKYJVO.getLisKYJVOList()){
-            String lisDetail="";
-            if(lisKYJVO.getValue()!=null){
-
-            }
-            if(lisKYJVO.getOtherValue()!=null){
-                
-            }
+        String lis = "";
+        List<String> lisResultList = Lists.newArrayList();
+        for (LisKYJVO lisKYJVO : pushKYJVO.getLisKYJVOList()) {
+            lisKYJVO = resultCalculation(lisKYJVO);
+            lisResultList.addAll(getLisInputs(lisKYJVO));
         }
+        lis = String.join(",", lisResultList);
+        pushVO.setLis(lis);
 
         ResponseData responseData = pushAI(pushVO);
         PushKYJDTO pushKYJDTO = new PushKYJDTO();
@@ -228,4 +228,64 @@ public class PushFacade {
         }
         return map;
     }
+
+    /**
+     * 快易检结果预处理
+     *
+     * @param lisKYJVO
+     * @return
+     */
+    public LisKYJVO resultCalculation(LisKYJVO lisKYJVO) {
+        if (lisKYJVO.getValue() != null) {
+            if (lisKYJVO.getMax() != null) {
+                Integer comResult = lisKYJVO.getValue().compareTo(lisKYJVO.getMax());
+                if (comResult > 0) {
+                    lisKYJVO.setMultipleState(QuantitativeTypeEnum.Up.getName());
+                    if (!lisKYJVO.getMax().equals(0.0)) {
+                        lisKYJVO.setMultipleValue(lisKYJVO.getValue() / lisKYJVO.getMax());
+                    }
+                }
+            }
+            if (lisKYJVO.getMin() != null) {
+                Integer comResult = lisKYJVO.getValue().compareTo(lisKYJVO.getMax());
+                if (comResult < 0) {
+                    lisKYJVO.setMultipleState(QuantitativeTypeEnum.Down.getName());
+                    if (!lisKYJVO.getMax().equals(0.0)) {
+                        lisKYJVO.setMultipleValue(lisKYJVO.getValue() / lisKYJVO.getMin());
+                    }
+                }
+            }
+            if (StringUtil.isBlank(lisKYJVO.getMultipleState())) {
+                lisKYJVO.setMultipleState(QuantitativeTypeEnum.Normal.getName());
+            }
+        }
+        return lisKYJVO;
+    }
+
+    /**
+     * 拼接化验项的文本结果
+     *
+     * @param lisKYJVO
+     * @return
+     */
+    public List<String> getLisInputs(LisKYJVO lisKYJVO) {
+        List<String> stringList = Lists.newArrayList();
+        if (StringUtil.isBlank(lisKYJVO.getName())) {
+            return stringList;
+        } else if (lisKYJVO.getValue() != null) {
+            //数值
+            String lisText = lisKYJVO.getName() + "," + lisKYJVO.getValue() + " " + lisKYJVO.getUnits();
+            stringList.add(lisText);
+            //倍数
+            if (StringUtil.isBlank(lisKYJVO.getMultipleState())) {
+                lisText = lisKYJVO.getName() + "," + lisKYJVO.getMultipleState() + " " + lisKYJVO.getMultipleValue();
+                stringList.add(lisText);
+            }
+        } else if (StringUtil.isBlank(lisKYJVO.getOtherValue())) {
+            //阴性阳性和其他文字描述
+            String lisText = lisKYJVO.getName() + "," + lisKYJVO.getOtherValue();
+            stringList.add(lisText);
+        }
+        return stringList;
+    }
 }

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

@@ -4,6 +4,7 @@ import com.diagbot.dto.QuestionUsualDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.QuestionUsualServiceImpl;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.QuestionUsualVO;
 import org.springframework.stereotype.Component;
 
@@ -26,7 +27,7 @@ public class QuestionUsualFacade extends QuestionUsualServiceImpl {
      */
     public List<QuestionUsualDTO> getQuestionUsual(QuestionUsualVO questionUsualVO) {
         List<QuestionUsualDTO> questionUsualDTOList = this.getQuestionUsualName(questionUsualVO);
-        if(questionUsualDTOList == null || questionUsualDTOList.size() == 0){
+        if(ListUtil.isEmpty(questionUsualDTOList)){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取标签信息失败");
         }

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

@@ -4,6 +4,7 @@ import com.diagbot.dto.TranFieldInfoDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.impl.TranFieldInfoServiceImpl;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.TranFieldInfoVO;
 import org.springframework.stereotype.Component;
 
@@ -25,7 +26,7 @@ public class TranFieldInfoFacade extends TranFieldInfoServiceImpl {
      */
     public List<TranFieldInfoDTO> getInfoByUuid(TranFieldInfoVO info){
         List<TranFieldInfoDTO> tranFieldInfoDTOList = this.getInfosByUuid(info);
-        if(tranFieldInfoDTOList == null || tranFieldInfoDTOList.size() == 0){
+        if(ListUtil.isEmpty(tranFieldInfoDTOList)){
             throw new CommonException(CommonErrorCode.NOT_EXISTS,
                     "获取信息失败");
         }

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

@@ -1,22 +1,20 @@
 package com.diagbot.facade;
 
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.stereotype.Component;
-
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.diagbot.dto.VersionDetailDTO;
 import com.diagbot.entity.VersionDetail;
-import com.diagbot.entity.VersionInfo;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.StatusEnum;
 import com.diagbot.service.impl.VersionDetailServiceImpl;
-import com.diagbot.service.impl.VersionInfoServiceImpl;
+import com.diagbot.util.BeanUtil;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 版本详情
+ *
  * @author wangfeng
  * @Description: TODO
  * @date 2018年11月21日 上午11:38:40
@@ -24,37 +22,28 @@ import com.diagbot.service.impl.VersionInfoServiceImpl;
 @Component
 public class VersionDetailFacaed extends VersionDetailServiceImpl {
 
-	/**
-	 * 根据版本id查询版本详情
-	 * @param id
-	 * @return
-	 */
-	public List<VersionDetailDTO> getById(Long id) {
-		QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
-
-		versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey()).eq("STATUS", StatusEnum.Enable.getKey())
-				.eq("version_id", id).orderByAsc("order_no");
-
-		VersionDetail versionDetail = new VersionDetail();
-		versionDetail.setVersionId(id);
-		List<VersionDetail> datas = list(versionDetailQuery);
-		// System.out.println("List<VersionDetail>==="+datas.toString());
-		List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
-		//过滤字段
-		for (VersionDetail versionData : datas) {
-			VersionDetailDTO versionDTO = new VersionDetailDTO();
-			versionDTO.setId(versionData.getId());
-			versionDTO.setCreator(versionData.getCreator());
-			versionDTO.setDescription(versionData.getDescription());
-			versionDTO.setGmtCreate(versionData.getGmtCreate());
-			versionDTO.setOrderNo(versionData.getOrderNo());
-			versionDTO.setRemark(versionData.getRemark());
-			versionDTO.setStatus(versionData.getStatus());
-			versionDTO.setTitle(versionData.getTitle());
-			versionDTO.setVersionId(versionData.getVersionId());
-			dataNew.add(versionDTO);
-		}
-		return dataNew;
-
-	}
+    /**
+     * 根据版本id查询版本详情
+     *
+     * @param id
+     * @return
+     */
+    public List<VersionDetailDTO> getById(Long id) {
+        QueryWrapper<VersionDetail> versionDetailQuery = new QueryWrapper<>();
+
+        versionDetailQuery.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("STATUS", StatusEnum.Enable.getKey())
+                .eq("version_id", id)
+                .orderByAsc("order_no");
+
+        VersionDetail versionDetail = new VersionDetail();
+        versionDetail.setVersionId(id);
+        List<VersionDetail> datas = list(versionDetailQuery);
+        // System.out.println("List<VersionDetail>==="+datas.toString());
+        List<VersionDetailDTO> dataNew = new ArrayList<VersionDetailDTO>();
+        //过滤字段
+        dataNew = BeanUtil.listCopyTo(datas, VersionDetailDTO.class);
+        return dataNew;
+
+    }
 }

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

@@ -11,13 +11,12 @@ import lombok.Setter;
 @Getter
 @Setter
 public class LisKYJVO {
-    private String name ;//名称
+    private String name;//名称
     private Double value;//值
     private Double max;//最大值
     private Double min;//最小值
     private String units;//单位
-    private Integer  multipleState;//状态 0 1 2
-    private String  multipleValue;//状态值
-    private Integer  negativeState;//状态 (阴形,阳性)
-    private String otherValue;//
+    private String multipleState;//定量状态 0-正常 1-升高 2-降低
+    private Double multipleValue;//倍数
+    private String otherValue;//其他结果，包括阴性阳性，文字描述等
 }

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/vo/SaveInquiryVO.java

@@ -7,6 +7,8 @@ import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 
+import org.hibernate.validator.constraints.Range;
+
 import com.diagbot.dto.InquiryDetailDTO;
 
 import io.swagger.annotations.ApiModel;
@@ -63,12 +65,14 @@ public class SaveInquiryVO {
      * 就诊状态(0待接诊，1接诊中，2完成接诊)
      */
 	@ApiModelProperty(value="就诊状态(0待接诊，1接诊中，2完成接诊)")
-    private Integer regVisitedState=1;
+	@Range(min=0,max=2,message="就诊状态必须是0、1、2")
+	private Integer regVisitedState=1;
 
     /**
-     * 分类(1:门诊,2:住院)
+     * 病历分类(1:门诊,2:住院)
      */
-	@ApiModelProperty(value="分类(1:门诊,2:住院)")
+	@ApiModelProperty(value="病历分类(1:门诊,2:住院)")
+	@Range(min=1,max=2,message="病历分类必须是1、2")
     private Integer type=1;
 
     /**
@@ -79,9 +83,10 @@ public class SaveInquiryVO {
     private String diagnose;
 
     /**
-     * 类型：1：结构化 2：文本模式
+     * 内容输入类型：1：结构化 2：文本模式
      */
-	@ApiModelProperty(value="类型：1：结构化 2：文本模式")
+	@ApiModelProperty(value="内容输入类型：1：结构化 2：文本模式")
+	@Range(min=1,max=2,message="内容输入类型必须是1、2")
     private Integer sign=1;
 
     /**

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

@@ -1,26 +1,22 @@
 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.RespDTO;
 import com.diagbot.entity.DoctorPageMode;
 import com.diagbot.facade.DoctorPageModeFacade;
 import com.diagbot.vo.DoctorIdVO;
 import com.diagbot.vo.DoctorPageModeVO;
-
 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;
 
 /**
  * <p>

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

@@ -11,9 +11,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 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;
@@ -28,18 +30,25 @@ import io.swagger.annotations.ApiOperation;
 @Api(value = "问诊记录API", tags = { "问诊记录API" })
 @SuppressWarnings("unchecked")
 public class InquiryInfoController {
-	
-	@Autowired
-	private InquiryInfoFacade inquiryInfoFacade;
-	
-	@ApiOperation(value = "问诊记录保存[by:rengb]")
-	@PostMapping("/saveInquiry")
-	@SysLogger("saveInquiry")
-	@Transactional
-	public RespDTO<SaveInquiryDTO> saveInquiry(@Valid @RequestBody SaveInquiryVO saveInquiryVO) {
-		return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
-	}
-	
-	
 
+    @Autowired
+    private InquiryInfoFacade inquiryInfoFacade;
+
+    @ApiOperation(value = "问诊记录保存[by:rengb]")
+    @PostMapping("/saveInquiry")
+    @SysLogger("saveInquiry")
+    @Transactional
+    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));
+	}
+    
+    
+    
 }

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

@@ -2,8 +2,6 @@ package com.diagbot.web;
 
 
 import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RestController;
 
 /**

icss-service/src/main/resources/mapper/QuestionUsualMapper.xml

@@ -18,7 +18,7 @@
     </resultMap>
 
     <select id="getQuestionUsualName" resultType="com.diagbot.dto.QuestionUsualDTO">
-        SELECT b.`name` FROM `icss_dept_info` a
+        SELECT b.id as question_id, b.`name` FROM `icss_dept_info` a
         LEFT JOIN `icss_question_usual` c ON a.id = c.dept_id
         LEFT JOIN `icss_question_info` b ON b.id = c.question_id
         LEFT JOIN `tran_hospital_dept` d ON d.dept_id = a.id