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

# Conflicts:
#	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/PatientDoorCoachOrderService.java
#	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

common/common-entity/sql记录

@@ -1091,4 +1091,7 @@ ALTER table base.base_business_order_pay add INDEX index_status_last_pay(status,
-- 2021-07-12
ALTER table base.dm_device add column need_register tinyint(2) DEFAULT '0' COMMENT '是否需要注册 0否 1是'
ALTER TABLE wlyy_patient_rehabilitation_plan add COLUMN  `admin_team_code` int(11) DEFAULT NULL COMMENT '家签行政团队Id';
ALTER TABLE wlyy_patient_rehabilitation_plan add COLUMN  `admin_team_code` int(11) DEFAULT NULL COMMENT '家签行政团队Id';
-- 2021-07-12 lb
ALTER table base.dm_device modify column need_register varchar(255) DEFAULT NULL COMMENT '注册至iot接口，为空表示不注册'

common/common-entity/src/main/java/com/yihu/jw/entity/care/device/Device.java

@@ -27,7 +27,7 @@ public class Device extends IdEntity {
	private Date czrq;
	private String del;
	private String serviceTopic;//设备所属专题 防走失 preventLost
	private Integer needRegister;//设备是否注册iot(脉搏波血压计)
	private String needRegister;//设备是否注册iot(脉搏波血压计)
	@Column(name="category_code")
	public String getCategoryCode() {
@@ -119,11 +119,11 @@ public class Device extends IdEntity {
		this.serviceTopic = serviceTopic;
	}
	public Integer getNeedRegister() {
	public String getNeedRegister() {
		return needRegister;
	}
	public void setNeedRegister(Integer needRegister) {
	public void setNeedRegister(String needRegister) {
		this.needRegister = needRegister;
	}
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/device/DeviceDetailService.java

@@ -50,7 +50,7 @@ public class DeviceDetailService extends BaseJpaService<DeviceDetail, DeviceDeta
	private JdbcTemplate jdbcTemplate;
	@Autowired
	private HttpClientUtil httpClientUtil;
	@Value("${cloudCare.url}")
	@Value("${cloudCare.deviceUrl}")
	private String cloudDeviceUrl;
@@ -199,12 +199,12 @@ public class DeviceDetailService extends BaseJpaService<DeviceDetail, DeviceDeta
	public void registerToWlyy(DevicePatientDevice device){
		//判断设备类型
		Device deviceDO = deviceDao.findOne(device.getDeviceId());
		if (1==deviceDO.getNeedRegister()){
		if (StringUtils.isNotBlank(deviceDO.getNeedRegister())){
			// 设备注册至iot后 通过iot将设备数据转发
			String url = "http://www.cityihealth.com:43210/deviceManage/register";
			List<NameValuePair> params = new ArrayList<>();
			params.add(new BasicNameValuePair("deviceSN", device.getDeviceSn()));
			params.add(new BasicNameValuePair("pushAddress", cloudDeviceUrl));
			params.add(new BasicNameValuePair("pushAddress", cloudDeviceUrl+"/"+deviceDO.getNeedRegister()));
			String response = httpClientUtil.post(url, params,"UTF-8");
			//注册日志
		}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/doorCoach/PatientDoorCoachOrderService.java

@@ -865,6 +865,9 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
                logger.error(failMsg);
                return result;
            }
            BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(orderDO.getId());
            businessOrderDO.setStatus(2);
            businessOrderDao.save(businessOrderDO);
        }else{//调度员拒单,此时工单已支付抵达调度员
            try {
                if (orderDO.getStatus() > BaseDoorCoachOrderDO.Status.waitForPay.getType()&&1==orderDO.getPayWay()){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

@@ -183,7 +183,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        String sql = "SELECT a.status, COUNT(DISTINCT a.id) as num FROM base_life_care_order a " ;
        sql +=  "  WHERE  a.hospital = ? group BY a.status";
        sql +=  "  WHERE  a.hospital = ? and a.status<>0 group BY a.status";
        List<Map<String, Object>> list = jdbcTemplate.queryForList(sql, hospital);
        Map<String, Integer> map = new HashMap<>();
        //状态 待服务 1、已完成 2 、已取消 -1 已签到 3
@@ -248,7 +248,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
                " LEFT JOIN base_patient p ON o.patient = p.id ) "+
                " WHERE " +
                "  o.hospital = '{hospital}' " +buffer+
                " AND ( o.`status` = {status} OR -100 = {status} ) " +
                " AND ( o.`status` = {status} OR -100 = {status} ) and o.pay_status>0 " +
                " ORDER BY o.create_time desc " +
                " LIMIT {start},{end};";
@@ -413,6 +413,9 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
            logger.error(failMsg);
            return result;
        }
        BusinessOrderDO businessOrderDO = businessOrderDao.selectByRelationCode(orderDO.getId());
        businessOrderDO.setStatus(2);
        businessOrderDao.save(businessOrderDO);
//        if(orderDO.getStatus().equals(LifeCareOrderDO.Status.complete.getType())){
//            result.put(ResponseContant.resultFlag, ResponseContant.fail);
//            String failMsg = "只有医生服务前的工单才可取消";
@@ -467,7 +470,6 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
    @Transactional(rollbackFor = Exception.class)
    public JSONObject create(String jsonData,String proxyPatient) {
        logger.info("申请生活照料jsonData参数：" + jsonData);
        proxyPatient = "808080eb78d3ce030178edeb4346002b";
        JSONObject result = new JSONObject();
        JSONObject jsonObjectParam;
        LifeCareOrderDO orderDO = null;
@@ -694,7 +696,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        String sql = "select ord.id,DATE_FORMAT(ord.create_time,'%Y-%m-%d %H:%i:%S') createTime,DATE_FORMAT(ord.patient_expected_serve_time,'%Y-%m-%d %H:%i:%S') serveTime,ord.status,ord.hospital,ord.hospital_name hospitalName" +
                ",ord.doctor,ord.doctor_name doctorName,ord.expected_doctor_name expectedDoctorName,group_concat(Distinct fee.name SEPARATOR '、') serveItems" +
                " from base_life_care_order ord LEFT JOIN base_life_care_fee_detail fee on ord.id = fee.order_id " +
                "and fee.`status`<>3 where ord.patient = '"+patient+"' ";
                "and fee.`status`<>3 where ord.patient = '"+patient+"' and ord.status<>0 ";
        String fliter = "";
       if (status != null){
           fliter += " and ord.status = "+status;
@@ -713,7 +715,7 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        String sql = "select ord.id,DATE_FORMAT(ord.create_time,'%Y-%m-%d %H:%i:%S') createTime,DATE_FORMAT(ord.patient_expected_serve_time,'%Y-%m-%d %H:%i:%S') serveTime,ord.status,ord.hospital,ord.hospital_name hospitalName" +
                ",ord.doctor,ord.doctor_name doctorName,ord.expected_doctor_name expectedDoctorName,group_concat(Distinct fee.name SEPARATOR '、') serveItems" +
                " from base_life_care_order ord LEFT JOIN base_life_care_fee_detail fee on ord.id = fee.order_id " +
                "and fee.`status`<>3 where ord.patient = '"+patient+"' ";
                "and fee.`status`<>3 where ord.patient = '"+patient+"' and ord.status<>0  ";
        String fliter = "";
        if (status != null){
            fliter += " and ord.status = "+status;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/pay/PayService.java

@@ -556,11 +556,12 @@ public class PayService {
        orderDO.setStatus(2);
        orderDO.setRefundTime(new Date());
        if (orderDO.getOutRefundNo().contains("CAREDISPATCHER")){//调度员拒单时 不生成售后订单
            businessOrderDO.setStatus(2);
            orderRefundDao.delete(orderDO.getId());
        }else {
            businessOrderDO.setStatus(4);
            orderRefundDao.save(orderDO);
        }
        businessOrderDO.setStatus(4);
        businessOrderDao.save(businessOrderDO);
        log.info("【退款通知】成功，type：{}", type);
    }

svr/svr-cloud-care/src/main/resources/application.yml

@@ -185,7 +185,7 @@ base:
  hospitalUrl: http://172.26.0.107:10022/
cloudCare:
  url: http://172.26.0.107:9112/
  deviceUrl: http://172.26.0.107:9112/
---
spring:
  profiles: jwtest
@@ -293,7 +293,7 @@ base:
  hospitalUrl: http://172.26.0.107:10022/
cloudCare:
  url: http://172.26.0.107:9112/
  deviceUrl: http://172.26.0.107:9112/
---
spring:
  profiles: jwprod
@@ -403,7 +403,7 @@ base:
  hospitalUrl: http://172.26.0.107:10022/
cloudCare:
  url: http://172.26.0.107:9112/
  deviceUrl: http://172.26.0.107:9112/
---
spring:
  profiles: hzprod
@@ -511,4 +511,4 @@ base:
  hospitalUrl: http://127.0.0.7:10022/
cloudCare:
  url: https://zhyzh.hzxc.gov.cn/device/
  deviceUrl: https://zhyzh.hzxc.gov.cn/device/