diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java index fb7c453..9c502db 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterMysqlAntexcMapper.java @@ -126,7 +126,7 @@ public interface MasterMysqlAntexcMapper { List> getIsYgbmkyCheckCount(Map param); List> getHasYgbmkyCheckCount(Map param); - List> getMatdeliverCount(Map param); + List> getLisMatdeliverCount(Map param); List> getMatdeliverHivktCheckCount(Map param); List> getMatdeliverHivktCheckzqCount(Map param); List> getHasMatdeliverHivktCheckzqCount(Map param); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportMatdeliver.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportMatdeliver.java index 29f8e9f..45d8cf5 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportMatdeliver.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/ReportMatdeliver.java @@ -15,6 +15,16 @@ public class ReportMatdeliver { private String fmHospital; private String hospitalId; private String sourceId; + //末次月经 + private Date lastMenses; + + public Date getLastMenses() { + return lastMenses; + } + + public void setLastMenses(Date lastMenses) { + this.lastMenses = lastMenses; + } public String getSourceId() { return sourceId; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java index 23207f2..87b68bb 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/MysqlAntexcService.java @@ -130,7 +130,7 @@ public interface MysqlAntexcService { List> getIsYgbmkyCheckCount(Map param); List> getHasYgbmkyCheckCount(Map param); - List> getMatdeliverCount(Map param); + List> getLisMatdeliverCount(Map param); List> getMatdeliverHivktCheckCount(Map param); List> getMatdeliverHivktCheckzqCount(Map param); List> getHasMatdeliverHivktCheckzqCount(Map param); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java index a7aea75..f03e1ea 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/MysqlAntexcServiceImpl.java @@ -362,8 +362,8 @@ public class MysqlAntexcServiceImpl implements MysqlAntexcService { } @Override - public List> getMatdeliverCount(Map param){ - return masterMysqlAntexcMapper.getMatdeliverCount(param); + public List> getLisMatdeliverCount(Map param){ + return masterMysqlAntexcMapper.getLisMatdeliverCount(param); } @Override public List> getMatdeliverHivktCheckCount(Map param){ diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml index 1e9c054..400740e 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterMysqlAntexc.xml @@ -1222,7 +1222,8 @@ created, fmHospital, hospitalId, - sourceId + sourceId, + lastMenses ) VALUES ( #{mid}, #{parentId}, @@ -1231,7 +1232,8 @@ #{created}, #{fmHospital}, #{hospitalId}, - #{sourceId} + #{sourceId}, + #{lastMenses} ) @@ -2458,7 +2460,7 @@ - SELECT count(f.id) as matdeliverCount ,o.id as hospitalId from report_matdeliver f INNER JOIN organization o on f.fmHospital = o.id and o.id = #{hospitalId,jdbcType=VARCHAR} @@ -2515,10 +2517,17 @@ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java index ab868b7..5d02fb7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientSyncMysqlFacade.java @@ -1569,6 +1569,7 @@ public class PatientSyncMysqlFacade { ReportMatdeliver reportMatdeliver = new ReportMatdeliver(); reportMatdeliver.setSourceId(StringUtils.isNotEmpty(pat.getSource()) ? pat.getSource() : maternalDeliverModel.getParentId()); reportMatdeliver.setMid(maternalDeliverModel.getId()); + reportMatdeliver.setLastMenses(pat.getLastMenses()); try { ConvertUtils.register(new DateLocaleConverter(), Date.class); BeanUtils.copyProperties(reportMatdeliver,maternalDeliverModel); @@ -2380,7 +2381,7 @@ public class PatientSyncMysqlFacade { List> isYgbmkyCheckCounts = mysqlAntexcService.getIsYgbmkyCheckCount(param); List> hasYgbmkyCheckCounts = mysqlAntexcService.getHasYgbmkyCheckCount(param); - List> matdeliverCounts = mysqlAntexcService.getMatdeliverCount(param); + List> matdeliverCounts = mysqlAntexcService.getLisMatdeliverCount(param); List> matdeliverHivktCheckCounts = mysqlAntexcService.getMatdeliverHivktCheckCount(param); List> matdeliverHivktCheckzqCounts = mysqlAntexcService.getMatdeliverHivktCheckzqCount(param); List> hasMatdeliverHivktCheckzqCounts = mysqlAntexcService.getHasMatdeliverHivktCheckzqCount(param);