From a18dde79b1d35bbba46d5f68512dbb617bbc4ecd Mon Sep 17 00:00:00 2001
From: zxh <279049017@qq.com>
Date: Fri, 28 Aug 2020 16:21:35 +0800
Subject: [PATCH] Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java | 6 +++---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java | 2 +-
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java | 6 +++++-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalInfo.java | 1 +
kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java | 4 ++++
kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html | 21 +++++++++++++--------
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java | 13 ++++++++++++-
kidgrow-config/src/main/resources/application-dev.properties | 2 +-
8 files changed, 40 insertions(+), 15 deletions(-)
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalInfo.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalInfo.java
index c5d6a95..a54c9cb 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalInfo.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/model/HospitalInfo.java
@@ -6,4 +6,5 @@
public class HospitalInfo {
private Long hospitalId;
private Long departmentId;
+ private String diagnosticId;
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
index 3c69c13..bc8ad11 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/IProductOrderDetailService.java
@@ -68,7 +68,7 @@
UserProductDetail getUserProductDetail(Long hospitalId, Long departmentId);
ResultBody biUserNowProduct(Long hospitalId,Long departmentId);
- ResultBody<UserProductData> UserProductDetailData(Long hospitalId, Long departmentId);
+ ResultBody<UserProductData> UserProductDetailData(Long hospitalId, Long departmentId,String diagnosticId);
/**
* 试用审核的列表
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
index a672c0a..96cba5a 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/ProductOrderDetailServiceImpl.java
@@ -2,9 +2,11 @@
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.kidgrow.common.constant.CommonConstant;
import com.kidgrow.common.model.*;
import com.kidgrow.common.service.impl.SuperServiceImpl;
import com.kidgrow.common.utils.DateUtils;
+import com.kidgrow.common.utils.StringUtils;
import com.kidgrow.oprationcenter.feign.DiagnosticService;
import com.kidgrow.oprationcenter.mapper.ConsumptionRecordMapper;
import com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper;
@@ -14,6 +16,7 @@
import com.kidgrow.oprationcenter.service.IProductOrderDetailService;
import com.kidgrow.oprationcenter.service.IProductOrderService;
import com.kidgrow.oprationcenter.vo.*;
+import com.kidgrow.redis.util.RedisUtils;
import com.kidgrow.usercenter.feign.SysDoctorService;
import com.kidgrow.usercenter.feign.SysHospitalService;
import com.kidgrow.usercenter.model.SysHospital;
@@ -48,6 +51,8 @@
private ConsumptionRecordMapper consumptionRecordMapper;
@Autowired
private IProductOrderService iProductOrderService;
+ @Autowired
+ private RedisUtils redisUtils;
/**
* 列表
* @param params
@@ -73,9 +78,10 @@
* 判定医院科室的套餐是否到期 以及到期时间
* @param hospitalId
* @param departmentId
+ * @param diagnosticId
* @return
*/
- public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId)
+ public ResultBody<UserProductData> UserProductDetailData(Long hospitalId,Long departmentId,String diagnosticId)
{
UserProductData userProductData=new UserProductData();
userProductData.setEnd(true);
@@ -91,6 +97,11 @@
userProductData.setMaxEndTime(productOrderJoinDetailsNewList.get(0).getProEndtime());
}
}
+ //是否已经结束
+ if (userProductData.isEnd()&& StringUtils.isNotBlank(diagnosticId)) {
+ //写入redis中,防止扣非后不能生成报告
+ redisUtils.lSet(CommonConstant.SAAS_LAST_SERVER+diagnosticId,diagnosticId);
+ }
return ResultBody.ok().data(userProductData);
}
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
index fc51ad2..ab31f8c 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java
@@ -157,8 +157,8 @@
@ApiOperation(value = "获取医院套餐是否到期和到期时间")
@GetMapping("/UserProductDetailData")
- public ResultBody UserProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId) {
- return productOrderDetailService.UserProductDetailData(hospitalId, departmentId);
+ public ResultBody UserProductDetailData(@RequestParam Long hospitalId, @RequestParam Long departmentId,@RequestParam String diagnosticId) {
+ return productOrderDetailService.UserProductDetailData(hospitalId, departmentId,diagnosticId);
}
/**
@@ -172,7 +172,7 @@
@ApiOperation(value = "获取医院套餐是否到期和到期时间")
@PostMapping("/serviceperiod")
public ResultBody<UserProductData> ServicePeriod(@RequestBody HospitalInfo hospitalInfo) {
- return productOrderDetailService.UserProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId());
+ return productOrderDetailService.UserProductDetailData(hospitalInfo.getHospitalId(), hospitalInfo.getDepartmentId(),hospitalInfo.getDiagnosticId());
}
/**
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
index 9b95c0b..8a1dd0e 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java
@@ -835,7 +835,11 @@
//创建字典数据
sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK);
//将名称汉字转为拼音
- sysDictionaries.setDictionariesKey(Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true)));
+ String keyStr=Pinyin4jUtil.makeStringByStringSet(Pinyin4jUtil.getPinyin(userRegVo.getDoctorRank(), true));
+ if (keyStr.length()>50) {
+ keyStr=keyStr.substring(0,49);
+ }
+ sysDictionaries.setDictionariesKey(keyStr);
sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
sysDictionaries.setCreateUserId(createUserId);
sysDictionaries.setCreateUserName(createUserName);
diff --git a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
index 97ab00f..1ae6ce1 100644
--- a/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
+++ b/kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/constant/CommonConstant.java
@@ -315,6 +315,10 @@
* 销售主管角色code标识
*/
public static final String SALE_MANAGER_ROLE_CODE="salemanager";
+ /**
+ * 用于标识存储最后一次诊断redis的key,用于防止最后一个读片后无法生成报告
+ */
+ public static final String SAAS_LAST_SERVER="saaslastserver";
/**
* 喜高PC高管角色code标识
diff --git a/kidgrow-config/src/main/resources/application-dev.properties b/kidgrow-config/src/main/resources/application-dev.properties
index 2e67eb5..a0ce526 100644
--- a/kidgrow-config/src/main/resources/application-dev.properties
+++ b/kidgrow-config/src/main/resources/application-dev.properties
@@ -15,7 +15,7 @@
spring.redis.timeout=5000
#rabbitmq\u914D\u7F6E
-kidgrow.rabbitmq.host=182.92.99.224
+kidgrow.rabbitmq.host=192.168.2.240
kidgrow.rabbitmq.port=5672
kidgrow.rabbitmq.username=liuke
kidgrow.rabbitmq.password=kidgrow2020
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
index d985a0f..4dc5240 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/console.html
@@ -194,6 +194,7 @@
let $ = layui.jquery;
var counts = 0;
var noData="无权查看";
+ layer.load(2);
// 加载医院统计数据
var loadHospitalChart = function (datatype) {
admin.req("api-user/syshospital/chartHospital?datatype=" + datatype, {}, function (data) {
@@ -278,6 +279,7 @@
};
chartcontract.setOption(optionchart, true);
}
+ layer.closeAll('loading');
}
}, "get");
}
@@ -328,6 +330,7 @@
chartproducts.setOption(optionchart, true);
}
}
+ layer.closeAll('loading');
}, "get");
}
@@ -345,16 +348,16 @@
var chartreport = echarts.init(document.getElementById('report'));
admin.req(apiUrl, {}, function (data) {
if (0 === data.code) {
- var listData = data.data;
+ var listData = data.data.data;
var Xdata = new Array();
var Ydata = new Array();
if (listData != null) {
for (let index = 0; index < listData.length; index++) {
- Xdata.push(listData[index].itemName);
+ Ydata.push(listData[index].itemValue);
if (dataType == "1") {
- Ydata.push(listData[index].collectYear);
+ Xdata.push(listData[index].collectYear);
} else if (dataType == "0") {
- Ydata.push(listData[index].collectYearMonth);
+ Xdata.push(listData[index].collectYearMonth);
}
}
var optionchart = {
@@ -385,6 +388,7 @@
};
chartreport.setOption(optionchart, true);
}
+ layer.closeAll('loading');
}
}, "get");
}
@@ -403,16 +407,16 @@
var chartaiphoto = echarts.init(document.getElementById('aiphoto'));
admin.req(apiUrl, {}, function (data) {
if (0 === data.code) {
- var listData = data.data;
+ var listData = data.data.data;
var Xdata = new Array();
var Ydata = new Array();
if (listData != null) {
for (let index = 0; index < listData.length; index++) {
- Xdata.push(listData[index].itemName);
+ Ydata.push(listData[index].itemValue);
if (dataType == "1") {
- Ydata.push(listData[index].collectYear);
+ Xdata.push(listData[index].collectYear);
} else if (dataType == "0") {
- Ydata.push(listData[index].collectYearMonth);
+ Xdata.push(listData[index].collectYearMonth);
}
}
var optionchart = {
@@ -443,6 +447,7 @@
};
chartaiphoto.setOption(optionchart, true);
}
+ layer.closeAll('loading');
}
}, "get");
}
--
Gitblit v1.8.0