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

 Conflicts:

	svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/third/platForm/PatientInfoPlatFormEndpoint.java

common/common-entity/sql记录

@@ -1046,4 +1046,18 @@ ALTER table base_capacity_assessment_record add column age tinyint(4) default  C
ALTER TABLE base.base_doctor_patient_tmp MODIFY COLUMN  doctor_code varchar(50) DEFAULT NULL COMMENT 'type=(1,2,4为医生id) ';
ALTER TABLE base.base_doctor_patient_tmp ADD COLUMN org_code varchar(50) DEFAULT NULL COMMENT 'type=(3为机构code)';
ALTER TABLE base_security_monitoring_order add column scene_img VARCHAR(1000) default null COMMENT '工单发起时的现场照片';
ALTER TABLE base_security_monitoring_order add column scene_img VARCHAR(1000) default null COMMENT '工单发起时的现场照片';
-- 2021-06-17 ysj
ALTER table base_patient ADD COLUMN `lat_lon` varchar(100) DEFAULT NULL COMMENT '定位经纬度';
CREATE TABLE `base_service_news` (
  `id` varchar(50) NOT NULL,
  `content` varchar(200) DEFAULT NULL COMMENT '内容',
  `create_time` datetime DEFAULT NULL,
  `name` varchar(50) DEFAULT NULL COMMENT '姓名',
  `type` varchar(2) DEFAULT NULL COMMENT '类型',
  `code` varchar(50) DEFAULT NULL,
  PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='服务动态信息';

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

@@ -278,7 +278,7 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    private String archiveTypeName;
    private String bloodName;
    private String marriageName;
    private String latLon;//定位经纬度
    public String getCardType() {
        return cardType;
@@ -839,4 +839,13 @@ public class BasePatientDO extends UuidIdentityEntityWithOperator {
    public void setMarriageName(String marriageName) {
        this.marriageName = marriageName;
    }
    @Column(name = "lat_lon")
    public String getLatLon() {
        return latLon;
    }
    public void setLatLon(String latLon) {
        this.latLon = latLon;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/care/message/BaseServiceNews.java

@@ -0,0 +1,58 @@
package com.yihu.jw.entity.care.message;
import com.yihu.jw.entity.UuidIdentityEntityWithCreateTime;
import javax.persistence.Entity;
import javax.persistence.Table;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/6/17
 * @Description:
 */
@Entity
@Table(name="base_service_news")
public class BaseServiceNews extends UuidIdentityEntityWithCreateTime {
    //内容
    private String content;
    //姓名
    private String name;
    private String code;
    //类型 1上门辅导、2发起咨询、3发起生活照料、4代预约
    private String type;
    public String getContent() {
        return content;
    }
    public void setContent(String content) {
        this.content = content;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public String getCode() {
        return code;
    }
    public void setCode(String code) {
        this.code = code;
    }
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
}

svr/svr-cloud-care/pom.xml

@@ -256,13 +256,6 @@
            <artifactId>es-service</artifactId>
            <version>2.0.0</version>
        </dependency>
        <!--oracle驱动-->
        <dependency>
            <groupId>com.oracle</groupId>
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3</version>
        </dependency>
    </dependencies>
    <build>

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/dao/message/BaseServiceNewsDao.java

@@ -0,0 +1,23 @@
package com.yihu.jw.care.dao.message;
import com.yihu.jw.entity.care.device.DevicePatientHealthIndex;
import com.yihu.jw.entity.care.message.BaseServiceNews;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import java.util.List;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/6/18
 * @Description:
 */
public interface BaseServiceNewsDao extends PagingAndSortingRepository<BaseServiceNews,String>, JpaSpecificationExecutor<BaseServiceNews> {
    @Query("select a from BaseServiceNews a ")
    List<BaseServiceNews> findNews(Pageable pageRequest);
}

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

@@ -2,8 +2,8 @@ package com.yihu.jw.care.endpoint.consult;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.dao.course.DoctorPatientTmpDao;
import com.yihu.jw.care.service.consult.ConsultService;
import com.yihu.jw.care.service.message.BaseServiceNewsService;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorRoleDao;
import com.yihu.jw.doctor.service.BaseDoctorInfoService;
@@ -11,7 +11,6 @@ import com.yihu.jw.entity.base.doctor.BaseDoctorRoleDO;
import com.yihu.jw.entity.base.im.ConsultTeamDo;
import com.yihu.jw.entity.base.patient.BasePatientDO;
import com.yihu.jw.entity.base.wx.WxWechatDO;
import com.yihu.jw.entity.care.course.DoctorPatientTmpDO;
import com.yihu.jw.entity.hospital.message.SystemMessageDO;
import com.yihu.jw.file_upload.FileUploadService;
import com.yihu.jw.hospital.family.service.WlyyFamilyMemberService;
@@ -105,6 +104,9 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
	@Autowired
	private ConsultService consultService;
	@Autowired
	private BaseServiceNewsService serviceNewsService;
	@GetMapping(value = "findLastOnlineConsult")
	@ApiOperation(value = "获取居民该机构的最近一次在线咨询")
	public Envelop findLastOnlineConsult(
@@ -203,6 +205,8 @@ public class PatientConsultEndpoint extends EnvelopRestEndpoint {
			systemMessageDO.setData(data.toString());
			consultService.saveMessage(systemMessageDO);
			serviceNewsService.addServiceNews(re.getString("patientName"),patient,"2",null);
		}
		return success("操作成功", consult);

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/patient/PatientEndpoint.java

@@ -134,6 +134,20 @@ public class PatientEndpoint extends EnvelopRestEndpoint {
        }
    }
    @PostMapping(value = "updLatLon")
    @ApiOperation(value = "修改居民经纬度信息")
    public Envelop updLatLon(@ApiParam(name = "latLon", value = "经纬度24.48923061,118.10388605")
                              @RequestParam(value = "latLon", required = true)String latLon,
                              @ApiParam(name = "patientId", value = "居民id")
                              @RequestParam(value = "patientId", required = true)String patientId)throws Exception{
        try{
            patientService.updLatLon(latLon, patientId);
            return success("修改成功");
        }catch (Exception e){
            return failedException(e);
        }
    }
    @PostMapping(value = "updPatient")
    @ApiOperation(value = "修改居民信息")
    public Envelop updPatient(@ApiParam(name = "jsonData", value = "json格式")

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/third/platForm/PatientInfoPlatFormEndpoint.java

@@ -6,11 +6,13 @@ import com.yihu.jw.care.service.assistance.EmergencyAssistanceService;
import com.yihu.jw.care.service.doorCoach.DoctorDoorCoachOrderService;
import com.yihu.jw.care.service.doorCoach.PatientDoorCoachOrderService;
import com.yihu.jw.care.service.lifeCare.LifeCareOrderService;
import com.yihu.jw.care.service.message.BaseServiceNewsService;
import com.yihu.jw.care.service.security.SecurityMonitoringOrderService;
import com.yihu.jw.care.service.third.PatientInfoPlatFormService;
import com.yihu.jw.entity.care.doorCoach.BaseDoorCoachOrderDO;
import com.yihu.jw.entity.care.lifeCare.LifeCareOrderDO;
import com.yihu.jw.restmodel.ResponseContant;
import com.yihu.jw.restmodel.web.ListEnvelop;
import com.yihu.jw.restmodel.web.ObjEnvelop;
import com.yihu.jw.restmodel.web.PageEnvelop;
import com.yihu.jw.restmodel.web.endpoint.EnvelopRestEndpoint;
@@ -49,7 +51,51 @@ public class PatientInfoPlatFormEndpoint extends EnvelopRestEndpoint {
    private SecurityMonitoringOrderService securityMonitoringOrderService;
    @Autowired
    private EmergencyAssistanceService assistanceService;
    @Autowired
    private BaseServiceNewsService baseServiceNewsService;
    @GetMapping(value = "findOrgLocations")
    @ApiParam("查找机构坐标")
    public ListEnvelop findOrgLocations(){
        try {
            return ListEnvelop.getSuccess("查询成功",baseServiceNewsService.findOrgLocations());
        }catch (Exception e){
            return failedListEnvelopException(e);
        }
    }
    @GetMapping(value = "findPatinetLocations")
    @ApiParam("查找所有居民坐标")
    public ListEnvelop findPatinetLocations(){
        try {
            return ListEnvelop.getSuccess("查询成功",baseServiceNewsService.findPatinetLocations());
        }catch (Exception e){
            return failedListEnvelopException(e);
        }
    }
    @GetMapping(value = "findPatinetByName")
    @ApiParam("获取居民详情页")
    public ListEnvelop findPatinetByName(@ApiParam(name="name",value = "居民姓名",required = true)
                                @RequestParam(value = "name")String  name){
        try {
            return ListEnvelop.getSuccess("查询成功",baseServiceNewsService.findPatinetByName(name));
        }catch (Exception e){
            return failedListEnvelopException(e);
        }
    }
    @GetMapping(value = "findNews")
    @ApiParam("获取居民详情页")
    public ListEnvelop findNews(@ApiParam(name="size",value = "页面大小",required = true)
                                     @RequestParam(value = "size")Integer size){
        try {
            return ListEnvelop.getSuccess("查询成功",baseServiceNewsService.findNews(size));
        }catch (Exception e){
            return failedListEnvelopException(e);
        }
    }
    @GetMapping(value = "getPatientInfo")
    @ApiParam("获取居民详情页")

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.care.dao.doorCoach.*;
import com.yihu.jw.care.service.consult.ConsultTeamService;
import com.yihu.jw.care.service.message.BaseServiceNewsService;
import com.yihu.jw.care.util.MessageUtil;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.entity.base.doctor.BaseDoctorDO;
@@ -23,8 +24,6 @@ import com.yihu.jw.util.date.DateUtil;
import com.yihu.jw.util.entity.EntityUtils;
import com.yihu.jw.wechat.dao.BasePatientWechatDao;
import com.yihu.mysql.query.BaseJpaService;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -34,8 +33,6 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.math.BigDecimal;
import java.util.*;
@@ -95,6 +92,8 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
    private ConsultTeamService consultTeamService;
    @Autowired
    private SystemMessageDao systemMessageDao;
    @Autowired
    private BaseServiceNewsService serviceNewsService;
    /**
     * 创建上门辅导服务工单
@@ -226,6 +225,8 @@ public class PatientDoorCoachOrderService extends BaseJpaService<BaseDoorCoachOr
            sendOrderToDoctor(orderDO.getId(),null,"system","系统",transDoctor.getId(),transDoctor.getName(),transDoctor.getJobTitleName());
        }
        serviceNewsService.addServiceNews(orderDO.getPatientName(),orderDO.getPatient(),"1",null);
        return result;
    }

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

@@ -7,6 +7,7 @@ import com.yihu.jw.care.dao.lifeCare.LifeCareFeeDetailDao;
import com.yihu.jw.care.dao.lifeCare.LifeCareItemDictDao;
import com.yihu.jw.care.dao.lifeCare.LifeCareOrderDao;
import com.yihu.jw.care.service.common.OrderNoService;
import com.yihu.jw.care.service.message.BaseServiceNewsService;
import com.yihu.jw.care.util.MessageUtil;
import com.yihu.jw.doctor.dao.BaseDoctorDao;
import com.yihu.jw.doctor.dao.BaseDoctorHospitalDao;
@@ -76,6 +77,9 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
    private BaseDoctorDao doctorDao;
    @Autowired
    private OrderNoService orderNoService;
    @Autowired
    private BaseServiceNewsService serviceNewsService;
    /**
     * 记录完成情况
@@ -510,6 +514,12 @@ public class LifeCareOrderService extends BaseJpaService<LifeCareOrderDO, LifeCa
        result.put(ResponseContant.resultFlag, ResponseContant.success);
        result.put(ResponseContant.resultMsg, orderDO);
        if(orderDO.getType() == 3){
            serviceNewsService.addServiceNews(orderDO.getProxyPatientName(),orderDO.getProxyPatient(),"4",orderDO.getPatientName());
        }else {
            serviceNewsService.addServiceNews(orderDO.getPatientName(),orderDO.getPatient(),"3",null);
        }
        return result;
    }

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

@@ -0,0 +1,124 @@
package com.yihu.jw.care.service.message;
import com.yihu.jw.care.dao.message.BaseServiceNewsDao;
import com.yihu.jw.entity.care.message.BaseServiceNews;
import com.yihu.jw.util.common.IdCardUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Sort;
import org.springframework.data.domain.Sort.Direction;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
/**
 * Created with IntelliJ IDEA.
 *
 * @Author: yeshijie
 * @Date: 2021/6/18
 * @Description:
 */
@Service
public class BaseServiceNewsService {
    @Autowired
    private BaseServiceNewsDao baseServiceNewsDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    /**
     * 查找机构坐标
     * @return
     */
    public List<Map<String,Object>> findOrgLocations(){
        String sql = "SELECT code,name,brief,address,photo,mobile,longitude,latitude from base_org WHERE type in ('3','4') and del =1";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        return list;
    }
    /**
     * 按名字查找居民坐标
     * @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,CAST(archive_type AS char) type from base_patient p\n" +
                "WHERE p.del = 1 and p.name like '%"+name+"%'";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        for (Map<String,Object> map:list){
            String idcard = map.get("idcard").toString();
            map.put("age", IdCardUtil.getAgeForIdcard(idcard));
        }
        return list;
    }
    /**
     * 查找所有居民坐标
     * 已入学儿童+ 已签约老人
     * @return
     */
    public List<Map<String,Object>> findPatinetLocations(){
        String sql = "SELECT p.id,p.`name`,p.address,p.photo,p.mobile,p.lat_lon latLon,sex,idcard,archive_type type from base_doctor_patient_tmp t,base_patient p " +
                "WHERE t.patient = p.id and t.del=1 and t.`status`=1 and p.del =1 " +
                "UNION  " +
                "SELECT p.id,p.`name`,p.address,p.photo,p.mobile,p.lat_lon latLon,sex,idcard,archive_type type from base_service_package_sign_record t,base_patient p " +
                "WHERE t.patient = p.id and t.`status`=1 and p.del =1";
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        for (Map<String,Object> map:list){
            String idcard = map.get("idcard").toString();
            map.put("age", IdCardUtil.getAgeForIdcard(idcard));
        }
        return list;
    }
    /**
     * 服务动态
     * @param size
     * @return
     */
    public List<BaseServiceNews> findNews(Integer size){
        if(size==null||size<1){
            size = 9;
        }
        Sort sort = new Sort(Direction.DESC, "createTime");
        PageRequest pageRequest = new PageRequest(0, size, sort);
        List<BaseServiceNews> list = baseServiceNewsDao.findNews(pageRequest);
        return list;
    }
    /**
     * 添加服务动态信息-大屏展示用
     * @param name
     * @param code
     * @param type 类型 1上门辅导、2发起咨询、3发起生活照料、4代预约
     */
    public void addServiceNews(String name,String code,String type,String patientName){
        BaseServiceNews serviceNews = new BaseServiceNews();
        serviceNews.setName(name);
        serviceNews.setCode(code);
        serviceNews.setType(type);
        String content = "";
        switch (type){
            case "1":
                content = "发起上门辅导";
                break;
            case "2":
                content = "发起咨询";
                break;
            case "3":
                content = "发起生活照料";
                break;
            case "4":
                content = "为"+patientName+"代预约";
                break;
            default:
                content = "";
                break;
        }
        serviceNews.setContent(content);
        baseServiceNewsDao.save(serviceNews);
    }
}

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

@@ -150,6 +150,17 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
        return res;
    }
    /**
     * 修改居民经纬度信息
     * @param latLon
     * @param patientId
     */
    public void updLatLon(String latLon,String patientId){
        BasePatientDO patientDO = patientDao.findById(patientId);
        patientDO.setLatLon(latLon);
        patientDao.save(patientDO);
    }
    /**
     * 修改居民信息
     * @param jsonData

svr/svr-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/compute/ComputeHelper.java

@@ -176,7 +176,7 @@ public class ComputeHelper {
                " WHERE bdh.doctor_code = bd.id  " +
                "AND hd.code= bdh.dept_code " +
                "AND o.code = bdh.org_code " +
                "AND bdh.del=1 and o.code not in('fxty')";
                "AND bdh.del=1 and o.del=1 and o.code not in('fxty')";
        if(StringUtils.isNotBlank(orgType)){
            sql += " and o.type = '"+orgType+"'";
        }