心理测试记录保持

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

@@ -92,6 +92,11 @@ public class InquiryInfo implements Serializable {
      */
     private String idNum;
 
+    /**
+     * 手机号码
+     */
+    private String phone;
+
     /**
      * 人员类型
      */

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

@@ -8,15 +8,13 @@ import com.diagbot.entity.InquiryDetail;
 import com.diagbot.entity.InquiryInfo;
 import com.diagbot.enums.IdTypeEnum;
 import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.exception.CommonErrorCode;
-import com.diagbot.exception.CommonException;
 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.util.HttpUtils;
 import com.diagbot.util.IdCard;
-import com.diagbot.util.ListUtil;
+import com.diagbot.util.IntegerUtil;
 import com.diagbot.util.StringUtil;
 import com.diagbot.vo.HospitalVO;
 import com.diagbot.vo.InquiryDetailVO;
@@ -48,29 +46,36 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
     @Qualifier("inquiryDetailServiceImpl")
     private InquiryDetailServiceImpl inquiryDetailService;
 
-    public void saveInquiry(SaveInquiryVO saveInquiryVO) {
+    public Long saveInquiry(SaveInquiryVO saveInquiryVO) {
         if (StringUtil.isBlank(saveInquiryVO.getHospitalCode())) {
             saveInquiryVO.setHospitalCode("朗通通用");
         }
         Date now = DateUtil.now();
+        InquiryInfo inquiryInfo = null;
         // 如果是身份证，获取性别和年龄
-        if (IdTypeEnum.IdentityCard.getKey() == saveInquiryVO.getIdType()) {
+        if (null != saveInquiryVO.getIdType()
+                && IdTypeEnum.IdentityCard.getKey() == saveInquiryVO.getIdType()) {
             String idNum = saveInquiryVO.getIdNum();
             if (StringUtil.isNotBlank(idNum)) {
                 saveInquiryVO.setPatAge(IdCard.getAgeByIdCardAddOne(idNum));
                 saveInquiryVO.setPatSex(IdCard.getGenderByIdCard(idNum));
             }
         }
+        if (StringUtil.isNotBlank(saveInquiryVO.getHospitalCode())
+                && StringUtil.isNotBlank(saveInquiryVO.getPatName())
+                && !IntegerUtil.isNull(saveInquiryVO.getIdType())
+                && StringUtil.isNotBlank(saveInquiryVO.getIdNum())) {
+            String dateStr = DateUtil.formatDate(now);
+            inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
+                    .eq("is_deleted", IsDeleteEnum.N.getKey())
+                    .eq("hospital_code", saveInquiryVO.getHospitalCode())
+                    .eq("pat_name", saveInquiryVO.getPatName())
+                    .eq("id_type", saveInquiryVO.getIdType())
+                    .eq("id_num", saveInquiryVO.getIdNum())
+                    .apply("date_format(gmt_modified, '%Y-%m-%d')={0}", dateStr), false
+            );
+        }
 
-        String dateStr = DateUtil.formatDate(now);
-        InquiryInfo inquiryInfo = this.getOne(new QueryWrapper<InquiryInfo>()
-                .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("hospital_code", saveInquiryVO.getHospitalCode())
-                .eq("pat_name", saveInquiryVO.getPatName())
-                .eq("id_type", saveInquiryVO.getIdType())
-                .eq("id_num", saveInquiryVO.getIdNum())
-                .apply("date_format(gmt_modified, '%Y-%m-%d')={0}", dateStr), false
-        );
         if (inquiryInfo == null) {
             inquiryInfo = new InquiryInfo();
             BeanUtil.copyProperties(saveInquiryVO, inquiryInfo);
@@ -91,20 +96,21 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
             this.update(new UpdateWrapper<InquiryInfo>()
                     .set("ip", HttpUtils.getIpAddress())
                     .set("gmt_modified", now)
-                    .set("personnel", saveInquiryVO.getPersonnel())
-                    .set("anxiety_point", saveInquiryVO.getAnxietyPoint())
-                    .set("anxiety_judge", saveInquiryVO.getAnxietyJudge())
-                    .set("anxiety_advise", saveInquiryVO.getAnxietyAdvise())
-                    .set("depression_point", saveInquiryVO.getDepressionPoint())
-                    .set("depression_judge", saveInquiryVO.getDepressionJudge())
-                    .set("depression_advise", saveInquiryVO.getDepressionAdvise())
+                    .set(StringUtil.isNotBlank(saveInquiryVO.getPhone()), "phone", saveInquiryVO.getPhone())
+                    .set(StringUtil.isNotBlank(saveInquiryVO.getPersonnel()), "personnel", saveInquiryVO.getPersonnel())
+                    .set(StringUtil.isNotBlank(saveInquiryVO.getAnxietyPoint()), "anxiety_point", saveInquiryVO.getAnxietyPoint())
+                    .set(StringUtil.isNotBlank(saveInquiryVO.getAnxietyJudge()), "anxiety_judge", saveInquiryVO.getAnxietyJudge())
+                    .set(StringUtil.isNotBlank(saveInquiryVO.getAnxietyAdvise()), "anxiety_advise", saveInquiryVO.getAnxietyAdvise())
+                    .set(StringUtil.isNotBlank(saveInquiryVO.getDepressionPoint()), "depression_point", saveInquiryVO.getDepressionPoint())
+                    .set(StringUtil.isNotBlank(saveInquiryVO.getDepressionJudge()), "depression_judge", saveInquiryVO.getDepressionJudge())
+                    .set(StringUtil.isNotBlank(saveInquiryVO.getDepressionAdvise()), "depression_advise", saveInquiryVO.getDepressionAdvise())
                     .eq("id", inquiryInfo.getId())
             );
             // 删除原明细
             inquiryDetailFacade.update(new UpdateWrapper<InquiryDetail>()
-                   .set("gmt_modified", now)
-                   .set("is_deleted", IsDeleteEnum.Y.getKey())
-                   .eq("inquiry_id", inquiryInfo.getId())
+                    .set("gmt_modified", now)
+                    .set("is_deleted", IsDeleteEnum.Y.getKey())
+                    .eq("inquiry_id", inquiryInfo.getId())
             );
         }
         Long id = inquiryInfo.getId();
@@ -120,6 +126,8 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         hospitalVO.setHospitalCode(saveInquiryVO.getHospitalCode());
         // 保存记录表
         optInfoFacade.saveOptOnfo(hospitalVO, "2");
+
+        return id;
     }
 
 

xlcs-service/src/main/java/com/diagbot/vo/InquiryPatVO.java

@@ -34,8 +34,4 @@ public class InquiryPatVO {
      */
     private String idNum;
 
-//    /**
-//     * 诊断程度(1：高，2：中，3：低)
-//     */
-//    private Integer degree;
 }

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

@@ -43,6 +43,9 @@ public class SaveInquiryVO {
     @ApiModelProperty(value = "证件号")
     private String idNum;
 
+    @ApiModelProperty(value = "手机号码")
+    private String phone;
+
     @ApiModelProperty(value = "人员类型")
     private String personnel;
 

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

@@ -37,13 +37,12 @@ public class InquiryInfoController {
     @Autowired
     private InquiryInfoFacade inquiryInfoFacade;
 
-    @ApiOperation(value = "问诊记录保存[by:zhoutg]")
+    @ApiOperation(value = "问诊记录保存[by:gaodm]")
     @PostMapping("/saveInquiry")
     @SysLogger("saveInquiry")
     @Transactional
-    public RespDTO<Boolean> saveInquiry(@RequestBody SaveInquiryVO saveInquiryVO) {
-        inquiryInfoFacade.saveInquiry(saveInquiryVO);
-        return RespDTO.onSuc(true);
+    public RespDTO<Long> saveInquiry(@RequestBody SaveInquiryVO saveInquiryVO) {
+        return RespDTO.onSuc(inquiryInfoFacade.saveInquiry(saveInquiryVO));
     }
 
 
@@ -52,8 +51,7 @@ public class InquiryInfoController {
                     "patName：姓名<br>" +
                     "patSex：性别<br>" +
                     "idType：证件类型(1：身份证，2：护照)<br>" +
-                    "idNum：证件号<br>" +
-                    "degree：诊断程度(1：高，2：中，3：低)<br>")
+                    "idNum：证件号<br>")
     @PostMapping("/getPatList")
     @SysLogger("getPatList")
     public RespDTO<List<InquiryPatDTO>> getPatList(@RequestBody InquiryPatVO inquiryPatVO) {

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

@@ -17,6 +17,7 @@
         <result column="pat_sex" property="patSex" />
         <result column="id_type" property="idType" />
         <result column="id_num" property="idNum" />
+        <result column="phone" property="phone" />
         <result column="personnel" property="personnel" />
         <result column="anxiety_point" property="anxietyPoint" />
         <result column="anxiety_judge" property="anxietyJudge" />