From 719ff4aaa8adb06228e57a5a1b02ba15b23427a5 Mon Sep 17 00:00:00 2001 From: yangfei Date: Fri, 13 Oct 2017 15:15:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/permission/model/PatientService.java | 12 ++++++++++++ .../permission/model/PatientServiceQuery.java | 13 +++++++++++++ .../resources/mainOrm/master/PatientService.xml | 21 ++++++++++----------- .../web/controller/PatientServiceController.java | 2 +- .../web/facade/PatientMarkHospServiceFacade.java | 2 ++ 5 files changed, 38 insertions(+), 12 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java index 6d74106..71fbc9a 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientService.java @@ -81,6 +81,18 @@ public class PatientService { * 退款人 */ private String backUser; + /** + * 订单号 + */ + private String orderId; + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } public String getSerTypes() { return serTypes; diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java index 85203a2..663ab33 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PatientServiceQuery.java @@ -55,6 +55,19 @@ public class PatientServiceQuery extends BaseQuery { */ private String backUser; + /** + * 订单号 + */ + private String orderId; + + public String getOrderId() { + return orderId; + } + + public void setOrderId(String orderId) { + this.orderId = orderId; + } + public Date getBackDate() { return backDate; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml index 158ce9f..dc55c74 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/PatientService.xml @@ -22,12 +22,13 @@ + - insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser}) + insert into patient_service (id,parentid,pid,ser_type,ser_doct,create_date,create_user_name,create_user,ser_status,update_date,update_user_name,update_user,hospital_id,ser_code,status,receive_date,receive_user,back_date,back_user,order_id) values (#{id},#{parentid},#{pid},#{serType},#{serDoct},#{createDate},#{createUserName},#{createUser},#{serStatus},#{updateDate},#{updateUserName},#{updateUser},#{hospitalId},#{serCode},#{status},#{receiveDate},#{receiveUser},#{backDate},#{backUser},#{orderId}) @@ -87,6 +88,9 @@ back_user = #{backUser,jdbcType=VARCHAR}, + + order_id = #{orderId,jdbcType=VARCHAR}, + where id = #{id,jdbcType=VARCHAR} @@ -99,7 +103,7 @@ @@ -113,8 +117,6 @@ - - 1 = 1 @@ -194,28 +196,25 @@ and back_user = #{backUser,jdbcType=VARCHAR} + + and order_id = #{orderId,jdbcType=VARCHAR} + ${sql} - - - - - - \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java index 5abb97a..fdd375b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientServiceController.java @@ -20,7 +20,7 @@ import java.util.Date; /** * @auther yangfei * @createTime 2017年09月11日 11时36分 - * @discription + * @discription 服务开通相关 */ @Controller public class PatientServiceController extends BaseController { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index 6a56d5b..2c11c07 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -354,6 +354,8 @@ public class PatientMarkHospServiceFacade { } else if (null != patientMarkRequest.getcDueWeekStart() || null != patientMarkRequest.getcDueWeekEnd()) { return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } + patientMarkHospQuery.setMakeStartDate(patientMarkRequest.getMakeStartDate()); + patientMarkHospQuery.setMakeEndDate(patientMarkRequest.getMakeEndDate()); //列数据 List legendData = new ArrayList<>(); -- 1.8.3.1