|
@@ -242,15 +242,12 @@ public class PrescriptionServices {
|
|
|
int extStatusInt = Integer.parseInt(extStatus);
|
|
|
switch (extStatusInt) {
|
|
|
case 0:
|
|
|
- whereSql += " and ( ext_status < ? or ext_status > ? ) and ( ext_status & ? != ? ) ";
|
|
|
- paramList.add(PrescriptionInfoExtStatusEnum.Delivered.getValue());
|
|
|
- paramList.add(2 * PrescriptionInfoExtStatusEnum.Delivered.getValue());
|
|
|
+ whereSql += " and ( ext_status & ? != ? ) ";
|
|
|
paramList.add(PrescriptionInfoExtStatusEnum.Delivered.getValue());
|
|
|
paramList.add(PrescriptionInfoExtStatusEnum.Delivered.getValue());
|
|
|
break;
|
|
|
case 1:
|
|
|
- whereSql += " and ext_status > ? and ( ext_status & ? = ? )";
|
|
|
- paramList.add(PrescriptionInfoExtStatusEnum.Delivered.getValue());
|
|
|
+ whereSql += " and ( ext_status & ? = ? ) ";
|
|
|
paramList.add(PrescriptionInfoExtStatusEnum.Delivered.getValue());
|
|
|
paramList.add(PrescriptionInfoExtStatusEnum.Delivered.getValue());
|
|
|
break;
|