|
@ -1597,14 +1597,14 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
|
|
|
//2.判断是否有未结束的
|
|
|
List<WlyyOutpatientDO> list = new ArrayList<>();
|
|
|
if(StringUtils.isNotBlank(outpatientType)&&(outpatientType.equalsIgnoreCase("3")||outpatientType.equalsIgnoreCase("4"))){
|
|
|
if(StringUtils.isNotBlank(outpatientType)&&(outpatientType.equalsIgnoreCase("3")||outpatientType.equalsIgnoreCase("4")||outpatientType.equalsIgnoreCase("5"))){
|
|
|
list = outpatientDao.findByPatientAndDoctorList(patient,outpatientType);
|
|
|
}else {
|
|
|
list = outpatientDao.findByPatientList(patient);
|
|
|
}
|
|
|
|
|
|
if (list != null && list.size() > 0) {
|
|
|
if(!list.get(0).getOutpatientType().equalsIgnoreCase("3")){
|
|
|
if(list.get(0).getOutpatientType().equalsIgnoreCase("1")){
|
|
|
rs.put("outpatient", list.get(0));
|
|
|
rs.put("code", -2);
|
|
|
rs.put("mes", "存在未结束的诊断");
|