|
@@ -60,6 +60,9 @@ public class MrtestInfoFacade extends MrtestInfoServiceImpl {
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
.eq((null != mrtestInfoVO && null != mrtestInfoVO.getHospitalId()),
|
|
.eq((null != mrtestInfoVO && null != mrtestInfoVO.getHospitalId()),
|
|
"hospital_id", mrtestInfoVO.getHospitalId())
|
|
"hospital_id", mrtestInfoVO.getHospitalId())
|
|
|
|
+ .eq((null != mrtestInfoVO && null != mrtestInfoVO.getPass()),
|
|
|
|
+ "pass", mrtestInfoVO.getPass())
|
|
|
|
+ .in(ListUtil.isNotEmpty(mrtestInfoVO.getIds()), "id", mrtestInfoVO.getIds())
|
|
);
|
|
);
|
|
|
|
|
|
if (ListUtil.isEmpty(mrtestInfoList)) {
|
|
if (ListUtil.isEmpty(mrtestInfoList)) {
|
|
@@ -77,6 +80,7 @@ public class MrtestInfoFacade extends MrtestInfoServiceImpl {
|
|
indicationPushVO.setSex(1);
|
|
indicationPushVO.setSex(1);
|
|
indicationPushVO.setAge("20");
|
|
indicationPushVO.setAge("20");
|
|
indicationPushVO.setRuleType("2");
|
|
indicationPushVO.setRuleType("2");
|
|
|
|
+ indicationPushVO.setSymptom(mrtestInfo.getReplaceText());
|
|
if ("医保手术和操作名称".equals(mrtestInfo.getBillType())) {
|
|
if ("医保手术和操作名称".equals(mrtestInfo.getBillType())) {
|
|
List<Item> operationOrder = new ArrayList<>();
|
|
List<Item> operationOrder = new ArrayList<>();
|
|
Item item = new Item();
|
|
Item item = new Item();
|