Browse Source

feature: 就诊卡数据新增返回 hisPatientId

Walker 2 years ago
parent
commit
313a538cda

+ 4 - 0
onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvMedicCardServiceImpl.java

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

+ 1 - 0
onemini-hospital-sdk/src/main/java/com/ywt/response/card/MyCardListResponse.java

@@ -12,4 +12,5 @@ public class MyCardListResponse implements IsvResponseData {
     private Integer type;
     private Integer type;
     private String balance;
     private String balance;
     private Integer cardId;
     private Integer cardId;
+    private String hisPatientId;
 }
 }

+ 1 - 0
onemini-hospital-sdk/src/main/java/com/ywt/response/card/QueryDefaultCardResponseData.java

@@ -21,4 +21,5 @@ public class QueryDefaultCardResponseData implements IsvResponseData {
     private String defaultCard;//是否是默认就诊卡
     private String defaultCard;//是否是默认就诊卡
     private String patientId;//登录用户就诊人id
     private String patientId;//登录用户就诊人id
     private Integer id; // 诊疗卡 id
     private Integer id; // 诊疗卡 id
+    private String hisPatientId;
 }
 }

+ 1 - 0
onemini-hospital-sdk/src/main/java/com/ywt/response/card/QueryPatientDetailResponse.java

@@ -24,4 +24,5 @@ public class QueryPatientDetailResponse implements IsvResponseData {
     private String relationShip; //用户与就诊人关系
     private String relationShip; //用户与就诊人关系
     private String bindCardNum; //就诊人默认绑定就诊卡
     private String bindCardNum; //就诊人默认绑定就诊卡
     private List<MedicCard> medicCards; //就诊人就诊卡列表
     private List<MedicCard> medicCards; //就诊人就诊卡列表
+    private String hisPatientId;
 }
 }

+ 1 - 0
onemini-hospital-sdk/src/main/java/com/ywt/response/card/QueryPatientListResponse.java

@@ -25,4 +25,5 @@ public class QueryPatientListResponse implements IsvResponseData {
     private Boolean defaultPatient; //是否为默认就诊人
     private Boolean defaultPatient; //是否为默认就诊人
     private String bindCardNum; //就诊人默认绑定就诊卡
     private String bindCardNum; //就诊人默认绑定就诊卡
     private List<MedicCard> medicCards; //就诊人就诊卡列表
     private List<MedicCard> medicCards; //就诊人就诊卡列表
+    private String hisPatientId;
 }
 }