From cc51b41fa3dd6c51eef9028fbbb72ec3e7139d74 Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 24 Sep 2020 14:10:14 +0800
Subject: [PATCH] 添加字段
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SaasClientPayMapper.xml | 10 ++++++++--
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java | 13 +++++++++++++
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html | 2 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java | 13 -------------
4 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
index 2e7263d..3b524f6 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/SaasClientPay.java
@@ -51,6 +51,13 @@
*/
private String createHospitalName;
/**
+ * 医生id
+ */
+ private String createDoctorId; /**
+ * 医生姓名
+ */
+ private String createDoctorName;
+ /**
* 金额 （单位为分）
*/
@NotEmpty(message = "金额 （单位为分）不能为空")
@@ -77,6 +84,12 @@
*/
@NotEmpty(message = "关联诊断记录ID不能为空")
private String diaId;
+
+ /**
+ * 诊断人姓名
+ */
+ @NotEmpty(message = "关联诊断记录ID不能为空")
+ private String diaName;
/**
* 孩子的id
*/
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
index 14c3d00..b3095f5 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/SaasClientPayServiceImpl.java
@@ -69,19 +69,6 @@
beanCopier.copy(saasClientPay,vo,null);
double v = Double.parseDouble(vo.getPayPrice().toString())/100;
vo.setPrice(v+"");
-// if (StringUtils.isNotBlank(vo.getChildId())) {
-// Map<String,Object> map=new HashMap<>();
-// map.put("id",vo.getChildId());
-// ResultBody byId = childService.findById(map);
-// if(byId.getCode()==0){
-// Child parse = JSON.parseObject(JSON.toJSONString(byId.getData()), Child.class);
-// if(parse!=null){
-// vo.setChildName(parse.getChildName());
-// vo.setChildSex(parse.getChildSex());
-// vo.setChildBirthday(parse.getChildBirthday());
-// }
-// }
-// }
listVo.add(vo);
}
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SaasClientPayMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SaasClientPayMapper.xml
index ec198ce..dc83d50 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SaasClientPayMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SaasClientPayMapper.xml
@@ -52,7 +52,7 @@
and prepay_id = #{p.prepayId}
</if>
<if test="p.type != null ">
- and type = #{p.type}
+ and type = #{p.type}
</if>
<if test="p.createUserId != null and p.createUserId !=''">
and create_user_id = #{p.createUserId}
@@ -92,6 +92,12 @@
<if test="p.createHospitalName != null and p.createHospitalName !=''">
and create_hospital_name = #{p.createHospitalName}
</if>
+ <if test="p.createDoctorId != null and p.createDoctorId !=''">
+ and create_doctor_id = #{p.createDoctorId}
+ </if>
+ <if test="p.createDoctorIdName != null and p.createDoctorIdName !=''">
+ and create_doctor_name like '%${p.createDoctorIdName}%'
+ </if>
<if test="p.payPrice != null and p.payPrice !=''">
and pay_price = #{p.payPrice}
</if>
@@ -123,7 +129,7 @@
and prepay_id = #{p.prepayId}
</if>
<if test="p.type != null ">
- and type = #{p.type}
+ and type = #{p.type}
</if>
<if test="p.createUserId != null and p.createUserId !=''">
and create_user_id = #{p.createUserId}
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html
index 53fb049..9d5f45e 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/saasClientPay.html
@@ -189,7 +189,7 @@
type:0,
createHospitalId: $("#hospitalId").val(),
createHospitalDepartid: departmentId,
- doctorId: doctorId,
+ createDoctorId: doctorId,
startTime: startTime,
endTime: endTime
}
--
Gitblit v1.8.0