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

common/common-entity/src/main/java/com/yihu/jw/entity/base/patient/BasePatientDO.java

@@ -21,6 +21,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    /**
     * saas配置id
     * 云照护 签约社区
     */
//    @NotNull(message = "saasid不可为空")
    private String saasId;
@@ -248,6 +249,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
     */
    private String yktId;
    //云照护-是否签约老人 1是
    private String register;
    private String phone;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/admin/CommonEndpoint.java

@@ -51,6 +51,17 @@ public class CommonEndpoint extends EnvelopRestEndpoint {
    @Autowired
    private CarePatientService carePatientService;
    @GetMapping(value = "open/initOldTmp2")
    @ApiOperation(value = "初始化签约老人")
    public Envelop initOldTmp2() {
        try {
            carePatientService.initOldTmp2();
            return success("初始化成功");
        } catch (Exception e) {
            return failedException2(e);
        }
    }
    @GetMapping(value = "open/initJczdPerson")
    @ApiOperation(value = "初始化杭州老人")
    public Envelop initJczdPerson(Integer size) {

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -93,6 +93,149 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
    @Autowired
    private BasePatientService basePatientService;
    /**
     * 初始化签约老人2
     */
    public void initOldTmp2(){
        Map<String,String> lableCodeNameMap = new HashMap<>();
        lableCodeNameMap.put("3","独居");//独居
        lableCodeNameMap.put("4","孤寡");//孤寡
        String sql = "select * from old_tmp";
        List<Map<String,Object>> mapList = jdbcTemplate.queryForList(sql);
        for (Map<String,Object> map:mapList){
            String name = (map.get("name")+"").trim();
            String idcard = (map.get("idcard")+"").trim();
            String area = (map.get("area")+"").trim();
            String address = (map.get("address")+"").trim();
            String mobile = (map.get("mobile")+"").trim();
            String type = (map.get("type")+"").trim();
            BasePatientDO patientDO = patientDao.findByIdcard(idcard);
            if(patientDO==null){
                patientDO = new BasePatientDO();
            }else{
                continue;
            }
            patientDO.setRegister("1");
            patientDO.setSaasId(area);
            String salt = UUID.randomUUID().toString().substring(0,5);
            patientDO.setPassword(MD5.md5Hex(idcard + "{" + salt + "}"));
            patientDO.setSalt(salt);
            patientDO.setOpenid(null);
            patientDO.setIdcard(idcard);
            patientDO.setSsc(null);
            patientDO.setMobile(mobile);
            patientDO.setSex(Integer.valueOf(IdCardUtil.getSexForIdcard_new(idcard)));
            patientDO.setName(name);
            patientDO.setArchiveType(1);
            patientDO.setArchiveStatus(1);
            if(patientDO.getSex()==2){
                patientDO.setPhoto("group1/M00/00/7C/rBoAbmIu8g6ANMrpAAAiSDNDGrM907.png");
            }else{
                patientDO.setPhoto("group1/M00/00/5A/rBoAb2Iu8gOAQ9WYAAAgcmCLvjQ782.png");
            }
            patientDO.setDel("1");
            patientDO.setLocked(0);
            patientDO.setEnabled(1);
            patientDO.setSignStatus(0);
            patientDO.setCreateTime(new Date());
            patientDO.setAddress(address);
            Map<String,String> tmp = LatitudeUtils.getGeocoderLatitude(address);
            if(tmp!=null){
                String latlon = tmp.get("lat")+","+tmp.get("lng");
                patientDO.setLatLon(latlon);
            }
            patientDao.save(patientDO);
            String label = lableCodeNameMap.get(type);
            if(StringUtils.isNotBlank(label)){
                WlyyPatientLabelDO patientLabelDO = new WlyyPatientLabelDO();
                patientLabelDO.setCzrq(new Date());
                patientLabelDO.setLabelType("3");
                patientLabelDO.setPatient(patientDO.getId());
                patientLabelDO.setLabelCode(label);
                patientLabelDO.setLabelName(lableCodeNameMap.get(label));
                patientLabelDao.save(patientLabelDO);
            }
            logger.info("idcard="+idcard);
        }
    }
    /**
     * 初始化签约老人
     */
    public void initOldTmp(){
        Map<String,String> lableCodeNameMap = new HashMap<>();
        lableCodeNameMap.put("3","独居");//独居
        lableCodeNameMap.put("4","孤寡");//孤寡
        String sql = "select * from old_tmp";
        List<Map<String,Object>> mapList = jdbcTemplate.queryForList(sql);
        for (Map<String,Object> map:mapList){
            String name = (map.get("name")+"").trim();
            String idcard = (map.get("idcard")+"").trim();
            String area = (map.get("area")+"").trim();
            String address = (map.get("address")+"").trim();
            String mobile = (map.get("mobile")+"").trim();
            String type = (map.get("type")+"").trim();
            BasePatientDO patientDO = patientDao.findByIdcard(idcard);
            if(patientDO!=null){
                if(patientDO.getSignStatus()!=null&&patientDO.getSignStatus()==1){
                    logger.info("已签约居民idcard="+idcard);
                    continue;
                }
            }else{
                patientDO = new BasePatientDO();
            }
            patientDO.setRegister("1");
            patientDO.setSaasId(area);
            boolean flag = false;
            if(StringUtils.isBlank(patientDO.getIdcard())){
                String salt = UUID.randomUUID().toString().substring(0,5);
                patientDO.setPassword(MD5.md5Hex(idcard + "{" + salt + "}"));
                patientDO.setSalt(salt);
                patientDO.setOpenid(null);
                patientDO.setIdcard(idcard);
                patientDO.setSsc(null);
                patientDO.setMobile(mobile);
                patientDO.setSex(Integer.valueOf(IdCardUtil.getSexForIdcard_new(idcard)));
                patientDO.setName(name);
                patientDO.setArchiveType(1);
                patientDO.setArchiveStatus(1);
                if(patientDO.getSex()==2){
                    patientDO.setPhoto("group1/M00/00/7C/rBoAbmIu8g6ANMrpAAAiSDNDGrM907.png");
                }else{
                    patientDO.setPhoto("group1/M00/00/5A/rBoAb2Iu8gOAQ9WYAAAgcmCLvjQ782.png");
                }
                patientDO.setDel("1");
                patientDO.setLocked(0);
                patientDO.setEnabled(1);
                patientDO.setSignStatus(0);
                patientDO.setCreateTime(new Date());
                flag = true;
            }
            patientDO.setAddress(address);
            Map<String,String> tmp = LatitudeUtils.getGeocoderLatitude(address);
            if(tmp!=null){
                String latlon = tmp.get("lat")+","+tmp.get("lng");
                patientDO.setLatLon(latlon);
            }
            patientDao.save(patientDO);
            if(flag){
                String label = lableCodeNameMap.get(type);
                if(StringUtils.isNotBlank(label)){
                    WlyyPatientLabelDO patientLabelDO = new WlyyPatientLabelDO();
                    patientLabelDO.setCzrq(new Date());
                    patientLabelDO.setLabelType("3");
                    patientLabelDO.setPatient(patientDO.getId());
                    patientLabelDO.setLabelCode(label);
                    patientLabelDO.setLabelName(lableCodeNameMap.get(label));
                    patientLabelDao.save(patientLabelDO);
                }
            }
            logger.info("idcard="+idcard);
        }
    }
    /**
     * 初始化杭州老人，只保存有身份证且有手机号的数据
     */