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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/doorCoach/DoctorDoorCoachOrderController.java

@@ -86,6 +86,7 @@ public class DoctorDoorCoachOrderController extends BaseController {
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1") @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15") @RequestParam(value = "size") int size) {
        try{
            doctorDoorCoachOrderService.initDoorStatus(hospital);
            JSONObject result = patientDoorCoachOrderService.queryDoctorListWithNotStopped(hospital,page, size);
            if (result.getIntValue(ResponseContant.resultFlag) == ResponseContant.fail) {
                return error(-1,result.getString(ResponseContant.resultMsg));

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/course/CourseService.java

@@ -440,7 +440,7 @@ public class CourseService {
     * @return
     */
    public List<Map<String,Object>> findDoctorByOrg(String orgCode){
        String sql1 = "SELECT * FROM base_doctor WHERE doctor_level = 3 AND enabled = 1 AND locked = 0 AND del = 1 and  visit_hospital = '"+orgCode+"'" ;
        String sql1 = "SELECT d.* FROM base_doctor d,base_doctor_hospital sh WHERE  d.del = 1 and  d.id = sh.doctor_code AND sh.del = 1 AND sh.org_code = '"+orgCode+"'\n" ;
        List<Map<String , Object >> amapList = jdbcTemplate.queryForList(sql1);
        return amapList;
    }
@@ -706,7 +706,7 @@ public class CourseService {
            object.put("fee",mapList.get(0).get("fee"));//报名费用
            String sql1 = "SELECT COUNT(*) count\n" +
                    "FROM base_recruit_students_record rsr \n" +
                    "WHERE rsr.recruit_students_id = '"+mapList.get(0).get("rsId")+"' AND `org_code` = '"+mapList.get(0).get("code")+"' AND (`status` = 1 OR `status` = 2 OR `status` = 3 OR `status` = 4 OR `status` = 6);\n";
                    "WHERE rsr.recruit_students_id = '"+mapList.get(0).get("rsId")+"' AND `org_code` = '"+mapList.get(0).get("code")+"' AND (`status` = 1 OR `status` = 2 OR `status` = 3 OR `status` = 4 OR `status` = 6 OR `status` = 8);\n";
            Integer count = jdbcTemplate.queryForObject(sql1,Integer.class);
            String sql2 = "SELECT * FROM base_course WHERE del = 1 AND org_code = '"+mapList.get(0).get("code")+"'" ;

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

@@ -1056,7 +1056,7 @@ public class DoctorDoorCoachOrderService {
    }
    public void initDoorStatus(String hospital){
        String sql = "SELECT * from base_doctor WHERE doctor_level=3 and id not in ( " +
        String sql = "SELECT * from base_doctor doc WHERE doctor_level=3 and id not in ( " +
                "SELECT doctor from base_door_coach_doctor_status " +
                ")";
        if (StringUtils.isNotBlank(hospital)){

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

@@ -199,15 +199,16 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
        if (orderWithPackageItemFeeAdd(result, jsonObjectParam, orderDO,null)) {return result;}
        JSONObject dispatcherJson = queryDispatcherInfoByPatient(jsonObjectParam.getJSONObject("hospital").get("code").toString());
        List<Map<String,Object>> dispatcherInfoList = (List)dispatcherJson.get(ResponseContant.resultMsg);
        for(Map<String,Object> map: dispatcherInfoList){
            String dispatcher = map.get("code").toString();
            BaseDoctorDO doctorVO = doctorDao.findById(dispatcher);
            // 派单消息-首页
            this.createMessage("新增居民预约服务申请","702","system","system", orderDO.getId(), dispatcher,doctorVO.getName() ,doctorVO.getIdcard(), orderDO.getPatientName() + "提交了服务预约申请，请您前往处理");
            // 派单-实时工单消息  430 居民提交工单申请-- 张三提交了服务工单12345678申请
            this.createMessage("居民提交工单申请","730","system","system", orderDO.getId(), dispatcher,doctorVO.getName() ,doctorVO.getIdcard(), orderDO.getPatientName() + "提交了服务工单"+orderDO.getNumber()+"申请");
        if (dispatcherJson.getInteger("resultFlag")==1){
            List<Map<String,Object>> dispatcherInfoList = (List<Map<String, Object>>) dispatcherJson.get(ResponseContant.resultMsg);
            for(Map<String,Object> map: dispatcherInfoList){
                String dispatcher = map.get("code").toString();
                BaseDoctorDO doctorVO = doctorDao.findById(dispatcher);
                // 派单消息-首页
                this.createMessage("新增居民预约服务申请","702","system","system", orderDO.getId(), dispatcher,doctorVO.getName() ,doctorVO.getIdcard(), orderDO.getPatientName() + "提交了服务预约申请，请您前往处理");
                // 派单-实时工单消息  430 居民提交工单申请-- 张三提交了服务工单12345678申请
                this.createMessage("居民提交工单申请","730","system","system", orderDO.getId(), dispatcher,doctorVO.getName() ,doctorVO.getIdcard(), orderDO.getPatientName() + "提交了服务工单"+orderDO.getNumber()+"申请");
            }
        }
        result.put(ResponseContant.resultFlag, ResponseContant.success);
        result.put(ResponseContant.resultMsg, consultTeam);
@@ -1129,7 +1130,7 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
    public JSONObject queryDispatcherInfoByPatient(String hospitalCode) {
        JSONObject result = new JSONObject();
        List dispatcherInfoList = queryDispatcherInfoByHospital(hospitalCode);
        List<Map<String,Object>> dispatcherInfoList = queryDispatcherInfoByHospital(hospitalCode);
        if(CollectionUtils.isEmpty(dispatcherInfoList)){
            result.put(ResponseContant.resultFlag, ResponseContant.fail);
            String failMsg = "当前居民所签约机构【" + hospitalCode + "】没有调度员，请联系管理员分配！";

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/job/message/PatientSendUnreadJob.java

@@ -68,13 +68,7 @@ public class PatientSendUnreadJob implements Job {
                }
                if (unreadCount > 0) {//发送模板
                    String first = ""+name+"您好，您与您的家庭成员共有"+unreadCount+"条消息未回复，请及时处理";
                    String url = server_url + "wxpush/sendPatientUnreadWXTemplate";
                    List<NameValuePair> params = new ArrayList<>();
                    params.add(new BasicNameValuePair("openid", openId));
                    params.add(new BasicNameValuePair("first", first));
                    params.add(new BasicNameValuePair("templateName", "template_process_feedback"));
                    params.add(new BasicNameValuePair("scene", "jobfsjmwd"));
                    String response = httpClientUtil.post(url,params,"UTF-8");
                    sendPatientUnreadWXTemplate(openId,first,"template_process_feedback","jobfsjmwd");
                }
            } catch (Exception e) {
            }
@@ -86,7 +80,7 @@ public class PatientSendUnreadJob implements Job {
        String time = DateUtil.getStringDateShort()+" 09:00:00";
        Date timeDate = DateUtil.strToDate(time);
        messageUtil.putTemplateWxMessage(wxId,templateName,scene,openid,first,null,null,1,null,
        messageUtil.putTemplateWxMessage(wxId,templateName,scene,openid,first,null,null,null,null,
                DateUtil.dateToChineseTime2(timeDate),"消息未回复通知","未回复");
    }
}