身份信息页面添加HIS身份信息

src/main/java/thyyxxk/webserver/controller/yibao/PatientController.java

@@ -46,7 +46,7 @@ public class PatientController {
     }
 
     @GetMapping("/getIdCardInfo")
-    public ResultVo<Map<String, List<IdCard>>> getIdCardInfo(@RequestParam("inpatientNo") String inpatientNo,
+    public ResultVo<Map<String, Object>> getIdCardInfo(@RequestParam("inpatientNo") String inpatientNo,
                                                              @RequestParam("admissTimes") Integer admissTimes) {
         return service.getIdCardInfo(inpatientNo, admissTimes);
     }

src/main/java/thyyxxk/webserver/dao/his/yibao/PatientDao.java

@@ -64,9 +64,9 @@ public interface PatientDao {
             "balance=RTRIM((select balance+charge_yb from zy_ledger_file where inpatient_no=a.inpatient_no and " +
             "admiss_times=a.admiss_times and ledger_sn=a.times_billed)), " +
             "injuryArea=(select injury_area from t_injury_si_pat_info where pat_no=a.inpatient_no " +
-            "and times=a.admiss_times and ledger_sn=a.times_billed) " +
-            "FROM zy_actpatient a, a_patient_mi b WHERE a.inpatient_no=#{inpatientNo} AND b.inpatient_no=a.inpatient_no")
-    Patient getPatientInfo(@Param("inpatientNo") String inpatientNo);
+            "and times=a.admiss_times and ledger_sn=a.times_billed) FROM ${table} a with(nolock), " +
+            "a_patient_mi b with(nolock) WHERE a.inpatient_no=#{inpatientNo} AND b.inpatient_no=a.inpatient_no")
+    Patient getPatientInfo(@Param("inpatientNo") String inpatientNo, @Param("table") String table);
 
     @Select("select inpatientNo=rtrim(a.inpatient_no),a.admiss_times,a.med_type,b.social_no, " +
             "name=rtrim(a.name),sex=isnull(a.sex, b.sex),act_ipt_days=(datediff(day, admiss_date, getdate())), " +

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

@@ -42,7 +42,7 @@ public class PatientService {
     }
 
     public ResultVo<Patient> getPatientInfo(String inpatientNo) {
-        Patient data = dao.getPatientInfo(inpatientNo);
+        Patient data = dao.getPatientInfo(inpatientNo, "zy_actpatient");
         if (null == data) {
             return ResultVoUtil.fail(ExceptionEnum.NULL_POINTER, "没有住院号【" + inpatientNo + "】的在院业务！");
         }
@@ -95,12 +95,17 @@ public class PatientService {
         return ResultVoUtil.success(map);
     }
 
-    public ResultVo<Map<String, List<IdCard>>> getIdCardInfo(String inpatientNo, Integer admissTimes) {
+    public ResultVo<Map<String, Object>> getIdCardInfo(String inpatientNo, Integer admissTimes) {
         List<IdCard> idCard = dao.getIdCard(inpatientNo, admissTimes);
         List<IdCard> scanFile = dao.getScanFile(inpatientNo, admissTimes);
-        Map<String, List<IdCard>> map = new HashMap<>(Capacity.TWO);
+        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("patient", patient);
         return ResultVoUtil.success(map);
     }