优化代码

src/main/java/thyyxxk/wxservice_server/service/InpatientService.java

@@ -30,12 +30,9 @@ public class InpatientService {
     }
 
     public ResultVo<InpatientInfo> getInpatientInfo(String patientId) {
-        String inpatientNo = dao.selectInpatientNoByPatientId(patientId);
+        String inpatientNo = getInpatientNoByPatientId(patientId);
         if (StringUtil.isBlank(inpatientNo)) {
-            inpatientNo = dao.selectInpatientNoBySocialNo(patientId);
-            if (StringUtil.isBlank(inpatientNo)) {
-                return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有找到此卡号对应的住院号。");
-            }
+            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有找到此卡号对应的住院号。");
         }
         InpatientInfo info = dao.getInpatientInfo(inpatientNo);
         if (null == info) {
@@ -59,21 +56,22 @@ public class InpatientService {
     }
 
     public ResultVo<Map<String, Object>> getPrepaidHistory(String patientId) {
-        String inpatientNo = dao.selectInpatientNoByPatientId(patientId);
-        if (StringUtil.isBlank(inpatientNo)) {
-            inpatientNo = dao.selectInpatientNoBySocialNo(patientId);
-            if (StringUtil.isBlank(inpatientNo)) {
-                return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有找到此卡号对应的住院号。");
-            }
-        }
-        InpatientInfo info = dao.getInpatientInfo(inpatientNo);
-        if (null == info) {
-            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有找到此卡号的在院信息。");
+        ResultVo<InpatientInfo> infoResultVo = getInpatientInfo(patientId);
+        if (infoResultVo.getCode() != ExceptionEnum.SUCCESS.getCode()) {
+            return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, infoResultVo.getMessage());
         }
+        InpatientInfo info = infoResultVo.getData();
         Map<String, Object> map = new HashMap<>(Constants.Capacity.TWO);
         map.put("baseInfo", info);
         map.put("prepaid", dao.selectPrepaidHistory(info.getInpatientNo(), info.getAdmissTimes()));
         return ResultVoUtil.success(map);
     }
 
+    private String getInpatientNoByPatientId(String patientId) {
+        String inpatientNo = dao.selectInpatientNoByPatientId(patientId);
+        if (StringUtil.isBlank(inpatientNo)) {
+            inpatientNo = dao.selectInpatientNoBySocialNo(patientId);
+        }
+        return inpatientNo;
+    }
 }