From 3ecb43bd5455df7c541d382370c981c4ffa24853 Mon Sep 17 00:00:00 2001
From: houruijun <411269194@kidgrow.com>
Date: Fri, 27 Nov 2020 16:13:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html | 14 +++-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml | 3 +
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java | 5 +
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java | 15 ++--
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html | 132 +++++++++++++++-----------------------------
5 files changed, 69 insertions(+), 100 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java
index 380586f..2de6bff 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalScreening.java
@@ -79,4 +79,9 @@
* 微站首页中间位置图片
*/
private String homePage;
+
+ /**
+ * 查询关键字
+ */
+ private String keyWord;
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
index a501e7e..8d86f78 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/HospitalScreeningMapper.xml
@@ -63,6 +63,9 @@
<if test="p.homePage != null and p.homePage !=''">
and home_page = #{p.homePage}
</if>
+ <if test="p.keyWord != null and p.keyWord !=''">
+ and hospital_name like concat('%', #{p.keyWord}, '%')
+ </if>
</where>
</sql>
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
index f5a92fc..ce57544 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysDoctorServiceImpl.java
@@ -190,17 +190,16 @@
return ResultBody.failed("选择一个角色");
}
}
-
- /**
- * 限制只有创建医生的个数
- *
- */
- if (sysUserServiceImpl.departmetAccountsCount(sysDoctor.getDepartmentId()) <= 0) {
- return ResultBody.failed("该部门创建人数已经达到上限");
- }
SysHospital sysHospital = sysHospitalMapper.selectById(sysDoctor.getHospitalId());
SysDepartment sysDepartment = sysDepartmentMapper.selectById(sysDoctor.getDepartmentId());
if (sysDoctor.getId() == null) {
+ /**
+ * 限制只有创建医生的个数
+ *
+ */
+ if (sysUserServiceImpl.departmetAccountsCount(sysDoctor.getDepartmentId()) <= 0) {
+ return ResultBody.failed("该部门创建人数已经达到上限");
+ }
Long sysUserId = null;
//保存部门信息
ResultBody resultBody = this.saveFenjiekou(sysDoctor, id, sysHospital, sysDepartment, null);
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
index 27257d1..975f886 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/recharge.html
@@ -616,7 +616,9 @@
var listNum = 0;
if (!strUtil.isEmpty(listData)) {
listData.forEach(item => {
- listNum += item.ailightCount;
+ if(item.proType==1){
+ listNum += item.ailightCount;
+ }
})
}
if ($("#contractNum").val() < listNum) {
@@ -748,21 +750,23 @@
});
function isthenNum(num) {
if (num <= 0) {
- return "请输入读片量大于0";
+ return "请输入合同读片充值量大于0";
}
var listData = admin.getTempData("t_tempProduct");
var listNum = 0;
if (!strUtil.isEmpty(listData)) {
listData.forEach(item => {
- listNum += item.ailightCount;
+ if(item.proType==1){
+ listNum += item.ailightCount;
+ }
})
}
listNum += num;
if ($("#contractNum").val() == undefined || $("#contractNum").val() == "") {
- return "请输入读片量！";
+ return "请输入合同读片充值量！";
} else {
if ($("#contractNum").val() < listNum) {
- return "当前产品总数不得大于合同总量";
+ return "当前产品总数不得大于合同读片充值量";
} else {
return null;
}
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
index cc711aa..c40d620 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/rechargeupdate.html
@@ -278,20 +278,11 @@
$('#contractBeginTime').val($('#contractEndTime').val());
} else {
$('#custom_beginTime').val($("#contractBeginTime").val())
- custom_beginTimes.config.min = {
- year: date.year,
- month: date.month - 1,//关键
- date: date.date,
- hours: date.hours,
- minutes: date.minutes,
- seconds: date.seconds
- }
}
}
});
var contractEndTime = laydate.render({
elem: '#contractEndTime', //指定元素
- // min: $("#contractEndTime_not").val(),
done: function (value, date, endDate) {
var startDate = new Date($('#contractBeginTime').val()).getTime();
var endTime = new Date(value).getTime();
@@ -300,23 +291,7 @@
$('#contractEndTime').val($('#contractBeginTime').val());
} else {
$('#custom_endTime').val($("#contractEndTime").val())
- custom_endTimes.config.max = {
- year: date.year,
- month: date.month - 1,//关键
- date: date.date,
- hours: date.hours,
- minutes: date.minutes,
- seconds: date.seconds
- }
- var begin = new Date($("#contractBeginTime").val())
- custom_endTimes.config.min = {
- year: layui.util.toDateString(begin, "yyyy"),
- month: layui.util.toDateString(begin, "MM") - 1,//关键
- date: layui.util.toDateString(begin, "dd"),
- hours: layui.util.toDateString(begin, "HH"),
- minutes: layui.util.toDateString(begin, "mm"),
- seconds: layui.util.toDateString(begin, "ss")
- }
+
}
}
@@ -327,32 +302,7 @@
laydate.render({
elem: '#contractEndTime_not' //指定元素
});
- var custom_beginTimes = laydate.render({
- elem: '#custom_beginTime', //指定元素
- // min: $("#contractEndTime").val(),
- // man: $("#contractBeginTime").val(),
- done: function (value, date, endDate) {
- var startDate = new Date(value).getTime();
- var endTime = new Date($('#custom_endTime').val()).getTime();
- if (endTime < startDate) {
- layer.msg('结束时间不能小于开始时间');
- $('#custom_beginTime').val($('#custom_endTime').val());
- }
- }
- });
- var custom_endTimes = laydate.render({
- elem: '#custom_endTime', //指定元素
- // min: $("#contractEndTime").val(),
- // man: $("#contractBeginTime").val(),
- done: function (value, date, endDate) {
- var startDate = new Date($('#custom_beginTime').val()).getTime();
- var endTime = new Date(value).getTime();
- if (endTime < startDate) {
- layer.msg('结束时间不能小于开始时间');
- $('#custom_endTime').val($('#custom_beginTime').val());
- }
- }
- });
+
//现将临时数据清理
admin.putTempData("t_tempProduct", "");
//待充值列表
@@ -513,6 +463,8 @@
//如果是异步请求数据方式，res即为你接口返回的信息。
//如果是直接赋值的方式，res即为：{data: [], count: 99} data为当前页数据、count为数据总长度
var num = 0;
+ //已经充值的套餐
+ admin.putTempData("t_nowProduct", "");
res.data.forEach(element => {
if(element.proType==1){
if (element.enabled) {
@@ -553,35 +505,35 @@
},"get")
}
- //获取软件的服务周期
- // var getCycleTime=function(departmentId){
- // admin.req('api-opration/productorderdetail/getContractBeginEndTimeAndNum' , {departmentId: departmentId},
- // function (data) {
- // if(data.code==0){
- // $("#contractBeginTime").val(layui.util.toDateString(data.data.beginTime,"yyyy-MM-dd"));
- // $("#contractEndTime").val( layui.util.toDateString(data.data.endTime,"yyyy-MM-dd"));
- // $("#contractNum").val(data.data.count);
- // contractBeginTime.config.max = {
- // year: layui.util.toDateString(data.data.beginTime, "yyyy"),
- // month: layui.util.toDateString(data.data.beginTime, "MM") - 1,//关键
- // date: layui.util.toDateString(data.data.beginTime, "dd"),
- // hours: layui.util.toDateString(data.data.beginTime, "HH"),
- // minutes: layui.util.toDateString(data.data.beginTime, "mm"),
- // seconds: layui.util.toDateString(data.data.beginTime, "ss")
- // }
- // contractEndTime.config.min = {
- // year: layui.util.toDateString(data.data.endTime, "yyyy"),
- // month: layui.util.toDateString(data.data.endTime, "MM") - 1,//关键
- // date: layui.util.toDateString(data.data.endTime, "dd"),
- // hours: layui.util.toDateString(data.data.endTime, "HH"),
- // minutes: layui.util.toDateString(data.data.endTime, "mm"),
- // seconds: layui.util.toDateString(data.data.endTime, "ss")
- // }
- // }
-
- // },"get")
- // }
-
+ //限制自定义的时间
+ function xianzhi(){
+ var custom_beginTimesd = laydate.render({
+ elem: '#custom_beginTime', //指定元素
+ min: $("#contractBeginTime").val(),
+ max: $("#contractEndTime").val(),
+ done: function (value, date, endDate) {
+ var startDate = new Date(value).getTime();
+ var endTime = new Date($('#custom_endTime').val()).getTime();
+ if (endTime < startDate) {
+ layer.msg('结束时间不能小于开始时间');
+ $('#custom_beginTime').val($('#custom_endTime').val());
+ }
+ }
+ });
+ var custom_endTimes = laydate.render({
+ elem: '#custom_endTime', //指定元素
+ min: $("#contractBeginTime").val(),
+ max: $("#contractEndTime").val(),
+ done: function (value, date, endDate) {
+ var startDate = new Date($('#custom_beginTime').val()).getTime();
+ var endTime = new Date(value).getTime();
+ if (endTime < startDate) {
+ layer.msg('结束时间不能小于开始时间');
+ $('#custom_endTime').val($('#custom_beginTime').val());
+ }
+ }
+ });
+ }
//回显医院基本数据
let hospitalData = admin.getTempData('t_hospital');
@@ -603,6 +555,8 @@
hospitalData.contractBeginTime = layui.util.toDateString(hospitalData.contractBeginTime, 'yyyy-MM-dd')
hospitalData.contractEndTime = layui.util.toDateString(hospitalData.contractEndTime, 'yyyy-MM-dd')
form.val('recharge-form', hospitalData);
+ //限制时间
+ xianzhi();
getHospitalAddress(hospitalData.hospitalId);
//装载产品数据
table.render({
@@ -728,7 +682,9 @@
var listNum = 0;
if (!strUtil.isEmpty(listData)) {
listData.forEach(item => {
- listNum += item.ailightCount;
+ if(item.proType==1){
+ listNum += item.ailightCount;
+ }
})
}
if ($("#contractNum").val() < listNum) {
@@ -895,23 +851,26 @@
}
}
});
+ // $("#contractNum_not").val($("#contractNum").val() - num);
function isthenNum(num) {
if (num <= 0) {
- return "请输入读片量且大于0";
+ return "请输入合同读片充值量大于0";
}
var listData = admin.getTempData("t_tempProduct");
var listNum = 0;
if (!strUtil.isEmpty(listData)) {
listData.forEach(item => {
- listNum += item.ailightCount;
+ if(item.proType==1){
+ listNum += item.ailightCount;
+ }
})
}
listNum += num;
if ($("#contractNum_not").val() == undefined || $("#contractNum_not").val() == "") {
- return "请输入读片量！";
+ return "请输入合同读片充值量！";
} else {
if ($("#contractNum_not").val() < listNum) {
- return "当前产品总数不得大于合同总量";
+ return "当前产品总数不得大于合同读片充值量";
} else {
return null;
}
@@ -971,7 +930,6 @@
}
}
function submit() {
- console.log(1111111)
if (!isRun) {
layer.load(2);
var listData = admin.getTempData("t_tempProduct");
--
Gitblit v1.8.0