jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8c9ed03a38262af66a36987491867693aa1290ab

Authored by baohanddd
2 parents 4725345de4 e990c0c0e8
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java View file @ 8c9ed03
... ... @@ -85,7 +85,7 @@
85 85 //产检日期
86 86 private String checkDate;
87 87 //下次产检日期
88   - private String nextCheckDate;
  88 + private String nextCheckTime;
89 89 private Integer yn;
90 90 private Date created;
91 91  
92 92  
... ... @@ -225,12 +225,12 @@
225 225 this.id = id;
226 226 }
227 227  
228   - public String getNextCheckDate() {
229   - return nextCheckDate;
  228 + public String getNextCheckTime() {
  229 + return nextCheckTime;
230 230 }
231 231  
232   - public void setNextCheckDate(String nextCheckDate) {
233   - this.nextCheckDate = nextCheckDate;
  232 + public void setNextCheckTime(String nextCheckTime) {
  233 + this.nextCheckTime = nextCheckTime;
234 234 }
235 235  
236 236 public String getOtherRisk() {
platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 8c9ed03
... ... @@ -5,6 +5,7 @@
5 5 import com.lyms.platform.common.dao.operator.MongoCondition;
6 6 import com.lyms.platform.common.dao.operator.MongoOper;
7 7 import com.lyms.platform.common.dao.operator.MongoQuery;
  8 +import com.lyms.platform.common.utils.StringUtils;
8 9 import org.bson.types.ObjectId;
9 10 import org.springframework.data.mongodb.core.query.Criteria;
10 11  
11 12  
12 13  
13 14  
... ... @@ -264,21 +265,21 @@
264 265 condition=condition.and("communityId", null, MongoOper.IS);
265 266 }
266 267  
267   - if(null!=mcertNo){
  268 + if(!StringUtils.isEmpty(mcertNo)){
268 269 condition=condition.and("mcertNo", mcertNo, MongoOper.IS);
269 270 }
270   - if(null!=cardNo){
  271 + if(!StringUtils.isEmpty(cardNo)){
271 272 condition=condition.and("cardNo", cardNo, MongoOper.IS);
272 273 }
273 274  
274   - if(null!=vcCardNo){
  275 + if(!StringUtils.isEmpty(vcCardNo)){
275 276 condition=condition.and("vcCardNo", vcCardNo, MongoOper.IS);
276 277 }
277 278  
278 279 if(null!=hospitalId){
279 280 condition=condition.and("hospitalId", hospitalId, MongoOper.IS);
280 281 }
281   - if(null!=diagnose){
  282 + if(!StringUtils.isEmpty(diagnose)){
282 283 condition=condition.and("diagnose", diagnose, MongoOper.LIKE);
283 284 }
284 285  
285 286  
286 287  
287 288  
... ... @@ -305,17 +306,17 @@
305 306 }
306 307  
307 308  
308   - if (null != parentId) {
  309 + if (!StringUtils.isEmpty(parentId)) {
309 310 condition = condition.and("parentid", parentId, MongoOper.IS);
310 311 }
311   - if (null != mphone) {
  312 + if (!StringUtils.isEmpty(mphone)) {
312 313 condition = condition.and("mphone", mphone, MongoOper.IS);
313 314 }
314   - if (null != mname) {
  315 + if (!StringUtils.isEmpty(mname)) {
315 316 condition = condition.and("mname", mname, MongoOper.IS);
316 317 }
317 318  
318   - if (null != name) {
  319 + if (!StringUtils.isEmpty(name)) {
319 320 condition = condition.and("name", name, MongoOper.IS);
320 321 }
321 322  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java View file @ 8c9ed03
... ... @@ -155,7 +155,6 @@
155 155 * @param mcardNo 母亲身份证
156 156 * @param page
157 157 * @param limit
158   - * @param serviceType 服务状态
159 158 * @param name 儿童姓名
160 159 * @param highRiskType 0 非高危 1 高危 2/空 全部
161 160 * @return
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java View file @ 8c9ed03
... ... @@ -69,7 +69,7 @@
69 69 //产检日期
70 70 private String checkDate;
71 71 //下次产检日期
72   - private String nextCheckDate;
  72 + private String nextCheckTime;
73 73  
74 74  
75 75  
... ... @@ -109,7 +109,7 @@
109 109 examinationModel.setGuide(guide);
110 110 examinationModel.setCheckDoctor(checkDoctor);
111 111 examinationModel.setCheckDate(checkDate);
112   - examinationModel.setNextCheckDate(nextCheckDate);
  112 + examinationModel.setNextCheckTime(nextCheckTime);
113 113  
114 114 return examinationModel;
115 115 }
116 116  
... ... @@ -226,12 +226,12 @@
226 226 this.id = id;
227 227 }
228 228  
229   - public String getNextCheckDate() {
230   - return nextCheckDate;
  229 + public String getNextCheckTime() {
  230 + return nextCheckTime;
231 231 }
232 232  
233   - public void setNextCheckDate(String nextCheckDate) {
234   - this.nextCheckDate = nextCheckDate;
  233 + public void setNextCheckTime(String nextCheckTime) {
  234 + this.nextCheckTime = nextCheckTime;
235 235 }
236 236  
237 237 public Map getOtherRisk() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java View file @ 8c9ed03
... ... @@ -68,13 +68,21 @@
68 68 //产检日期
69 69 private String checkDate;
70 70 //下次产检日期
71   - private String nextCheckDate;
  71 + private String nextCheckTime;
72 72  
  73 + public String getNextCheckTime() {
  74 + return nextCheckTime;
  75 + }
  76 +
  77 + public void setNextCheckTime(String nextCheckTime) {
  78 + this.nextCheckTime = nextCheckTime;
  79 + }
  80 +
73 81 @Override
74 82 public AntenatalExaminationResult convertToResult(AntenatalExaminationModel destModel) {
75 83 setEdema(destModel.getEdema());
76 84 setParentId(destModel.getParentId());
77   - setNextCheckDate(destModel.getNextCheckDate());
  85 + setNextCheckTime(destModel.getNextCheckTime());
78 86 setUrineProtein(destModel.getUrineProtein());
79 87 setTreatmentOpinion(destModel.getTreatmentOpinion());
80 88  
... ... @@ -224,14 +232,6 @@
224 232  
225 233 public void setId(String id) {
226 234 this.id = id;
227   - }
228   -
229   - public String getNextCheckDate() {
230   - return nextCheckDate;
231   - }
232   -
233   - public void setNextCheckDate(String nextCheckDate) {
234   - this.nextCheckDate = nextCheckDate;
235 235 }
236 236  
237 237 public Map getOtherRisk() {