Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-statistics/pom.xml

@@ -8,8 +8,8 @@
    <modelVersion>4.0.0</modelVersion>
    <!--打成war包需要的配置-->
    <!--<packaging>war</packaging>-->
    <packaging>jar</packaging>
    <packaging>war</packaging>
    <!--<packaging>jar</packaging>-->
    <name>patient-co-statistics</name>
    <properties>
@@ -376,7 +376,7 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-tomcat</artifactId>
            <version>${version.spring-boot}</version>
            <!--<scope>provided</scope>-->
            <scope>provided</scope>
        </dependency>
        <dependency>
            <groupId>org.json</groupId>
@@ -404,12 +404,12 @@
    <build>
        <plugins>
            <!--打成war包需要的配置-->
            <!--<plugin>-->
            <!--<artifactId>maven-war-plugin</artifactId>-->
            <!--<configuration>-->
            <!--<failOnMissingWebXml>false</failOnMissingWebXml>-->
            <!--</configuration>-->
            <!--</plugin>-->
            <plugin>
            <artifactId>maven-war-plugin</artifactId>
            <configuration>
            <failOnMissingWebXml>false</failOnMissingWebXml>
            </configuration>
            </plugin>
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/config/war/ServletInitializer.java

@@ -7,9 +7,9 @@ import org.springframework.boot.context.web.SpringBootServletInitializer;
/**
 * Created by Administrator on 2016.10.14.
 */
