[解决bug]

common/common-entity/src/main/java/com/yihu/jw/entity/a1entity/Mediicinedrugs.java

@@ -223,6 +223,11 @@ public class Mediicinedrugs extends UuidIdentityEntityWithOperator implements Se
     */
    private String orgName;
    /**
     * 拼音码
     */
    private String spellCode;
    public Mediicinedrugs() {
    }
@@ -500,4 +505,12 @@ public class Mediicinedrugs extends UuidIdentityEntityWithOperator implements Se
    public void setOrgName(String orgName) {
        this.orgName = orgName;
    }
    public String getSpellCode() {
        return spellCode;
    }
    public void setSpellCode(String spellCode) {
        this.spellCode = spellCode;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineOutEndpoint.java

@@ -133,6 +133,8 @@ public class MedicineOutEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "replenishEr", required = false) String replenishEr,
            @ApiParam(name = "docNum", value = "单号")
            @RequestParam(value = "docNum", required = false) String docNum,
            @ApiParam(name = "deviceId", value = "设备id")
            @RequestParam(value = "deviceId", required = false) String deviceId,
            @ApiParam(name = "receiveState", value = "领料状态")
            @RequestParam(value = "receiveState", required = false) String receiveState,
            @ApiParam(name = "userId", value = "用户id")
@@ -141,7 +143,7 @@ public class MedicineOutEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = stockoutService.queryOutListFullInfo(startTime, endTime, replenishEr, docNum,receiveState, userId, page,size,wechatId);
        JSONObject result = stockoutService.queryOutListFullInfo(deviceId,startTime, endTime, replenishEr, docNum,receiveState, userId, page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/a4endpoint/MedicineUpEndpoint.java

@@ -101,13 +101,15 @@ public class MedicineUpEndpoint extends EnvelopRestEndpoint {
            @RequestParam(value = "community", required = false) String community,
            @ApiParam(name = "state", value = "备货单状态，1已生成，2未生成，3删除")
            @RequestParam(value = "state", required = false) String state,
            @ApiParam(name = "deviceId", value = "设备id")
            @RequestParam(value = "deviceId", required = false) String deviceId,
            @ApiParam(name = "userId", value = "用户id")
            @RequestParam(value = "userId", required = true) String userId,
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) throws Exception {
        JSONObject result = stockupService.queryUpListFullInfo(startTime, endTime, content, community, state, userId,page,size,wechatId);
        JSONObject result = stockupService.queryUpListFullInfo(deviceId,startTime, endTime, content, community, state, userId,page,size,wechatId);
        return success(result.getJSONArray("msg"),result.getInteger("count"),page,size);
    }

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

@@ -415,7 +415,7 @@ public class MedicineDrugsService extends BaseJpaService<Mediicinedrugs, Mediici
        String conditionSql = " WHERE t.org_code = '" + mediicinedevice.getBelongCommunity() + "'\n";
        if (!StringUtils.isEmpty(content)) {
            conditionSql += " AND CONCAT(IFNULL(t.`drug_name`,''),IFNULL(t.`drug_code`,''),IFNULL(t.`drug_name_alies`,'')) LIKE '%" + content + "%'";
            conditionSql += " AND CONCAT(IFNULL(t.drug_name,''),IFNULL(t.drug_code,''),IFNULL(t.drug_name_alies,''),IFNULL(t.spell_code,'')) LIKE '%" + content + "%'";
        }
//        List<Mediicinedrugs> mediicinedrugs = drugsDao.findMediicinedrugsByOrgCode(mediicinedevice.getBelongCommunity());
        result.put("msg", hibenateUtils.createSQLQuery(sql + conditionSql));

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

@@ -69,6 +69,7 @@ public class MedicineServive {
                        org.setOrgCode(h.getString("orgCode"));
                        org.setQuantityUnit(h.getString("quantity_unit_name"));
                        org.setPackUnit(h.getString("pack_unit_name"));
                        org.setSpellCode(h.getString("spellCode"));
                        list.add(org);
                        addCount++;
                    } else {
@@ -85,6 +86,7 @@ public class MedicineServive {
                        org.setOrgCode(h.getString("orgCode"));
                        org.setQuantityUnit(h.getString("quantity_unit_name"));
                        org.setPackUnit(h.getString("pack_unit_name"));
                        org.setSpellCode(h.getString("spellCode"));
                        list.add(org);
                        updateCount++;
                    }

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

@@ -297,8 +297,7 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
    //orderNum, equNum, contact, startTime, endTime, sellState, orderState, dispensingWindow
    public JSONObject queryOutListFullInfo(
                                             String startTime, String endTime, String replenishEr,
    public JSONObject queryOutListFullInfo(String deviceId,String startTime, String endTime, String replenishEr,
                                             String docNum, String receiveState, String userId, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        UserDO user = userDao.findOne(userId);
@@ -398,6 +397,10 @@ public class MedicineStockOutService extends BaseJpaService<Mediicinestockout, M
        if (!StringUtils.isEmpty(docNum)){
            conditionSql += " and t.doc_num like '%" + docNum + "%'";
        }
        if (!StringUtils.isEmpty(deviceId)){
             conditionSql +=" and t.replenish_equ ='"+deviceId+"' ";
        }
        sql = sql + conditionSql +" order by t.receive_state asc,t.doc_time desc ";
        List<Map<String,Object>> list=null;

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

@@ -246,8 +246,7 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
    }
    public JSONObject queryUpListFullInfo(
            String startTime, String endTime, String content,
    public JSONObject queryUpListFullInfo(String deviceId,String startTime, String endTime, String content,
            String community, String state, String userId, int page, int size,String wechatId) throws Exception {
        JSONObject result = new JSONObject();
        UserDO user = userDao.findOne(userId);
@@ -347,6 +346,9 @@ public class MedicineStockUpService extends BaseJpaService<Mediicinestockup, Med
        if (!StringUtils.isEmpty(state)){
            conditionSql += " and t.state = '" + state + "'";
        }
        if (!StringUtils.isEmpty(deviceId)){
            conditionSql += " and t.replenish_equ = '" + deviceId + "'";
        }
        sql = sql + conditionSql +" order by t.state desc,t.doc_time desc  ";
        List<Map<String,Object>> list=null;

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

@@ -2555,6 +2555,7 @@ public class MedicinedeviceService  extends BaseJpaService<Mediicinedevice, Medi
                "\tdir.layer_no as layerNo,\n" +
                "\tdir.wayer_no as wayerNo,\n" +
                "\tdir.merge_cargo as mergeCargo,\n" +
                "\tdir.quantity as quantity,\n" +
                "\tdir.merge_state as mergeState\n" +
                "FROM\n" +
                "\tt_medicine_drug_inventory_record dir\n" +