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

@@ -1038,7 +1038,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
            totalSql += " AND h.org_code = '" + orgCode + "'";
        }
        if (StringUtils.isNotBlank(chargeType)) {
            totalSql += " AND d.charge_type ='" + chargeType + "'";
            if ("all".equalsIgnoreCase(chargeType)){
            }else {
                totalSql += " AND d.charge_type ='" + chargeType + "'";
            }
        } else {
            totalSql += " AND d.charge_type is not null ";
        }
@@ -1113,7 +1117,11 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        }
        if (StringUtils.isNotBlank(chargeType)) {
            sql += " AND d.charge_type ='" + chargeType + "'";
            if ("all".equalsIgnoreCase(chargeType)){
            }else {
                sql += " AND d.charge_type ='" + chargeType + "'";
            }
        } else {
            sql += " AND d.charge_type is not null";
        }
@@ -1237,7 +1245,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                " h.org_code = '" + orgCode + "'" +
                " AND r.role_code ='specialist'";
        if (StringUtils.isNotBlank(chargeType)) {
            if ("all".equals(chargeType)) {
            if ("all".equalsIgnoreCase(chargeType)) {
                //不过滤号别
            } else {
                totalSql += " AND d.charge_type ='" + chargeType + "'";
@@ -1302,7 +1310,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
                " h.org_code = '" + orgCode + "'" +
                " AND r.role_code ='specialist'";
        if (StringUtils.isNotBlank(chargeType)) {
            if ("all".equals(chargeType)) {
            if ("all".equalsIgnoreCase(chargeType)) {
                //不过滤号别
            } else {
                sql += " AND d.charge_type ='" + chargeType + "'";

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -1755,12 +1755,12 @@ public class ImService {
					"op.general_doctor as \"generalDoctor\"," +
					"op.icd10_name as \"icd10Name\"," +
					"d.photo AS \"patientphoto\" " +
					"FROM wlyy_consult a," +
					"wlyy_consult_team b," +
					"base_patient d, " +
					"wlyy_outpatient op " +
					"FROM wlyy_consult_team b," +
					"base_patient d," +
					"wlyy_consult a   " +
					"left join wlyy_outpatient op on  a.relation_code = op.id " +
					"WHERE a.id=b.consult " +
					"AND b.patient=d.id AND b.doctor='"+doctor+"' AND a.relation_code = op.id ";
					"AND b.patient=d.id AND b.doctor='"+doctor+"' ";
		}
		
@@ -1827,12 +1827,12 @@ public class ImService {
		
		String  sql = "SELECT " +
				" COUNT(1) AS \"total\" " +
				"FROM wlyy_consult a," +
				"wlyy_consult_team b," +
				"FROM wlyy_consult_team b," +
				"base_patient d," +
				"wlyy_outpatient op " +
				"wlyy_consult a  " +
				"left join wlyy_outpatient op on  a.relation_code = op.id " +
				"WHERE a.id=b.consult " +
				"AND b.patient=d.id AND b.doctor='"+doctor+"' AND a.relation_code = op.id  ";
				"AND b.patient=d.id AND b.doctor='"+doctor+"'   ";
		List<ConsultVO> result = new ArrayList<>();
		
		if(!StringUtils.isEmpty(title)){

common/common-entity/src/main/java/com/yihu/jw/entity/IntegerIdentityEntity.java

@@ -19,13 +19,13 @@ public abstract class IntegerIdentityEntity implements Serializable {
    @Id
//==========mysql 环境 id策略======================================================
    @GeneratedValue(generator = "generator")
/*    @GeneratedValue(generator = "generator")
    @GenericGenerator(name = "generator", strategy = "identity")
    @Column(name = "id", unique = true, nullable = false)
    @Column(name = "id", unique = true, nullable = false)*/
//==========mysql 环境 id策略 end======================================================
//==========Oracle 环境id策略 =========================================================
/*    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")*/
    @GeneratedValue(strategy=GenerationType.SEQUENCE, generator="id_generated")
//==========Oracle 环境id策略 =========================================================
    public Integer getId() {
        return id;

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

@@ -573,7 +573,7 @@ fastDFS:
fast-dfs:
  tracker-server: 172.16.100.240:22122 #服务器地址
wechat:
  id: d24d1367-7f4f-43af-910e-a0a43799e040  # base库中,wx_wechat 的id字段  # todo 待配置
  id: xm_xzzx_wx  # base库中,wx_wechat 的id字段  # todo 待配置
# 短信验证码发送的客户端标识,居民端
sms:
  clientId: EwC0iRSrcP #todo 待配置