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

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

@@ -643,5 +643,5 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        return list;
    }
    public JSONArray find
//    public JSONArray find
}

common/common-entity/src/main/java/com/yihu/jw/entity/base/dict/DictHospitalDeptDO.java

@@ -41,12 +41,6 @@ public class DictHospitalDeptDO extends IntegerIdentityEntity {
	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
	private Date createTime;
    /**
     * 6总部7金榜8夏禾
     */
    @Autowired
    private String deptTypeCode;
	@Column(name = "org_code")
    public String getOrgCode() {
@@ -80,12 +74,4 @@ public class DictHospitalDeptDO extends IntegerIdentityEntity {
        this.createTime = createTime;
    }
    @Column(name = "dept_type_code")
    public String getDeptTypeCode() {
        return deptTypeCode;
    }
    public void setDeptTypeCode(String deptTypeCode) {
        this.deptTypeCode = deptTypeCode;
    }
}

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

@@ -158,6 +158,11 @@ public class BaseOrgDO extends UuidIdentityEntityWithOperator {
     */
    private Integer level;
    /**
     * 机构分部号，每个机构都不一样，例如中山医院：6总部7金榜8夏禾
     */
    private String winNo;
    public BaseOrgDO() {
    }
@@ -390,4 +395,13 @@ public class BaseOrgDO extends UuidIdentityEntityWithOperator {
    public void setLevel(Integer level) {
        this.level = level;
    }
    @Column(name = "win_no")
    public String getWinNo() {
        return winNo;
    }
    public void setWinNo(String winNo) {
        this.winNo = winNo;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyOutpatientDO.java

@@ -54,6 +54,11 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
     */
    private String hospitalName;
    /**
     * 机构分部编码
     */
    private String winNo;
    /**
	 * 部门
	 */
@@ -339,4 +344,13 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
    public void setCardNo(String cardNo) {
        this.cardNo = cardNo;
    }
    @Column(name="win_no")
    public String getWinNo() {
        return winNo;
    }
    public void setWinNo(String winNo) {
        this.winNo = winNo;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/org/BaseOrgVO.java

@@ -151,6 +151,8 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
     */
    @ApiModelProperty(value = "11一级甲等 12一级乙等 13一级丙等二级甲等 22二级乙等 23二级丙等31三级特等 32三级甲等 33三级乙等 34三级丙级", example = "1")
    private Integer level;
    @ApiModelProperty(value = "机构分部号，每个机构都不一样，例如中山医院：6总部7金榜8夏禾", example = "1")
    private String winNo;
    private List<DictHospitalDeptVO> depts;
@@ -310,4 +312,12 @@ public class BaseOrgVO extends UuidIdentityVOWithOperator {
    public void setDepts(List<DictHospitalDeptVO> depts) {
        this.depts = depts;
    }
    public String getWinNo() {
        return winNo;
    }
    public void setWinNo(String winNo) {
        this.winNo = winNo;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyOutpatientVO.java

@@ -59,6 +59,12 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
     */
    @ApiModelProperty(value = "医院名称", example = "模块1")
    private String hospitalName;
    /**
     * 机构分部编码
     */
    @ApiModelProperty(value = "机构分部编码", example = "模块1")
    private String winNo;
    /**
	 * 部门
	 */
@@ -328,4 +334,12 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
    public void setCardNo(String cardNo) {
        this.cardNo = cardNo;
    }
    public String getWinNo() {
        return winNo;
    }
    public void setWinNo(String winNo) {
        this.winNo = winNo;
    }
}

svr/svr-internet-hospital/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
spring:
  application:
    name: svr-internet-hospital-lyx
    name: svr-internet-hospital
  cloud:
    config:
      failFast: true