Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/common/account/CustomerController.java

@@ -5,14 +5,12 @@ import com.yihu.wlyy.entity.Doctor;
import com.yihu.wlyy.entity.Patient;
import com.yihu.wlyy.entity.User;
import com.yihu.wlyy.entity.WlyyCustomerLog;
import com.yihu.wlyy.entity.call.CallRecord;
import com.yihu.wlyy.repository.PatientDao;
import com.yihu.wlyy.service.manager.account.CustomerService;
import com.yihu.wlyy.service.manager.hos.HosDoctorService;
import com.yihu.wlyy.service.manager.patient.AdminPatientService;
import com.yihu.wlyy.service.manager.user.UserService;
import com.yihu.wlyy.service.manager.user.WlyyCustomerLogService;
import com.yihu.wlyy.util.DateUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/controller/synergy/doctor/DoctorSynergyManageController.java

@@ -126,4 +126,17 @@ public class DoctorSynergyManageController extends BaseController {
            return error(-1, "请求失败");
        }
    }
    @RequestMapping(value = "getWorkorderInfo", method = RequestMethod.GET)
    @ApiOperation("医生端-获取工单详情")
    public String getWorkorderInfo(@ApiParam(name = "workorderCode", value = "协同服务工单code", required = true)
                           @RequestParam(value = "workorderCode", required = true)String workorderCode){
        try {
            ManageSynergyWorkorderDO workorderInfo = synergyManageService.getWorkorderInfo(workorderCode);
            return write(200, "请求成功","data",workorderInfo);
        }catch (Exception e){
            error(e);
            return error(-1, "请求失败");
        }
    }
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/synergy/ManageSynergyWorkorderDO.java

@@ -61,7 +61,7 @@ public class ManageSynergyWorkorderDO extends IdEntity {
    }
    @Column(name = "service_time")
    @JsonFormat(pattern="yyyy-MM-dd HH:mm")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+08:00")
    public Date getServiceTime() {
        return serviceTime;
    }

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/entity/synergy/ManageSynergyWorkorderReserveConsultDO.java

