Commit aadf67278012a040154d7d623f553d8722034bd8
1 parent
b4e5bb7560
Exists in
master
and in
1 other branch
1
Showing 5 changed files with 150 additions and 8 deletions
- platform-common/src/main/java/com/lyms/platform/common/enums/ChanQResultEnums.java
- platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java
- platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
- platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
platform-common/src/main/java/com/lyms/platform/common/enums/ChanQResultEnums.java
View file @
aadf672
| 1 | +package com.lyms.platform.common.enums; | |
| 2 | + | |
| 3 | +/** | |
| 4 | + * 产前诊断结果 | |
| 5 | + * | |
| 6 | + * Created by Administrator on 2016/6/29 0029. | |
| 7 | + */ | |
| 8 | +public enum ChanQResultEnums { | |
| 9 | + | |
| 10 | + | |
| 11 | + O("已检查",1),O1("未检查",0); | |
| 12 | + private ChanQResultEnums(String name,Integer id){ | |
| 13 | + this.id=id; | |
| 14 | + this.name=name; | |
| 15 | + } | |
| 16 | + | |
| 17 | + public static String getTitle(int id){ | |
| 18 | + for(ChanQResultEnums chanQResultEnums:values()){ | |
| 19 | + if(chanQResultEnums.getId()==id){ | |
| 20 | + return chanQResultEnums.getName(); | |
| 21 | + } | |
| 22 | + } | |
| 23 | + return null; | |
| 24 | + } | |
| 25 | + private Integer id; | |
| 26 | + private String name; | |
| 27 | + | |
| 28 | + public Integer getId() { | |
| 29 | + return id; | |
| 30 | + } | |
| 31 | + | |
| 32 | + public void setId(Integer id) { | |
| 33 | + this.id = id; | |
| 34 | + } | |
| 35 | + | |
| 36 | + public String getName() { | |
| 37 | + return name; | |
| 38 | + } | |
| 39 | + | |
| 40 | + public void setName(String name) { | |
| 41 | + this.name = name; | |
| 42 | + } | |
| 43 | + | |
| 44 | + public static enum CqResult{ | |
| 45 | + O("阳性",1),O1("阴性",0); | |
| 46 | + private CqResult(String name,Integer id){ | |
| 47 | + this.id=id; | |
| 48 | + this.name=name; | |
| 49 | + } | |
| 50 | + private Integer id; | |
| 51 | + private String name; | |
| 52 | + | |
| 53 | + public Integer getId() { | |
| 54 | + return id; | |
| 55 | + } | |
| 56 | + | |
| 57 | + public void setId(Integer id) { | |
| 58 | + this.id = id; | |
| 59 | + } | |
| 60 | + | |
| 61 | + public String getName() { | |
| 62 | + return name; | |
| 63 | + } | |
| 64 | + | |
| 65 | + public void setName(String name) { | |
| 66 | + this.name = name; | |
| 67 | + } | |
| 68 | + } | |
| 69 | +} |
platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java
View file @
aadf672
| 1 | +package com.lyms.platform.common.enums; | |
| 2 | + | |
| 3 | +/** | |
| 4 | + * | |
| 5 | + * 产筛枚举 | |
| 6 | + * | |
| 7 | + * Created by Administrator on 2016/6/29 0029. | |
| 8 | + */ | |
| 9 | +public enum SieveEnums { | |
| 10 | + O("低风险",0),O1("临界值",1),O2("高风险",2); | |
| 11 | + private SieveEnums(String name,int id){ | |
| 12 | + this.id | |
| 13 | + =id; | |
| 14 | + this.name=name; | |
| 15 | + } | |
| 16 | + private Integer id; | |
| 17 | + private String name; | |
| 18 | + | |
| 19 | + public Integer getId() { | |
| 20 | + return id; | |
| 21 | + } | |
| 22 | + | |
| 23 | + public void setId(Integer id) { | |
| 24 | + this.id = id; | |
| 25 | + } | |
| 26 | + | |
| 27 | + public String getName() { | |
| 28 | + return name; | |
| 29 | + } | |
| 30 | + | |
| 31 | + public void setName(String name) { | |
| 32 | + this.name = name; | |
| 33 | + } | |
| 34 | +} |
platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java
View file @
aadf672
| 1 | +package com.lyms.platform.pojo; | |
| 2 | + | |
| 3 | +import com.lyms.platform.common.result.BaseModel; | |
| 4 | +import org.springframework.data.mongodb.core.mapping.Document; | |
| 5 | + | |
| 6 | +import java.util.Date; | |
| 7 | + | |
| 8 | +/** | |
| 9 | + * 产前筛查 | |
| 10 | + * | |
| 11 | + * Created by Administrator on 2016/6/29 0029. | |
| 12 | + */ | |
| 13 | +@Document(collection = "lyms_sieve") | |
| 14 | +public class SieveModel extends BaseModel { | |
| 15 | + | |
| 16 | + private String id; | |
| 17 | + //患者id | |
| 18 | + private String parentId; | |
| 19 | + //姓名 | |
| 20 | + private String name; | |
| 21 | + //末次月经 | |
| 22 | + private Date lastMenses; | |
| 23 | + //胎数 | |
| 24 | + private Integer tireNumber; | |
| 25 | + //整体风险 | |
| 26 | + private Integer ztfx; | |
| 27 | + //联系方式 | |
| 28 | + private String phone; | |
| 29 | + //申请孕周 | |
| 30 | + private String dueWeek; | |
| 31 | + //产前诊断 1 已检查 0 未检查 | |
| 32 | + private Integer cqStatus; | |
| 33 | + //产前诊断结果 | |
| 34 | + private String cqResult; | |
| 35 | + //妊娠结局 | |
| 36 | + private String renShenResult; | |
| 37 | + private Date created; | |
| 38 | + private Date modified; | |
| 39 | +} |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java
View file @
aadf672
| ... | ... | @@ -88,7 +88,7 @@ |
| 88 | 88 | //产检日期 |
| 89 | 89 | private String checkTime; |
| 90 | 90 | //下次产检时间 |
| 91 | - private String nextCheckTime; | |
| 91 | + private Map nextCheckTime; | |
| 92 | 92 | |
| 93 | 93 | |
| 94 | 94 | |
| 95 | 95 | |
| ... | ... | @@ -141,11 +141,11 @@ |
| 141 | 141 | this.dirOpinion = dirOpinion; |
| 142 | 142 | } |
| 143 | 143 | |
| 144 | - public String getNextCheckTime() { | |
| 144 | + public Map getNextCheckTime() { | |
| 145 | 145 | return nextCheckTime; |
| 146 | 146 | } |
| 147 | 147 | |
| 148 | - public void setNextCheckTime(String nextCheckTime) { | |
| 148 | + public void setNextCheckTime(Map nextCheckTime) { | |
| 149 | 149 | this.nextCheckTime = nextCheckTime; |
| 150 | 150 | } |
| 151 | 151 | |
| ... | ... | @@ -329,7 +329,7 @@ |
| 329 | 329 | postReviewModel.setDirOpinion(dirOpinion); |
| 330 | 330 | postReviewModel.setProdDoctor(prodDoctor); |
| 331 | 331 | postReviewModel.setCheckTime(checkTime); |
| 332 | - postReviewModel.setNextCheckTime(nextCheckTime); | |
| 332 | + postReviewModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime)); | |
| 333 | 333 | return postReviewModel; |
| 334 | 334 | } |
| 335 | 335 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java
View file @
aadf672
| ... | ... | @@ -85,7 +85,7 @@ |
| 85 | 85 | //产检日期 |
| 86 | 86 | private String checkTime; |
| 87 | 87 | //下次产检时间 |
| 88 | - private String nextCheckTime; | |
| 88 | + private Map nextCheckTime; | |
| 89 | 89 | |
| 90 | 90 | |
| 91 | 91 | public PostReviewResult convertToResult(PostReviewModel postReviewModel) { |
| ... | ... | @@ -114,7 +114,7 @@ |
| 114 | 114 | setDirOpinion(postReviewModel.getDirOpinion()); |
| 115 | 115 | setProdDoctor(postReviewModel.getProdDoctor()); |
| 116 | 116 | setCheckTime(postReviewModel.getCheckTime()); |
| 117 | - setNextCheckTime(postReviewModel.getNextCheckTime()); | |
| 117 | + setNextCheckTime(JsonUtil.str2Obj(postReviewModel.getNextCheckTime(),Map.class)); | |
| 118 | 118 | return this; |
| 119 | 119 | } |
| 120 | 120 | |
| 121 | 121 | |
| ... | ... | @@ -167,11 +167,11 @@ |
| 167 | 167 | this.dirOpinion = dirOpinion; |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | - public String getNextCheckTime() { | |
| 170 | + public Map getNextCheckTime() { | |
| 171 | 171 | return nextCheckTime; |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - public void setNextCheckTime(String nextCheckTime) { | |
| 174 | + public void setNextCheckTime(Map nextCheckTime) { | |
| 175 | 175 | this.nextCheckTime = nextCheckTime; |
| 176 | 176 | } |
| 177 | 177 |