From b5f854bc1aa4c8cc4485a9cd782d7bcf101c05e7 Mon Sep 17 00:00:00 2001 From: gengxiaokai Date: Tue, 9 Oct 2018 16:06:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E8=AF=8A=E6=96=AD=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/query/DiagnosisQuery.java | 4 ++-- .../java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java index 360ea4e..7c1687f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/DiagnosisQuery.java @@ -261,9 +261,9 @@ public class DiagnosisQuery extends BaseQuery implements IConvertToNativeQuery { } if(null != applyWeeksStart && null != applyWeeksEnd){ if(c != null){ - c = c.where("applyWeek").gte(applyWeeksStart).lte(applyWeeksEnd); + c = c.where("dueDays").gte(applyWeeksStart).lte(applyWeeksEnd); }else{ - c = Criteria.where("applyWeek").gte(applyWeeksStart).lte(applyWeeksEnd); + c = Criteria.where("dueDays").gte(applyWeeksStart).lte(applyWeeksEnd); } } if(null != lastMensesStart && null != lastMensesEnd){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java index e16e2e0..a04c4dc 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/DiagnosisFacaed.java @@ -218,8 +218,8 @@ public class DiagnosisFacaed { }else{//新增数据 diagnosisModel.setCreated(new Date()); diagnosisModel.setDiaStatus("1");//已申请状态 - diagnosisModel.setStatus("1"); - diagnosisModel.setRefStatus("0"); + diagnosisModel.setStatus("1");//数据来源 + diagnosisModel.setRefStatus("0");//未转诊默认状态 //查询孕妇基本信息 Patients patients = patientsService.findOnePatientById(diagnosisModel.getParentId()); int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); -- 1.8.3.1