云照护修改

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/endpoint/sign/SignEndpoint.java

@@ -80,6 +80,8 @@ public class SignEndpoint extends EnvelopRestEndpoint {
        try{
            servicePackageService.check(id,getUID(),status, refuseType, refuseReason);
            return Envelop.getSuccess("操作成功");
        }catch (ServiceException se){
            return Envelop.getError(se.getMessage());
        }catch (Exception e){
            return failedException2(e);
        }
@@ -149,7 +151,7 @@ public class SignEndpoint extends EnvelopRestEndpoint {
                }
                signRecordDO.setRevokeTime(DateUtil.getStringDate());
                servicePackageSignRecordDao.save(signRecordDO);
                return Envelop.getSuccess("查询成功");
                return Envelop.getSuccess("撤销成功");
            }else {
                return Envelop.getError("只有待审核和待支付才能撤销");
            }
@@ -194,15 +196,15 @@ public class SignEndpoint extends EnvelopRestEndpoint {
        }
    }
    @GetMapping(value = "servicePackagePage")
    @GetMapping(value = "servicePackageList")
    @ApiOperation(value = "服务包列表")
    public PageEnvelop servicePackagePage (
    public PageEnvelop servicePackageList (
            @ApiParam(name = "page", value = "分页大小", required = true, defaultValue = "1")
            @RequestParam(value = "page") int page,
            @ApiParam(name = "size", value = "页码", required = true, defaultValue = "15")
            @RequestParam(value = "size") int size) {
        try{
            return servicePackageService.servicePackagePage( page, size);
            return servicePackageService.servicePackageList(page, size);
        }catch (Exception e){
            return failedPageEnvelopException2(e);
        }
@@ -241,7 +243,7 @@ public class SignEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) {
        try{
            return ObjEnvelop.getSuccess("查询成功",servicePackageService.sign(jsonData,getUID(),"1"));
            return ObjEnvelop.getSuccess("申请成功",servicePackageService.sign(jsonData,getUID(),"1"));
        }catch (ServiceException se){
            return ObjEnvelop.getError(se.getMessage());
        }catch (Exception e){
@@ -256,7 +258,7 @@ public class SignEndpoint extends EnvelopRestEndpoint {
            @ApiParam(name = "jsonData", value = "Json数据", required = true)
            @RequestParam String jsonData) {
        try{
            return ObjEnvelop.getSuccess("查询成功",servicePackageService.sign(jsonData,getUID(),"2"));
            return ObjEnvelop.getSuccess("申请成功",servicePackageService.sign(jsonData,getUID(),"2"));
        }catch (ServiceException se){
            return ObjEnvelop.getError(se.getMessage());
        }catch (Exception e){

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/ServicePackageService.java

@@ -92,6 +92,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
    private MessageUtil messageUtil;
    //分配服务者
    @Transactional(rollbackFor = Exception.class)
    public void allocationDoctor(String jsonData) throws Exception{
        List<ServicePackageRecordDO> recordDOList = new ArrayList<>();
        JavaType javaType = objectMapper.getTypeFactory().constructParametricType(List.class, Map.class);
@@ -102,12 +103,13 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
            String servicePackageId = map.get("servicePackageId");
            String patient = map.get("patient");
            String packageItemId = map.get("packageItemId");
            String type = map.get("type");
            String type = map.get("serviceType");
            String doctor = map.get("doctor");
            String doctorName = map.get("doctorName");
            String id = map.get("recordId");
            if(StringUtils.isNotBlank(id)&&!"null".equals(id)){
                recordDO.setCreateTime(new Date());
                recordDO.setId(id);
            }
            recordDO.setPatient(patient);
            recordDO.setSignId(signId);
@@ -129,8 +131,12 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
     * @param refuseType 拒绝原因
     * @param refuseReason 拒绝说明
     */
    @Transactional(rollbackFor = Exception.class)
    public void check(String id,String uid,String status,String refuseType,String refuseReason){
        ServicePackageSignRecordDO signRecordDO = servicePackageSignRecordDao.findOne(id);
        if(signRecordDO.getStatus()!=0){
            throw new ServiceException("只有待审核记录才能审核");
        }
        BaseDoctorDO doctorDO = doctorDao.findById(uid);
        signRecordDO.setCheckTime(DateUtil.getStringDate());
        if(doctorDO!=null){
@@ -224,7 +230,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        ServicePackageDO servicePackageDO = servicePackageDao.findOne(signRecordDO.getServicePackageId());
        List<ServicePackageItemDO> itemDOList = null;
        if("1".equals(type)){
            String sql = "SELECT i.*,r.id recordId,r.doctor,r.doctor_name,r.type serverType from base_service_package_item i " +
            String sql = "SELECT i.*,r.id recordId,r.doctor,r.doctor_name,r.type serviceType from base_service_package_item i " +
                    "LEFT JOIN base_service_package_record r on r.sign_id='"+id+"' and r.package_item_id=i.id " +
                    "WHERE i.service_package_id ='"+servicePackageDO.getId()+"' and i.del='1' ";
            itemDOList = jdbcTemplate.query(sql,new BeanPropertyRowMapper<>(ServicePackageItemDO.class));
@@ -284,7 +290,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
    public PageEnvelop signPage(String patientId,String doctorId,String name,String status,Integer page,Integer size){
        String sql = "SELECT DISTINCT ar.level_conclusion,di2.dict_value levelConclusionName,r.id,r.`status`,di.dict_value statusName" +
                ",r.patient,p.`name`,p.sex,p.mobile,p.idcard,p.birthday,p.openid " +
                ",p.photo,r.create_time createTime,r.type,sp.`name` packageName,sp.num,sp.org_name orgName";
                ",p.photo,DATE_FORMAT(r.create_time,'%Y-%m-%d %H:%i:%S') createTime,r.type,sp.`name` packageName,sp.num,sp.org_name orgName";
        String countSql = "select count(distinct r.id) ";
        String filter = " from base_service_package_sign_record r " +
                " inner JOIN base_patient p on p.id = r.patient " +
@@ -305,7 +311,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        if(StringUtils.isNotBlank(name)){
            filter += " and p.name like '%"+name+"%' ";
        }
        String oderBy = " order by r.id desc limit "+(page-1)*size+","+size;
        String oderBy = " order by r.create_time desc limit "+(page-1)*size+","+size;
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql+filter+oderBy);
        for (Map<String,Object> map:list){
            String idcard = map.get("idcard")+"";
@@ -330,6 +336,7 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
     * @param type 1居民 2医生
     * @throws Exception
     */
    @Transactional(rollbackFor = Exception.class)
    public ServicePackageSignRecordDO sign(String jsonData,String uid,String type) throws Exception{
        ServicePackageSignRecordDO signRecordDO = objectMapper.readValue(jsonData, ServicePackageSignRecordDO.class);
        String patientId = signRecordDO.getPatient();
@@ -435,18 +442,10 @@ public class ServicePackageService extends BaseJpaService<ServicePackageDO, Serv
        }
    }
    public static void main(String[] args) {
        String s1 = "*1";
        String s2 = "2*";
        String ss[] = s1.split("\\*");
        String ss2[] = s2.split("\\*");
        System.out.println(ss.length);
        System.out.println(ss2.length);
    }
    //服务包列表
    public PageEnvelop servicePackagePage(Integer page,Integer size){
        String sql = "SELECT id,name,type,price,org_name orgName,server_time_type serverTimeType,serverTime,isCheck,feeAfter ";
    public PageEnvelop servicePackageList(Integer page,Integer size){
        String sql = "SELECT id,name,type,price,org_name orgName,server_time_type serverTimeType,server_time serverTime" +
                ",is_check isCheck,fee_after feeAfter";
        String countSql = "select count(*) ";
        String filter = " from base_service_package WHERE del='1' ";
        String orderBy = " ORDER BY create_time desc limit "+(page-1)*size+","+size;

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/util/PostConstructUtil.java

@@ -1,6 +1,5 @@
package com.yihu.jw.care.util;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +29,6 @@ public class PostConstructUtil {
    @PostConstruct
    public void init(){
        logger.info("启动凯旋的设备的mqtt订阅====");
        mqttkxClientUtil.start();
//        mqttkxClientUtil.start();
    }
}