feature: 门诊缴费详情, 核酸确认

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/IsvPayServiceImpl.java

@@ -281,7 +281,7 @@ public class IsvPayServiceImpl implements IsvPayService {
                         data.setIdNum("");//Todo
                         data.setInvoiceNo(Checker.getStringValue(payItem.getInvoiceNo()));
                         data.setHisPatientId(hisPatientId);
-                        data.setAge(pAge);
+                        data.setAge(Checker.getIntegerValue(pAge));
                         data.setSex(pGender);
                         data.setDoctorName(payItem.getDoctorName());
                         data.setDoctorCode(payItem.getDoctorCode());

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/service/impl/NucleicServiceImpl.java

@@ -292,18 +292,18 @@ public class NucleicServiceImpl implements NucleicService {
 
             doctorId = 0;
             avatar = Constants.DOCTOR_AVATAR_URL;
-//            getDoctorByHisCodeResponse = getDoctorByHisCode(s.getDoctorCode(), hospitalId);
-//
-//            if (getDoctorByHisCodeResponse.getResult().getCode() == ResultCode.SUCCEED) {
-//                if (!StringHelper.isNullOrWhiteSpace(getDoctorByHisCodeResponse.getAvatar())) {
-//                    avatar = getDoctorByHisCodeResponse.getAvatar();
-//                }
-//
-//                doctorId = getDoctorByHisCodeResponse.getDoctorId();
-//            }
-//            if (doctorId <= 0) {
-//                continue;
-//            }
+            getDoctorByHisCodeResponse = getDoctorByHisCode(s.getDoctorCode(), hospitalId);
+
+            if (getDoctorByHisCodeResponse.getResult().getCode() == ResultCode.SUCCEED) {
+                if (!StringHelper.isNullOrWhiteSpace(getDoctorByHisCodeResponse.getAvatar())) {
+                    avatar = getDoctorByHisCodeResponse.getAvatar();
+                }
+
+                doctorId = getDoctorByHisCodeResponse.getDoctorId();
+            }
+            if (doctorId <= 0) {
+                continue;
+            }
             NucleicItemResponseData data = new NucleicItemResponseData();
             Map<String, Object> scheduleMap = new HashMap<>();
             data.setNucleicItemId(s.getScheduleItemCode());
@@ -407,4 +407,12 @@ public class NucleicServiceImpl implements NucleicService {
 //                    .build();
 //            return doctorServiceBlockingStub.getDoctorByHisCode(getDoctorByHisCodeRequest);
 //        }
+
+    private GetDoctorByHisCodeResponse getDoctorByHisCode(String doctorCode, int hospitalId) {
+        GetDoctorByHisCodeRequest getDoctorByHisCodeRequest = GetDoctorByHisCodeRequest.newBuilder()
+                .setHospitalId(hospitalId)
+                .setHisCode(doctorCode)
+                .build();
+        return doctorServiceBlockingStub.getDoctorByHisCode(getDoctorByHisCodeRequest);
+    }
 }