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

svr/svr-base/src/main/java/com/yihu/jw/base/dao/lifeCare/LifeCareItemDictDao.java

@@ -15,4 +15,7 @@ public interface LifeCareItemDictDao extends PagingAndSortingRepository<LifeCare
    @Query("from LifeCareItemDictDO w where  w.del=1 order by sort asc")
    List<LifeCareItemDictDO> findByAll();
    @Query("select a from LifeCareItemDictDO a where a.code = ?1 and a.orgCode = ?2")
    LifeCareItemDictDO findByCodeAndOrgCode(String code,String orgCode);
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/lifeCare/LifeCareEndpoint.java

@@ -59,14 +59,16 @@ public class LifeCareEndpoint extends EnvelopRestEndpoint {
        }
    }
    @ApiOperation("删除生活照料服务项目")
    @RequestMapping(value = "/delLifeItem",method = RequestMethod.POST)
    public Envelop saveLifeItem(@ApiParam(name = "id",value = "机构名称",required = true)
                                @RequestParam(value = "id",required = false)String id,
    @ApiOperation("修改生活照料服务项目状态")
    @RequestMapping(value = "/updDelLifeItem",method = RequestMethod.POST)
    public Envelop saveLifeItem(@ApiParam(name = "code",value = "服务项code",required = true)
                                @RequestParam(value = "code",required = false)String code,
                                @ApiParam(name = "status",value = "1有效 0无效",required = true)
                                @RequestParam(value = "status",required = false)Integer status){
                                @RequestParam(value = "status",required = false)Integer status,
                                @ApiParam(name = "orgCode",value = "机构code",required = true)
                                @RequestParam(value = "orgCode",required = false)String orgCode){
        try {
            return success(lifeCareService.delLifeItem(id,status));
            return success(lifeCareService.updDelLifeItem(code,status,orgCode));
        }catch (Exception e){
            return failedException2(e);
        }
@@ -74,8 +76,8 @@ public class LifeCareEndpoint extends EnvelopRestEndpoint {
    @ApiOperation("获取服务详情")
    @RequestMapping(value = "/getLifeItemDetail",method = RequestMethod.GET)
    public ObjEnvelop getLifeItemDetail(@ApiParam(name = "id",value = "机构名称",required = true)
                                    @RequestParam(value = "id",required = false)String id){
    public ObjEnvelop getLifeItemDetail(@ApiParam(name = "code",value = "服务项code",required = true)
                                    @RequestParam(value = "code",required = false)String id){
        try {
            return success(lifeCareService.getLifeItemDetail(id));
        }catch (Exception e){

svr/svr-base/src/main/java/com/yihu/jw/base/service/lifeCare/LifeCareService.java

@@ -1,8 +1,8 @@
package com.yihu.jw.base.service.lifeCare;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.base.dao.lifeCare.LifeCareItemDictDao;
import com.yihu.jw.entity.care.lifeCare.LifeCareItemDictDO;
import com.yihu.jw.restmodel.web.PageEnvelop;
import org.apache.commons.lang3.RandomStringUtils;
@@ -13,7 +13,6 @@ import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.Random;
/**
 * Created by Bing on 2022/3/9.
@@ -30,7 +29,10 @@ public class LifeCareService {
     * 获取服务项目列表
     */
    public PageEnvelop<List<Map<String,Object>>> getServeDictList(String orgName, String itemName, Integer page, Integer size){
        String sql = " select dict.*,cast(dict.del as UNSIGNED INTEGER)as del,cast(org.name as char)as org_name  from base_life_care_item_dict dict INNER JOIN base_org org on dict.org_code = org.code  where dict.del=1 and org.del=1 ";
        String sql = "SELECT dict.id,dict.`name`,dict.sort,dict.`code`,dict.life_care_img,dict.pad_icon_img,GROUP_CONCAT( DISTINCT dict.org_code SEPARATOR ',' ) AS orgCode" +
                ",GROUP_CONCAT( DISTINCT dict.org_name SEPARATOR ',' ) AS orgName FROM " +
                "base_life_care_item_dict dict INNER JOIN base_org org ON dict.org_code = org.CODE WHERE dict.del = 1  AND org.del = 1" ;
        String sqlCount = " select count(dict.id) from base_life_care_item_dict dict INNER JOIN base_org org on dict.org_code = org.code  where dict.del=1 and org.del=1  ";
        String filter = " ";
        if (StringUtils.isNotBlank(orgName)){
@@ -40,6 +42,9 @@ public class LifeCareService {
            filter +=" and dict.name like '%"+itemName+"%' ";
        }
        Long count = jdbcTemplate.queryForObject(sqlCount+filter,Long.class);
        filter +=" GROUP BY dict.`code` ";
        filter += " order by dict.org_code,dict.sort asc ";
        filter += " limit "+(page-1)*size+","+size;
@@ -48,24 +53,27 @@ public class LifeCareService {
        return PageEnvelop.getSuccessListWithPage("success",list,page,size,count);
    }
    public String saveLifeItem(String json){
        LifeCareItemDictDO lifeCareItemDictDO = JSONObject.parseObject(json,LifeCareItemDictDO.class);
        if (StringUtils.isBlank(lifeCareItemDictDO.getId())){
            lifeCareItemDictDO.setDel(1);
            String code =" ";
            Boolean notExist=true;
            while (notExist){
    public String saveLifeItem(String json) {
        List<LifeCareItemDictDO> lifeCareItemDictDO = JSONArray.parseArray(json, LifeCareItemDictDO.class);
        if (lifeCareItemDictDO.size() > 0 && StringUtils.isBlank(lifeCareItemDictDO.get(0).getId())) {
            String code = "";
            Boolean notExist = true;
            while (notExist) {
                code = RandomStringUtils.randomAlphanumeric(10);
                notExist = findServeItemByCode(code);
            }
            lifeCareItemDictDO.setCode(code);
            for (LifeCareItemDictDO careItemDictDO : lifeCareItemDictDO) {
                careItemDictDO.setCode(code);
            }
        }
        lifeCareItemDictDao.save(lifeCareItemDictDO);
        return "success";
    }
    public String delLifeItem(String id,Integer status){
        LifeCareItemDictDO lifeCareItemDictDO = lifeCareItemDictDao.findOne(id);
    public String updDelLifeItem(String code,Integer status,String orgCode){
        LifeCareItemDictDO lifeCareItemDictDO = lifeCareItemDictDao.findByCodeAndOrgCode(code,orgCode);
        if(null == lifeCareItemDictDO){
            return " 未找到改服务项目 ";
        }
@@ -74,8 +82,24 @@ public class LifeCareService {
        return "success";
    }
    public LifeCareItemDictDO getLifeItemDetail(String id){
        return lifeCareItemDictDao.findOne(id);
    public JSONObject getLifeItemDetail(String code){
        JSONObject result = new JSONObject();
        String lifeSql = "SELECT code,name,sort,del*1 as del,life_care_img AS lifeCareImg,org_code AS orgCode,org_name AS orgName,charge_standard AS chargeStandard," +
                "serve_standard AS serveStandard,remark FROM base_life_care_item_dict WHERE `code` = '"+code+"' ";
        List<Map<String, Object>> lifeList = jdbcTemplate.queryForList(lifeSql);
        if (lifeList.size()>0) {
            JSONObject lifeItemObj = new JSONObject();
            lifeItemObj.put("name",lifeList.get(0).get("name"));
            lifeItemObj.put("code",lifeList.get(0).get("code"));
            lifeItemObj.put("sort",lifeList.get(0).get("sort"));
            lifeItemObj.put("del",lifeList.get(0).get("del"));
            lifeItemObj.put("lifeCareImg",lifeList.get(0).get("lifeCareImg"));
            result.put("lifeItem",lifeItemObj);
        }
        result.put("data",lifeList);
        return result;
    }
    public boolean findServeItemByCode(String code){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/consult/PatientConsultEndpoint.java

@@ -142,9 +142,8 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
	@PostMapping(value = "sendGetuiMessage")
	@ApiOperation(value = "im推送个推消息")
	public Envelop sendGetuiMessage(String sessionId,String type,String contentType,String senderName,String senderId,String targetId){
	public Envelop sendGetuiMessage(String sessionId,String type,String contentType,String senderName,String senderId,String targetId,String content){
		try {
			logger.info("im推送1个推消息"+sessionId+","+senderName+","+targetId);
			String body = "收到来自"+senderName+"的一条消息，请关注并及时处理。";
			String peerName = null;
			String sql = "SELECT name from im_internet_hospital.sessions WHERE id = '"+sessionId+"'";
@@ -152,10 +151,11 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			if(list!=null&&list.size()>0){
				peerName = URLEncoder.encode(list.get(0).get("name").toString(), "UTF-8");
			}
			String url = "/chatroom/index?type="+type+"&peerId="+senderId+"&action=callVideo&peerName="+peerName+"&sessionId="+sessionId;
			String url = "/chatroom/index?type="+type+"&peerId="+senderId+"&action=callVideo&peerName="+peerName+"&sessionId="+sessionId+"&content="+URLEncoder.encode(content, "UTF-8");
			logger.info("url="+url);
			messageUtil.sendDoctorGetuiMessage(targetId,"4",url,"im消息",body);
			messageUtil.sendDoctorDingdingMessage(null,targetId,"text","4",body,null,null);
//			messageUtil.sendDoctorDingdingMessage(null,targetId,"text","4",body,null,null);
			return Envelop.getSuccess("请求成功");
		}catch (Exception e){
			e.printStackTrace();

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/lifeCare/LifeCareOrderService.java

@@ -471,12 +471,13 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
     * @return
     */
    public List<LifeCareItemDictDO> findItemDict(String orgCode){
        String sql = " select dict.*,org.address,org.photo as orgPhoto from base_life_care_item_dict dict " +
                " LEFT JOIN base_org org  on dict.org_code = org.`code` where 1=1 " ;
        String sql = "select dict.id,dict.`code`,dict.`name`,dict.serve_standard,org.address,org.photo as orgPhoto,GROUP_CONCAT( DISTINCT dict.org_name SEPARATOR ',' ) AS orgName,\n" +
                " GROUP_CONCAT( DISTINCT dict.org_code SEPARATOR ',' ) AS orgCode,GROUP_CONCAT( DISTINCT dict.charge_standard SEPARATOR ',' ) AS charge_standard ,dict.life_care_img,dict.pad_icon_img  from base_life_care_item_dict dict LEFT JOIN base_org org  on dict.org_code = org.`code` where 1=1\n" +
                " " ;
        if (StringUtils.isNotBlank(orgCode)){
            sql += " and dict.org_code='"+orgCode+"' ";
        }
        sql+=  " and dict.del=1 order by dict.sort asc  ";
        sql+=  " and dict.del=1  GROUP BY dict.`code` order by dict.sort asc ";
        List<LifeCareItemDictDO> list = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(LifeCareItemDictDO.class));
        return list;
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/message/BaseServiceNewsService.java

@@ -77,7 +77,7 @@ public class BaseServiceNewsService {
     * @return
     */
    public List<Map<String,Object>> findPatinetByName(String name){
        String sql = "SELECT p.id,p.`name`,p.address,p.photo,p.mobile,p.lat_lon latLon,sex,idcard,p.pad_imei,p.openid,CAST(archive_type AS char) type,p.sign_status as signStatus from base_patient p\n" +
        String sql = "SELECT p.id,p.`name`,p.address,p.photo,p.mobile,p.lat_lon latLon,sex,idcard,p.pad_imei,p.openid,CAST(archive_type AS char) type,(p.sign_status * 1) as signStatus from base_patient p\n" +
                "WHERE p.del = 1 and p.name like '%"+name+"%'";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        List<DevicePatientDevice> feeDetail = patientDeviceDao.findByAll();

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/visit/BaseVisitService.java

@@ -177,7 +177,7 @@ public class BaseVisitService {
        visitDO.setVisitImg(visitImg);
        visitDO.setDeviceMaintenance(deviceMaintenance);
        visitDO.setHealth(health);
        visitDO.setLifeConsult(visitImg);
        visitDO.setLifeConsult(lifeConsult);
        baseVisitDao.save(visitDO);
        return null;
    }