优化获取身份证和扫描件

src/main/java/thyyxxk/webserver/service/yibao/PatientService.java

@@ -97,14 +97,18 @@ public class PatientService {
 
     public ResultVo<Map<String, Object>> getIdCardInfo(String inpatientNo, Integer admissTimes) {
         List<IdCard> idCard = dao.getIdCard(inpatientNo, admissTimes);
-        List<IdCard> scanFile = dao.getScanFile(inpatientNo, admissTimes);
+        if (idCard.isEmpty()) {
+            idCard = dao.getScanFile(inpatientNo, admissTimes);
+        }
+        if (idCard.isEmpty()) {
+            return ResultVoUtil.fail(ExceptionEnum.LOGICAL_ERROR, "此患者没有录入身份证或扫描件！");
+        }
         Patient patient = dao.getPatientInfo(inpatientNo, "zy_actpatient");
         if (null == patient) {
             patient = dao.getPatientInfo(inpatientNo, "zy_inactpatient");
         }
         Map<String, Object> map = new HashMap<>();
-        map.put("idCard", idCard);
-        map.put("scanFile", scanFile);
+        map.put("idCard", idCard.get(0));
         map.put("patient", patient);
         return ResultVoUtil.success(map);
     }