diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureDataInfoMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureDataInfoMapper.java index e047f86..f34692f 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureDataInfoMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MeasureDataInfoMapper.java @@ -20,4 +20,6 @@ public interface MeasureDataInfoMapper { int queryMeasureDataInfoListCount(MeasureDataInfoQuery query); List queryMeasureList(MeasureDataInfoQuery query); + + int queryMeasureListCount(MeasureDataInfoQuery query); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureDataInfoServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureDataInfoServiceImpl.java index 9e02e4d..cf933a8 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureDataInfoServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MeasureDataInfoServiceImpl.java @@ -41,6 +41,9 @@ public class MeasureDataInfoServiceImpl implements MeasureDataInfoService { @Override public List queryMeasureList(MeasureDataInfoQuery query) { + if (query.getNeed() != null) { + query.mysqlBuild(measureDataInfoMapper.queryMeasureListCount(query)); + } return measureDataInfoMapper.queryMeasureList(query); } } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml index e645ae2..91fc16f 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml @@ -70,6 +70,112 @@ + + + + + 1 = 1 + + and m.id = #{id,jdbcType=INTEGER} + + + and m.value_one = #{valueOne,jdbcType=VARCHAR} + + + and m.value_two = #{valueTwo,jdbcType=VARCHAR} + + + and m.value_three = #{valueThree,jdbcType=VARCHAR} + + + and m.value_type = #{valueType,jdbcType=INTEGER} + + + AND date_format(m.created,'%Y-%m-%d') = #{created} + + + and m.record_count = #{m.recordCount,jdbcType=INTEGER} + + + + AND date_format(m.modified,'%Y-%m-%d') = #{modified} + + + + AND m.created >= date_format(#{createdTimeStart},'%Y-%m-%d') + + + AND + + + + AND m.modified >= date_format(#{modifiedTimeStart},'%Y-%m-%d') + + + AND + + + + m.today_count = #{todayCount,jdbcType=INTEGER}, + + + + and (u.phone = #{queryNo,jdbcType=VARCHAR} or u.cert_no = #{queryNo,jdbcType=VARCHAR} + or u.user_name = #{queryNo,jdbcType=VARCHAR}) + + + + and u.hospital_id = #{hospitalId,jdbcType=VARCHAR} + + + and u.hospital_id in + + #{item} + + + + and u.address = #{address,jdbcType=VARCHAR} + + + and u.face = #{face,jdbcType=VARCHAR} + + + and u.finger = #{finger,jdbcType=VARCHAR} + + + + and u.user_name = #{userName,jdbcType=VARCHAR} + + + and u.cert_type = #{certType,jdbcType=VARCHAR} + + + and u.cert_no = #{certNo,jdbcType=VARCHAR} + + + and u.age = #{age,jdbcType=VARCHAR} + + + and u.phone = #{phone,jdbcType=VARCHAR} + + + and u.sex = #{sex,jdbcType=INTEGER} + + + and u.vc_card_no = #{vcCardNo,jdbcType=VARCHAR} + + + and u.zy_no = #{zyNo,jdbcType=VARCHAR} + + + and u.visit_id = #{visitId,jdbcType=VARCHAR} + + + and u.patient_id = #{valueOne,jdbcType=VARCHAR} + + + + - - and u.hospital_id = #{hospitalId,jdbcType=VARCHAR} - - - and u.hospital_id in - - #{item} - - - - and u.address = #{address,jdbcType=VARCHAR} - - - and u.face = #{face,jdbcType=VARCHAR} - - - and u.finger = #{finger,jdbcType=VARCHAR} - - - and u.user_name = #{userName,jdbcType=VARCHAR} - - - and u.cert_type = #{certType,jdbcType=VARCHAR} - - - and u.cert_no = #{certNo,jdbcType=VARCHAR} - - - and u.age = #{age,jdbcType=VARCHAR} - - - and u.phone = #{phone,jdbcType=VARCHAR} - - - and u.sex = #{sex,jdbcType=INTEGER} - - - and u.vc_card_no = #{vcCardNo,jdbcType=VARCHAR} - - - and u.zy_no = #{zyNo,jdbcType=VARCHAR} - - - and u.visit_id = #{visitId,jdbcType=VARCHAR} - - - and u.patient_id = #{valueOne,jdbcType=VARCHAR} - + + +