瀏覽代碼

fix: 如果不传诊疗卡 id,则查询本人诊疗卡

Walker 2 年之前
父節點
當前提交
8d23914198

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

@@ -440,8 +440,12 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
         String id = request.getId(); // 对应 medicalCard 的 id
         int userId = ContextHelper.getCurrentUserIdWrapped();
         int hospitalId = BizUtil.getCurrentHospitalId();
+        // 如果不传诊疗卡 id,则查询本人诊疗卡
+        // 获取用户身份证
+        User user = getUserInfoById(userId);
+        String idNo = Checker.getStringValue(user.getIdno());
         MedicalCard c = getUserMedCardList(userId, hospitalId).stream()
-                .filter(i -> i.getCardId() == Checker.parseInt(id))
+                .filter(i -> StringHelper.isNullOrEmpty(idNo) ? i.getCardId() == Checker.parseInt(id) : idNo.equals(i.getIdNo()))
                 .findFirst()
                 .orElse(null);
         if (c == null) throw new AppMessageException("找不到诊疗卡信息");

+ 2 - 2
onemini-hospital-sdk/src/main/java/com/ywt/alipaympapi/controller/MedicCardController.java

@@ -82,7 +82,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("miniProRequest.medicCard.myCard")
-    public ResponseVO<QueryDefaultCardResponseData> myCard(QueryDefaultCardRequest request) throws Exception {
+    public ResponseVO<QueryDefaultCardResponseData> myCard(QueryDefaultCardRequest request) {
         try {
             return ResponseVO.success(medicCardService.queryDefaultMedicCard(request));
         } catch (AppMessageException e) {
@@ -186,7 +186,7 @@ public class MedicCardController {
      * @return
      */
     @PostMapping("isvRequest.patient.querySingle")
-    public ResponseVO<QueryPatientDetailResponse> querySinglePatient(QueryPatientDetailRequest request) throws Exception {
+    public ResponseVO<QueryPatientDetailResponse> querySinglePatient(QueryPatientDetailRequest request) {
         try {
             return ResponseVO.success(medicCardService.querySinglePatient(request));
         } catch (AppMessageException e) {