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

# Conflicts:
#	common/common-entity/sql记录

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/dict/BusinessSysDictEndpoint.java

@@ -76,4 +76,25 @@ public class BusinessSysDictEndpoint extends EnvelopRestEndpoint {
        return businessSysDictService.findModel(modelName,dictName,page,pageSize);
    }
    @ApiOperation("批量修改字典")
    @GetMapping(value= BaseHospitalRequestMapping.PatientNoLogin.updateDictGroup)
    public Envelop updateDictGroup(@ApiParam(name = "json", value = "", required = true)
                                   @RequestParam(value = "json", required = true)String json) {
        try {
            return businessSysDictService.updateByModelName(json);
        } catch (Exception e) {
            e.printStackTrace();
            return failed(e.getMessage());
        }
    }
    @ApiOperation("批量删除字典")
    @GetMapping(value= BaseHospitalRequestMapping.PatientNoLogin.delDictGroup)
    public Envelop delDictGroup(@ApiParam(name = "preDictName", value = "", required = true)
                                @RequestParam(value = "preDictName", required = true)String preDictName) throws Exception{
        return businessSysDictService.deleteByModelName(preDictName);
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/service/dict/BusinessSysDictService.java

@@ -1,8 +1,10 @@
package com.yihu.jw.base.service.dict;
import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.base.dao.dict.BusinessSysDictDao;
import com.yihu.jw.entity.care.common.BusinessSysDictDO;
import com.yihu.jw.restmodel.web.Envelop;
import com.yihu.jw.restmodel.web.MixEnvelop;
import com.yihu.jw.utils.hibernate.HibenateUtils;
import com.yihu.mysql.query.BaseJpaService;
@@ -154,4 +156,61 @@ public class BusinessSysDictService extends BaseJpaService<BusinessSysDictDO, Bu
        mixEnvelop.setPageSize(pageSize);
        return  mixEnvelop;
    }
    public Envelop updateByModelName(String jsonData) throws Exception{
        Envelop envelop = new Envelop();
        JSONObject jsonObject = JSONObject.parseObject(jsonData);
        if (StringUtils.isNoneBlank(jsonObject.getString("preDictName"))){
            String preDictName = jsonObject.get("preDictName").toString();
            List<BusinessSysDictDO> list  =  businessSysDictDao.findByDictName(preDictName);
            for (BusinessSysDictDO sysDictDO:list){
                if (jsonObject.get("dictName")!=null){
                    sysDictDO.setDictName(jsonObject.get("dictName").toString());
                }
                if (jsonObject.get("modelName")!=null){
                    sysDictDO.setModelName(jsonObject.get("modelName").toString());
                }
            }
            businessSysDictDao.save(list);
            envelop.setMessage("操作成功");
            envelop.setStatus(200);
        }else {
            if (jsonObject.get("dictName")!=null){
                List<BusinessSysDictDO> list  =  businessSysDictDao.findByDictName(jsonObject.get("dictName").toString());
                if (list!=null&&list.size()>0){
                    throw new Exception("该dictName已经存在");
                }else {
                    BusinessSysDictDO sysDictDO=new BusinessSysDictDO();
                    sysDictDO.setDictName(jsonObject.get("dictName").toString());
                    if (jsonObject.get("modelName")!=null){
                        sysDictDO.setModelName(jsonObject.get("modelName").toString());
                    }
                    businessSysDictDao.save(sysDictDO);
                }
                envelop.setMessage("操作成功");
                envelop.setStatus(200);
            }else {
                envelop.setMessage("dictName为空");
                envelop.setStatus(-1);
            }
        }
        return envelop;
    }
    public Envelop deleteByModelName(String preDictName){
        Envelop envelop = new Envelop();
        if (StringUtils.isNoneBlank(preDictName)){
            List<BusinessSysDictDO> list  =  businessSysDictDao.findByDictName(preDictName);
            for (BusinessSysDictDO sysDictDO:list){
                businessSysDictDao.delete(sysDictDO);
            }
            envelop.setMessage("操作成功");
            envelop.setStatus(200);
        }else {
            envelop.setMessage("preDictName为空");
            envelop.setStatus(-1);
        }
        return envelop;
    }
}

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/contacts/ContactsService.java

@@ -171,8 +171,10 @@ public class ContactsService {
            map.put("mobile",orgDO.getMobile());
            map.put("address",orgDO.getAddress());
            if(contactsOrgDO!=null&&contactsOrgDO.getOrgCode().equals(orgDO.getCode())){
                map.put("isContacts","1");
                result.add(map);
            }else {
                map.put("isContacts","0");
                result1.add(map);
            }
        }