From 85dcc5864ff825f25eb2266b81f13d04661fc107 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 8 Aug 2016 20:11:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?= =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/biz/service/PatientsService.java | 1 + platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java | 2 +- .../java/com/lyms/platform/operate/web/result/MatDeliverListResult.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 00ebc37..98dd1f5 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -177,6 +177,7 @@ public class PatientsService { List patientses = queryPatient(patientsQuery); for(Patients patients:patientses){ patients.setType(3); + patients.setBuildType(2); patients.setFmDate(new Date()); patients.setModified(new Date()); updatePatient(patients); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index 48f3f07..2fb3f36 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -116,7 +116,7 @@ public class Patients extends BaseModel { //分娩状态 0未终止妊娠 1终止妊娠 private Integer dueStatus; - //建档类型 0 未分娩建档 1儿童建档时建档 + //建档类型 0 未分娩建档 1儿童建档时建档 2 自动分娩类型 private Integer buildType; /** diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index f0bbc67..66e076b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -191,7 +191,7 @@ public class MatDeliverListResult { setEnableEdit(date.after(lastCreatedTime) ? "1" : "0"); } if(null!=buildType){ - dueType=buildType+""; + dueType=0==buildType?"0":"1"; } if(null!=dueDate){ this.dueDate=DateUtil.getyyyy_MM_dd(dueDate); -- 1.8.3.1