shiyang / regional-platform

Download as
Browse Code »

Commit 27bfed506918a4bd1c36dfe453d23cbc18613646

Authored by landong2015
2 parents 21f2e07f21 aa1d01c302
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 10 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ 27bfed5
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import com.lyms.platform.common.result.BaseModel;
3 4 import org.springframework.data.mongodb.core.mapping.Document;
4 5  
5 6 import java.util.Date;
... ... @@ -12,7 +13,7 @@
12 13 * Created by Administrator on 2016/6/16 0016.
13 14 */
14 15 @Document(collection = "lyms_antex")
15   -public class AntenatalExaminationModel {
  16 +public class AntenatalExaminationModel extends BaseModel {
16 17  
17 18 private String id;
18 19 private String pid;
platform-dal/src/main/java/com/lyms/platform/pojo/AwModel.java View file @ 27bfed5
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import com.lyms.platform.common.result.BaseModel;
3 4 import org.springframework.data.mongodb.core.mapping.Document;
4 5  
5 6 /**
... ... @@ -7,7 +8,7 @@
7 8 * Created by Administrator on 2016/6/22.
8 9 */
9 10 @Document(collection = "lyms_healthconfig")
10   -public class AwModel {
  11 +public class AwModel extends BaseModel {
11 12 private String id;
12 13 private Integer sex;
13 14 private Integer age;
platform-dal/src/main/java/com/lyms/platform/pojo/CommunityConfig.java View file @ 27bfed5
1 1 package com.lyms.platform.pojo;
2 2  
3 3 import com.lyms.platform.common.enums.YnEnums;
  4 +import com.lyms.platform.common.result.BaseModel;
4 5 import org.springframework.data.mongodb.core.mapping.Document;
5 6  
6 7 import java.util.List;
... ... @@ -11,7 +12,7 @@
11 12 *
12 13 */
13 14 @Document(collection="lyms_communityConfig")
14   -public class CommunityConfig {
  15 +public class CommunityConfig extends BaseModel {
15 16 private String id;
16 17 private String name;
17 18 private Integer yn;
platform-dal/src/main/java/com/lyms/platform/pojo/LisCrisisItem.java View file @ 27bfed5
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import com.lyms.platform.common.result.BaseModel;
3 4 import org.springframework.data.mongodb.core.mapping.Document;
4 5  
5 6 import java.util.Date;
... ... @@ -8,7 +9,7 @@
8 9 * Created by Administrator on 2016/10/19 0019.
9 10 */
10 11 @Document(collection = "lyms_lis_crisis_item")
11   -public class LisCrisisItem {
  12 +public class LisCrisisItem extends BaseModel {
12 13  
13 14 private String id;
14 15 private String hospitalId;
platform-dal/src/main/java/com/lyms/platform/pojo/LisReport.java View file @ 27bfed5
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import com.lyms.platform.common.result.BaseModel;
3 4 import org.apache.commons.lang.StringUtils;
4 5 import org.springframework.data.mongodb.core.mapping.Document;
5 6  
... ... @@ -10,7 +11,7 @@
10 11 * Created by Administrator on 2016/10/19 0019.
11 12 */
12 13 @Document(collection = "lyms_lis_report")
13   -public class LisReport {
  14 +public class LisReport extends BaseModel {
14 15  
15 16 private String id;
16 17 private String hospitalId;
platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java View file @ 27bfed5
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import com.lyms.platform.common.result.BaseModel;
3 4 import org.apache.commons.lang.math.NumberUtils;
4 5 import org.springframework.data.mongodb.core.mapping.Document;
5 6  
... ... @@ -13,7 +14,7 @@
13 14 * Created by Administrator on 2016/6/16 0016.
14 15 */
15 16 @Document(collection = "lyms_matdeliver")
16   -public class MaternalDeliverModel {
  17 +public class MaternalDeliverModel extends BaseModel {
17 18  
18 19 private String id;
19 20 //产妇id
platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java View file @ 27bfed5
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import com.lyms.platform.common.result.BaseModel;
3 4 import org.springframework.data.mongodb.core.mapping.Document;
4 5  
5 6 import java.util.Date;
... ... @@ -11,7 +12,7 @@
11 12 * Created by Administrator on 2016/6/15 0015.
12 13 */
13 14 @Document(collection = "lyms_referralapplyorder")
14   -public class ReferralApplyOrderModel {
  15 +public class ReferralApplyOrderModel extends BaseModel {
15 16  
16 17 private String id;
17 18 //患者id
platform-dal/src/main/java/com/lyms/platform/pojo/ServiceMonitor.java View file @ 27bfed5
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import com.lyms.platform.common.result.BaseModel;
3 4 import org.springframework.data.mongodb.core.mapping.Document;
4 5  
5 6 /**
6 7 * Created by Zhang.Rui on 2016/6/12.
7 8 */
8 9 @Document(collection="lyms_serviceMonitor")
9   -public class ServiceMonitor {
  10 +public class ServiceMonitor extends BaseModel {
10 11 private String id;
11 12 private Integer type; // 1短信 2邮箱
12 13 private String name;
platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java View file @ 27bfed5
1 1 package com.lyms.platform.pojo;
2 2  
  3 +import com.lyms.platform.common.result.BaseModel;
3 4 import org.springframework.data.mongodb.core.mapping.Document;
4 5  
5 6 import java.util.Date;
... ... @@ -10,7 +11,7 @@
10 11 * Created by Administrator on 2016/6/15 0015.
11 12 */
12 13 @Document(collection = "lyms_sieveapplyorder")
13   -public class SieveApplyOrderModel {
  14 +public class SieveApplyOrderModel extends BaseModel {
14 15 private String id;
15 16 //患者id
16 17 private String parentId;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java View file @ 27bfed5
... ... @@ -479,10 +479,6 @@
479 479 break;
480 480 }
481 481 try {
482   - int tempIndex = line.indexOf(",,,,,,,,,,,,,,,");
483   - if (tempIndex > 20) {
484   - line = line.substring(0, tempIndex + 1);
485   - }
486 482 String ss[] = line.split(",");
487 483 if (!ss[1].startsWith("2016")) {
488 484 continue;