Merge branch 'develop' into dev/mix20191205_push

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;
+
 	/**
 	 * 系统时间
 	 */

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

@@ -3,7 +3,6 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.TranServiceClient;
 import com.diagbot.dto.HospitalDeptInfoAllDTO;
 import com.diagbot.dto.RespDTO;
@@ -25,7 +24,6 @@ import com.diagbot.vo.HospitalCodeVo;
 import com.diagbot.vo.TemplateAdminIdsVO;
 import com.diagbot.vo.TemplateIdVO;
 import com.diagbot.vo.TemplateInfoAdminPageVO;
-import com.diagbot.vo.TemplateInfoPageVO;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoTypeVO;
 import com.diagbot.vo.TemplateInfosVO;
@@ -50,17 +48,16 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
     TranServiceClient tranServiceClient;
 
     /**
-     *
      * @param templateInfoRevampVO
      * @return
      */
     public boolean updateByIdUsName(TemplateInfoRevampVO templateInfoRevampVO) {
         //检验权限
-        HospitalCodeSetVO hospitalCodeSetVO =new HospitalCodeSetVO();
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
         hospitalCodeSetVO.setDoctorId(templateInfoRevampVO.getDoctorId());
         hospitalCodeSetVO.setHospitalId(templateInfoRevampVO.getHospitalId());
         boolean res = getadminCheck(hospitalCodeSetVO);
-        if(!res){
+        if (!res) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无修改权限");
         }
         //1.先判断数据是否存在有效
@@ -82,11 +79,11 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
         if (sumA == 0) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "个人模板无权修改");
         }
-        //2.再判断该医生下模板名是否重复重在
+        //2.再判断该科室下模板名是否重复重在
         QueryWrapper<TemplateInfo> templates = new QueryWrapper<>();
         Map<String, Object> mapAll = new HashMap<>();
         mapAll.put("hospital_dept_id", templateInfoRevampVO.getHospitalDeptId());
-        mapAll.put("doctor_id", templateInfoRevampVO.getDoctorId());
+        //mapAll.put("doctor_id", templateInfoRevampVO.getDoctorId());
         mapAll.put("hospital_id", templateInfoRevampVO.getHospitalId());
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         mapAll.put("template_type", TemplateTypeEnum.AdminTemplate.getKey());
@@ -111,25 +108,24 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
     }
 
     /**
-     *
      * @param templateInfosVO
      * @return
      */
     public boolean saveTemplateInfo(TemplateInfosVO templateInfosVO) {
         //检验权限
-        HospitalCodeSetVO hospitalCodeSetVO =new HospitalCodeSetVO();
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
         hospitalCodeSetVO.setDoctorId(templateInfosVO.getDoctorId());
         hospitalCodeSetVO.setHospitalId(templateInfosVO.getHospitalId());
         boolean res = getadminCheck(hospitalCodeSetVO);
-        if(!res){
+        if (!res) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无修改权限");
         }
-        //1.判断该医生下是否存在模板名相同的数据
+        //1.判断同科室下是否存在模板名相同的数据
         TemplateInfo templateInfo = new TemplateInfo();
         QueryWrapper<TemplateInfo> templateInfoFand = new QueryWrapper<>();
         Map<String, Object> mapAll = new HashMap<>();
         mapAll.put("hospital_dept_id", templateInfosVO.getHospitalDeptId());
-        mapAll.put("doctor_id", templateInfosVO.getDoctorId());
+        //mapAll.put("doctor_id", templateInfosVO.getDoctorId());
         mapAll.put("hospital_id", templateInfosVO.getHospitalId());
         mapAll.put("is_deleted", IsDeleteEnum.N.getKey());
         mapAll.put("template_type", TemplateTypeEnum.AdminTemplate.getKey());
@@ -153,7 +149,7 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
         templateInfo.setName(templateInfosVO.getModeName());//模板名称
         templateInfo.setType(templateInfosVO.getModeType());//类型
         templateInfo.setTemplateType(TemplateTypeEnum.AdminTemplate.getKey());//模板类型
-         res = save(templateInfo);
+        res = save(templateInfo);
         if (!res) {
             throw new CommonException(CommonErrorCode.INSERT_DATA_FAILED);
         }
@@ -162,17 +158,16 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
     }
 
     /**
-     *
      * @param templateAdminIdsVO
      * @return
      */
     public boolean cancelTemplateInfo(TemplateAdminIdsVO templateAdminIdsVO) {
         //检验权限
-        HospitalCodeSetVO hospitalCodeSetVO =new HospitalCodeSetVO();
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
         hospitalCodeSetVO.setDoctorId(templateAdminIdsVO.getDoctorId());
         hospitalCodeSetVO.setHospitalId(templateAdminIdsVO.getHospitalId());
         boolean res = getadminCheck(hospitalCodeSetVO);
-        if(!res){
+        if (!res) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无删除权限");
         }
         //1.获取传入的ids数据
@@ -191,48 +186,45 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
         templateInfoNew
                 .in("id", ListUtil.arrayToList(splitIds))
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("template_type",TemplateTypeEnum.AdminTemplate.getKey())
+                .eq("template_type", TemplateTypeEnum.AdminTemplate.getKey())
                 .set("is_deleted", IsDeleteEnum.Y.getKey())
                 //.set("modifier",UserUtils.getCurrentPrincipleID())
                 .set("gmt_modified", DateUtil.now());
-         res = update(new TemplateInfo(), templateInfoNew);
+        res = update(new TemplateInfo(), templateInfoNew);
 
         return res;
     }
 
     /**
-     *
      * @param templateInfoPageVO
      * @return
      */
