feature: 名字脱敏

onemini-hospital-empty/src/main/java/com/ywt/alipaympapi/core/utils/BizUtil.java

@@ -41,7 +41,7 @@ public final class BizUtil {
      */
     public static String masked(String s, int resBit) {
         if (s == null) return "";
-        if (s.length() <= 2 * resBit) return s;
+        if (s.length() < 2 * resBit) return s;
         int maskedBitLen = s.length() - 2 * resBit;
         StringBuilder sb = new StringBuilder();
         for (int i = 0; i < maskedBitLen; i++) {

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

@@ -423,7 +423,7 @@ public class InpatientServiceImpl implements InpatientService {
                 for (CashListItem i : list) {
                     if (request.getReceiptNo().equals(i.getReceiptNo())) {
                         da = new DepositTradeDetailsResponseData();
-                        da.setInpatientName(BizUtil.masked(Checker.getStringValue(request.getName())));
+                        da.setInpatientName(Checker.getStringValue(request.getName()));
                         da.setAmount(String.format("%.2f", i.getPayAmout() / 100d));
                         da.setOutTradeNo(i.getReceiptNo());
                         da.setPayTime(i.getPayDate() + "    " + i.getPayTime());
@@ -526,7 +526,7 @@ public class InpatientServiceImpl implements InpatientService {
                     data = new InpatientDetailsResponseData();
                     data.setPatientId(hisPationId);
                     data.setInpatientId(hisPationId);
-                    data.setInpatientName(BizUtil.masked(medicalCard.getPatientName()));
+                    data.setInpatientName(medicalCard.getPatientName());
                     data.setSex(medicalCard.getSex() == 1 ? "男" : "女");
                     Date date = DateUtil.stringToDate(medicalCard.getBirthday(), DateUtil.DADE_FROMAT_YMD);
                     data.setInpatientAge(Integer.parseInt(getAgeFromMedicalCard(medicalCard)));

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

@@ -506,7 +506,7 @@ public class IsvMedicCardServiceImpl implements IsvMedicCardService {
         QueryPatientDetailResponse r = new QueryPatientDetailResponse();
         List<MedicCard> medicCards = new ArrayList<>();
         r.setId(String.valueOf(c.getCardId()));
-        r.setName(c.getPatientName());
+        r.setName(BizUtil.masked(c.getPatientName(), 1));
         r.setAge(getAgeFromMedicalCard(c));
         r.setSex(SexEnum.getSexDisplayName(c.getSex()));
         r.setPhoneNumber(BizUtil.masked(c.getMobile()));

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

@@ -135,8 +135,8 @@ public class IsvPayServiceImpl implements IsvPayService {
             da.setHisClinicCode(Checker.getStringValue(request.getHisClinicCode()));
             da.setPrescribeDate(Checker.getStringValue(request.getPrescribeDate()));
             da.setTotal(request.getTotal());
-            da.setUserName(BizUtil.masked(Checker.getStringValue(request.getName())));
-            da.setName(BizUtil.masked(Checker.getStringValue(request.getName())));
+            da.setUserName(Checker.getStringValue(request.getName()));
+            da.setName(Checker.getStringValue(request.getName()));
             da.setHisOrderNo(Checker.getStringValue(request.getHisOrderNo()));
             da.setAmount(Checker.getStringValue(request.getAmount()));
             da.setCreateTime(Checker.getStringValue(request.getPrescribeDate()));
@@ -194,7 +194,7 @@ public class IsvPayServiceImpl implements IsvPayService {
                             .collect(Collectors.toList());
                 }
                 da.setAge(Checker.getIntegerValue(pAge));
-                da.setUserName(BizUtil.masked(Checker.getStringValue(pName)));
+                da.setUserName(Checker.getStringValue(pName));
                 da.setSex(pGender);
                 da.setPayDate(request.getDate());
                 da.setOrderItems(list);
@@ -282,7 +282,7 @@ public class IsvPayServiceImpl implements IsvPayService {
                         data.setOrderId(payItem.getOrderId());
                         data.setDeptName(payItem.getDeptName());
                         data.setPrescribeDate(payItem.getPrescriptionDate());
-                        data.setName(BizUtil.masked(resp.getPatientName()));
+                        data.setName(resp.getPatientName());
                         data.setTotal(payItem.getTotalFee());
                         data.setAmount(String.format("%.2f", payItem.getTotalFee() / 100d));
                         data.setTradeNo(""); //Todo
@@ -387,7 +387,7 @@ public class IsvPayServiceImpl implements IsvPayService {
                             data.setTitle("");
                             data.setDeptName(payItem.getDeptName());
                             data.setPrescribeDate(payItem.getPrescriptionDate());
-                            data.setName(BizUtil.masked(resp.getPatientName()));
+                            data.setName(resp.getPatientName());
                             data.setAmount(String.format("%.2f", payItem.getTotalFee() / 100d));
                             data.setTradeNo(""); //Todo
                             data.setOutTradeNo("");//Todo
@@ -447,9 +447,9 @@ public class IsvPayServiceImpl implements IsvPayService {
                 .setHisPatientId(request.getHisPatientId())
                 .setHisClinicCode(request.getHisClinicCode())
                 .setHisOrderNo(request.getHisOrderNo())
-                .setPayName(BizUtil.masked(request.getName()))
+                .setPayName(request.getName())
                 .setPrescriptionDate(Checker.isNone(pDate) ? 0L : pDate.getTime())
-                .setPatientName(BizUtil.masked(request.getName()))
+                .setPatientName(request.getName())
                 .setPatientAge(request.getAge())
                 .setPatientSex(sex)
                 .setOrderInsType("自费")

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

@@ -519,7 +519,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 QueryOrderDetailResponseData data = new QueryOrderDetailResponseData();
                 data.setOrderId(Integer.toString(orderId));
                 data.setOrderNo(item.getOrderNo());
-                data.setUserName(BizUtil.masked(item.getPatientName()));
+                data.setUserName(item.getPatientName());
                 data.setDoctorName(item.getDoctorName());
                 data.setDepName(item.getDeptName());
                 data.setDeptCode(item.getDeptCode());
@@ -606,7 +606,7 @@ public class IsvRegisterServiceImpl implements IsvRegisterService {
                 int orderId = Checker.getIntegerValue(item.getOrderId());
                 data.setOrderId(Integer.toString(orderId));
                 data.setOrderNo(item.getOrderNo());
-                data.setUserName(BizUtil.masked(item.getPatientName()));
+                data.setUserName(item.getPatientName());
                 data.setDoctorName(item.getDoctorName());
                 data.setDepName(item.getDeptName());
                 data.setDeptCode(item.getDeptCode());

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

@@ -63,7 +63,7 @@ public class IsvReportServiceImpl implements IsvReportService {
                     List<String> reportItem = new ArrayList<>();
                     InspectionDetail detail = res.getDetail();
                     data.setRecordId(request.getRecordId());
-                    data.setUserName(BizUtil.masked(Checker.getStringValue(card.getPatientName())));
+                    data.setUserName(Checker.getStringValue(card.getPatientName()));
                     data.setUserSex(card.getSex() == 1 ? "男": card.getSex() ==  2 ? "女": "");
                     data.setUserAge(Checker.getStringValue(card.getAge()));
                     data.setCardNum(Checker.getStringValue(card.getCardNum()));
@@ -87,7 +87,7 @@ public class IsvReportServiceImpl implements IsvReportService {
                         List<String> reportItem = new ArrayList<>();
                         com.ywt.gapi.user.InspectionReportDetail detail = girdResp.getReport();
                         data.setRecordId(request.getRecordId());
-                        data.setUserName(BizUtil.masked(card.getPatientName()));
+                        data.setUserName(card.getPatientName());
                         data.setUserSex(card.getSex() == 1 ? "男": card.getSex() ==  2 ? "女": "");
                         data.setUserAge(Checker.getStringValue(card.getAge()));
                         data.setCardNum(Checker.getStringValue(card.getCardNum()));
@@ -115,7 +115,7 @@ public class IsvReportServiceImpl implements IsvReportService {
                     List<ReportItem> reportItemList = new ArrayList<>();
                     List<String> reportItem = new ArrayList<>();
                     data.setDiagnosis(reportItem);
-                    data.setUserName(BizUtil.masked(card.getPatientName()));
+                    data.setUserName(card.getPatientName());
                     data.setUserSex(card.getSex() == 1 ? "男": card.getSex() ==  2 ? "女": "");
                     data.setUserAge(Checker.getStringValue(card.getAge()));
                     data.setItemName(res.getTitle());
@@ -145,7 +145,7 @@ public class IsvReportServiceImpl implements IsvReportService {
                         List<ReportItem> reportItemList = new ArrayList<>();
                         List<String> reportItem = new ArrayList<>();
                         data.setDiagnosis(reportItem);
-                        data.setUserName(BizUtil.masked(Checker.getStringValue(card.getPatientName())));
+                        data.setUserName(Checker.getStringValue(card.getPatientName()));
                         data.setUserSex(card.getSex() == 1 ? "男": card.getSex() ==  2 ? "女": "");
                         data.setUserAge(Checker.getStringValue(card.getAge()));
                         data.setItemName(res.getTitle());
@@ -206,7 +206,7 @@ public class IsvReportServiceImpl implements IsvReportService {
                         QueryReportListResponseData da = new QueryReportListResponseData();
                         da.setItemName(Checker.getStringValue(q.getReportTitle()));
                         da.setRecordId(Checker.getStringValue(q.getReportId()));
-                        da.setUserName(BizUtil.masked(card.getPatientName()));
+                        da.setUserName(card.getPatientName());
                         da.setCardNum(card.getCardNum());
                         da.setStatus(Checker.getStringValue(""));
                         da.setDiagnosis(Checker.getStringValue(""));
@@ -229,7 +229,7 @@ public class IsvReportServiceImpl implements IsvReportService {
                         QueryReportListResponseData da = new QueryReportListResponseData();
                         da.setItemName(Checker.getStringValue(report.getReportTitle()));
                         da.setRecordId(Checker.getStringValue(report.getReportId()));
-                        da.setUserName(BizUtil.masked(card.getPatientName()));
+                        da.setUserName(card.getPatientName());
                         da.setCardNum(card.getCardNum());
                         da.setStatus(Checker.getStringValue(""));
                         da.setDiagnosis(Checker.getStringValue(""));
@@ -255,7 +255,7 @@ public class IsvReportServiceImpl implements IsvReportService {
                         da.setItemName(Checker.getStringValue(q.getReportTitle()));
                         da.setDepartmentName(Checker.getStringValue(q.getDeptName()));
                         da.setRecordId(Checker.getStringValue(q.getReportId()));
-                        da.setUserName(BizUtil.masked(card.getPatientName()));
+                        da.setUserName(card.getPatientName());
                         da.setCardNum(card.getCardNum());
                         da.setType(Checker.getStringValue(request.getType()));
                         da.setHisPatientId(hisPatientId);
@@ -276,7 +276,7 @@ public class IsvReportServiceImpl implements IsvReportService {
                         da.setItemName(Checker.getStringValue(report.getInspectionName()));
                         da.setDepartmentName(Checker.getStringValue(report.getDeptName()));
                         da.setRecordId(Checker.getStringValue(report.getInspectionId()));
-                        da.setUserName(BizUtil.masked(card.getPatientName()));
+                        da.setUserName(card.getPatientName());
                         da.setCardNum(card.getCardNum());
                         da.setType(Checker.getStringValue(request.getType()));
                         da.setHisPatientId(hisPatientId);