@@ -18,7 +18,7 @@ public class ManageSynergyWorkorderReserveConsultDO extends IdEntity {
    private Integer dealType;//处理方式：1.电话回复，2.客服回复
    private Date dealTime;//处理时间
    private Integer dealState;//处理结果：1.完成，2.无法联系居民
    private Integer dealContent;//处理内容
    private String dealContent;//处理内容
    private Integer dealReason;//处理取消原因：0.没有号源、1.病人取消
    private String orderHospital;//预约医院code
    private String orderHospitalName;//预约医院
@@ -26,7 +26,7 @@ public class ManageSynergyWorkorderReserveConsultDO extends IdEntity {
    private String orderDeptName;//预约科室名称
    private String orderDoctor;//预约医生code
    private String orderDoctorName;//预约医生名称
    private Date orderTime;//预约时间段
    private String orderTime;//预约时间段
    private Date registerTime;//挂号时间
    private String user;//创建人（客服）code
    private String userName;//客服姓名（创建人）
@@ -72,11 +72,11 @@ public class ManageSynergyWorkorderReserveConsultDO extends IdEntity {
    }
    @Column(name = "deal_content")
    public Integer getDealContent() {
    public String getDealContent() {
        return dealContent;
    }
    public void setDealContent(Integer dealContent) {
    public void setDealContent(String dealContent) {
        this.dealContent = dealContent;
    }
@@ -144,11 +144,11 @@ public class ManageSynergyWorkorderReserveConsultDO extends IdEntity {
    }
    @Column(name = "order_time")
    public Date getOrderTime() {
    public String getOrderTime() {
        return orderTime;
    }
    public void setOrderTime(Date orderTime) {
    public void setOrderTime(String orderTime) {
        this.orderTime = orderTime;
    }

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/repository/synergy/ManageSynergyWorkOrderDao.java

@@ -8,6 +8,8 @@ import org.springframework.data.repository.PagingAndSortingRepository;
public interface ManageSynergyWorkOrderDao extends PagingAndSortingRepository<ManageSynergyWorkorderDO, Long> {
    ManageSynergyWorkorderDO findByCode(String workorderCode);
    
    ManageSynergyWorkorderDO findByRelationCode(String relationCode);
    @Modifying
    @Query("update ManageSynergyWorkorderDO a set a.del=1 where a.code = ?1")

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/repository/synergy/ManageSynergyWorkorderReserveConsultDao.java

@@ -11,4 +11,6 @@ import java.util.List;
public interface ManageSynergyWorkorderReserveConsultDao extends PagingAndSortingRepository<ManageSynergyWorkorderReserveConsultDO, Long> {
    List<ManageSynergyWorkorderReserveConsultDO> findByCallCode(String callCode);
    
    ManageSynergyWorkorderReserveConsultDO findByWorkorderCode(String WorkorderCode);
}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/account/CustomerService.java

@@ -3,20 +3,17 @@ package com.yihu.wlyy.service.manager.account;
import com.yihu.wlyy.entity.*;
import com.yihu.wlyy.entity.call.CallRecord;
import com.yihu.wlyy.entity.call.CallService;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderCustomerLogDO;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderReserveConsultDO;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderServicerDO;
import com.yihu.wlyy.entity.synergy.*;
import com.yihu.wlyy.repository.*;
import com.yihu.wlyy.repository.call.CallRecordDao;
import com.yihu.wlyy.repository.call.CallServiceDao;
import com.yihu.wlyy.repository.synergy.ManageSynergyWorkorderCustomerLogDao;
import com.yihu.wlyy.repository.synergy.ManageSynergyWorkorderReserveConsultDao;
import com.yihu.wlyy.repository.synergy.ManageSynergyWorkorderServicerDao;
import com.yihu.wlyy.repository.synergy.*;
import com.yihu.wlyy.service.BaseService;
import com.yihu.wlyy.service.manager.family.FamilyMemberService;
import com.yihu.wlyy.service.manager.hos.HosDoctorService;
import com.yihu.wlyy.service.manager.sign.FamilyContractService;
import com.yihu.wlyy.service.manager.sign.SignFamilyService;
import com.yihu.wlyy.service.synergy.SynergyManageService;
import com.yihu.wlyy.util.DateUtil;
import com.yihu.wlyy.util.HttpClientUtil;
import io.swagger.models.auth.In;
@@ -66,6 +63,17 @@ public class CustomerService extends BaseService{
	private PatientReservationDao patientReservationDao;
	@Autowired
	private SignFamilyDao signFamilyDao;
	@Autowired
	private ManageSynergyWorkOrderDao manageSynergyWorkOrderDao;
	@Autowired
	private ManageSynergyWorkorderServicerDao manageSynergyWorkorderServicerDao;
	@Autowired
	private ManageSynergyWorkorderExecutorDao manageSynergyWorkorderExecutorDao;
	@Autowired
	private ManageSynergyWorkorderReserveConsultDao manageSynergyWorkorderReserveConsultDao;
	@Autowired
	private SynergyManageService synergyManageService;
	
	@Value(("${doctorAssistant.api}")+"/wlyygc/doctor/message")
	private String messageApi;
@@ -571,27 +579,81 @@ public class CustomerService extends BaseService{
		SignFamily sf = familyService.findByPatientCode(callService.getPatient());
		callService.setAdminTeamCode(sf.getAdminTeamId());
		callService.setCreateTime(new Date());
		callServiceDao.save(callService);
		callService = callServiceDao.save(callService);
		//待处理发送消息给医生
		sendCallServiceMes(callService);
		//发送消息
		sendWxMes(callService);
		
		//将旧数据存储到新表---------START
		ManageSynergyWorkorderDO manageSynergyWorkorderDO = new ManageSynergyWorkorderDO();
		// 协同服务工单的服务对象表
		ManageSynergyWorkorderServicerDO manageSynergyWorkorderServicerDO = new ManageSynergyWorkorderServicerDO();
		// 协同服务执行人表
		ManageSynergyWorkorderExecutorDO manageSynergyWorkorderExecutorDO = new ManageSynergyWorkorderExecutorDO();
		// 咨询、预约操作日志表
		ManageSynergyWorkorderReserveConsultDO manageSynergyWorkorderReserveConsultDO = new ManageSynergyWorkorderReserveConsultDO();
		
		manageSynergyWorkorderDO.setDel(0);
		//咨询
		if(0 == callService.getType()){
			manageSynergyWorkorderDO.setType(0);
			manageSynergyWorkorderServicerDO.setWorkorderType(0);
		}else if (1 == callService.getType()){
			manageSynergyWorkorderDO.setType(2);
			manageSynergyWorkorderServicerDO.setWorkorderType(2);
		}
		//服务时间
		manageSynergyWorkorderDO.setServiceTime(callService.getDealTime());
		//工单状态
		if( 0 == callService.getState()){
			manageSynergyWorkorderDO.setStatus(0);
			manageSynergyWorkorderServicerDO.setStatus(0);
		}else if (1 == callService.getState()){
			manageSynergyWorkorderDO.setStatus(2);
			manageSynergyWorkorderServicerDO.setStatus(2);
		}else if(2 == callService.getState()){
			manageSynergyWorkorderDO.setStatus(3);
			manageSynergyWorkorderServicerDO.setStatus(3);
		}
		//优先级
		manageSynergyWorkorderDO.setPriority(0);//默认普通
		manageSynergyWorkorderDO.setCreateTime(new Date());
		manageSynergyWorkorderDO.setCreateUser(callService.getUser());
		manageSynergyWorkorderDO.setCreateUserName(callService.getUserName());
		manageSynergyWorkorderDO.setCreateUserType(2);//默认为客服
		manageSynergyWorkorderDO.setRemark(callService.getRemark());
		manageSynergyWorkorderDO.setContent(callService.getDealContent());
		manageSynergyWorkorderDO.setServicerCount(1);
		manageSynergyWorkorderDO.setReceiverCode(callService.getDoctor());
		manageSynergyWorkorderDO.setReceiverName(callService.getDoctorName());
		manageSynergyWorkorderDO.setReceiverType(1);
		manageSynergyWorkorderDO.setRelationCode(callService.getCode());
		manageSynergyWorkorderDO.setCode(synergyManageService.getWorkorderNo());
		manageSynergyWorkorderDO = manageSynergyWorkOrderDao.save(manageSynergyWorkorderDO);
		
		manageSynergyWorkorderServicerDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
		manageSynergyWorkorderServicerDO.setCreateTime(new Date());
		manageSynergyWorkorderServicerDO.setCode(UUID.randomUUID().toString());
		manageSynergyWorkorderServicerDao.save(manageSynergyWorkorderServicerDO);
		
		manageSynergyWorkorderExecutorDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
		manageSynergyWorkorderExecutorDO.setDel(0);
		manageSynergyWorkorderExecutorDO.setExecutorType(3);
		manageSynergyWorkorderExecutorDO.setExecutorCode(callService.getUser());
		manageSynergyWorkorderExecutorDO.setExecutorName(callService.getUserName());
		manageSynergyWorkorderExecutorDO.setCode(UUID.randomUUID().toString());
		manageSynergyWorkorderExecutorDao.save(manageSynergyWorkorderExecutorDO);
		
		manageSynergyWorkorderReserveConsultDO.setCode(UUID.randomUUID().toString());
		manageSynergyWorkorderReserveConsultDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
		manageSynergyWorkorderReserveConsultDO.setWorkorderServiceCode(manageSynergyWorkorderServicerDO.getCode());
		manageSynergyWorkorderReserveConsultDao.save(manageSynergyWorkorderReserveConsultDO);
		
		return "1";
	}
	public boolean checkCallServiceCount(CallService callService ){
		String sql = "SELECT count(1) AS total FROM manage_call_service s WHERE s.call_code ='"+callService.getCallCode() +"' AND s.type = "+callService.getType();
		List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
		if(list!=null&&list.size()>0){
			Map<String,Object> map = list.get(0);
			Long total = (Long)map.get("total");
			if(total>=5){
				return false;
			}
		}
		return true;
	}
	public String updateCallService(String callServiceJson,String user){
		net.sf.json.JSONObject jsonObject = net.sf.json.JSONObject.fromObject(callServiceJson);
@@ -604,8 +666,104 @@ public class CustomerService extends BaseService{
		sendCallServiceMes(callService);
		//发送消息
		sendWxMes(callService);
		
		//将旧数据存储到新表---------START
		ManageSynergyWorkorderDO manageSynergyWorkorderDO = manageSynergyWorkOrderDao.findByRelationCode(callService.getCode());
		// 协同服务工单的服务对象表
		ManageSynergyWorkorderServicerDO manageSynergyWorkorderServicerDO = manageSynergyWorkorderServicerDao.findByWorkorderCode(manageSynergyWorkorderDO.getCode()).get(0);
		// 协同服务执行人表
		ManageSynergyWorkorderExecutorDO manageSynergyWorkorderExecutorDO = manageSynergyWorkorderExecutorDao.findByWorkorderCode(manageSynergyWorkorderDO.getCode(),3).get(0);
		// 咨询、预约操作日志表
		ManageSynergyWorkorderReserveConsultDO manageSynergyWorkorderReserveConsultDO = manageSynergyWorkorderReserveConsultDao.findByWorkorderCode(manageSynergyWorkorderDO.getCode());
		
		manageSynergyWorkorderDO.setDel(0);
		//咨询
		if(0 == callService.getType()){
			manageSynergyWorkorderDO.setType(0);
			manageSynergyWorkorderServicerDO.setWorkorderType(0);
		}else if (1 == callService.getType()){
			manageSynergyWorkorderDO.setType(2);
			manageSynergyWorkorderServicerDO.setWorkorderType(2);
		}
		//服务时间
		manageSynergyWorkorderDO.setServiceTime(callService.getDealTime());
		//工单状态
		if( 0 == callService.getState()){
			manageSynergyWorkorderDO.setStatus(0);
			manageSynergyWorkorderServicerDO.setStatus(0);
		}else if (1 == callService.getState()){
			manageSynergyWorkorderDO.setStatus(2);
			manageSynergyWorkorderServicerDO.setStatus(2);
		}else if(2 == callService.getState()){
			manageSynergyWorkorderDO.setStatus(3);
			manageSynergyWorkorderServicerDO.setStatus(3);
		}
		//优先级
		manageSynergyWorkorderDO.setPriority(0);//默认普通
		manageSynergyWorkorderDO.setCreateTime(new Date());
		manageSynergyWorkorderDO.setCreateUser(callService.getUser());
		manageSynergyWorkorderDO.setCreateUserName(callService.getUserName());
		manageSynergyWorkorderDO.setCreateUserType(2);//默认为客服
		manageSynergyWorkorderDO.setRemark(callService.getRemark());
		manageSynergyWorkorderDO.setContent(callService.getDealContent());
		manageSynergyWorkorderDO.setServicerCount(1);
		manageSynergyWorkorderDO.setReceiverCode(callService.getDoctor());
		manageSynergyWorkorderDO.setReceiverName(callService.getDoctorName());
		manageSynergyWorkorderDO.setReceiverType(1);
		manageSynergyWorkorderDO.setRelationCode(callService.getCode());
		manageSynergyWorkorderDO = manageSynergyWorkOrderDao.save(manageSynergyWorkorderDO);
		
		
		manageSynergyWorkorderServicerDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
		manageSynergyWorkorderServicerDO.setCreateTime(new Date());
		manageSynergyWorkorderServicerDao.save(manageSynergyWorkorderServicerDO);
		
		manageSynergyWorkorderExecutorDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
		manageSynergyWorkorderExecutorDO.setDel(0);
		manageSynergyWorkorderExecutorDO.setExecutorType(3);
		manageSynergyWorkorderExecutorDO.setExecutorCode(callService.getUser());
		manageSynergyWorkorderExecutorDO.setExecutorName(callService.getUserName());
		manageSynergyWorkorderExecutorDao.save(manageSynergyWorkorderExecutorDO);
		
		manageSynergyWorkorderReserveConsultDO.setWorkorderCode(manageSynergyWorkorderDO.getCode());
		manageSynergyWorkorderReserveConsultDO.setWorkorderServiceCode(manageSynergyWorkorderServicerDO.getCode());
		manageSynergyWorkorderReserveConsultDO.setDealType(callService.getDealType());
		manageSynergyWorkorderReserveConsultDO.setDealTime(new Date());
		manageSynergyWorkorderReserveConsultDO.setDealState(callService.getDealState());
		manageSynergyWorkorderReserveConsultDO.setDealContent(callService.getDealContent());
		manageSynergyWorkorderReserveConsultDO.setDealReason(callService.getDealReason());
		manageSynergyWorkorderReserveConsultDO.setOrderHospital(callService.getOrderHospital());
		manageSynergyWorkorderReserveConsultDO.setOrderHospitalName(callService.getOrderHospitalName());
		manageSynergyWorkorderReserveConsultDO.setOrderDept(callService.getOrderDept());
		manageSynergyWorkorderReserveConsultDO.setOrderDeptName(callService.getOrderDeptName());
		manageSynergyWorkorderReserveConsultDO.setOrderDoctor(callService.getOrderDoctor());
		manageSynergyWorkorderReserveConsultDO.setOrderDoctorName(callService.getOrderDoctorName());
		manageSynergyWorkorderReserveConsultDO.setOrderTime(callService.getOrderTime());
		manageSynergyWorkorderReserveConsultDO.setRegisterTime(callService.getRegisterTime());
		manageSynergyWorkorderReserveConsultDO.setUser(callService.getUser());
		manageSynergyWorkorderReserveConsultDO.setUserName(callService.getUserName());
		manageSynergyWorkorderReserveConsultDO.setCreateTime(callService.getCreateTime());
		manageSynergyWorkorderReserveConsultDO.setCallCode(callService.getCallCode());
		manageSynergyWorkorderReserveConsultDao.save(manageSynergyWorkorderReserveConsultDO);
		
		
		return "1";
	}
	
	
	public boolean checkCallServiceCount(CallService callService ){
		String sql = "SELECT count(1) AS total FROM manage_call_service s WHERE s.call_code ='"+callService.getCallCode() +"' AND s.type = "+callService.getType();
		List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
		if(list!=null&&list.size()>0){
			Map<String,Object> map = list.get(0);
			Long total = (Long)map.get("total");
			if(total>=5){
				return false;
			}
		}
		return true;
		
	}
	public void sendWxMes(CallService callService){
		Doctor d = doctorDao.findByCode(callService.getDoctor());
@@ -747,8 +905,13 @@ public class CustomerService extends BaseService{
	}
	public String delCallService(String code){
		CallService c = callServiceDao.findByCode(code);
		callServiceDao.delete(c);
		//旧代码
//		CallService c = callServiceDao.findByCode(code);
//		callServiceDao.delete(c);
		//新代码--根据CODE逻辑删除工单表
		ManageSynergyWorkorderDO manageSynergyWorkorderDO = manageSynergyWorkOrderDao.findByCode(code);
		manageSynergyWorkorderDO.setDel(1);
		manageSynergyWorkOrderDao.save(manageSynergyWorkorderDO);
		return "1";
	}

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/synergy/SynergyManageService.java

@@ -392,6 +392,7 @@ public class SynergyManageService extends BaseJpaService {
        if(workorderDO.getType() == 3){
            List<ManageSynergyWorkorderServicerDO> workorderServicerDO = workorderServicerDao.findByWorkorderCode(workorderCode);
            map.put("patientName", workorderServicerDO.get(0).getServicePatientName());
            map.put("patient", workorderServicerDO.get(0).getServicePatientCode());
            map.put("idcard", workorderServicerDO.get(0).getIdcard());
            map.put("ssc", workorderServicerDO.get(0).getSsc());
        }else if(workorderDO.getType() == 5) {
@@ -1961,4 +1962,9 @@ public class SynergyManageService extends BaseJpaService {
            throw new Exception("删除失败");
        }
    }
    public ManageSynergyWorkorderDO getWorkorderInfo(String workorderCode){
        return workOrderDao.findByCode(workorderCode);
    }
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/job/PrescriptionPayQueryJob.java

@@ -37,10 +37,14 @@ public class PrescriptionPayQueryJob implements Job {
            String accesstoken =  weiXinAccessTokenUtils.getAccessToken();
            //获取支付完成，院内结算失败的 处方CODE 集合
            List<String> prescriptionCodeList = prescriptionPayDao.findTodayUnpay();
    
            logger.info("PrescriptionPayQueryJob size:"+prescriptionCodeList.size());
            if (!prescriptionCodeList.isEmpty()) {
                for (String code : prescriptionCodeList) {
                    try {
                        logger.info("PrescriptionPayQueryJob code:"+code);
    
                        payService.chargeQuery(code,accesstoken);
                    } catch (Exception e) {
                        logger.info("PrescriptionPayQueryJob error ..........continue this JOB,CODE:" + code + ",message:" + e.getMessage());

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/repository/prescription/PrescriptionPayDao.java

@@ -18,7 +18,7 @@ public interface PrescriptionPayDao extends PagingAndSortingRepository<Prescript
    @Query("from PrescriptionPay p where p.code=?1 ")
    PrescriptionPay findByCode(String code);
    //   查询当天支付，页面回调及异步回调均失败的支付 tradeStatus为空
    @Query(value = "SELECT t.`code` FROM wlyy_prescription_pay t WHERE t.trade_status != '1' AND t.create_time >= date(now()) AND t.create_time < DATE_ADD(date(now()), INTERVAL 1 DAY) ", nativeQuery = true)
    //   查询5天内支付，页面回调及异步回调均失败的支付 tradeStatus为空
    @Query(value = "SELECT t.`code` FROM wlyy_prescription_pay t WHERE (t.trade_status IS NULL OR t.trade_status=0) AND t.create_time>=DATE_ADD(date(now()),INTERVAL-3 DAY) AND t.create_time< DATE_ADD(date(now()),INTERVAL 1 DAY)", nativeQuery = true)
    List<String> findTodayUnpay();
}

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/app/prescription/PatientPrescriptionPayService.java

@@ -139,10 +139,13 @@ public class PatientPrescriptionPayService extends BaseService {
            requestParams.setParam(params);
            msgBody = JSON.toJSONString(requestParams);
            System.out.println("查询长处方支付明细入参："+requestParams.toString());
            //执行支付 返回原生返回值
            ResponseParams<JSONObject> res = onepayClient.execute(requestParams);
            response = JSON.toJSONString(res);
    
            System.out.println("查询长处方支付明细出参："+response);
            if (OnepayDefaultClient.isSuccessful(res)) {
                //业务处理*******************

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionNoticesService.java

@@ -95,7 +95,7 @@ public class PrescriptionNoticesService extends BaseService {
                            url = url.replace(touser, "&toUser=" + member.getCode());
                            //name患者姓名
                            sendJson.put("first", weiXinOpenIdUtils.getTitleMes(people, (int) j.get("relation"), name) + first);
                            sendJson.put("url", url);
                            sendJson.put("url", url +="&represent="+patient);
                            pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 19, member.getOpenid(), name, sendJson);
                        }
                    }
@@ -128,7 +128,7 @@ public class PrescriptionNoticesService extends BaseService {
                            url = url.replace(touser, "&toUser=" + member.getCode());
                            //name患者姓名
                            sendJson.put("first", weiXinOpenIdUtils.getTitleMes(people, (int) j.get("relation"), name) + first);
                            sendJson.put("url", url);
                            sendJson.put("url", url +="&represent="+patient);
                            pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 19, member.getOpenid(), name, sendJson);
                        }
                    }
@@ -161,7 +161,7 @@ public class PrescriptionNoticesService extends BaseService {
                            url = url.replace(touser, "&toUser=" + member.getCode());
                            //name患者姓名
                            sendJson.put("first", weiXinOpenIdUtils.getTitleMes(people, (int) j.get("relation"), name) + first);
                            sendJson.put("url", url);
                            sendJson.put("url", url +="&represent="+patient);
                            pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 19, member.getOpenid(), name, sendJson);
                        }
                    }
@@ -194,7 +194,7 @@ public class PrescriptionNoticesService extends BaseService {
                    url = url.replace(touser, "&toUser=" + member.getCode());
                    //name患者姓名
                    sendJson.put("first", weiXinOpenIdUtils.getTitleMes(people, (int) j.get("relation"), name) + first);
                    sendJson.put("url", url);
                    sendJson.put("url", url +="&represent="+patient);
                    pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 11, member.getOpenid(), name, sendJson);
                }
            }
@@ -227,7 +227,7 @@ public class PrescriptionNoticesService extends BaseService {
                    url = url.replace(touser, "&toUser=" + member.getCode());
                    //name患者姓名
                    sendJson.put("first", weiXinOpenIdUtils.getTitleMes(people, (int) j.get("relation"), name) + first);
                    sendJson.put("url", url);
                    sendJson.put("url", url +="&represent="+patient);
                    pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 10, member.getOpenid(), name, sendJson);
                }
            }
@@ -261,7 +261,7 @@ public class PrescriptionNoticesService extends BaseService {
                    url = url.replace(touser, "&toUser=" + member.getCode());
                    //name患者姓名
                    sendJson.put("first", weiXinOpenIdUtils.getTitleMes(people, (int) j.get("relation"), name) + first);
                    sendJson.put("url", url);
                    sendJson.put("url", url +="&represent="+patient);
                    pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 20, member.getOpenid(), name, sendJson);
                }
            }

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/survey/SurveyScreenResultService.java

@@ -1109,8 +1109,7 @@ public class SurveyScreenResultService extends BaseService {
                "LEFT JOIN wlyy_sign_patient_label_info t2 on t2.patient = t1.patient and t2.label_type = " + labelType + " and t2.status=1 " +
                "RIGHT JOIN wlyy_sign_family_server s on s.sign_code = t1.code" +
                "LEFT JOIN dm_hospital h on t1.hospital = h.`code` " +
                "WHERE ( t1.doctor = ? OR t1.doctor_health = ?) AND t1. STATUS > 0  and t1.expenses_status = 1 AND t1.admin_team_code = ? " +
                "AND p.openid IS NOT NULL AND p.openid <>'' ";
                "WHERE ( t1.doctor = ? OR t1.doctor_health = ?) AND t1. STATUS > 0  and t1.expenses_status = 1 AND t1.admin_team_code = ? " ;
        if(StringUtils.isNotBlank(serverType)){
            sql = sql.replace("on s.sign_code = t1.code", "on s.sign_code = t1.code and s.server_type in (" + serverType + ") ");
        }
@@ -1135,9 +1134,11 @@ public class SurveyScreenResultService extends BaseService {
        if(object.getInt("type") == 4){
            Survey survey = surveyDao.findById(object.getString("relationCode"));
            object.put("relationCodeName", survey.getTitle());
            object.put("createUserRole", 2);
        }else if(object.getInt("type") == 5){
            SurveyTemplates templates = surveyTemplatesDao.findById(object.getString("relationCode"));
            object.put("relationCodeName", templates.getTitle());
            object.put("createUserRole", 1);
        }
        Doctor d = doctorService.findDoctorByCode(doctor);
        object.put("hospital", d.getHospital());
@@ -1151,6 +1152,9 @@ public class SurveyScreenResultService extends BaseService {
        HttpResponse response = null;
        response = HttpUtils.doPost(customerUrl + "synergy/questionnaire/createWorkOrder", param);
        JSONObject rs = new JSONObject(response.getContent());
        return rs;
        if(rs.getInt("status") == 200) {
            return rs;
        }
        throw new Exception();
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/survey/DoctorSurveyScreenResultController.java

@@ -225,6 +225,23 @@ public class DoctorSurveyScreenResultController extends WeixinBaseController {
        }
    }
    @RequestMapping(value = "/getCount",method = RequestMethod.POST)
    @ApiOperation(value = "确认疾病筛查推送人数")
    public String getCount(@ApiParam(name = "labelType", value = "疾病类型", defaultValue = "3")
                               @RequestParam(value = "labelType", required = false) String labelType,
                           @ApiParam(name = "serverType",value = "服务类型,多个条件以逗号分割")
                               @RequestParam(value = "serverType", required = false) String serverType,
                           @ApiParam(name = "teamCode",value = "行政团队id")
                               @RequestParam(value = "teamCode", required = true) Long teamCode){
        try {
            List<Map<String, Object>> patientInfo = surveyScreenResultService.initPatient(getUID(), labelType, serverType, teamCode);
            return write(200, "查询成功！", "data", patientInfo.size());
        } catch (Exception e) {
            e.printStackTrace();
            return write(-1, "查询失败!");
        }
    }
    @RequestMapping(value = "/createWorkOrder",method = RequestMethod.POST)
    @ApiOperation(value = "创建协同服务")

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/survey/ManagerQuestionnaireController.java

@@ -583,6 +583,24 @@ public class ManagerQuestionnaireController extends WeixinBaseController {
    }
    @RequestMapping(value = "getCount",method = RequestMethod.GET)
    @ApiOperation("确认调查问卷推送人数")
    public String getCount(@ApiParam(name = "labelUnitType", value = "标签类型  1:下属单位，多个用逗号分隔", required = false) @RequestParam(value = "labelUnitType", required = false, defaultValue = "") String labelUnitType,
                                           @ApiParam(name = "labelSexType", value = "标签类型  2:性别，多个用逗号分隔", required = false) @RequestParam(value = "labelSexType", required = false, defaultValue = "") String labelSexType,
                                           @ApiParam(name = "labelServeType", value = "标签类型  3:服务类型，多个用逗号分隔", required = false) @RequestParam(value = "labelServeType", required = false, defaultValue = "") String labelServerType,
                                           @ApiParam(name = "labelDiseaseType", value = "标签类型  4:疾病类型，多个用逗号分隔", required = false) @RequestParam(value = "labelDiseaseType", required = false, defaultValue = "") String labelDiseaseType,
                                           @ApiParam(name = "labelHealthType", value = "标签类型  5:健康情况，多个用逗号分隔", required = false) @RequestParam(value = "labelHealthType", required = false, defaultValue = "") String labelHealthType,
                                           @ApiParam(name = "currentRoleCode", value = "当前登录的角色code", required = false) @RequestParam(value = "currentRoleCode", required = false) String currentRoleCode,
                                           @ApiParam(name = "currentRoleLevel", value = "当前登录的角色级别", required = false) @RequestParam(value = "currentRoleLevel", required = false) String currentRoleLevel){
        try {
            List<Map<String, Object>> patientInfo = managerQuestionnaireService.initPatient(labelUnitType, labelSexType, labelServerType, labelDiseaseType, labelHealthType, currentRoleCode, currentRoleLevel);
            return write(200,"查询成功！","data", patientInfo.size());
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败！");
        }
    }
    @RequestMapping(value = "/createWorkOrder",method = RequestMethod.POST)
    @ApiOperation(value = "创建协同服务")
    public String createWorkOrder(@ApiParam(name = "jsonData",value = "协同服务json字符串")

patient-co/patient-co-wlyy/src/main/resources/application-devtest.yml

@@ -52,7 +52,7 @@ rehabilitation:
  url: http://localhost:10055/svr-wlyy-rehabilitation/
#集美客服配置
customerService:
  url: http://localhost:8082/
  url: http://localhost:8180/
#小程序
applets:

patient-co/patient-co-wlyy/src/main/resources/application-local.yml

@@ -150,7 +150,8 @@ es:
#集美宣教居民端健康文章
jkEdu:
  web:
    articleBaseUrl: http://172.19.103.87:9088/jkeduweb
    articleBaseUrl: http://10.95.22.137:9661
#消息队列
activemq: