|
@@ -46,7 +46,10 @@ public class IsvReportServiceImpl implements IsvReportService {
|
|
String userIdStr = request.getUserId();
|
|
String userIdStr = request.getUserId();
|
|
int userId = Integer.parseInt(userIdStr);
|
|
int userId = Integer.parseInt(userIdStr);
|
|
int hospitalId = BizUtil.getCurrentHospitalId();
|
|
int hospitalId = BizUtil.getCurrentHospitalId();
|
|
- String hisPatientId = request.getHisPatientId();
|
|
|
|
|
|
+ if(Checker.isNone(request.getHisPatientId())){
|
|
|
|
+ throw new AppMessageException("hisPatientId不能为空");
|
|
|
|
+ }
|
|
|
|
+ String hisPatientId = Checker.getStringValue(request.getHisPatientId());
|
|
MedicalCardVo card = getCard(userId, hospitalId, hisPatientId);
|
|
MedicalCardVo card = getCard(userId, hospitalId, hisPatientId);
|
|
String type = request.getType();
|
|
String type = request.getType();
|
|
if ("检查报告".equals(type)) {
|
|
if ("检查报告".equals(type)) {
|
|
@@ -167,11 +170,17 @@ public class IsvReportServiceImpl implements IsvReportService {
|
|
String userIdStr = request.getUserId();
|
|
String userIdStr = request.getUserId();
|
|
int userId = Integer.parseInt(userIdStr);
|
|
int userId = Integer.parseInt(userIdStr);
|
|
// 报告类型:分为"检查报告"、"检验报告"两种
|
|
// 报告类型:分为"检查报告"、"检验报告"两种
|
|
|
|
+ if(Checker.isNone(request.getType())){
|
|
|
|
+ throw new AppMessageException("报告类型不能为空");
|
|
|
|
+ }
|
|
String type = request.getType();
|
|
String type = request.getType();
|
|
int hospitalId = BizUtil.getCurrentHospitalId();
|
|
int hospitalId = BizUtil.getCurrentHospitalId();
|
|
int pageIndex = request.getPageIndex();
|
|
int pageIndex = request.getPageIndex();
|
|
int pageSize = request.getPageSize();
|
|
int pageSize = request.getPageSize();
|
|
- String hisPatientId = request.getHisPatientId();
|
|
|
|
|
|
+ if(Checker.isNone(request.getHisPatientId())){
|
|
|
|
+ throw new AppMessageException("hisPatientId不能为空");
|
|
|
|
+ }
|
|
|
|
+ String hisPatientId = Checker.getStringValue(request.getHisPatientId());
|
|
int total = 0;
|
|
int total = 0;
|
|
int totalT = 0;
|
|
int totalT = 0;
|
|
int totalTh = 0;
|
|
int totalTh = 0;
|