Merge branch 'dev' of chenjiasheng/wlyy2.0 into medicare

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

@@ -127,6 +127,16 @@ public class Mediicinedrugs extends UuidIdentityEntityWithOperator implements Se
     */
    private String unit;
    /*
    *包装单位
    */
    private String packUnit;
    /*
    数量单位
     */
    private String quantityUnit;
    /**
     * 售价
     */
@@ -239,6 +249,14 @@ public class Mediicinedrugs extends UuidIdentityEntityWithOperator implements Se
        return barcode;
    }
    public String getPackUnit() {
        return packUnit;
    }
    public void setPackUnit(String packUnit) {
        this.packUnit = packUnit;
    }
    public void setBarcode(String barcode) {
        this.barcode = barcode;
    }
@@ -287,6 +305,14 @@ public class Mediicinedrugs extends UuidIdentityEntityWithOperator implements Se
        return pic;
    }
    public String getQuantityUnit() {
        return quantityUnit;
    }
    public void setQuantityUnit(String quantityUnit) {
        this.quantityUnit = quantityUnit;
    }
    public void setPic(String pic) {
        this.pic = pic;
    }

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

@@ -52,31 +52,33 @@ public class MedicineServive {
                    if(!mediicinedrugsDao.existsByDrugCodeAndOrgCode(drugCode,orgCode)){
                        Mediicinedrugs org = new Mediicinedrugs();
                        org.setDrugCode(drugCode);
                        org.setDosForm(h.getString("physic_form"));
                        org.setDosForm(h.getString("physic_form_name"));
                        org.setDrugName(h.getString("physic_name"));
                        org.setDrugNameAlies(h.getString("physic_name"));
                        org.setPrice(h.getFloat("retail_price"));
                        org.setSpecif(h.getString("physic_spec"));
                        org.setDrugClass(h.getString("subject_class"));
                        org.setUnit(h.getString("dose_unit"));
                        org.setDrugClass(h.getString("subject_class_name"));
                        org.setUnit(h.getString("dose_unit_name"));
                        org.setUseDose(h.getString("min_dose"));
                        org.setOrgCode(h.getString("orgCode"));
                        org.setEarlywarningcate(h.getString("toxicology_type"));
                        org.setQuantityUnit(h.getString("quantity_unit_name"));
                        org.setPackUnit(h.getString("pack_unit_name"));
                        list.add(org);
                        addCount++;
                    }else{
                        Mediicinedrugs org = mediicinedrugsDao.findByDrugCodeAndOrgCode(drugCode,orgCode);
                        org.setDrugCode(drugCode);
                        org.setDosForm(h.getString("physic_form"));
                        org.setDosForm(h.getString("physic_form_name"));
                        org.setDrugName(h.getString("physic_name"));
                        org.setDrugNameAlies(h.getString("physic_name"));
                        org.setSpecif(h.getString("physic_spec"));
                        org.setDrugClass(h.getString("subject_class"));
                        org.setPrice(h.getFloat("retail_price"));
                        org.setUnit(h.getString("dose_unit"));
                        org.setSpecif(h.getString("physic_spec"));
                        org.setDrugClass(h.getString("subject_class_name"));
                        org.setUnit(h.getString("dose_unit_name"));
                        org.setUseDose(h.getString("min_dose"));
                        org.setOrgCode(h.getString("orgCode"));
                        org.setEarlywarningcate(h.getString("toxicology_type"));
                        org.setQuantityUnit(h.getString("quantity_unit_name"));
                        org.setPackUnit(h.getString("pack_unit_name"));
                        list.add(org);
                        updateCount++;
                    }