冲突代码手动合并

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

@@ -187,19 +187,19 @@ public class MedicineDrugsEndpoint extends EnvelopRestEndpoint {
            for (Map<String,Object> tmp : list) {
                addCell(sheet, j, 0, ii + "img");
                addCell(sheet, j, 1, tmp.get("drugNameAlies") +"/" + tmp.get("drugBarCode"));
                addCell(sheet, j, 2, tmp.get("drugTypeCode")==null?"":new String(tmp.get("drugTypeCode").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 3, tmp.get("dosForm")==null?"":new String(tmp.get("dosForm").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 4, tmp.get("drugTypeCode")==null?"":new String(tmp.get("drugTypeCode").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 5, tmp.get("unit")==null?"":new String(tmp.get("unit").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 6, tmp.get("price")==null?"":new String(tmp.get("price").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 7, tmp.get("inventory")==null?"":new String(tmp.get("inventory").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 8, tmp.get("saleVolume")==null?"":new String(tmp.get("saleVolume").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 9, tmp.get("selfCode")==null?"":new String(tmp.get("selfCode").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 10, tmp.get("specif") == null?"":new String(tmp.get("specif").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 11, tmp.get("manufactor") ==null? "":new String(tmp.get("manufactor").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 12, tmp.get("approvalNum") ==null? "":new String(tmp.get("approvalNum").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 13, tmp.get("brand") ==null? "":new String(tmp.get("brand").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 14, tmp.get("state") ==null? "":new String(tmp.get("state").toString().getBytes("UTF-8"),"ISO8859-1"));
                addCell(sheet, j, 2, tmp.get("drugTypeCode")==null?"":tmp.get("drugTypeCode").toString());
                addCell(sheet, j, 3, tmp.get("dosForm")==null?"":tmp.get("dosForm").toString());
                addCell(sheet, j, 4, tmp.get("drugTypeCode")==null?"":tmp.get("drugTypeCode").toString());
                addCell(sheet, j, 5, tmp.get("unit")==null?"":tmp.get("unit").toString());
                addCell(sheet, j, 6, tmp.get("price")==null?"":tmp.get("price").toString());
                addCell(sheet, j, 7, tmp.get("inventory")==null?"":tmp.get("inventory").toString());
                addCell(sheet, j, 8, tmp.get("saleVolume")==null?"":tmp.get("saleVolume").toString());
                addCell(sheet, j, 9, tmp.get("selfCode")==null?"":tmp.get("selfCode").toString());
                addCell(sheet, j, 10, tmp.get("specif") == null?"":tmp.get("specif").toString());
                addCell(sheet, j, 11, tmp.get("manufactor") ==null? "":tmp.get("manufactor").toString());
                addCell(sheet, j, 12, tmp.get("approvalNum") ==null? "":tmp.get("approvalNum").toString());
                addCell(sheet, j, 13, tmp.get("brand") ==null? "":tmp.get("brand").toString());
                addCell(sheet, j, 14, tmp.get("state") ==null? "":tmp.get("state").toString());
                j++;
                ii++;
            }