预问诊登陆接口修改

aipt-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -121,6 +121,12 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value="病人证件号码")
     private String patientIdNo;
 
+	/**
+	 * 患者身份证号
+	 */
+	@ApiModelProperty(value = "患者身份证号")
+	private String patientIdentityNum;
+
 	/**
 	 * 系统时间
 	 */

icss-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -121,6 +121,12 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value="病人证件号码")
     private String patientIdNo;
 
+	/**
+	 * 患者身份证号
+	 */
+	@ApiModelProperty(value = "患者身份证号")
+	private String patientIdentityNum;
+
 	/**
 	 * 系统时间
 	 */

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

@@ -438,7 +438,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfo.setPatientId(inquiryQuoteVO.getPatientInfo().getId());
         inquiryInfo.setPatientCode(inquiryQuoteVO.getPatientInfo().getCode());
         inquiryInfo.setPatientName(inquiryQuoteVO.getPatientInfo().getName());
-        inquiryInfo.setPatientIdNo(inquiryQuoteVO.getPatientInfo().getIdNo());
+        inquiryInfo.setPatientIdNo(inquiryQuoteVO.getPatientInfo().getIdentityNum());
         inquiryInfo.setPatientBirthday(inquiryQuoteVO.getPatientInfo().getBirthday());
         inquiryInfo.setPatientPhone(inquiryQuoteVO.getPatientInfo().getPhone());
         inquiryInfo.setPatientSex(inquiryQuoteVO.getPatientInfo().getSex());
@@ -458,7 +458,7 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryQuote.setPatientId(inquiryQuoteVO.getPatientInfo().getId());
         inquiryQuote.setPatientCode(inquiryQuoteVO.getPatientInfo().getCode());
         inquiryQuote.setPatientName(inquiryQuoteVO.getPatientInfo().getName());
-        inquiryQuote.setPatientIdNo(inquiryQuoteVO.getPatientInfo().getIdNo());
+        inquiryQuote.setPatientIdNo(inquiryQuoteVO.getPatientInfo().getIdentityNum());
         inquiryQuote.setPatientBirthday(inquiryQuoteVO.getPatientInfo().getBirthday());
         inquiryQuote.setPatientPhone(inquiryQuoteVO.getPatientInfo().getPhone());
         inquiryQuote.setPatientSex(inquiryQuoteVO.getPatientInfo().getSex());
@@ -496,7 +496,11 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryInfo.setPatientId(inquiryQuoteForIcssVO.getPatientId());
         inquiryInfo.setPatientCode(inquiryQuoteForIcssVO.getPatientCode());
         inquiryInfo.setPatientName(inquiryQuoteForIcssVO.getPatientName());
-        inquiryInfo.setPatientIdNo(inquiryQuoteForIcssVO.getPatientIdNo());
+        inquiryInfo.setPatientIdNo(
+                StringUtil.isBlank(inquiryQuoteForIcssVO.getPatientIdentityNum())
+                        ? inquiryQuoteForIcssVO.getPatientIdNo()
+                        : inquiryQuoteForIcssVO.getPatientIdentityNum()
+        );
         inquiryInfo.setPatientBirthday(inquiryQuoteForIcssVO.getPatientBirthday());
         inquiryInfo.setPatientPhone(inquiryQuoteForIcssVO.getPatientPhone());
         inquiryInfo.setPatientSex(inquiryQuoteForIcssVO.getPatientSex());
@@ -507,7 +511,11 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         inquiryQuote.setRegVisitedState(inquiryInfo.getRegVisitedState());
         inquiryQuote.setType(inquiryInfo.getType());
         inquiryQuote.setDataJson(inquiryInfo.getDataJson());
-
+        inquiryQuote.setPatientIdNo(
+                StringUtil.isBlank(inquiryQuoteForIcssVO.getPatientIdentityNum())
+                        ? inquiryQuoteForIcssVO.getPatientIdNo()
+                        : inquiryQuoteForIcssVO.getPatientIdentityNum()
+        );
         inquiryQuoteFacade.save(inquiryQuote);
 
         return true;

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

