|
|
|
|
@ -6,6 +6,7 @@ import com.ynxbd.common.bean.lis.XBDLisReport; |
|
|
|
|
import com.ynxbd.common.bean.report.CheckReport; |
|
|
|
|
import com.ynxbd.common.bean.report.InspectionReport; |
|
|
|
|
import com.ynxbd.common.bean.report.PEIS; |
|
|
|
|
import com.ynxbd.common.config.interceptor.AesDecode; |
|
|
|
|
import com.ynxbd.common.dao.his.HisReportDao; |
|
|
|
|
import com.ynxbd.common.helper.common.DateHelper; |
|
|
|
|
import com.ynxbd.common.result.Result; |
|
|
|
|
@ -68,9 +69,8 @@ public class ReportAction extends BaseAction { |
|
|
|
|
* @return list |
|
|
|
|
*/ |
|
|
|
|
@Action("getCheckByPatient") |
|
|
|
|
public Result getCheckByPatient(String begDate, String endDate, String patientId, String treatNum, String openid) { |
|
|
|
|
public Result getCheckByPatient(String begDate, String endDate, @AesDecode String patientId, String treatNum, String openid) { |
|
|
|
|
try { |
|
|
|
|
patientId = decodeReqString(patientId); |
|
|
|
|
// http://localhost:8080/wx/report/getCheckByPatient.do?patientId=153671&token=123
|
|
|
|
|
log.info("[检查报告]查询 patientId={}, begDate={}, endDate={}, treatNum={}", patientId, begDate, endDate, treatNum); |
|
|
|
|
if (patientId == null || begDate == null || endDate == null) { |
|
|
|
|
@ -124,9 +124,8 @@ public class ReportAction extends BaseAction { |
|
|
|
|
* @return list |
|
|
|
|
*/ |
|
|
|
|
@Action("getHisCheckByTreat") |
|
|
|
|
public Result getHisCheckByTreat(String begDate, String endDate, String patientId, String treatNum, Boolean isDistinctTreat, String openid) { |
|
|
|
|
public Result getHisCheckByTreat(String begDate, String endDate, @AesDecode String patientId, String treatNum, Boolean isDistinctTreat, String openid) { |
|
|
|
|
try { |
|
|
|
|
patientId = decodeReqString(patientId); |
|
|
|
|
// http://localhost:8080/wx/report/getCheckByPatient.do?patientId=153671&token=123
|
|
|
|
|
log.info("[检查报告]查询 patientId={}, begDate={}, endDate={}, treatNum={}, isDistinctTreat={}", patientId, begDate, endDate, treatNum, isDistinctTreat); |
|
|
|
|
if (patientId == null || begDate == null || endDate == null) { |
|
|
|
|
@ -185,9 +184,8 @@ public class ReportAction extends BaseAction { |
|
|
|
|
* @param isLately 是否只查询最近一条记录 |
|
|
|
|
*/ |
|
|
|
|
@Action("getTreatRecordList") |
|
|
|
|
public Result getTreatRecordList(String begDate, String endDate, String patientId, String patientType, String reportType, Boolean isLately, String deptCode) { |
|
|
|
|
public Result getTreatRecordList(String begDate, String endDate, @AesDecode String patientId, String patientType, String reportType, Boolean isLately, String deptCode) { |
|
|
|
|
try { |
|
|
|
|
patientId = decodeReqString(patientId); |
|
|
|
|
// http://localhost:8081/wx/report/getTreatRecordList.do?patientId=406212&begDate=201801-01&endDate=2020-08-12&patientType=0&reportType=2
|
|
|
|
|
if (patientId == null || begDate == null || endDate == null) { |
|
|
|
|
return Result.error(ResultEnum.PARAM_IS_DEFECT); |
|
|
|
|
@ -224,9 +222,8 @@ public class ReportAction extends BaseAction { |
|
|
|
|
* @param isLately 是否只查询最近一条记录 |
|
|
|
|
*/ |
|
|
|
|
@Action("getReportTreatRecords") |
|
|
|
|
public Result getReportTreatRecords(String begDate, String endDate, String patientId, String treatType, String reportType, Boolean isLately, String deptCode) { |
|
|
|
|
public Result getReportTreatRecords(String begDate, String endDate, @AesDecode String patientId, String treatType, String reportType, Boolean isLately, String deptCode) { |
|
|
|
|
try { |
|
|
|
|
patientId = decodeReqString(patientId); |
|
|
|
|
// http://localhost:8081/wx/report/getTreatRecords.do?patientId=406212&begDate=201801-01&endDate=2020-08-12&treatType=0&reportType=2
|
|
|
|
|
if (patientId == null || begDate == null || endDate == null) { |
|
|
|
|
return Result.error(ResultEnum.PARAM_IS_DEFECT); |
|
|
|
|
@ -258,10 +255,8 @@ public class ReportAction extends BaseAction { |
|
|
|
|
* [患者]查询化验（检验）结果 |
|
|
|
|
*/ |
|
|
|
|
@Action("getInspectByPatient") |
|
|
|
|
public Result getInspectByPatient(String openid, String patientId, String begDate, String endDate) { |
|
|
|
|
public Result getInspectByPatient(String openid, @AesDecode String patientId, String begDate, String endDate) { |
|
|
|
|
try { |
|
|
|
|
patientId = decodeReqString(patientId); |
|
|
|
|
|
|
|
|
|
// http://localhost:8080/wx/report/getInspectByPatient.do?patientId=153671&token=123
|
|
|
|
|
log.info("化验（检验）结果查询：patientId={}, begDate={}, endDate={}", patientId, begDate, endDate); |
|
|
|
|
if (patientId == null || begDate == null || endDate == null) { |
|
|
|
|
@ -286,10 +281,8 @@ public class ReportAction extends BaseAction { |
|
|
|
|
* [门诊号]通过HIS根据门诊号查询化验（检验）结果 |
|
|
|
|
*/ |
|
|
|
|
@Action("getInspectByTreatNum") |
|
|
|
|
public Result getInspectByTreatNum(String type, String treatNum, String patientId) { |
|
|
|
|
public Result getInspectByTreatNum(@AesDecode String treatNum, @AesDecode String patientId, String type) { |
|
|
|
|
try { |
|
|
|
|
treatNum = decodeReqString(treatNum); |
|
|
|
|
patientId = decodeReqString(patientId); |
|
|
|
|
// http://localhost:8080/wx/report/getInspectByTreatNum.do?patientId=153671&token=123
|
|
|
|
|
log.info("[化验（检验）]结果查询：patientId={}, type={}, treatNum={}", patientId, type, treatNum); |
|
|
|
|
if (patientId == null || type == null || treatNum == null) { |
|
|
|
|
|
wangsq
13 hours ago