首页 发现 帮助
注册 登录
trick9191
/
wlyy2.0
派生自 Amoy2/wlyy2.0
关注 1
点赞 0
派生 0
文件
浏览代码

解决冲突

humingfen 7 年之前
父节点
bac27e1f2e
当前提交
55ef5c3c90
共有 2 个文件被更改，包括 4 次插入 和 11 次删除
合并视图 显示文件统计
  1. 2 9
      patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/data/DataHandingService.java
  2. 2 2
      patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/booking/PatientBookingController.java

+ 2 - 9
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/data/DataHandingService.java
查看文件 

@ -1,9 +1,7 @@
 
package com.yihu.wlyy.web.data;
 
package com.yihu.wlyy.web.data;
 
import com.alibaba.fastjson.JSON;
 
import com.yihu.device.entity.DeviceDetail;
 
import com.yihu.device.entity.DeviceDetail;
 
import com.yihu.es.entity.HealthEduArticleES;
 
import com.yihu.es.entity.HealthEduArticleES;
 
//import com.yihu.es.entity.MapDataDTO;
 
import com.yihu.wlyy.config.es.ElastricSearchSave;
 
import com.yihu.wlyy.config.es.ElastricSearchSave;
 
import com.yihu.wlyy.entity.device.PatientDevice;
 
import com.yihu.wlyy.entity.device.PatientDevice;
 
import com.yihu.wlyy.entity.device.PatientDeviceLog;
 
import com.yihu.wlyy.entity.device.PatientDeviceLog;
 
@ -19,31 +17,26 @@ import com.yihu.wlyy.repository.patient.PatientDeviceDao;
 
import com.yihu.wlyy.repository.patient.PatientDeviceLogDao;
 
import com.yihu.wlyy.repository.patient.PatientDeviceLogDao;
 
import com.yihu.wlyy.repository.patient.SignFamilyDao;
 
import com.yihu.wlyy.repository.patient.SignFamilyDao;
 
import com.yihu.wlyy.service.app.device.DeviceDetailService;
 
import com.yihu.wlyy.service.app.device.DeviceDetailService;
 
import com.yihu.wlyy.service.app.device.PatientDeviceService;
 
import com.yihu.wlyy.service.app.health.bank.CreditLogService;
 
import com.yihu.wlyy.service.app.health.bank.CreditLogService;
 
import com.yihu.wlyy.service.app.health.bank.TaskService;
 
import com.yihu.wlyy.service.app.health.bank.TaskService;
 
import com.yihu.wlyy.util.*;
 
import com.yihu.wlyy.util.*;
 
import net.sf.json.JSONArray;
 
import net.sf.json.JSONArray;
 
import org.apache.commons.collections.map.HashedMap;
 
import org.apache.commons.collections.map.HashedMap;
 
import org.apache.commons.lang.StringEscapeUtils;
 
import org.json.JSONObject;
 
import org.json.JSONObject;
 
import org.slf4j.Logger;
 
import org.slf4j.Logger;
 
import org.slf4j.LoggerFactory;
 
import org.slf4j.LoggerFactory;
 
import org.springframework.beans.factory.annotation.Autowired;
 
import org.springframework.beans.factory.annotation.Autowired;
 
import org.springframework.beans.factory.annotation.Value;
 
import org.springframework.beans.factory.annotation.Value;
 
import org.springframework.jdbc.core.BatchPreparedStatementSetter;
 
import org.springframework.jdbc.core.BeanPropertyRowMapper;
 
import org.springframework.jdbc.core.BeanPropertyRowMapper;
 
import org.springframework.jdbc.core.JdbcTemplate;
 
import org.springframework.jdbc.core.JdbcTemplate;
 
import org.springframework.jdbc.core.RowMapper;
 
import org.springframework.stereotype.Service;
 
import org.springframework.stereotype.Service;
 
import org.springframework.transaction.annotation.Transactional;
 
import org.springframework.transaction.annotation.Transactional;
 
import org.springframework.util.StringUtils;
 
import org.springframework.util.StringUtils;
 
import java.sql.PreparedStatement;
 
import java.sql.ResultSet;
 
import java.sql.SQLException;
 
import java.util.*;
 
import java.util.*;
 
//import com.yihu.es.entity.MapDataDTO;
 
/**
 
/**
 
 * Created by Administrator on 2016.10.17.
 
 * Created by Administrator on 2016.10.17.
 
 */
 
 */

+ 2 - 2
patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/booking/PatientBookingController.java
查看文件 

@ -613,7 +613,7 @@ public class PatientBookingController extends WeixinBaseController{
 
        return json;
 
        return json;
 
    }
 
    }
 
    @RequestMapping(value = "/imm/findWzymBymykh", method = RequestMethod.GET)
 
   /* @RequestMapping(value = "/imm/findWzymBymykh", method = RequestMethod.GET)
 
    @ResponseBody
 
    @ResponseBody
 
    @ObserverRequired
 
    @ObserverRequired
 
    @ApiOperation("计免：获取计划免疫接种记录")
 
    @ApiOperation("计免：获取计划免疫接种记录")
 
@ -628,7 +628,7 @@ public class PatientBookingController extends WeixinBaseController{
 
            return error(-1, e.getMessage());
 
            return error(-1, e.getMessage());
 
        }
 
        }
 
    }
 
    }
 
    
    */
 
    /**
 
    /**
 
     *-----------------计划免疫预约相关接口--------------END
 
     *-----------------计划免疫预约相关接口--------------END
 
     */
 
     */