Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -3181,6 +3181,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                BaseOrgDO org = baseOrgDao.findByCode(orgCode);
                if (org!=null){
                    doctorHospitalDO.setWinNo(org.getWinNo());
                    doctorHospitalDO.setHisId(org.getHisId());
                    hospitalDOList.add(doctorHospitalDO);
                }
            }

common/common-entity/src/main/java/com/yihu/jw/entity/base/doctor/BaseDoctorHospitalDO.java

@@ -61,6 +61,12 @@ public class BaseDoctorHospitalDO extends IntegerIdentityEntity {
	 */
	private String del;
    /**
     * hisid
     *
     */
	private String hisId;
	public BaseDoctorHospitalDO(){}
	public BaseDoctorHospitalDO(String orgCode, String orgName, String doctorDutyCode, String doctorDutyName){
@@ -144,4 +150,13 @@ public class BaseDoctorHospitalDO extends IntegerIdentityEntity {
    public void setWinNo(String winNo) {
        this.winNo = winNo;
    }
    @Transient
    public String getHisId() {
        return hisId;
    }
    public void setHisId(String hisId) {
        this.hisId = hisId;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/org/BaseOrgDO.java

@@ -160,6 +160,11 @@ public class BaseOrgDO extends UuidIdentityEntityWithOperator {
     * 机构分部号，每个机构都不一样，例如中山医院：6总部7金榜8夏禾 默认1
     */
    private String winNo;
    /**
     * 医院code
     */
    private String hisId;
	
//	/**
//	 * 排序
@@ -421,4 +426,13 @@ public class BaseOrgDO extends UuidIdentityEntityWithOperator {
    public void setWinNo(String winNo) {
        this.winNo = winNo;
    }
    @Column(name = "his_id")
    public String getHisId() {
        return hisId;
    }
    public void setHisId(String hisId) {
        this.hisId = hisId;
    }
}