Commit b5f854bc1aa4c8cc4485a9cd782d7bcf101c05e7
1 parent
53ec7e977b
Exists in
master
and in
6 other branches
产前诊断条件查询
Showing 2 changed files with 4 additions and 4 deletions
platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java
View file @
b5f854b
... | ... | @@ -261,9 +261,9 @@ |
261 | 261 | } |
262 | 262 | if(null != applyWeeksStart && null != applyWeeksEnd){ |
263 | 263 | if(c != null){ |
264 | - c = c.where("applyWeek").gte(applyWeeksStart).lte(applyWeeksEnd); | |
264 | + c = c.where("dueDays").gte(applyWeeksStart).lte(applyWeeksEnd); | |
265 | 265 | }else{ |
266 | - c = Criteria.where("applyWeek").gte(applyWeeksStart).lte(applyWeeksEnd); | |
266 | + c = Criteria.where("dueDays").gte(applyWeeksStart).lte(applyWeeksEnd); | |
267 | 267 | } |
268 | 268 | } |
269 | 269 | if(null != lastMensesStart && null != lastMensesEnd){ |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java
View file @
b5f854b
... | ... | @@ -218,8 +218,8 @@ |
218 | 218 | }else{//新增数据 |
219 | 219 | diagnosisModel.setCreated(new Date()); |
220 | 220 | diagnosisModel.setDiaStatus("1");//已申请状态 |
221 | - diagnosisModel.setStatus("1"); | |
222 | - diagnosisModel.setRefStatus("0"); | |
221 | + diagnosisModel.setStatus("1");//数据来源 | |
222 | + diagnosisModel.setRefStatus("0");//未转诊默认状态 | |
223 | 223 | //查询孕妇基本信息 |
224 | 224 | Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId()); |
225 | 225 | int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); |