|
@@ -228,6 +228,7 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
|
|
|
item.setDefaultCard(medicalCard.getIsDefault() ? "是" : "否");//是否是默认就诊卡
|
|
|
item.setPatientId("");//如果是医保卡,传参保城市
|
|
|
item.setId(medicalCard.getCardId());
|
|
|
+ item.setHisPatientId(medicalCard.getHisPatientId());
|
|
|
return item;
|
|
|
}
|
|
|
|
|
@@ -347,6 +348,7 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
|
|
|
r.setRelationShip(RelationshipEnum.valueOf(c.getRelationship()).getDisplayName());
|
|
|
r.setDefaultPatient(false); // TODO: 怎么确定默认就诊人
|
|
|
r.setBindCardNum(c.getCardNo());
|
|
|
+ r.setHisPatientId(c.getHisPatientId());
|
|
|
MedicCard card = new MedicCard();
|
|
|
card.setCardNum(c.getCardNo());
|
|
|
card.setType(CARD_TYPE_NORMAL);
|
|
@@ -507,6 +509,7 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
|
|
|
r.setIdCardNo(BizUtil.masked(c.getIdNo()));
|
|
|
r.setRelationShip(RelationshipEnum.valueOf(c.getRelationship()).getDisplayName());
|
|
|
r.setBindCardNum(c.getCardNo());
|
|
|
+ r.setHisPatientId(c.getHisPatientId());
|
|
|
MedicCard card = new MedicCard();
|
|
|
card.setCardNum(c.getCardNo());
|
|
|
card.setType(CARD_TYPE_NORMAL);
|
|
@@ -532,6 +535,7 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
|
|
|
r.setBalance(String.valueOf(c.getBalance() / 100d));
|
|
|
r.setType(CARD_TYPE_NORMAL);
|
|
|
r.setCardId(c.getCardId());
|
|
|
+ r.setHisPatientId(c.getHisPatientId());
|
|
|
return r;
|
|
|
})
|
|
|
.collect(Collectors.toList());
|