From aa1d01c3029f156613072bf137712bcd9c5fb14f Mon Sep 17 00:00:00 2001 From: hanshaofeng Date: Tue, 29 Nov 2016 13:46:21 +0800 Subject: [PATCH] add extends BaseModel --- .../main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java | 3 ++- platform-dal/src/main/java/com/lyms/platform/pojo/AwModel.java | 3 ++- .../src/main/java/com/lyms/platform/pojo/CommunityConfig.java | 3 ++- platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java | 3 ++- platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java | 3 ++- .../src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java | 3 ++- .../src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java | 3 ++- platform-dal/src/main/java/com/lyms/platform/pojo/ServiceMonitor.java | 3 ++- .../src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java | 3 ++- .../com/lyms/platform/operate/web/service/SyncDataTaskService.java | 4 ---- 10 files changed, 18 insertions(+), 13 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 2f29bec..603bf2c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -1,5 +1,6 @@ package com.lyms.platform.pojo; +import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; @@ -12,7 +13,7 @@ import java.util.Map; * Created by Administrator on 2016/6/16 0016. */ @Document(collection = "lyms_antex") -public class AntenatalExaminationModel { +public class AntenatalExaminationModel extends BaseModel { private String id; private String pid; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AwModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AwModel.java index 2e6009d2..6f6ff2b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AwModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AwModel.java @@ -1,5 +1,6 @@ package com.lyms.platform.pojo; +import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; /** @@ -7,7 +8,7 @@ import org.springframework.data.mongodb.core.mapping.Document; * Created by Administrator on 2016/6/22. */ @Document(collection = "lyms_healthconfig") -public class AwModel { +public class AwModel extends BaseModel { private String id; private Integer sex; private Integer age; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java index 159a074..f140e29 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java @@ -1,6 +1,7 @@ package com.lyms.platform.pojo; import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; import java.util.List; @@ -11,7 +12,7 @@ import java.util.Map; * */ @Document(collection="lyms_communityConfig") -public class CommunityConfig { +public class CommunityConfig extends BaseModel { private String id; private String name; private Integer yn; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java b/platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java index cc66fac..45ff622 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java @@ -1,5 +1,6 @@ package com.lyms.platform.pojo; +import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; @@ -8,7 +9,7 @@ import java.util.Date; * Created by Administrator on 2016/10/19 0019. */ @Document(collection = "lyms_lis_crisis_item") -public class LisCrisisItem { +public class LisCrisisItem extends BaseModel { private String id; private String hospitalId; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java index fb6eedf..e27f542 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java @@ -1,5 +1,6 @@ package com.lyms.platform.pojo; +import com.lyms.platform.common.result.BaseModel; import org.apache.commons.lang.StringUtils; import org.springframework.data.mongodb.core.mapping.Document; @@ -10,7 +11,7 @@ import java.util.List; * Created by Administrator on 2016/10/19 0019. */ @Document(collection = "lyms_lis_report") -public class LisReport { +public class LisReport extends BaseModel { private String id; private String hospitalId; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 235d6a1..2bc3c60 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -1,5 +1,6 @@ package com.lyms.platform.pojo; +import com.lyms.platform.common.result.BaseModel; import org.apache.commons.lang.math.NumberUtils; import org.springframework.data.mongodb.core.mapping.Document; @@ -13,7 +14,7 @@ import java.util.Map; * Created by Administrator on 2016/6/16 0016. */ @Document(collection = "lyms_matdeliver") -public class MaternalDeliverModel { +public class MaternalDeliverModel extends BaseModel { private String id; //产妇id diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index c641a30..adac60c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -1,5 +1,6 @@ package com.lyms.platform.pojo; +import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; @@ -11,7 +12,7 @@ import java.util.List; * Created by Administrator on 2016/6/15 0015. */ @Document(collection = "lyms_referralapplyorder") -public class ReferralApplyOrderModel { +public class ReferralApplyOrderModel extends BaseModel { private String id; //患者id diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ServiceMonitor.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ServiceMonitor.java index 08b8154..a7e3f85 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ServiceMonitor.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ServiceMonitor.java @@ -1,12 +1,13 @@ package com.lyms.platform.pojo; +import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; /** * Created by Zhang.Rui on 2016/6/12. */ @Document(collection="lyms_serviceMonitor") -public class ServiceMonitor { +public class ServiceMonitor extends BaseModel { private String id; private Integer type; // 1短信 2邮箱 private String name; diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java index c25e913..9d7b923 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java @@ -1,5 +1,6 @@ package com.lyms.platform.pojo; +import com.lyms.platform.common.result.BaseModel; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; @@ -10,7 +11,7 @@ import java.util.Date; * Created by Administrator on 2016/6/15 0015. */ @Document(collection = "lyms_sieveapplyorder") -public class SieveApplyOrderModel { +public class SieveApplyOrderModel extends BaseModel { private String id; //患者id private String parentId; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index 7000c13..1aa6d50 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -479,10 +479,6 @@ public class SyncDataTaskService { break; } try { - int tempIndex = line.indexOf(",,,,,,,,,,,,,,,"); - if (tempIndex > 20) { - line = line.substring(0, tempIndex + 1); - } String ss[] = line.split(","); if (!ss[1].startsWith("2016")) { continue; -- 1.8.3.1