update bug

common/common-request-mapping/src/main/java/com/yihu/jw/rm/base/BaseRequestMapping.java

@@ -303,6 +303,8 @@ public class BaseRequestMapping {
        public static final String PAGE = "/page";
        public static final String LIST = "/list";
        public static final String FINDBYID = "/findById";
        public static final String findDictById = "/findDictById";
        public static final String FIND_MODULE_BY_SAASID = "/findModuleBySaasId";
        public static final String STATUS = "/status";
    }

gateway/ag-basic/src/main/java/com/yihu/jw/gateway/filter/PostFilter.java

@@ -136,6 +136,7 @@ public class PostFilter extends ZuulFilter {
            url.contains("/open/noLogin/ylzSettleRecord")||
                url.contains("/weixin")||url.contains("/oauth/getSsoPublicKey")||
                url.contains("/open/gc")||
                url.contains("/open/noLogin/findDictById")||
                url.contains("/prescription/pushListWrite")||
                url.contains("/prescription/pushListDrug")||
                url.contains("/open/noLogin/pushYkCardCharge")||

svr/svr-base/pom.xml

@@ -11,7 +11,7 @@
    </parent>
    <groupId>com.yihu.jw</groupId>
    <artifactId>svr-base</artifactId>
    <artifactId>svr-base-yg</artifactId>
    <packaging>jar</packaging>
    <version>${parent.version}</version>
@@ -232,7 +232,7 @@
    </dependencies>
    <build>
        <finalName>svr-base</finalName>
        <finalName>svr-base-yg</finalName>
        <plugins>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/open/nologin/ServiceNoLoginEndPoint.java

@@ -429,6 +429,14 @@ public class ServiceNoLoginEndPoint extends EnvelopRestEndpoint {
        return success(deviceService.findByEquNum(equNum));
    }
    @GetMapping(value = BaseRequestMapping.BaseDevice.findDictById)
    @ApiOperation(value = "根据id获取设备版本号", notes = "根据id获取设备版本号")
    public Envelop findDictById(
            @ApiParam(name = "id", value = "字典id", required = true)
            @RequestParam(value = "id") String id) throws Exception {
        return success(deviceService.findDictById(id));
    }
    @GetMapping(value = BaseRequestMapping.BaseTown.LIST)
    @ApiOperation(value = "获取列表")
    public ListEnvelop<BaseTownVO> list (

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicineOrderService.java

@@ -2365,7 +2365,7 @@ public class MedicineOrderService extends BaseJpaService<Mediicineorder, Mediici
                            "\t\t\tFROM\n" +
                            "\t\t\t\tt_mediicinecabinet_inventory t WHERE t.drug_code = '" + mediicineorderdetail.getDrugCode() + "'\n" +
                            "\t\t\tAND t.org_code = '" + mediicineorderdetail.getOrgCode() + "'\n" +
                            "\t\t\tAND t.cargo_state = '1' and t.fault_state=1 " +
                            "\t\t\tAND t.cargo_state = '1' and t.fault_state=0 " +
                            "\t\t\tAND CONCAT(IFNULL(t.`id_device`,''), IFNULL(t.`equ_num`,'')) like '%" + deviceId + "%'\n" +
                            "\t\t\tGROUP BY\n" +
                            "\t\t\t\tt.drug_code,\n" +

svr/svr-base/src/main/java/com/yihu/jw/base/service/a3service/MedicinedeviceService.java

@@ -5965,6 +5965,10 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
        return deviceDao.findMediicinedeviceByEquNum(equNum);
    }
    public WlyyHospitalSysDictDO findDictById(String id ){
        return hospitalSysDictDao.findById(id);
    }
    /**
     * 设置设备药品库存预警规则，rule1,规则1，rule2,规则2
     * @param isAll