问诊保存修改2

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

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author gaodm
- * @since 2019-06-17
+ * @since 2019-06-20
  */
 @TableName("prec_inquiry_detail")
 public class InquiryDetail implements Serializable {

prec-service/src/main/java/com/diagbot/entity/InquiryEvaluator.java

@@ -14,7 +14,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author gaodm
- * @since 2019-06-17
+ * @since 2019-06-20
  */
 @TableName("prec_inquiry_evaluator")
 public class InquiryEvaluator implements Serializable {
@@ -62,26 +62,6 @@ public class InquiryEvaluator implements Serializable {
      */
     private String hospitalCode;
 
-    /**
-     * 姓名
-     */
-    private String name;
-
-    /**
-     * 手机号
-     */
-    private String phone;
-
-    /**
-     * 性别(1：男 2：女)
-     */
-    private Integer sex;
-
-    /**
-     * 年龄
-     */
-    private Integer age;
-
     /**
      * 平和体质转化分
      */
@@ -178,34 +158,6 @@ public class InquiryEvaluator implements Serializable {
     public void setHospitalCode(String hospitalCode) {
         this.hospitalCode = hospitalCode;
     }
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-    public String getPhone() {
-        return phone;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
-    public Integer getSex() {
-        return sex;
-    }
-
-    public void setSex(Integer sex) {
-        this.sex = sex;
-    }
-    public Integer getAge() {
-        return age;
-    }
-
-    public void setAge(Integer age) {
-        this.age = age;
-    }
     public BigDecimal getMildValue() {
         return mildValue;
     }
@@ -274,10 +226,6 @@ public class InquiryEvaluator implements Serializable {
         ", modifier=" + modifier +
         ", inquiryId=" + inquiryId +
         ", hospitalCode=" + hospitalCode +
-        ", name=" + name +
-        ", phone=" + phone +
-        ", sex=" + sex +
-        ", age=" + age +
         ", mildValue=" + mildValue +
         ", faintValue=" + faintValue +
         ", wetValue=" + wetValue +

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

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author gaodm
- * @since 2019-06-17
+ * @since 2019-06-20
  */
 @TableName("prec_inquiry_info")
 public class InquiryInfo implements Serializable {
@@ -86,16 +86,6 @@ public class InquiryInfo implements Serializable {
      */
     private Integer type;
 
-    /**
-     * 诊断
-     */
-    private String diagnose;
-
-    /**
-     * 类型：0：结构化 1：文本模式
-     */
-    private Integer sign;
-
     /**
      * 内容JSON字符串
      */
@@ -197,20 +187,6 @@ public class InquiryInfo implements Serializable {
     public void setType(Integer type) {
         this.type = type;
     }
-    public String getDiagnose() {
-        return diagnose;
-    }
-
-    public void setDiagnose(String diagnose) {
-        this.diagnose = diagnose;
-    }
-    public Integer getSign() {
-        return sign;
-    }
-
-    public void setSign(Integer sign) {
-        this.sign = sign;
-    }
     public String getDataJson() {
         return dataJson;
     }
@@ -242,8 +218,6 @@ public class InquiryInfo implements Serializable {
         ", inquiryCode=" + inquiryCode +
         ", regVisitedState=" + regVisitedState +
         ", type=" + type +
-        ", diagnose=" + diagnose +
-        ", sign=" + sign +
         ", dataJson=" + dataJson +
         ", remark=" + remark +
         "}";

prec-service/src/main/java/com/diagbot/entity/InquiryReport.java

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
  * </p>
  *
  * @author gaodm
- * @since 2019-06-17
+ * @since 2019-06-20
  */
 @TableName("prec_inquiry_report")
 public class InquiryReport implements Serializable {

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

@@ -62,9 +62,13 @@ public class InquiryEvaluatorFacade extends InquiryEvaluatorServiceImpl {
         BeanUtil.copyProperties(addDeptInfoVO, inquiryInfo);
         inquiryInfo.setGmtModified(now);
         inquiryInfoFacade.saveOrUpdate(inquiryInfo);
+        
+        EvaluatorCalVO evaluatorCalVO = new EvaluatorCalVO();
+        BeanUtil.copyProperties(addDeptInfoVO, evaluatorCalVO);
+        EvaluatorCalDTO evaluatorCalDTO = evaluatorCalPrav(evaluatorCalVO);
 
         InquiryEvaluator inquiryEvaluator = new InquiryEvaluator();
-        BeanUtil.copyProperties(addDeptInfoVO, inquiryEvaluator);
+        BeanUtil.copyProperties(evaluatorCalDTO, inquiryEvaluator);
         inquiryEvaluator.setInquiryId(inquiryInfo.getId());
         inquiryEvaluator.setGmtCreate(now);
         inquiryEvaluator.setGmtModified(now);
@@ -82,9 +86,18 @@ public class InquiryEvaluatorFacade extends InquiryEvaluatorServiceImpl {
      * @return
      */
     public EvaluatorCalDTO evaluatorCal(EvaluatorCalVO evaluatorCalVO){
-    	EvaluatorCalDTO evaluatorCalDTO = new EvaluatorCalDTO();
-    	
-        List<PhysicalVal> physicalValList = valueSort(evaluatorCalVO);
+    	EvaluatorCalDTO evaluatorCalDTO = evaluatorCalPrav(evaluatorCalVO);
+        evaluatorCalDTO.setPhysicalInfoList(Lists.newArrayList(physicalInfoFacade.listByIds(Arrays.asList(evaluatorCalDTO.getPhysicalTypes().split(",")).stream().map(i->Integer.parseInt(i)).collect(Collectors.toList()))));
+        return evaluatorCalDTO;
+    }
+    
+    /**
+     * 进行体质计算
+     * @param evaluatorCalVO
+     * @return
+     */
+    private EvaluatorCalDTO evaluatorCalPrav(EvaluatorCalVO evaluatorCalVO){
+    	List<PhysicalVal> physicalValList = valueSort(evaluatorCalVO);
         Double max = physicalValList.get(0).getValue();
         Double min = physicalValList.get(4).getValue();
         
@@ -131,16 +144,15 @@ public class InquiryEvaluatorFacade extends InquiryEvaluatorServiceImpl {
                 }
             }
         }
-        
-        BeanUtil.copyProperties(evaluatorCalVO, evaluatorCalDTO);;
-        evaluatorCalDTO.setPhysicalRes(physicalRes);
+    	
+    	EvaluatorCalDTO evaluatorCalDTO = new EvaluatorCalDTO();
+    	BeanUtil.copyProperties(evaluatorCalVO, evaluatorCalDTO);
+    	evaluatorCalDTO.setPhysicalRes(physicalRes);
         evaluatorCalDTO.setPhysicalTypes(physicalTypes);
-        evaluatorCalDTO.setPhysicalInfoList(Lists.newArrayList(physicalInfoFacade.listByIds(Arrays.asList(physicalTypes.split(",")).stream().map(i->Integer.parseInt(i)).collect(Collectors.toList()))));
-        
-        return evaluatorCalDTO;
+    	
+    	return evaluatorCalDTO;
     }
     
-    
     /**
      * 对偏颇体质排序
      * @param evaluatorCalVO

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

@@ -38,7 +38,11 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     @Qualifier("inquiryReportServiceImpl")
     private InquiryReportServiceImpl inquiryReportServiceImpl;
 
-    
+    /**
+     * 问诊记录保存
+     * @param saveInquiryVO
+     * @return
+     */
 	public SaveInquiryDTO saveInquiry(SaveInquiryVO saveInquiryVO){
 		SaveInquiryDTO saveInquiryDTO = new SaveInquiryDTO();
         Date now = DateUtil.now();
@@ -67,7 +71,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         
         BeanUtil.copyProperties(saveInquiryVO, inquiryInfo);
         inquiryInfo.setGmtModified(now);
-        this.saveOrUpdate(inquiryInfo);
+        saveOrUpdate(inquiryInfo);
         
         Long inquiryId = inquiryInfo.getId();
         

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

@@ -123,15 +123,13 @@ public class AddEvaluatorVO {
     /**
      * 体质结果
      */
-	@ApiModelProperty(value="体质结果",required=true)
-	@NotBlank(message="体质结果必传")
+	@ApiModelProperty(value="体质结果")
     private String physicalRes;
 
     /**
      * 需要显示的体质逗号隔开
      */
-	@ApiModelProperty(value="需要显示的体质逗号隔开",required=true)
-	@NotBlank(message="需要显示的体质逗号隔开必传")
+	@ApiModelProperty(value="需要显示的体质逗号隔开")
     private String physicalTypes;
 	
 }

prec-service/src/main/resources/mapper/InquiryEvaluatorMapper.xml

@@ -12,10 +12,6 @@
         <result column="modifier" property="modifier" />
         <result column="inquiry_id" property="inquiryId" />
         <result column="hospital_code" property="hospitalCode" />
-        <result column="name" property="name" />
-        <result column="phone" property="phone" />
-        <result column="sex" property="sex" />
-        <result column="age" property="age" />
         <result column="mild_value" property="mildValue" />
         <result column="faint_value" property="faintValue" />
         <result column="wet_value" property="wetValue" />

prec-service/src/main/resources/mapper/InquiryInfoMapper.xml

@@ -17,8 +17,6 @@
         <result column="inquiry_code" property="inquiryCode" />
         <result column="reg_visited_state" property="regVisitedState" />
         <result column="type" property="type" />
-        <result column="diagnose" property="diagnose" />
-        <result column="sign" property="sign" />
         <result column="data_json" property="dataJson" />
         <result column="remark" property="remark" />
     </resultMap>