@@ -152,6 +152,12 @@ public class InquiryQuoteForIcssVO {
     @ApiModelProperty(value = "证件号码")
     private String patientIdNo;
 
+    /**
+     * 患者身份证号
+     */
+    @ApiModelProperty(value = "患者身份证号")
+    private String patientIdentityNum;
+
     /**
      * 就诊序列号
      */

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

@@ -76,6 +76,13 @@ public class InquiryQuotePatientVO {
     @ApiModelProperty(value = "联系电话")
     private String phone;
 
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "身份证号", required = true)
+    @NotBlank(message = "身份证号必传")
+    private String identityNum;
+
     /**
      * 家庭邮编
      */

tran-service/src/main/java/com/diagbot/dto/GetTopPatientInfoDTO.java

@@ -123,6 +123,12 @@ public class GetTopPatientInfoDTO {
 	@ApiModelProperty(value="病人证件号码")
     private String patientIdNo;
 
+	/**
+	 * 患者身份证号
+	 */
+	@ApiModelProperty(value = "患者身份证号")
+	private String patientIdentityNum;
+
 	/**
 	 * 系统时间
 	 */

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

@@ -180,8 +180,10 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
         signInDTO.setHospitalDeptName(hospitalDeptFacade.getOne(hospitalDeptQe, false).getName());
 
         QueryWrapper<PatientInfo> patientInfoQe = new QueryWrapper<>();
-        patientInfoQe.eq("id_no", signInVO.getPatientInfo());
+        patientInfoQe.eq("hospital_code", signInVO.getHospitalCode());
         patientInfoQe.eq("name", signInVO.getPatientName());
+        patientInfoQe.and(a ->
+                a.eq("id_no", signInVO.getPatientInfo()).or().eq("identity_num", signInVO.getPatientInfo()));
         PatientInfo patientInfo = getOne(patientInfoQe, false);
         if (patientInfo == null) {
             patientInfo = new PatientInfo();
@@ -433,11 +435,11 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
         //        List<RegisterInfoDTO> rifList = GsonUtil.toList(retJson, RegisterInfoDTO.class);
         List<RegisterInfoDTO> rifList = JSON.parseArray(retJson, RegisterInfoDTO.class);
         System.out.println(rifList);
-        if (StringUtil.isBlank(signInVO.getSonHospitalCode())){
+        if (StringUtil.isBlank(signInVO.getSonHospitalCode())) {
             return rifList;
         }
 
-        Map<String,List<RegisterInfoDTO>> registerInfoDTOListMap = rifList.stream().collect(Collectors.groupingBy(RegisterInfoDTO::getSonHospitalCode));
+        Map<String, List<RegisterInfoDTO>> registerInfoDTOListMap = rifList.stream().collect(Collectors.groupingBy(RegisterInfoDTO::getSonHospitalCode));
 
         return registerInfoDTOListMap.get(signInVO.getSonHospitalCode());
     }
@@ -516,7 +518,11 @@ public class PatientInfoDjFacade extends PatientInfoServiceImpl {
 
         QueryWrapper<PatientInfo> patientInfoQe = new QueryWrapper<>();
         patientInfoQe.eq("hospital_code", inquiryQuoteVO.getHospitalCode());
-        patientInfoQe.eq("code", inquiryQuoteVO.getPatientInfo().getCode());
+        patientInfoQe.eq("name", inquiryQuoteVO.getPatientInfo().getName());
+        patientInfoQe.and(a ->
+                a.eq("id_no", inquiryQuoteVO.getPatientInfo().getIdentityNum())
+                        .or()
+                        .eq("identity_num", inquiryQuoteVO.getPatientInfo().getIdentityNum()));
         PatientInfo patientInfo = getOne(patientInfoQe, false);
         Long patientId = null;
         if (patientInfo == null) {

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

@@ -64,6 +64,11 @@ public class InquiryQuotePatientVO {
      */
     private String postcode;
 
+    /**
+     * 身份证号
+     */
+    private String identityNum;
+
     /**
      * 联系人
      */

tran-service/src/main/resources/mapper/PatientInfoMapper.xml

@@ -55,6 +55,7 @@
 		d.`name` as patientName,
 		case when d.sex=1 then '男' when d.sex=2 then '女' else '未知' end as patientSex,
 		d.id_no as patientIdNo,
+        d.identity_num as patientIdentityNum,
 		d.birthday as birthday
 		FROM tran_hospital_info a LEFT JOIN tran_hospital_dept b 
 		ON a.`code`=b.hospital_code and b.`status`=1 and b.is_deleted='N' and b.`code`=#{hospitalDeptCode} 	
@@ -81,7 +82,7 @@
         d.`code` as patientCode,
         d.`name` as patientName,
         case when d.sex=1 then '男' when d.sex=2 then '女' else '未知' end as patientSex,
-        d.id_no as patientIdNo,
+        case when d.identity_num is null or d.identity_num='' then d.id_no else d.identity_num end as patientIdNo,
         d.birthday as birthday
         FROM tran_hospital_info a
         LEFT JOIN tran_doctor_info c