|
@@ -149,10 +149,7 @@ public class IdCardAnalyzeService {
|
|
|
card.setPatSex(StringUtil.isBlank(idCard.getSocialNo()) ? idCard.getSex() :
|
|
|
DateUtil.calculateSex(idCard.getSocialNo()));
|
|
|
card.setPatBirth(DateUtil.formatBirthday(idCard.getSocialNo(), idCard.getBirthday()));
|
|
|
- card.setPatType(calculatePatType(card.getPatAge()));
|
|
|
- card.setGuardName(idCard.getGuardName());
|
|
|
- card.setGuardIdType(1);
|
|
|
- card.setGuardIdNo(idCard.getGuardIdNo());
|
|
|
+ card.setPatType(1);
|
|
|
String provinceName = redis.getRegionName(idCard.getProvince());
|
|
|
String cityName = redis.getRegionName(idCard.getCity());
|
|
|
String districtName = redis.getRegionName(idCard.getDistrict());
|
|
@@ -160,13 +157,6 @@ public class IdCardAnalyzeService {
|
|
|
return card;
|
|
|
}
|
|
|
|
|
|
- private Integer calculatePatType(Integer age) {
|
|
|
- if (null == age) {
|
|
|
- return 2;
|
|
|
- }
|
|
|
- return age > 12 ? 1 : 2;
|
|
|
- }
|
|
|
-
|
|
|
private ResultVo<HashMap<String, Object>> bindExistCard(IdCardAnalyzeResult temp) {
|
|
|
HashMap<String, Object> map = new HashMap<>(Constants.Capacity.TWO);
|
|
|
final int count = cardsDao.selectHistoryBindCount(temp.getPatientId(), temp.getOpenId());
|