-    public IPage<TemplateInfoPageDTO> getTemplatePageAlls(Page page, TemplateInfoAdminPageVO templateInfoPageVO) {
+    public IPage<TemplateInfoPageDTO> getTemplatePageAlls(TemplateInfoAdminPageVO templateInfoPageVO) {
         //检验权限
-        HospitalCodeSetVO hospitalCodeSetVO =new HospitalCodeSetVO();
+        HospitalCodeSetVO hospitalCodeSetVO = new HospitalCodeSetVO();
         hospitalCodeSetVO.setDoctorId(templateInfoPageVO.getDoctorId());
         hospitalCodeSetVO.setHospitalId(templateInfoPageVO.getHospitalId());
         boolean res = getadminCheck(hospitalCodeSetVO);
-        if(!res){
+        if (!res) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "暂无权限");
         }
-        HospitalCodeVo hospitalCodeVo =new HospitalCodeVo();
+        HospitalCodeVo hospitalCodeVo = new HospitalCodeVo();
         hospitalCodeVo.setHospitalCode(templateInfoPageVO.getHospitalCode());
         hospitalCodeVo.setDeptInfoName("");
         hospitalCodeVo.setThirdpartyName("");
         RespDTO<List<HospitalDeptInfoAllDTO>> deptInfoDTO = tranServiceClient.getHospitalDeptInfoAll(hospitalCodeVo);
         RespDTOUtil.respNGDeal(deptInfoDTO, deptInfoDTO.msg);
         List<HospitalDeptInfoAllDTO> deptInfo = deptInfoDTO.data;
-        Map<Long,HospitalDeptInfoAllDTO> deptMap =deptInfo.stream().collect(Collectors.toMap(HospitalDeptInfoAllDTO::getId,i->i));
+        Map<Long, HospitalDeptInfoAllDTO> deptMap = deptInfo.stream().collect(Collectors.toMap(HospitalDeptInfoAllDTO::getId, i -> i));
         TemplateInfoTypeVO adminVO = new TemplateInfoTypeVO();
-        adminVO.setName(templateInfoPageVO.getName());
-        adminVO.setSex(templateInfoPageVO.getSex());
-        adminVO.setHospitalDeptId(templateInfoPageVO.getHospitalDeptId());
-        adminVO.setHospitalId(templateInfoPageVO.getHospitalId());
+        BeanUtil.copyProperties(templateInfoPageVO, adminVO);
+        adminVO.setDoctorId(null);
         adminVO.setTemplateType(TemplateTypeEnum.AdminTemplate.getKey());
         IPage<TemplateInfoPageDTO> adminTemplate = getTemplatePages(adminVO);
-        if(adminTemplate.getRecords().size()>0){
-            adminTemplate.getRecords().forEach(i->{
+        if (adminTemplate.getRecords().size() > 0) {
+            adminTemplate.getRecords().forEach(i -> {
                 HospitalDeptInfoAllDTO data = deptMap.get(i.getHospitalDeptId());
-                if(data!=null){
+                if (data != null) {
                     i.setConceptDeptName(data.getConceptDeptName());
                     i.setThirdpartyName(data.getName());
                 }
@@ -240,11 +232,10 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
             });
         }
 
-        return  adminTemplate;
+        return adminTemplate;
     }
 
     /**
-     *
      * @param templateIdVO
      * @return
      */
@@ -254,10 +245,10 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
         templateInfoQuery
                 .eq("id", templateIdVO.getId())
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
-                .eq("template_type",TemplateTypeEnum.AdminTemplate.getKey());
+                .eq("template_type", TemplateTypeEnum.AdminTemplate.getKey());
         TemplateInfoDTO data = new TemplateInfoDTO();
         TemplateInfo datas = getOne(templateInfoQuery, false);
-        if(datas==null){
+        if (datas == null) {
             throw new CommonException(CommonErrorCode.NOT_EXISTS, "该模板不存在！");
         }
         //过滤
@@ -267,14 +258,13 @@ public class TemplateAdminFacade extends TemplateInfoServiceImpl {
 
 
     /**
-     *
      * @param hospitalCodeSetVO
      * @return
      */
-    public boolean getadminCheck(HospitalCodeSetVO hospitalCodeSetVO){
+    public boolean getadminCheck(HospitalCodeSetVO hospitalCodeSetVO) {
         hospitalCodeSetVO.setShowError(true);
         RespDTO<Boolean> datas = tranServiceClient.getAdminCheckout(hospitalCodeSetVO);
         RespDTOUtil.respNGDeal(datas, datas.msg);
-        return  datas.data;
+        return datas.data;
     }
 }

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

@@ -3,7 +3,9 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.diagbot.client.TranServiceClient;
+import com.diagbot.dto.HospitalDeptInfoAllDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TemplateInfoDTO;
 import com.diagbot.dto.TemplateInfoPageAllDTO;
 import com.diagbot.dto.TemplateInfoPageDTO;
@@ -17,13 +19,17 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.GsonUtil;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.HospitalCodeVo;
 import com.diagbot.vo.TemplateIdVO;
+import com.diagbot.vo.TemplateInfoAdminPageVO;
 import com.diagbot.vo.TemplateInfoPageVO;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoTypeVO;
 import com.diagbot.vo.TemplateInfoVO;
 import com.diagbot.vo.TemplateInfosIdVO;
 import com.diagbot.vo.TemplateInfosVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -40,6 +46,9 @@ import java.util.stream.Collectors;
 @Component
 public class TemplateInfoFacade extends TemplateInfoServiceImpl {
 
+    @Autowired
+    TranServiceClient tranServiceClient;
+
     /**
      * @param templateInfoVO
      * @return 医生病历模板信息
@@ -203,13 +212,33 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
      * @param templateInfoPageVO
      * @return
      */
-    public TemplateInfoPageAllDTO getTemplatePageAlls(Page page, TemplateInfoPageVO templateInfoPageVO) {
+    public TemplateInfoPageAllDTO getTemplatePageAlls(TemplateInfoAdminPageVO templateInfoPageVO) {
+        //取出所有科室
+        HospitalCodeVo hospitalCodeVo =new HospitalCodeVo();
+        hospitalCodeVo.setHospitalCode(templateInfoPageVO.getHospitalCode());
+        hospitalCodeVo.setDeptInfoName("");
+        hospitalCodeVo.setThirdpartyName("");
+        RespDTO<List<HospitalDeptInfoAllDTO>> deptInfoDTO = tranServiceClient.getHospitalDeptInfoAll(hospitalCodeVo);
+        RespDTOUtil.respNGDeal(deptInfoDTO, deptInfoDTO.msg);
+        List<HospitalDeptInfoAllDTO> deptInfo = deptInfoDTO.data;
+        Map<Long,HospitalDeptInfoAllDTO> deptMap =deptInfo.stream().collect(Collectors.toMap(HospitalDeptInfoAllDTO::getId,i->i));
         TemplateInfoPageAllDTO data = new TemplateInfoPageAllDTO();
         //取出个人模板
         TemplateInfoTypeVO personalVO = new TemplateInfoTypeVO();
         BeanUtil.copyProperties(templateInfoPageVO, personalVO);
         personalVO.setTemplateType(TemplateTypeEnum.PersonalTemplate.getKey());
+        personalVO.setHospitalDeptId(null);
         IPage<TemplateInfoPageDTO> personalTemplate = getTemplatePages(personalVO);
+        if(personalTemplate.getRecords().size()>0){
+            personalTemplate.getRecords().forEach(i->{
+                HospitalDeptInfoAllDTO datas = deptMap.get(i.getHospitalDeptId());
+                if(datas!=null){
+                    i.setConceptDeptName(datas.getConceptDeptName());
+                    i.setThirdpartyName(datas.getName());
+                }
+
+            });
+        }
         data.setPersonalTemplate(personalTemplate);
         //取出标准模板
         TemplateInfoTypeVO adminVO = new TemplateInfoTypeVO();
@@ -217,8 +246,19 @@ public class TemplateInfoFacade extends TemplateInfoServiceImpl {
         adminVO.setDoctorId(null);
         adminVO.setTemplateType(TemplateTypeEnum.AdminTemplate.getKey());
         IPage<TemplateInfoPageDTO> adminTemplate = getTemplatePages(adminVO);
+        if(adminTemplate.getRecords().size()>0){
+            adminTemplate.getRecords().forEach(i->{
+                HospitalDeptInfoAllDTO datas = deptMap.get(i.getHospitalDeptId());
+                if(datas!=null){
+                    i.setConceptDeptName(datas.getConceptDeptName());
+                    i.setThirdpartyName(datas.getName());
+                }
+
+            });
+        }
         data.setAdminTemplate(adminTemplate);
 
+
         return data;
     }
 

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

@@ -1,46 +1,46 @@
-package com.diagbot.vo;
-
-import java.util.List;
-
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * 
- * @author wangfeng
- * @Description: TODO
- * @date 2019年7月24日 上午11:06:33
- */
-@Getter
-@Setter
-public class TemplateInfoPageVO extends Page{
-
-	/**
-     * 医生id
-     */
-	@NotNull(message = "请输入医生id")
-    private Long doctorId;
-
-    /**
-     * 医院编码
-     */
-	@NotNull(message = "请输入医院Id")
-    private Long hospitalId;
-	/**
-	 * 部门id
-	 */
-	@NotNull(message = "请输入部门id")
-	private Long hospitalDeptId;//部门id
-	
-//	@NotBlank(message = "请输入模板类型")
-	private String type;//模板类型
-	
-	private List<Integer> sex;//性别
-
-	private String name;//模板名字
-}
+package com.diagbot.vo;
+
+import java.util.List;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年7月24日 上午11:06:33
+ */
+@Getter
+@Setter
+public class TemplateInfoPageVO extends Page{
+
+	/**
+     * 医生id
+     */
+	@NotNull(message = "请输入医生id")
+    private Long doctorId;
+
+    /**
+     * 医院编码
+     */
+	@NotNull(message = "请输入医院Id")
+    private Long hospitalId;
+	/**
+	 * 部门id
+	 */
+	//@NotNull(message = "请输入部门id")
+	private Long hospitalDeptId;//部门id
+	
+//	@NotBlank(message = "请输入模板类型")
+	private String type;//模板类型
+	
+	private List<Integer> sex;//性别
+
+	private String name;//模板名字
+}

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

@@ -14,7 +14,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class TemplateInfoRevampVO {
+public class TemplateInfoRevampVO{
 	@NotNull(message = "请输入模板id")
 	private Long id;//模板id
 	@NotBlank(message = "请输入模板名")

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

@@ -86,7 +86,7 @@ public class TemplateInfoAdminController {
     @SysLogger("getTemplatePageAlls")
     public RespDTO<IPage<TemplateInfoPageDTO>> getTemplatePageAll(@Valid @RequestBody TemplateInfoAdminPageVO templateInfoPageVO) {
 
-        IPage<TemplateInfoPageDTO> data = templateAdminFacade.getTemplatePageAlls(templateInfoPageVO, templateInfoPageVO);
+        IPage<TemplateInfoPageDTO> data = templateAdminFacade.getTemplatePageAlls(templateInfoPageVO);
 
         return RespDTO.onSuc(data);
     }

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

@@ -6,6 +6,7 @@ import com.diagbot.dto.TemplateInfoDTO;
 import com.diagbot.dto.TemplateInfoPageAllDTO;
 import com.diagbot.facade.TemplateInfoFacade;
 import com.diagbot.vo.TemplateIdVO;
+import com.diagbot.vo.TemplateInfoAdminPageVO;
 import com.diagbot.vo.TemplateInfoPageVO;
 import com.diagbot.vo.TemplateInfoRevampVO;
 import com.diagbot.vo.TemplateInfoVO;
@@ -97,9 +98,9 @@ public class TemplateInfoController {
                     + "name：模板名称")
     @PostMapping("/getTemplatePageAlls")
     @SysLogger("getTemplatePageAlls")
-    public RespDTO<TemplateInfoPageAllDTO> getTemplatePageAll(@Valid @RequestBody TemplateInfoPageVO templateInfoPageVO) {
+    public RespDTO<TemplateInfoPageAllDTO> getTemplatePageAll(@Valid @RequestBody TemplateInfoAdminPageVO templateInfoPageVO) {
 
-        TemplateInfoPageAllDTO data = templateInfoFacade.getTemplatePageAlls(templateInfoPageVO, templateInfoPageVO);
+        TemplateInfoPageAllDTO data = templateInfoFacade.getTemplatePageAlls(templateInfoPageVO);
 
         return RespDTO.onSuc(data);
     }

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