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/repository/synergy/ManageSynergyWorkorderServicerLogDao.java

@@ -14,9 +14,12 @@ public interface ManageSynergyWorkorderServicerLogDao extends PagingAndSortingRe
    @Query("select count(distinct l.workorderServiceCode) from ManageSynergyWorkorderServicerLogDO l where l.workorderCode=?1 and l.followUp=2 ")
    Integer findByWorkorderCodeAndFollowUp(String workorderCode);
    @Query("select count(distinct l.workorderServiceCode) from ManageSynergyWorkorderServicerLogDO l where l.workorderCode=?1 and l.returnVisit=2 ")
    @Query("select count(distinct l.workorderServiceCode) from ManageSynergyWorkorderServicerLogDO l where l.workorderCode=?1 and l.returnVisit=1 ")
    Integer findByWorkorderCodeAndReturnVisit(String workorderCode);
    @Query("select count(distinct l.workorderServiceCode) from ManageSynergyWorkorderServicerLogDO l where l.workorderCode=?1")
    Integer findByWorkorderCode(String workorderCode);
    @Query("select l from ManageSynergyWorkorderServicerLogDO l where l.workorderServiceCode=?1 order by id desc")
    List<ManageSynergyWorkorderServicerLogDO> findByWorkorderServiceCode(String workorderServiceCode);
}

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

