|
@ -190,7 +190,7 @@ public class PrescriptionInfoService extends BaseService {
|
|
params.add(patient);
|
|
params.add(patient);
|
|
//查询已经审核通过的,否则查询所有
|
|
//查询已经审核通过的,否则查询所有
|
|
if ("2".equals(type)) {
|
|
if ("2".equals(type)) {
|
|
sqlBuffer.append(" AND p.status >=10 ");
|
|
|
|
|
|
sqlBuffer.append(" AND p.status >="+PrescriptionLog.PrescriptionLogStatus.wait_pay.getValue());
|
|
}
|
|
}
|
|
if (StringUtils.isNotBlank(startDate)) {
|
|
if (StringUtils.isNotBlank(startDate)) {
|
|
sqlBuffer.append(" AND p.create_time >= ?");
|
|
sqlBuffer.append(" AND p.create_time >= ?");
|
|
@ -211,6 +211,13 @@ public class PrescriptionInfoService extends BaseService {
|
|
String code = (String) map.get("code");
|
|
String code = (String) map.get("code");
|
|
map.put("patient", p.getCode());
|
|
map.put("patient", p.getCode());
|
|
map.put("patientName", p.getName());
|
|
map.put("patientName", p.getName());
|
|
|
|
StringBuffer isAdjustSql = new StringBuffer("SELECT a.id FROM wlyy_prescription_adjust a WHERE a.prescription_code = ? ");
|
|
|
|
List<Map<String,Object>> adjusts = jdbcTemplate.queryForList(isAdjustSql.toString(),new Object[]{code});
|
|
|
|
if(adjusts!=null&&adjusts.size()>0){
|
|
|
|
map.put("isAdjust", "1");
|
|
|
|
}else{
|
|
|
|
map.put("isAdjust", "0");
|
|
|
|
}
|
|
map.put("prescriptionInfo", prescriptionDiagnosisService.getPrescriptionInfo(code));
|
|
map.put("prescriptionInfo", prescriptionDiagnosisService.getPrescriptionInfo(code));
|
|
map.put("prescriptionDt", prescriptionDiagnosisService.getPrescriptionDiagnosis(code));
|
|
map.put("prescriptionDt", prescriptionDiagnosisService.getPrescriptionDiagnosis(code));
|
|
}
|
|
}
|