//public class ServletInitializer extends SpringBootServletInitializer {
//    @Override
//    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
//        return application.sources(Application.class);
//    }
//}
public class ServletInitializer extends SpringBootServletInitializer {
    @Override
    protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
        return application.sources(Application.class);
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -359,8 +359,14 @@ public class SignWebService extends BaseService {
        List<SignFamily> signFamilys =  signFamilyDao.findAllActiveSignByPatient(patient);
        JSONArray jsonArray = new JSONArray();
        for(SignFamily signFamily: signFamilys){
            AdminTeam adminTeam = adminTeamService.getTeam(signFamily.getAdminTeamId());
            Doctor doctor = doctorService.findDoctorByCode(adminTeam.getLeaderCode());
            AdminTeam adminTeam = null;
            Doctor doctor = null;
            if(signFamily.getAdminTeamId()!=null){
                adminTeam = adminTeamService.getTeam(signFamily.getAdminTeamId());
                doctor = doctorService.findDoctorByCode(adminTeam.getLeaderCode());
            }
            if(adminTeam==null)adminTeam = new AdminTeam();
            if(doctor==null)doctor = new Doctor();
            JSONObject jsonObject = new JSONObject();
            jsonObject.put("hospitalName",signFamily.getHospitalName());
            jsonObject.put("hospital",signFamily.getHospital());
@@ -375,7 +381,7 @@ public class SignWebService extends BaseService {
            jsonObject.put("doctorHealth",signFamily.getDoctorHealth());
            jsonObject.put("doctorName",signFamily.getDoctorName());
            jsonObject.put("doctorHealthName",signFamily.getDoctorHealthName());
            jsonObject.put("expensesStatus",signFamily.getExpensesStatus());
            jsonObject.put("expensesStatus",StringUtils.isNotBlank(signFamily.getExpensesStatus())?signFamily.getExpensesStatus():"1");
            jsonObject.put("applyDate",signFamily.getApplyDate());
            jsonObject.put("type",signFamily.getType());
            jsonObject.put("typeName",signFamily.getType()==1?"三师签约":"家庭签约");

patient-co-wlyy/src/main/java/com/yihu/wlyy/util/ImUtill.java

@@ -7,8 +7,9 @@ import org.json.JSONObject;
 * Created by 卓 on 2017/1/13.
 */
public class ImUtill {
    //    ===============================
    private static String host = "http://192.168.131.107:3000";
    
    private static final String im_host = SystemConf.getInstance().getImListGet();
    /**
     * 获取医生统计数据
     * status reply 为空值是是该医生总咨询量
@@ -17,10 +18,10 @@ public class ImUtill {
     * @param status
     * @param reply
     * @return
     *
     */
    public static String getConsultData(String user, Integer status, Integer reply) {
//        String imAddr = SystemConf.getInstance().getImListGet() + "/api/v2/sessions/topics/count/reply";
        String imAddr = host + "/api/v2/sessions/topics/count/reply";
        String imAddr = im_host + "api/v2/sessions/topics/count/reply";
        JSONObject params = new JSONObject();
        params.put("user", user);
        if (status!=null) {
@@ -47,7 +48,7 @@ public class ImUtill {
     * @return
     */
    public static String getConsultByStatus(String user, Integer status, Integer reply, int page, int pagesize) {
        String imAddr = host + "/api/v2/sessions/topics";
        String imAddr = im_host + "api/v2/sessions/topics";
        JSONObject params = new JSONObject();
        params.put("user", user);
        params.put("page", page);
@@ -70,7 +71,7 @@ public class ImUtill {
     * @param content     内容
     */
    public static String sendImMsg(String from,String fromName, String sessionId, String contentType, String content,String businessType) {
        String imAddr = SystemConf.getInstance().getImListGet() + "/api/v2/sessions/"+sessionId+"/messages";
        String imAddr = im_host + "api/v2/sessions/"+sessionId+"/messages";
        JSONObject params = new JSONObject();
        params.put("sender_id", from);
        params.put("sender_name", fromName);
@@ -89,7 +90,7 @@ public class ImUtill {
     * @param status 状态
     */
    public static String updateSessionStatus(String sessionId,String status) {
        String imAddr = SystemConf.getInstance().getImListGet() + "/api/v2/sessions/"+sessionId+"/status?status="+status+"&sessionId="+sessionId;
        String imAddr = im_host + "api/v2/sessions/"+sessionId+"/status?status="+status+"&sessionId="+sessionId;
        JSONObject params = new JSONObject();
        String response = HttpClientUtil.postBody(imAddr, params);
        return response;
@@ -104,8 +105,7 @@ public class ImUtill {
     * @param content     内容
     */
    public static String sendTopicIM(String from,String fromName, String topicId, String contentType, String content) {
        String url = SystemConf.getInstance().getSystemProperties().getProperty("im_list_get")
                + ("api/v2/sessions/topic/"+topicId+"/messages");
        String url = im_host + "api/v2/sessions/topic/"+topicId+"/messages";
        JSONObject params = new JSONObject();
        params.put("sender_id", from);
        params.put("sender_name", fromName);
@@ -125,7 +125,7 @@ public class ImUtill {
     * @param sessionId 会话ID
     */
    public static JSONObject endTopics(String sessionId,String endUser, String endUserName,String topicId) {
        String imAddr = SystemConf.getInstance().getImListGet() + "api/v2/sessions/"+sessionId+"/topics/"+topicId+"/ended";
        String imAddr = im_host + "api/v2/sessions/"+sessionId+"/topics/"+topicId+"/ended";
        JSONObject params = new JSONObject();
        params.put("session_id", sessionId);
        params.put("end_user", endUser);
@@ -148,7 +148,7 @@ public class ImUtill {
     * @param sessionId 会话ID
     */
    public static void updateTopicUser(String sessionId,String user) {
        String imAddr = SystemConf.getInstance().getImListGet() + "api/v2/sessions/"+sessionId+"/participants/"+user;
        String imAddr = im_host + "api/v2/sessions/"+sessionId+"/participants/"+user;
        JSONObject params = new JSONObject();
        params.put("user", user+":"+0);
        HttpClientUtil.putBody(imAddr,params);
@@ -162,7 +162,7 @@ public class ImUtill {
     * @param participants 成员
     */
    public static JSONObject createTopics(String sessionId, String topicId, String topicName, JSONObject participants, JSONObject messages, String sessionType) {
        String imAddr = SystemConf.getInstance().getImListGet() + "api/v2/sessions/"+topicId+"/topics";
        String imAddr = im_host + "api/v2/sessions/"+topicId+"/topics";
        JSONObject params = new JSONObject();
        params.put("topic_id", topicId);
        params.put("topic_name", topicName);
@@ -185,7 +185,7 @@ public class ImUtill {
     *
     */
    public static JSONObject createSession(JSONObject participants,String sessionType,String sessionName,String sessionId) {
        String imAddr = SystemConf.getInstance().getImListGet() + "api/v2/sessions";
        String imAddr = im_host + "api/v2/sessions";
        JSONObject params = new JSONObject();
        params.put("participants", participants.toString());
        params.put("session_name", sessionName);
@@ -221,7 +221,7 @@ public class ImUtill {
    }
    public static JSONObject getTopicMessage(String topicId,String startMsgId,String endMsgId,int page,int pagesize,String uid){
        String url = SystemConf.getInstance().getSystemProperties().getProperty("im_list_get")
        String url =  im_host
                + "api/v2/sessions/topic/"+topicId+"/messages?topic_id="+topicId+"&end="+startMsgId
                +"&start="+(endMsgId==null?"":endMsgId)+"&page="+page+"&pagesize="+pagesize+"&user="+uid;
        try{
@@ -239,8 +239,7 @@ public class ImUtill {
    }
    public static JSONArray getSessionMessage(String sessionId,String startMsgId,String endMsgId,int page,int pagesize,String uid){
        String url = SystemConf.getInstance().getSystemProperties().getProperty("im_list_get")
                + "api/v2/sessions/"+sessionId+"/messages?session_id="+sessionId+"&user="+uid+"&start_message_id="+startMsgId+"&end_message_id="+endMsgId+"&page="+page+"&pagesize="+pagesize;
        String url =  im_host+ "api/v2/sessions/"+sessionId+"/messages?session_id="+sessionId+"&user="+uid+"&start_message_id="+startMsgId+"&end_message_id="+endMsgId+"&page="+page+"&pagesize="+pagesize;
        try{
            String ret = HttpClientUtil.get(url, "UTF-8");
            JSONArray obj = new JSONArray(ret);
@@ -258,8 +257,7 @@ public class ImUtill {
     * @return
     */
    public static JSONObject deleteMucUser(String userId,String oldUserId,String sessionId) throws  Exception{
        String url = SystemConf.getInstance().getSystemProperties().getProperty("im_list_get")
                + "api/v2/sessions/"+sessionId+"/participant/update";
        String url =  im_host+ "api/v2/sessions/"+sessionId+"/participant/update";
        try{
            JSONObject params = new JSONObject();
            params.put("user_id", userId);
@@ -284,8 +282,7 @@ public class ImUtill {
     * @return
     */
    public static JSONObject getTopic(String topicId) throws  Exception{
        String url = SystemConf.getInstance().getSystemProperties().getProperty("im_list_get")
                + "api/v2/sessions/topics/"+topicId+"?topic_id="+topicId;
        String url =  im_host + "api/v2/sessions/topics/"+topicId+"?topic_id="+topicId;
        try{
            String ret = HttpClientUtil.get(url,"utf-8");
            JSONObject obj = new JSONObject(ret);
@@ -306,8 +303,7 @@ public class ImUtill {
     * @throws Exception
     */
    public static JSONArray getParticipants(String sessionId){
        String url = SystemConf.getInstance().getSystemProperties().getProperty("im_list_get")
                + "api/v2/sessions/"+sessionId+"/participants?session_id="+sessionId;
        String url =  im_host + "api/v2/sessions/"+sessionId+"/participants?session_id="+sessionId;
        try{
            String ret = HttpClientUtil.get(url,"utf-8");
            return new JSONArray(ret);
@@ -323,8 +319,7 @@ public class ImUtill {
     * @throws Exception
     */
    public static JSONArray getSessions(String sessionId){
        String url = SystemConf.getInstance().getSystemProperties().getProperty("im_list_get")
                + "api/v2/sessions/"+sessionId+"/participants?session_id="+sessionId;
        String url =  im_host+ "api/v2/sessions/"+sessionId+"/participants?session_id="+sessionId;
        try{
            String ret = HttpClientUtil.get(url,"utf-8");
            return new JSONArray(ret);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/sign/PatientSignController.java

@@ -276,6 +276,7 @@ public class PatientSignController extends BaseController {
			JSONArray jsonArray  = signWebService.getSigns(getUID());
			return write(200, "查询成功！", "data", jsonArray);
		} catch (Exception ex) {
			ex.printStackTrace();
			return error(-1, "系统错误,请联系管理员!");
		}
	}

patient-co-wlyy/src/main/resources/system.properties

@@ -68,7 +68,8 @@ chat_server=http://weixin.xmtyw.cn/res/chat/
sign_check_upload=http://172.19.103.87:8011/wlyy_service
# IM配置
im_list_get=http://192.168.131.102:3008/
im_list_get=http://172.19.103.29:3008
#im_list_get=http://192.168.131.102:3008/
im_group_server=http://172.19.103.29:3000/api/v1/chats/gm
msg_push_server=http://172.19.103.29:3000/api/v1/chats/sm