@@ -487,7 +487,7 @@ public class SynergyManageService extends BaseJpaService {
            whereSql+=" and aa.label LIKE '%,3"+diseaseCode+",%' ";
        }
        if(isFollow!=null&&isFollow==1){//跟进
            leftSql+=" LEFT JOIN manage_synergy_workorder_servicer_log ll on ll.service_patient_code=s.code ";
            leftSql+=" LEFT JOIN manage_synergy_workorder_servicer_log ll on ll.workorder_service_code=s.code ";
            whereSql+=" and ll.follow_up=2 and ll.workorder_service_code not in (select DISTINCT lll.workorder_service_code from manage_synergy_workorder_servicer_log lll where lll.follow_up=1 and lll.workorder_code='"+workorderCode+"') ";
            orderBySql=" ll.id desc";
            whereSql+=" and s.status=3 ";
@@ -802,10 +802,12 @@ public class SynergyManageService extends BaseJpaService {
        Map<String,Object> resultMap = new HashMap<>();
        //完成情况
        //1、有效
        Integer validCount = workorderServicerDao.findByWorkorderCodeCount(workorderCode,3);
//        Integer validCount = workorderServicerDao.findByWorkorderCodeCount(workorderCode,3);
        Integer validCount = manageSynergyWorkorderServicerLogDao.findByWorkorderCodeAndReturnVisit(workorderCode);
        resultMap.put("validCount",validCount);
        //2、无效
        resultMap.put("invalidCount",0);
        Integer allCount = manageSynergyWorkorderServicerLogDao.findByWorkorderCode(workorderCode);
        resultMap.put("invalidCount",allCount-validCount);
        //3、总数
        ManageSynergyWorkorderDO manageSynergyWorkorder = workOrderDao.findByCode(workorderCode);
        resultMap.put("allCount",manageSynergyWorkorder.getServicerCount());
@@ -1412,6 +1414,7 @@ public class SynergyManageService extends BaseJpaService {
                i++;
            }
            wwb.write();
            os.flush();
        }catch (Exception e) {
            e.printStackTrace();
            if(os!=null)os.close();

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

@@ -5,7 +5,6 @@ package com.yihu.wlyy.service.synergy;/**
import com.alibaba.fastjson.JSONObject;
import com.yihu.wlyy.entity.Patient;
import com.yihu.wlyy.entity.User;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderDO;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderServicerDO;
import com.yihu.wlyy.entity.synergy.ManageSynergyWorkorderServicerLogDO;
import com.yihu.wlyy.repository.PatientDao;
@@ -31,7 +30,7 @@ import java.util.Map;
 * @desc 协同服务处理操作日志
 **/
@Service
@Transactional
public class SynergyWorkorderServicerLogService extends BaseJpaService {
    @Autowired
    private ManageSynergyWorkorderServicerLogDao manageSynergyWorkorderServicerLogDao;
@@ -53,24 +52,20 @@ public class SynergyWorkorderServicerLogService extends BaseJpaService {
     *
     * @param synergyWorkorderServicerLogDO
     */
    @Transactional
    public void create(ManageSynergyWorkorderServicerLogDO synergyWorkorderServicerLogDO,String userCode){
        ManageSynergyWorkorderServicerDO workorderServicerDO = workorderServicerDao.findByWorkOrderCodeAndPatientCode1(synergyWorkorderServicerLogDO.getWorkorderCode(),synergyWorkorderServicerLogDO.getWorkorderServiceCode());
        synergyWorkorderServicerLogDO.setCreateTime(new Date());
        synergyWorkorderServicerLogDO.setCode(getCode());
        synergyWorkorderServicerLogDO.setWorkorderServiceCode(workorderServicerDO.getCode());
        ManageSynergyWorkorderServicerLogDO workorderServicerLogDO = manageSynergyWorkorderServicerLogDao.save(synergyWorkorderServicerLogDO);
        User user = userDao.findByCode(userCode);
        ManageSynergyWorkorderServicerDO workorderServicerDO = workorderServicerDao.findByWorkOrderCodeAndPatientCode1(workorderServicerLogDO.getWorkorderCode(),workorderServicerLogDO.getWorkorderServiceCode());
        workorderServicerDO.setStatus(3);
        workorderServicerDO.setExecutorCode(user.getCode());
        workorderServicerDO.setExecutorName(user.getName());
        workorderServicerDO.setExecutorType(2);
        workorderServicerDO.setCompleteTime(new Date());
        workorderServicerDao.save(workorderServicerDO);
        String sql = "select * from manage_synergy_workorder_servicer where workorder_code = '"+workorderServicerLogDO.getWorkorderCode()+"' and status IN(1,2)";
        List<ManageSynergyWorkorderServicerDO> workorderServicerDOS = jdbcTemplate.query(sql,new BeanPropertyRowMapper(ManageSynergyWorkorderServicerDO.class));
        if (workorderServicerDOS == null || workorderServicerDOS.size() == 0){
            ManageSynergyWorkorderDO workorderDO = manageSynergyWorkOrderDao.findByCode(workorderServicerLogDO.getWorkorderCode());
            workorderDO.setStatus(3);
            workorderDO.setCompleteTime(new Date());
            manageSynergyWorkOrderDao.save(workorderDO);
        }
    }

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/controller/JMController.java

@@ -346,6 +346,7 @@ public class JMController {
	{
		try {
			String data = jmService.findWzymBymykh(etmykh);
			System.out.println(data);
			JSONObject jsonObject = new JSONObject(data);
			if (jsonObject.getInt("msgCode")==800){
				return Result.success("获取接种记录成功！",data);
@@ -358,4 +359,5 @@ public class JMController {
			return Result.error(ex.getMessage());
		}
	}
}

patient-co-service/wlyy_service/src/main/java/com/yihu/wlyy/service/service/JMService.java

@@ -412,10 +412,12 @@ public class JMService {
            //保存http日志
            logService.saveHttpLog(isSuccess,apistr,content,method,apistr, net.sf.json.JSONObject.fromObject(params).toString(),re,error);
            //保存token到reids
            //保存token到reids.
            if (isSuccess && apistr.equals(GET_TOKEN)){
                //System.out.println();
                redisTemplate.opsForValue().set(redis_key, com.alibaba.fastjson.JSON.parseObject(re).getString("body"),4,TimeUnit.HOURS);
                long tokenCreateTime = com.alibaba.fastjson.JSON.parseObject(re).getLongValue("createtime");
                redisTemplate.opsForValue().set(redis_key, com.alibaba.fastjson.JSON.parseObject(re).getString("body"));
                redisTemplate.expireAt(redis_key,DateUtil.getNextMin(new Date(tokenCreateTime),4*60));
            }
        }
        catch (Exception ex)

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

@@ -18,8 +18,8 @@ public class AlertChildImmuneVaccinJob implements Job {
    public void execute(JobExecutionContext context) throws JobExecutionException {
        logger.info("START========每天九点提醒居民待接种JOB========");
        try {
            int result = childVaccinImmuneService.alertBefore();
            logger.info("END========每天九点提醒居民待接种JOB========"+result);
            //int result = childVaccinImmuneService.alertBefore();
            //logger.info("END========每天九点提醒居民待接种JOB========"+result);
        }catch (Exception e){
            e.printStackTrace();
            logger.info("END===ERROE===每天九点提醒居民待接种JOB,message:"+e.getMessage());

patient-co/patient-co-wlyy-job/src/main/java/com/yihu/wlyy/service/imm/ChildVaccinImmuneService.java

@@ -274,13 +274,18 @@ public class ChildVaccinImmuneService extends BaseService {
					" LEFT JOIN wlyy_patient p ON cfi.family_code = p.`code`" +
					" WHERE" +
					" cfi.child_code = '"+childCode+"'" +
					" AND cfi.del = 0 and (p.openid is not null or p.openid !='') AND p.`code`='0fab4dd67e074e16ac86db6b6c15233e'";
					" AND cfi.del = 0 and (p.openid is not null or p.openid !='') "
                     +" AND p.`code`='0fab4dd67e074e16ac86db6b6c15233e'"
                    ;
			List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
			if (list.size()==0){
				return -10000;
			}
			List<String> openIdList = new ArrayList<>();
			for (Map<String,Object> map : list){
                String familyCode = String.valueOf(map.get("code"));
                String openid = String.valueOf(map.get("openid"));
                String familyName = String.valueOf(map.get("name"));
				//如果父母亲都在就都发
				if (!openIdList.contains(String.valueOf(map.get("openid")))){
					if (StringUtils.isNotBlank(String.valueOf(map.get("openid")))){
@@ -293,7 +298,7 @@ public class ChildVaccinImmuneService extends BaseService {
                            json.put("keyword2", temp.getKeyword2().replace("key1",DateUtil.dateToStr(new Date(), "yyyy-MM-dd")));
                            json.put("remark", temp.getRemark());
                            json.put("first", temp.getFirst().replace("key1",String.valueOf(map.get("name"))).replace("key2", childName).replace("key3",jzrq));
                            json.put("url",temp.getUrl().replace("key1",childCode));
                            json.put("url",temp.getUrl().replace("key1",childCode).replace("key2",familyCode).replace("key3",familyName).replace("key4",openid));
                            logger.info("weiTempJOSN:"+json.toString());
							pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 11,String.valueOf(map.get("openid")) , String.valueOf(map.get("name")), json);
						}catch (Exception e){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/followup/FollowUpService.java

@@ -1241,4 +1241,10 @@ public class FollowUpService extends BaseService {
            }
        }
    }
    public void updateFollowup(Long id){
        Followup followup = followupDao.findOne(id);
        followup.setStatus("1");
        followupDao.save(followup);
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/imm/ChildFamilyImmuneService.java

@@ -241,19 +241,22 @@ public class ChildFamilyImmuneService extends BaseService {
			}
			List<String> openIdList = new ArrayList<>();
			for (Map<String,Object> map : list){
				String familyCode = String.valueOf(map.get("code"));
				String openid = String.valueOf(map.get("openid"));
				String familyName = String.valueOf(map.get("name"));
				//如果父母亲都在就都发
				if (!openIdList.contains(String.valueOf(map.get("openid")))){
					if ( StringUtils.isNotBlank(String.valueOf(map.get("openid")))){
				if (!openIdList.contains(openid)){
					if ( StringUtils.isNotBlank(openid)){
						boolean flag =true;
						try {
							WechatTemplateConfig temp = templateConfigDao.findByScene("template_doctor_survey", "ymjztx");
							JSONObject json = new JSONObject();
							json.put("toUser",String.valueOf(map.get("code")));
							json.put("toUser",familyCode);
							json.put("keyword1", temp.getKeyword1().replace("key1",vaccinName).replace("key2",jzzc));
							json.put("keyword2", temp.getKeyword2().replace("key1",DateUtil.dateToStr(new Date(), "yyyy-MM-dd")));
							json.put("remark", temp.getRemark());
							json.put("first", temp.getFirst().replace("key1",String.valueOf(map.get("name"))).replace("key2", childName).replace("key3",jzrq));
							json.put("url",temp.getUrl().replace("key1",childCode));
							json.put("first", temp.getFirst().replace("key1",familyName).replace("key2", childName).replace("key3",jzrq));
							json.put("url",temp.getUrl().replace("key1",childCode).replace("key2",familyCode).replace("key3",familyName).replace("key4",openid));
							logger.info("weiTempJOSN:"+json.toString());
							pushMsgTask.putWxMsg(weiXinAccessTokenUtils.getAccessToken(), 11,String.valueOf(map.get("openid")) , String.valueOf(map.get("name")), json);
						}catch (Exception e){

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/guahao/ImmuneService.java

@@ -771,6 +771,7 @@ public class ImmuneService {
		List<NameValuePair> params = new ArrayList<>();
		params.add(new BasicNameValuePair("etmykh", barcode));
		String response = httpClientUtil.post(url, params, "UTF-8");
		System.out.println("获取接种记录结果："+response);
		return response;
	}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/data/DataHandlingController.java

@@ -12,6 +12,7 @@ import io.swagger.annotations.ApiParam;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -44,6 +45,10 @@ public class DataHandlingController extends BaseController {
    @Autowired
    private EduArticleService eduArticleService;
    @Autowired
    private StringRedisTemplate redisTemplate;
    private String redis_key ="imm:imm_token_key";
    /**
     * 生成签约表中的行政团队的code
     */
@@ -417,4 +422,17 @@ public class DataHandlingController extends BaseController {
            return write(-1,"清洗数据失败！");
        }
    }
    @RequestMapping(value = "/imm/clearRedis",method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("计免：清理redis")
    public String clearRedis(@RequestParam(value = "etmykh")String etmykh) {
        try {
            redisTemplate.delete(redis_key);
            return write(200,"操作成功！");
        } catch (Exception ex) {
            ex.printStackTrace();
            return error(-1,"操作失败！" );
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/imm/DoctorImmController.java

@@ -209,7 +209,7 @@ public class DoctorImmController extends BaseController {
			}
		}catch (Exception e){
			error(e);
			return error(-1, e.getMessage());
			return error(-1, "查询失败！");
		}
	}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/family/FamilyMemberController.java

@@ -582,7 +582,7 @@ public class FamilyMemberController extends WeixinBaseController {
            }
        }catch (Exception e){
            error(e);
            return error(-1, e.getMessage());
            return error(-1, "查询失败！");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/synergy/SynergyManagerController.java

@@ -100,6 +100,7 @@ public class SynergyManagerController extends BaseController{
                String followupProjectData = array.getJSONObject(i).getString("followupProjectData");
                followUpService.esSaveFollowupProjectData(id, followupProject, followupProjectData);
            }
            followUpService.updateFollowup(Long.parseLong(id));
            return write(200, "保存随访项目数据成功！");
        } catch (Exception e) {
            error(e);