diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 5a4c577..776b80b 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -47,7 +47,6 @@ public class PatientsService { @Autowired private TrackDownRecordService trackDownRecordService; - public Patients addPatient(Patients obj) { return iPatientDao.addPatient(obj); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/HospitalServiceContentMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/HospitalServiceContentMapper.java index 49aa6e2..30af818 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/HospitalServiceContentMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/HospitalServiceContentMapper.java @@ -20,6 +20,6 @@ public interface HospitalServiceContentMapper { public List queryGroupHospitalServiceContent(HospitalServiceContentQuery query); - public int queryGroupHospitalServiceContentCount(HospitalServiceContentQuery query); + public Integer queryGroupHospitalServiceContentCount(HospitalServiceContentQuery query); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/HospitalServiceContentServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/HospitalServiceContentServiceImpl.java index a6a2245..ee95334 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/HospitalServiceContentServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/HospitalServiceContentServiceImpl.java @@ -51,7 +51,8 @@ public class HospitalServiceContentServiceImpl implements HospitalServiceContent @Override public List queryGroupHospitalServiceContent(HospitalServiceContentQuery query) { if (query.getNeed() != null) { - query.mysqlBuild(hospitalServiceContentMapper.queryGroupHospitalServiceContentCount(query)); + Integer count = hospitalServiceContentMapper.queryGroupHospitalServiceContentCount(query); + query.mysqlBuild(count==null?0:count); } return hospitalServiceContentMapper.queryGroupHospitalServiceContent(query); } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml b/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml index 042876b..d575d5a 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/HospitalServiceContent.xml @@ -110,7 +110,7 @@ select id,hospital_id,ser_type,ser_price,create_date,create_user,status,sync_sta -