Parcourir la source

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

trick9191 il y a 7 ans
Parent
commit
75095658bd
100 fichiers modifiés avec 31 ajouts et 61751 suppressions
  1. 0 11
      bin/jetty.bat
  2. 0 11
      bin/jetty.sh
  3. 0 8
      bin/package.bat
  4. 0 9
      bin/package.sh
  5. 0 10
      bin/refresh-db.bat
  6. 0 9
      bin/refresh-db.sh
  7. 0 11
      bin/smoke-test.bat
  8. 0 11
      bin/smoke-test.sh
  9. 29 0
      common-lib/pom.xml
  10. 2 2
      Jolokia-admin-server/pom.xml
  11. 0 0
      jolokia-admin/src/main/java/com/yihu/wlyy/jolokia/JolokiaApplication.java
  12. 0 0
      jolokia-admin/src/main/java/com/yihu/wlyy/jolokia/config/counter/RestCounter.java
  13. 0 0
      jolokia-admin/src/main/resources/application.yml
  14. 0 0
      jolokia-admin/src/main/resources/logback.xml
  15. 0 32
      patient-co-wlyy/src/main/java/com/yihu/wlyy/exception/InvalidUserException.java
  16. 0 29
      patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionLogService.java
  17. 0 38
      patient-co-wlyy/src/main/java/com/yihu/wlyy/task/SignSsGetTask.java
  18. 0 241
      patient-co-wlyy/src/main/java/com/yihu/wlyy/util/HttpClientUtil.java
  19. 0 30
      patient-co-wlyy/src/main/java/com/yihu/wlyy/util/SendP2PUtil.java
  20. 0 389
      patient-co-wlyy/src/main/java/com/yihu/wlyy/util/SystemConf.java
  21. 0 373
      patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/archives/PatientArchivesController.java
  22. 0 42
      patient-co-wlyy/src/main/java/com/yihu/wlyy/web/swagger/SwaggerConfig.java
  23. 0 111
      patient-co-wlyy/src/main/resources/application.properties
  24. 0 238
      patient-co-wlyy/src/main/resources/applicationContext.xml
  25. BIN
      patient-co-wlyy/src/main/resources/fastdfs_lib.jar
  26. BIN
      patient-co-wlyy/src/main/resources/kaptcha-2.3.2.jar
  27. BIN
      patient-co-wlyy/src/main/resources/onepay-java-sdk.jar
  28. 0 1275
      patient-co-wlyy/src/main/resources/sql/mysql/schema.sql
  29. 0 1288
      patient-co-wlyy/src/main/resources/sql/mysql/ssgg_0425.sql
  30. 0 1819
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0428.sql
  31. 0 1871
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0503
  32. 0 1978
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0505.sql
  33. 0 1993
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0507.sql
  34. 0 2105
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0511.sql
  35. 0 2128
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0512.sql
  36. 0 2186
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0514.sql
  37. 0 2227
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0518.sql
  38. 0 2266
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0519.sql
  39. 0 2301
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0524.sql
  40. 0 2521
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0526.sql
  41. 0 2503
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0530.sql
  42. 0 2516
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0531.sql
  43. 0 2516
      patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0601.sql
  44. 0 117
      patient-co-wlyy/src/main/resources/sql/truncate.sql
  45. 0 2517
      patient-co-wlyy/src/main/resources/sql/wlyy_0602.sql
  46. 0 2515
      patient-co-wlyy/src/main/resources/sql/wlyy_0606.sql
  47. 0 2629
      patient-co-wlyy/src/main/resources/sql/wlyy_0612.sql
  48. 0 2699
      patient-co-wlyy/src/main/resources/sql/wlyy_0615.sql
  49. 0 2700
      patient-co-wlyy/src/main/resources/sql/wlyy_0620.sql
  50. 0 2708
      patient-co-wlyy/src/main/resources/sql/wlyy_0622.sql
  51. 0 2541
      patient-co-wlyy/src/main/resources/sql/wlyy_finally_20160627.sql
  52. 0 2559
      patient-co-wlyy/src/main/resources/sql/wlyy_finally_20160628.sql
  53. 0 2580
      patient-co-wlyy/src/main/resources/sql/wlyy_finally_20160629.sql
  54. 0 2574
      patient-co-wlyy/src/main/resources/sql/wlyy_一期备份_20160714.sql
  55. 0 293
      patient-co-wlyy/src/main/resources/system.properties
  56. 0 13
      patient-co-wlyy/src/main/webapp/WEB-INF/decorators.xml
  57. 0 95
      patient-co-wlyy/src/main/webapp/WEB-INF/spring-mvc.xml
  58. 0 16
      patient-co-wlyy/src/main/webapp/WEB-INF/views/error/404.jsp
  59. 0 21
      patient-co-wlyy/src/main/webapp/WEB-INF/views/error/500.jsp
  60. 0 4
      patient-co-wlyy/src/main/webapp/WEB-INF/views/index.jsp
  61. 0 72
      patient-co-wlyy/src/main/webapp/WEB-INF/web.xml
  62. 0 0
      patient-co/patient-co-analysis/pom.xml
  63. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/Application.java
  64. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/config/SchedulingConfig.java
  65. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/config/kafka/KafkaConsumerConfig.java
  66. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/config/kafka/KafkaProducerConfig.java
  67. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/config/war/ServletInitializer.java
  68. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/controller/KafKaTest.java
  69. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/entity/UserPortrait.java
  70. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/BusinessTypeEnum.java
  71. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/ETLConstantData.java
  72. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/ILogTransform.java
  73. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/LogDataTransform.java
  74. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/ConsultLogTransform.java
  75. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/HealthArchiveLogTransform.java
  76. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/HealthIndexTransform.java
  77. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/RegisterLogTransform.java
  78. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/util/IdcardUtil.java
  79. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/listener/LabelDataListener.java
  80. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/BusinessDataModel.java
  81. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/DataModel.java
  82. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/OperatorDataModel.java
  83. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/emun/BusinessType.java
  84. 0 0
      patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/repository/UserPortraitDao.java
  85. 0 0
      patient-co/patient-co-analysis/src/main/resources/application.yml
  86. 0 0
      patient-co/patient-co-analysis/src/main/resources/city.properties
  87. 0 0
      patient-co/patient-co-analysis/src/main/resources/quartz.properties
  88. 0 0
      patient-co/patient-co-figure/pom.xml
  89. 0 0
      patient-co/patient-co-figure/src/main/java/com/yihu/figure/Application.java
  90. 0 0
      patient-co/patient-co-figure/src/main/java/com/yihu/figure/config/SwaggerConfig.java
  91. 0 0
      patient-co/patient-co-figure/src/main/java/com/yihu/figure/config/quartz/JobFactory.java
  92. 0 0
      patient-co/patient-co-figure/src/main/java/com/yihu/figure/config/quartz/SchedulerConfig.java
  93. 0 0
      patient-co/patient-co-figure/src/main/java/com/yihu/figure/config/war/ServletInitializer.java
  94. 0 0
      patient-co/patient-co-figure/src/main/java/com/yihu/figure/controller/BaseController.java
  95. 0 0
      patient-co/patient-co-figure/src/main/java/com/yihu/figure/controller/DiseaseController.java
  96. 0 0
      patient-co/patient-co-figure/src/main/java/com/yihu/figure/controller/SuggestController.java
  97. 0 0
      patient-co/patient-co-figure/src/main/java/com/yihu/figure/controller/data/DataController.java
  98. 0 0
      patient-co/patient-co-figure/src/main/java/com/yihu/figure/controller/drug/MedicineController.java
  99. 0 0
      patient-co/patient-co-figure/src/main/java/com/yihu/figure/controller/health/HealthEduArticleController.java
  100. 0 0
      patient-co-figure/src/main/java/com/yihu/figure/controller/health/HealthIndexController.java

+ 0 - 11
bin/jetty.bat

@ -1,11 +0,0 @@
@echo off
echo [INFO] Use maven jetty-plugin run the project.
cd %~dp0
cd ..
set MAVEN_OPTS=%MAVEN_OPTS% -XX:MaxPermSize=128m
call mvn jetty:run -Djetty.port=8080
cd bin
pause

+ 0 - 11
bin/jetty.sh

@ -1,11 +0,0 @@
#!/bin/bash
echo "[INFO] Use maven jetty-plugin run the project."
cd ..
set MAVEN_OPTS=%MAVEN_OPTS% -XX:MaxPermSize=128m
mvn jetty:run -Djetty.port=8080
cd bin

+ 0 - 8
bin/package.bat

@ -1,8 +0,0 @@
@echo off
echo [INFO] Package the war in target dir.
cd %~dp0
cd ..
call mvn clean package -Dmaven.test.skip=true
cd bin
pause

+ 0 - 9
bin/package.sh

@ -1,9 +0,0 @@
#!/bin/bash
echo "[INFO] Package the war in target dir."
cd ..
mvn clean package -Dmaven.test.skip=true
cd bin

+ 0 - 10
bin/refresh-db.bat

@ -1,10 +0,0 @@
@echo off
echo [INFO] Re-create the schema and provision the sample data.
cd %~dp0
cd ..
call mvn antrun:run -Prefresh-db
cd bin
pause

+ 0 - 9
bin/refresh-db.sh

@ -1,9 +0,0 @@
#!/bin/bash
echo "[INFO] Re-create the schema and provision the sample data."
cd ..
mvn antrun:run -Prefresh-db
cd bin

+ 0 - 11
bin/smoke-test.bat

@ -1,11 +0,0 @@
@echo off
echo [INFO] run smoking functional test.
cd %~dp0
cd ..
set MAVEN_OPTS=%MAVEN_OPTS% -XX:MaxPermSize=128m
call mvn clean test -Pfunctional-test,run-smoke
cd bin
pause

+ 0 - 11
bin/smoke-test.sh

@ -1,11 +0,0 @@
#!/bin/bash
echo "[INFO] run smoking functional test."
cd ..
set MAVEN_OPTS=%MAVEN_OPTS% -XX:MaxPermSize=128m
mvn clean test -Pfunctional-test,run-smoke
cd bin

+ 29 - 0
common-lib/pom.xml

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <parent>
        <artifactId>wlyy</artifactId>
        <groupId>com.yihu</groupId>
        <version>1.0.0</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <artifactId>common-lib</artifactId>
    <version>1.0.0</version>
    <packaging>pom</packaging>
    <modelVersion>4.0.0</modelVersion>
    <modules>
        <!--<module>../jolokia-admin</module>&lt;!&ndash;springBoot性能分析项目&ndash;&gt;-->
        <module>../patient-co/patient-co-wlyy</module> <!--i健康-->
        <module>../patient-co/patient-co-statistics</module> <!--i健康 mysql 版本统计-->
        <module>../patient-co/patient-co-statistics-es</module> <!--i健康 es 版本统计-->
        <!--<module>../patient-co-figure</module>-->
    </modules>
</project>

+ 2 - 2
Jolokia-admin-server/pom.xml

@ -3,7 +3,7 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <artifactId>jolokia-admin-server</artifactId>
    <artifactId>jolokia-admin</artifactId>
    <groupId>com.yihu</groupId>
    <version>1.0.0</version>
@ -45,7 +45,7 @@
        </dependency>
    </dependencies>
    <build>
        <finalName>jolokia-server</finalName>
        <finalName>jolokia-admin</finalName>
        <plugins>
            <!--springboot插件 start-->
            <plugin>

Jolokia-admin-server/src/main/java/com/yihu/wlyy/jolokia/JolokiaApplication.java → jolokia-admin/src/main/java/com/yihu/wlyy/jolokia/JolokiaApplication.java


Jolokia-admin-server/src/main/java/com/yihu/wlyy/jolokia/config/counter/RestCounter.java → jolokia-admin/src/main/java/com/yihu/wlyy/jolokia/config/counter/RestCounter.java


Jolokia-admin-server/src/main/resources/application.yml → jolokia-admin/src/main/resources/application.yml


patient-co-statistics-es/src/main/resources/logback.xml → jolokia-admin/src/main/resources/logback.xml


+ 0 - 32
patient-co-wlyy/src/main/java/com/yihu/wlyy/exception/InvalidUserException.java

@ -1,32 +0,0 @@
package com.yihu.wlyy.exception;
public class InvalidUserException extends Exception {
	/**
	 * 
	 */
	private static final long serialVersionUID = -4062380426285600840L;
	private int code;
	private String msg;
	public InvalidUserException() {
		super();
	}
	public InvalidUserException(int code, String msg) {
		super();
		this.code = code;
		this.msg = msg;
	}
	public int getCode() {
		return code;
	}
	public String getMsg() {
		return msg;
	}
}

+ 0 - 29
patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/prescription/PrescriptionLogService.java

@ -1,29 +0,0 @@
package com.yihu.wlyy.service.app.prescription;
import com.yihu.wlyy.entity.patient.prescription.PrescriptionLog;
import com.yihu.wlyy.repository.prescription.PrescriptionLogDao;
import com.yihu.wlyy.service.BaseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
/**
 * Created by chenweida on 2017/7/27.
 */
@Service
public class PrescriptionLogService extends BaseService {
    @Autowired
    private PrescriptionLogDao prescriptionLogDao;
    /**
     * 根据处方code 和 types查询处方的流程日志 时间倒叙
     *
     * @param prescriptionCode 处方code
     * @param types            需要查询的types
     * @return
     */
    public List<PrescriptionLog> findPrescriptionLogsByPrescriptionCode(String prescriptionCode, Integer[] types) {
        return prescriptionLogDao.findPrescriptionLogsByPrescriptionCode(prescriptionCode, types);
    }
}

+ 0 - 38
patient-co-wlyy/src/main/java/com/yihu/wlyy/task/SignSsGetTask.java

@ -1,38 +0,0 @@
package com.yihu.wlyy.task;
import com.yihu.wlyy.util.HttpUtil;
import com.yihu.wlyy.util.SystemConf;
import org.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
 * Created by lyr-pc on 2016/10/20.
 */
public class SignSsGetTask implements Runnable {
    private static Logger logger = LoggerFactory.getLogger(SignUploadTask.class);
    String idcard = "";
    public SignSsGetTask(String idcard) {
        this.idcard = idcard;
    }
    @Override
    public void run() {
        try {
            Thread.sleep(3000);
            String url = SystemConf.getInstance().getJwUrl();
            String resultStr = HttpUtil.sendPost(url + "/third/sign/LoadSanshiSignFamily?idcard=" + idcard, "");
            JSONObject json = new JSONObject(resultStr);
            if (json.getInt("status") == 200) {
                logger.info("sign_ss_get_success:" + idcard);
            } else {
                logger.error("sign_ss_get_failed:" + idcard);
            }
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
}

+ 0 - 241
patient-co-wlyy/src/main/java/com/yihu/wlyy/util/HttpClientUtil.java

@ -1,241 +0,0 @@
package com.yihu.wlyy.util;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.ParseException;
import org.apache.http.client.ClientProtocolException;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.message.BasicNameValuePair;
import org.apache.http.util.EntityUtils;
import org.json.JSONObject;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.web.client.RestTemplate;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
public class HttpClientUtil {
	/**
	 * 发送post请求
	 * @param url 请求地址
	 * @param params 请求参数
	 * @param chatSet 编码格式
	 * @return
	 */
	public static String post(String url, List<NameValuePair> params, String chatSet) {
		// 创建默认的httpClient实例.
		CloseableHttpClient httpclient = HttpClients.createDefault();
		// 创建httppost
		HttpPost httppost = new HttpPost(url);
		UrlEncodedFormEntity uefEntity;
		try {
			uefEntity = new UrlEncodedFormEntity(params, chatSet);
			httppost.setEntity(uefEntity);
			CloseableHttpResponse response = httpclient.execute(httppost);
			try {
				HttpEntity entity = response.getEntity();
				if (entity != null) {
					return EntityUtils.toString(entity, chatSet);
				}
			} finally {
				response.close();
			}
		} catch (ClientProtocolException e) {
			e.printStackTrace();
		} catch (UnsupportedEncodingException e1) {
			e1.printStackTrace();
		} catch (IOException e) {
			e.printStackTrace();
		} finally {
			// 关闭连接,释放资源
			try {
				httpclient.close();
			} catch (IOException e) {
				e.printStackTrace();
			}
		}
		return null;
	}
	/**
	 * http post调用方法
	 * @param url
	 * @param xmlData 格式字符串
	 * @return
	 * @throws Exception
	 */
	public String httpPost(String url, String xmlData)throws Exception {
		CloseableHttpClient httpclient = HttpClients.createDefault();
		String strResult="";
		try {
		HttpPost post = new HttpPost(url);
		StringEntity entity = new StringEntity(xmlData);
		post.setEntity(entity);
		post.setHeader("Content-Type", "text/xml;charset=UTF-8");
		HttpResponse response = httpclient.execute(post);
		if(response.getStatusLine().getStatusCode()==200){
			try {
//				读取服务器返回过来的json字符串数据
				strResult = EntityUtils.toString(response.getEntity(),"UTF-8");
			} catch (Exception e) {
				e.printStackTrace();
			}
		}
		} catch (ClientProtocolException e) {
			e.printStackTrace();
		} catch (ParseException e) {
			e.printStackTrace();
		} catch (IOException e) {
			e.printStackTrace();
		} finally {
			// 关闭连接,释放资源
			try {
				httpclient.close();
			} catch (IOException e) {
				e.printStackTrace();
			}
		}
		return strResult;
	}
	/**
	 * 发送get请求
	 * @param url 请求地址
	 * @param chatSet 编码格式
	 * @return
	 */
	public static String get(String url, String chatSet) {
		CloseableHttpClient httpclient = HttpClients.createDefault();
		try {
			// 创建httpget.
			HttpGet httpget = new HttpGet(url);
			// 执行get请求.
			CloseableHttpResponse response = httpclient.execute(httpget);
			try {
				// 获取响应实体
				HttpEntity entity = response.getEntity();
				if (entity != null) {
					return EntityUtils.toString(entity, chatSet);
				}
			} finally {
				response.close();
			}
		} catch (ClientProtocolException e) {
			e.printStackTrace();
		} catch (ParseException e) {
			e.printStackTrace();
		} catch (IOException e) {
			e.printStackTrace();
		} finally {
			// 关闭连接,释放资源
			try {
				httpclient.close();
			} catch (IOException e) {
				e.printStackTrace();
			}
		}
		return null;
	}
	/**
	 * http调用方法,(健康之路开放平台)
	 * @param url
	 * @param params
	 * @return
	 * @throws Exception
	 */
	public static String httpPost(String url, Map<String, String> params) throws Exception {
		CloseableHttpClient httpclient = HttpClients.createDefault();
		try {
			HttpPost httpPost = new HttpPost(url);
			if(params!=null&&params.size()>0){
				List<NameValuePair> valuePairs = new ArrayList<NameValuePair>(params.size());
				for (Map.Entry<String, String> entry : params.entrySet()) {
					NameValuePair nameValuePair = new BasicNameValuePair(entry.getKey(), String.valueOf(entry.getValue()));
					valuePairs.add(nameValuePair);
				}
				UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(	valuePairs, "UTF-8");
				httpPost.setEntity(formEntity);
			}
			CloseableHttpResponse resp = httpclient.execute(httpPost);
			try {
				HttpEntity entity = resp.getEntity();
				String respContent = EntityUtils.toString(entity, "UTF-8").trim();
				return respContent;
			} finally {
				resp.close();
			}
		} catch (Exception e) {
			e.printStackTrace();
			return null;
		}finally {
			httpclient.close();
		}
	}
	/**
	 * 获取加密后参数集合(健康之路开放平台)
	 * @param params
	 * @return
	 */
	public static Map<String,String> getSecretParams(Map<String, String> params,String appId,String secret)
	{
		String timestamp = Long.toString(System.currentTimeMillis());
		params.put("timestamp", timestamp);
		StringBuilder stringBuilder = new StringBuilder();
		// 对参数名进行字典排序  
		String[] keyArray = params.keySet().toArray(new String[0]);
		Arrays.sort(keyArray);
		// 拼接有序的参数名-值串  
		stringBuilder.append(appId);
		for(String key : keyArray)
		{
			stringBuilder.append(key).append(params.get(key));
		}
		String codes = stringBuilder.append(secret).toString();
		String sign = org.apache.commons.codec.digest.DigestUtils.shaHex(codes).toUpperCase();
		// 添加签名,并发送请求  
		params.put("appId", appId);
		params.put("sign", sign);
		return params;
	}
	public static String postBody(String url,JSONObject params){
		RestTemplate restTemplate = new RestTemplate();
		HttpHeaders headers = new HttpHeaders();
		MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
		headers.setContentType(type);
		headers.add("Accept", MediaType.APPLICATION_JSON.toString());
		org.springframework.http.HttpEntity<String> formEntity = new org.springframework.http.HttpEntity<String>(params.toString(), headers);
		String ret = restTemplate.postForObject(url, formEntity, String.class);
		return ret;
	}
	public static void putBody(String url,JSONObject params){
		RestTemplate restTemplate = new RestTemplate();
		HttpHeaders headers = new HttpHeaders();
		MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
		headers.setContentType(type);
		headers.add("Accept", MediaType.APPLICATION_JSON.toString());
		org.springframework.http.HttpEntity<String> formEntity = new org.springframework.http.HttpEntity<String>(params.toString(), headers);
		restTemplate.put(url, formEntity, String.class);
	}
}

+ 0 - 30
patient-co-wlyy/src/main/java/com/yihu/wlyy/util/SendP2PUtil.java

@ -1,30 +0,0 @@
package com.yihu.wlyy.util;
import org.apache.commons.lang3.StringUtils;
import org.apache.http.NameValuePair;
import org.apache.http.message.BasicNameValuePair;
import java.util.ArrayList;
import java.util.List;
public class SendP2PUtil {
	public static String sendP2Pmsg(String from,String to,String contentType,String content){
		String url = SystemConf.getInstance().getSystemProperties().getProperty("im_list_get")
				+ "api/v1/chats/pm";
		List<NameValuePair> params = new ArrayList<>();
		if(!"4".equals(contentType)){
			contentType = "0";
		}
		params.add(new BasicNameValuePair("from", from));
		params.add(new BasicNameValuePair("to", to));
		params.add(new BasicNameValuePair("content",  content));
		params.add(new BasicNameValuePair("contentType",contentType));
		String response = HttpClientUtil.post(url, params, "UTF-8");
		if (StringUtils.isEmpty(response)) {
			return "-1";
		}else{
			return "200";
		}
	}
}

+ 0 - 389
patient-co-wlyy/src/main/java/com/yihu/wlyy/util/SystemConf.java

@ -1,389 +0,0 @@
package com.yihu.wlyy.util;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;
public class SystemConf {
	// 别处登录
	public static final int LOGIN_OTHER = 999;
	// 登录超时
	public static final int LOGIN_TIMEOUT = 998;
	// 未登录
	public static final int NOT_LOGIN = 997;
	private static final String SERVER_IP = "server_ip";
	private static final String IM_LIST_GET = "im_list_get";
	private static final String SERVER_PORT = "server_port";
	private static final String SERVER_DOMAIN = "server_domain";
	// 消息推送服务器地址
	private static final String MSG_PUSH_SERVER = "msg_push_server";
	//微信端websocket服务地址
	private static final String WEIXIN_WEBSOCKET_SERVER = "weixin_websocket_server";
	// 服务器地址
	private static final String SERVER_URL = "server_url";
	// 图片资源服务器地址
	private static final String IMAGE_SERVER = "image_server";
	// 语音资源服务器地址
	private static final String VOICE_SERVER = "voice_server";
	// 聊天咨询服务器地址
	private static final String CHAT_SERVER = "chat_server";
	// 文件保存临时路径
	private static final String TEMP_PATH = "upload_temp_path";
	// 聊天文件保存路径
	private static final String CHAT_FILE_PATH = "chat_file_path";
	// 图片存放地址
	private static final String IMAGE_PATH = "image_path";
	// 语音存在地址
	private static final String VOICE_PATH = "voice_path";
	private static final String appId = "appId";
	private static final String appSecret = "appSecret";
	// 血糖餐前最小值
	public static final double HEALTH_STANDARD_ST_MIN_BEFORE = 4;
	// 血糖餐前最大值
	public static final double HEALTH_STANDARD_ST_MAX_BEFORE = 7;
	// 血糖餐后最小值
	public static final double HEALTH_STANDARD_ST_MIN_AFTER = 4;
	// 血糖餐后最大值
	public static final double HEALTH_STANDARD_ST_MAX_AFTER = 11.1;
	// 舒张压最小值
	public static final double HEALTH_STANDARD_SZY_MIN = 60;
	// 舒张压最大值
	public static final double HEALTH_STANDARD_SZY_MAX = 90;
	// 收缩压最小值
	public static final double HEALTH_STANDARD_SSY_MIN = 90;
	// 收缩压最大值
	public static final double HEALTH_STANDARD_SSY_MAX = 140;
	// 同一ip最大短信数
	public static final int MAX_SMS_IP = 10;
	// 同一手机号大最短信数
	public static final int MAX_SMS_MOBILE = 5;
	// 发送短信验证码间隔(分钟)
	public static final int SMS_INTERVAL = 2;
	private static Object lock = new Object();
	// 全局系统配置信息
	private static SystemConf systemConf;
	// 系统配置文件
	private Properties systemProperties;
	//im列表
	private String imListGet;
	public static SystemConf getInstance() {
		if (systemConf == null) {
			synchronized (lock) {
				systemConf = new SystemConf();
			}
		}
		return systemConf;
	}
	/**
	 * 加载系统配置文件
	 * @return
	 */
	public Properties getSystemProperties() {
		if (systemProperties == null) {
			InputStream is = null;
			try {
				is = this.getClass().getResourceAsStream("/system.properties");
				systemProperties = new Properties();
				systemProperties.load(is);
			} catch (IOException e1) {
				e1.printStackTrace();
			} finally {
				if (is != null) {
					try {
						is.close();
					} catch (IOException e) {
						e.printStackTrace();
					}
				}
			}
		}
		return systemProperties;
	}
	/**
	 *  短信接口地址
 	 */
	public String getSmsUrl(){
		return getSystemProperties().getProperty("yihu_sms_url");
	}
	/**
	 *   短信企业编号
	 */
	public String getSmsCode(){
		return getSystemProperties().getProperty("yihu_sms_code");
	}
	/**
	 * 短信用户名
     */
	public String getSmsName(){
		return getSystemProperties().getProperty("yihu_sms_name");
	}
	/**
	 * 短信登录密码
     */
	public String getSmsPassword(){
		return getSystemProperties().getProperty("yihu_sms_password");
	};
	/**
	 *  挂号接口地址
	 */
	public String getGuahaoUrl(){
		return getSystemProperties().getProperty("yihu_guahao_url");
	}
	/**
	 *  挂号接口对接appid
	 */
	public String getGuahaoAppid(){
		return getSystemProperties().getProperty("yihu_guahao_appid");
	}
	/**
	 *  挂号接口对接app secret
	 */
	public String getGuahaoSecret(){
		return getSystemProperties().getProperty("yihu_guahao_secret");
	}
	/**
	 * 获取服务IP地址/域名
	 * @return
	 */
	public String getServerIp() {
		return getSystemProperties().getProperty(SERVER_IP);
	}
	/**
	 * 获取服务端口号
	 * @return
	 */
	public String getServerPort() {
		return getSystemProperties().getProperty(SERVER_PORT);
	}
	/**
	 * IM地址
	 * @return
     */
	public String getImListGet() {
		return getSystemProperties().getProperty(IM_LIST_GET);
	}
	/**
	 * 获取服务资源名
	 * @return
	 */
	public String getServerDomain() {
		return getSystemProperties().getProperty(SERVER_DOMAIN);
	}
	/**
	 * 获取图片资源服务器地址
	 * @return
	 */
	public String getImageServer() {
		return getSystemProperties().getProperty(IMAGE_SERVER);
	}
	/**
	 * 获取语音资源服务器地址
	 * @return
	 */
	public String getVoiceServer() {
		return getSystemProperties().getProperty(VOICE_SERVER);
	}
	/**
	 * 获取聊天附件服务器地址
	 * @return
	 */
	public String getChatServer() {
		return getSystemProperties().getProperty(CHAT_SERVER);
	}
	/**
	 * 获取文件保存的临时路径
	 * @return
	 */
	public String getTempPath() {
		return getSystemProperties().getProperty(TEMP_PATH);
	}
	/**
	 * 获取图片存在地址
	 * @return
	 */
	public String getImagePath() {
		return getSystemProperties().getProperty(IMAGE_PATH);
	}
	/**
	 * 获取语音存放地址
	 * @return
	 */
	public String getVoicePath() {
		return getSystemProperties().getProperty(VOICE_PATH);
	}
	/**
	 * 聊天附件保存路径
	 * @return
	 */
	public String getChatPath() {
		return getSystemProperties().getProperty(CHAT_FILE_PATH);
	}
	/**
	 * 获取消息推送服务器
	 * @return
	 */
	public String getMsgPushServer() {
		return getSystemProperties().getProperty(MSG_PUSH_SERVER);
	}
	public String getWeixinWebsocketServer() {
		return getSystemProperties().getProperty(WEIXIN_WEBSOCKET_SERVER);
	}
	public String getServerUrlStr() {
		String temp = getSystemProperties().getProperty(SERVER_URL);
		if (StringUtils.isEmpty(temp)) {
			temp = "http://www.xmtyw.cn/wlyy/";
		}
		return temp;
	}
	
	public String getAppId(){
		String temp = getSystemProperties().getProperty(appId);
		if (StringUtils.isEmpty(temp)) {
			temp = "wxad04e9c4c5255acf";
		}
		return temp;
	}
	public String getAccId(){
		String temp = getSystemProperties().getProperty("accId");
		return temp;
	}
	
	public String getAppSecret(){
		String temp = getSystemProperties().getProperty(appSecret);
		if (StringUtils.isEmpty(temp)) {
			temp = "ae77c48ccf1af5d07069f5153d1ac8d3";
		}
		return temp;
	}
	/**
	 * 获取服务全路径
	 * @return
	 */
	public String getServerUrl() {
		String port = getServerPort();
		port = StringUtils.isEmpty(port) ? "" : ":" + port;
		String domain = getServerDomain();
		domain = StringUtils.isEmpty(port) ? "" : "/" + domain;
		return "http://" + getServerIp() + port + domain + "/";
	}
	public static void main(String[] args) {
		System.out.println(getInstance().getServerUrl());
	}
	/******************************** 挂号配置 ********************************************/
	/**
	 * 获取厦门预约服务地址
	 */
	public String getXMGuahaoUrl() {
		return getSystemProperties().getProperty("guahao_url");
	}
	/**
	 * 获取厦门预约服务命名空间
	 */
	public String getXMGuahaoNamespace() {
		return getSystemProperties().getProperty("guahao_namespace");
	}
	/****************************************************************************************/
	/**
	 * 基卫服务地址
	 */
	public String getJwUrl() {
		return getSystemProperties().getProperty("sign_check_upload");
	}
	/********************************* EHR配置 **********************************************/
	/**
	 * 是否启用EHR演示
	 */
	public Boolean getEhrUsed() {
		return Boolean.valueOf(getSystemProperties().getProperty("ehr_used"));
	}
	/**
	 * EHR档案服务地址
	 */
	public String getEhrServices() {
		return getSystemProperties().getProperty("ehr_services");
	}
	/**
	 * EHR底层地址
	 */
	public String getEhrServicesBase() {
		return getSystemProperties().getProperty("ehr_services_base");
	}
	/**************************************************************************************/
	/********************************* 健康之路开放平台 配置 **********************************************/
	/**
	 * 健康之路开放平台url
	 */
	public String getYihuOpenPlatformUrl() {
		return getSystemProperties().getProperty("yihu_OpenPlatform_url");
	}
	/**
	 * 健康之路开放平台渠道号
	 */
	public String getYihuOpenPlatformAppId() {
		return getSystemProperties().getProperty("yihu_OpenPlatform_appId");
	}
	/**
	 * 健康之路开放平台秘钥
	 */
	public String getYihuOpenPlatformSecret() {
		return getSystemProperties().getProperty("yihu_OpenPlatform_secret");
	}
	/**************************************************************************************/
	/**
	 * 获取IM数据库名
	 * @return
     */
	public String getImDataBaseName(){ return getSystemProperties().getProperty("im_dataBase");}
}

+ 0 - 373
patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/archives/PatientArchivesController.java

@ -1,373 +0,0 @@
package com.yihu.wlyy.web.patient.archives;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.yihu.wlyy.config.FastDFSConfig;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.service.app.archives.PatientEventService;
import com.yihu.wlyy.service.app.archives.PatientRecordService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.service.third.jw.JwArchivesService;
import com.yihu.wlyy.util.SystemConf;
import com.yihu.wlyy.util.fastdfs.FastDFSUtil;
import com.yihu.wlyy.web.WeixinBaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
/**
 * Created by hzp on 2016/11/24.
 */
@Controller
@RequestMapping(value = "/patient/archives", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@Api(description = "患者端-健康档案服务接口")
public class PatientArchivesController extends WeixinBaseController {
    @Autowired
    private PatientRecordService patientRecordService;
    @Autowired
    private PatientEventService patientEventService;
    @Autowired
    private JwArchivesService jwArchivesService;
    @Autowired
    private PatientService patientService;
    @ApiOperation("获取门诊记录/住院记录(基卫+APP)")
    @RequestMapping(value = "/event", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ResponseBody
    public String getAllEvent(@ApiParam(name="type",value="类型",defaultValue = "")
                              @RequestParam(value="type",required = false) String type,
                              @ApiParam(name="page",value="第几页",defaultValue = "1")
                              @RequestParam(value="page",required = true) String page,
                              @ApiParam(name="pageSize",value="每页几行",defaultValue = "10")
                              @RequestParam(value="pageSize",required = true) String pageSize,
                              @ApiParam(name="lastTime",value="最后一条时间",defaultValue = "2010-10-10 00:00:00")
                              @RequestParam(value="lastTime",required = false) String lastTime) {
        try {
            List<Map<String,String>> result = patientRecordService.getAllEvent(getRepUID(),type,page,pageSize,lastTime);
            return write(200, "获取就诊记录成功!", "data", result);
        } catch (Exception e) {
            if(e.getMessage().indexOf("卡号尚未在医疗机构注册过")>0)
            {
                return error(-1,"对不起,您的社保卡有变更,请改天再试");
            }
            else if(e.getMessage().startsWith("error"))
            {
                return error(-1,e.getMessage());
            }
            else{
                return error(-1,"获取门/急诊数据失败!");
            }
        }
    }
    @RequestMapping(value = "/event/healthData", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("获取健康档案详情(基卫)")
    public String getHealthData(@ApiParam(name="event",value="事件ID",defaultValue = "")
                                @RequestParam(value="event",required = true) String event,
                                @ApiParam(name="catalog",value="档案类型",defaultValue = "")
                                @RequestParam(value="catalog",required = true) String catalog,
                                @ApiParam(name="serial",value="该类别顺序号,默认填1",defaultValue = "1")
                                @RequestParam(value="serial",required = true) String serial) {
        try {
            String result = patientRecordService.getHealthData(getRepUID(), event, catalog, serial);
//            String result = patientRecordService.getHealthData(getUID(), event, catalog, serial);
            return write(200, "获取健康档案详情成功!", "data", result);
        } catch (Exception e) {
            if(e.getMessage().indexOf("卡号尚未在医疗机构注册过")>0)
            {
                return error(-1,"对不起,您的社保卡有变更,请改天再试");
            }
            else if(e.getMessage().startsWith("error"))
            {
                return error(-1,e.getMessage());
            }
            else{
                return error(-1,"获取健康档案详情失败!");
            }
        }
    }
    @RequestMapping(value = "/event/catalog", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("通过事件号获取档案类型列表(基卫)")
    public String getEventCatalog(@ApiParam(name="event",value="事件ID",defaultValue = "")
                                @RequestParam(value="event",required = true) String event) {
        try {
            List<Map<String,String>> result = patientRecordService.getEventCatalog(getRepUID(),event);
//            List<Map<String,String>> result = patientRecordService.getEventCatalog(getUID(),event);
            return write(200, "通过事件号获取档案类型列表成功!", "data", result);
        } catch (Exception e) {
            if(e.getMessage().indexOf("卡号尚未在医疗机构注册过")>0)
            {
                return error(-1,"对不起,您的社保卡有变更,请改天再试");
            }
            else if(e.getMessage().startsWith("error"))
            {
                return error(-1,e.getMessage());
            }
            else{
                return error(-1,"获取档案类型列表失败!");
            }
        }
    }
    @RequestMapping(value = "/event/drug", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("获取用药记录(基卫)")
    public String getDrugsList(@ApiParam(name="page",value="第几页",defaultValue = "1")
                                   @RequestParam(value="page",required = true) String page,
                               @ApiParam(name="pageSize",value="每页几行",defaultValue = "10")
                                   @RequestParam(value="pageSize",required = true) String pageSize) {
        try {
            String result = patientRecordService.getDrugsListPage(getRepUID(), page, pageSize);     //"P20161008001"
//            String result = patientRecordService.getDrugsListPage(getUID(), page, pageSize);     //"P20161008001"
            return write(200, "获取用药记录成功!", "data", result);
        } catch (Exception e) {
            if(e.getMessage().indexOf("卡号尚未在医疗机构注册过")>0)
            {
                return error(-1,"对不起,您的社保卡有变更,请改天再试");
            }
            else if(e.getMessage().startsWith("error"))
            {
                return error(-1,e.getMessage());
            }
            else{
                return error(-1,"获取用药记录失败!");
            }
        }
    }
    @ApiOperation("获取检查检验报告(基卫+APP)")
    @RequestMapping(value = "/event/report", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ResponseBody
    public String getReportList(@ApiParam(name="page",value="第几页",defaultValue = "1")
                                    @RequestParam(value="page",required = true) String page,
                                @ApiParam(name="pageSize",value="每页几行",defaultValue = "10")
                                    @RequestParam(value="pageSize",required = true) String pageSize,
                                @ApiParam(name="lastTime",value="最后一条时间",defaultValue = "2010-10-10 00:00:00")
                                    @RequestParam(value="lastTime",required = false) String lastTime)
    {
        try {
            List<Map<String,String>> result = patientRecordService.getExamAndLabReport(getRepUID(), page, pageSize,lastTime);
//            List<Map<String,String>> result = patientRecordService.getExamAndLabReport(getUID(), page, pageSize,lastTime);
            return write(200, "获取检查检验报告成功!", "data", result);
        } catch (Exception e) {
            if(e.getMessage().indexOf("卡号尚未在医疗机构注册过")>0)
            {
                return error(-1,"对不起,您的社保卡有变更,请改天再试");
            }
            else if(e.getMessage().startsWith("error"))
            {
                return error(-1,e.getMessage());
            }
            else{
                return error(-1,"获取检查检验报告失败!");
            }
        }
    }
    /****************************************** 社区体检 **********************************************************/
    @RequestMapping(value = "list_medical", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("查询居民社区健康体检列表")
    public String medical(
                          @ApiParam(name = "pageIndex", value = "第几页", defaultValue = "")
                          @RequestParam(value = "pageIndex", required = false) Integer pageIndex,
                          @ApiParam(name = "pageSize", value = "每页记录数", defaultValue = "")
                          @RequestParam(value = "pageSize", required = false) Integer pageSize) {
        try{
            Patient p = patientService.findByCode(getRepUID());
//            Patient p = patientService.findByCode(getUID());
            if(p != null){
                JSONArray re = jwArchivesService.getEhrSickMedicalList(p.getIdcard(),pageIndex,pageSize);
                return write(200,"查询成功","list",re);
            }else{
                return error(-1,"患者不存在");
            }
        }catch (Exception e){
            if(e.getMessage().startsWith("error"))
            {
                return error(-1,e.getMessage());
            }
            else{
                return error(-1,"查询居民社区健康体检列表失败!");
            }
        }
    }
    @RequestMapping(value = "medical_detail", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("查询居民社区健康体检详情信息")
    public String medical_detail(@ApiParam(name = "medicalNo", value = "体检ID", defaultValue = "1249652")
                                 @RequestParam(value="medicalNo",required = true) String medicalNo){
        try{
            JSONObject json = jwArchivesService.getEhrSickMedicalRecord(medicalNo);
            return write(200,"查询成功","medical_detail",json);
        }catch (Exception e){
            if(e.getMessage().startsWith("error"))
            {
                return error(-1,e.getMessage());
            }
            else{
                return error(-1,"查询居民社区健康体检详情失败!");
            }
        }
    }
    /******************************************* 就诊事件管理 **********************************************************/
    @RequestMapping(value = "/event/detail", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
    @ResponseBody
    @ApiOperation("获取就诊事件详情")
    public String getEventDetail(@ApiParam(name="event",value="事件ID",defaultValue = "")
                                 @RequestParam(value="event",required = true) String event)
    {
        try {
            JSONObject result = patientEventService.getEventDetail(event);
            return write(200, "获取就诊事件详情成功!", "data", result);
        } catch (Exception e) {
            return invalidUserException(e, -1, "获取就诊事件详情失败!");
        }
    }
    @RequestMapping(value = "/event/save", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("保存就诊事件详情")
    public String saveEventDetail(@ApiParam(name="data",value="就诊事件json数据",defaultValue = "")
                                 @RequestParam(value="data",required = true) String data)
    {
        try {
            patientEventService.saveEventDetail(data, getRepUID());
//            patientEventService.saveEventDetail(data, getUID());
            return write(200, "保存就诊事件成功!");
        } catch (Exception e) {
            return invalidUserException(e, -1, "保存就诊事件失败!");
        }
    }
    @RequestMapping(value = "/event/delete", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("删除就诊事件")
    public String deleteEvent(@ApiParam(name="event",value="就诊事件id",defaultValue = "")
                                  @RequestParam(value="event",required = true) Long event)
    {
        try {
            patientEventService.deleteEvent(event);
            return write(200, "删除就诊事件成功!");
        } catch (Exception e) {
            return invalidUserException(e, -1, "删除就诊事件失败!");
        }
    }
    @RequestMapping(value = "/event/uploadImg", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("单张上传图片")
    public String uploadImg(@ApiParam(name="mediaId",value="微信图片标识",defaultValue = "wL1vfE9g1fiRCl5xd-Xotl1XycWQ9mwigDLUv-S0Kmde-pXNrlySKbf5RM5SwwFl")
                            @RequestParam(value="mediaId",required = true) String mediaId)
    {
        try {
            String url ="";
            FastDFSUtil fastDFSUtil = new FastDFSConfig().fastDFSUtil();
            InputStream wxImg = getInputStream(mediaId);
            ObjectNode result = fastDFSUtil.upload(wxImg, "jpg", "");
            wxImg.close();
            String serverUrl = SystemConf.getInstance().getSystemProperties().getProperty("fastdfs_file_url");
            if (result != null) {
                url = serverUrl
                        + result.get("groupName").toString().replaceAll("\"", "") + "/"
                        + result.get("remoteFileName").toString().replaceAll("\"", "");
            }
            else{
                return write(-1, "图片上传失败!");
            }
            return write(200, "图片上传成功!","url", url);
        } catch (Exception e) {
            return invalidUserException(e,-1, "图片上传失败!");
        }
    }
    @RequestMapping(value = "/event/img/delete", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("删除就诊事件图片")
    public String deleteEventImg(@ApiParam(name="id",value="就诊事件图片id",defaultValue = "")
                              @RequestParam(value="id",required = true) Long id)
    {
        try {
            patientEventService.deleteEventImg(id);
            return write(200, "删除就诊事件图片成功!");
        } catch (Exception e) {
            return invalidUserException(e, -1, "删除就诊事件图片失败!");
        }
    }
    @RequestMapping(value = "/event/img/add", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("新增就诊事件图片")
    public String addEventImg(@ApiParam(name="eventId",value="就诊事件id",defaultValue = "")
                                 @RequestParam(value="eventId",required = true) Long eventId,
                              @ApiParam(name="imgType",value="图片类别",defaultValue = "")
                              @RequestParam(value="imgType",required = true) String imgType,
                              @ApiParam(name="imgLabel",value="图片标签",defaultValue = "")
                                  @RequestParam(value="imgLabel",required = true) String imgLabel,
                              @ApiParam(name="imgUrl",value="图片路径",defaultValue = "")
                                  @RequestParam(value="imgUrl",required = true) String imgUrl)
    {
        try {
            patientEventService.addEventImg(eventId,imgType,imgLabel,imgUrl);
            return write(200, "新增就诊事件图片成功!");
        } catch (Exception e) {
            return invalidUserException(e, -1, "新增就诊事件图片失败!");
        }
    }
    @RequestMapping(value = "/event/img/edit", produces = "application/json;charset=UTF-8", method = RequestMethod.POST)
    @ResponseBody
    @ApiOperation("修改就诊事件图片")
    public String editEventImg(@ApiParam(name="id",value="就诊事件图片id",defaultValue = "")
                              @RequestParam(value="id",required = true) Long id,
                              @ApiParam(name="imgType",value="图片类别",defaultValue = "")
                              @RequestParam(value="imgType",required = true) String imgType,
                              @ApiParam(name="imgLabel",value="图片标签",defaultValue = "")
                              @RequestParam(value="imgLabel",required = true) String imgLabel)
    {
        try {
            patientEventService.editEventImg(id,imgType,imgLabel);
            return write(200, "修改就诊事件图片成功!");
        } catch (Exception e) {
            return invalidUserException(e, -1, "修改就诊事件图片失败!");
        }
    }
}

+ 0 - 42
patient-co-wlyy/src/main/java/com/yihu/wlyy/web/swagger/SwaggerConfig.java

@ -1,42 +0,0 @@
package com.yihu.wlyy.web.swagger;
import org.springframework.context.annotation.Bean;
import org.springframework.web.context.request.async.DeferredResult;
import springfox.documentation.builders.PathSelectors;
import springfox.documentation.service.ApiInfo;
import springfox.documentation.spi.DocumentationType;
import springfox.documentation.spring.web.plugins.Docket;
import springfox.documentation.swagger2.annotations.EnableSwagger2;
@EnableSwagger2
public class SwaggerConfig {
    private static final String PUBLIC_API = "Default";
    @Bean
    public Docket publicAPI() {
        return new Docket(DocumentationType.SWAGGER_2)
                .groupName(PUBLIC_API)
                .genericModelSubstitutes(DeferredResult.class)
                .useDefaultResponseMessages(false)
                .forCodeGeneration(true)
                .pathMapping("/")
                .select()
                .paths(PathSelectors.regex("/.*"))
                .build()
                .apiInfo(publicApiInfo());
    }
    private ApiInfo publicApiInfo() {
        ApiInfo apiInfo = new ApiInfo("三师平台API",
                "向PC端,微信、App等应用提供功能与数据接口。",
                "1.0",
                "No terms of service",
                "admin@jkzl.com",
                "The Apache License, Version 2.0",
                "http://www.apache.org/licenses/LICENSE-2.0.html"
        );
        return apiInfo;
    }
}

+ 0 - 111
patient-co-wlyy/src/main/resources/application.properties

@ -1,111 +0,0 @@
####--------------IMPORTANT!!! PRODUCTION ENVIRONMENT------------------#####
#mysql database setting
#jdbc.driver=com.mysql.jdbc.Driver
#jdbc.url=jdbc:mysql://59.61.92.94:3306/wlyy?useUnicode=true&amp;characterEncoding=utf-8&amp;autoReconnect=true
#jdbc.username=wlyy
#jdbc.password=jkzlehr@123
#
#fv.jdbc.driver=com.mysql.jdbc.Driver
#fv.jdbc.url=jdbc:mysql://59.61.92.94:3306/fv?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#fv.jdbc.username=wlyy
#fv.jdbc.password=jkzlehr@123
#
#health.jdbc.driver=com.mysql.jdbc.Driver
#health.jdbc.url=jdbc:mysql://59.61.92.94:3306/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#health.jdbc.username=wlyy
#health.jdbc.password=jkzlehr@123
#
#
#redis.host=120.41.253.95
#redis.port=6380
#redis.password=jkzl_ehr
####--------------IMPORTANT!!! DEMO ENVIRONMENT------------------#####
#mysql database setting
#mysql database setting
#jdbc.driver=com.mysql.jdbc.Driver
#jdbc.url=jdbc:mysql://11.1.2.24:3306/wlyy?useUnicode=true&amp;characterEncoding=utf-8&amp;autoReconnect=true
#jdbc.username=wlyy
#jdbc.password=jkzlehr@123
#
#fv.jdbc.driver=com.mysql.jdbc.Driver
#fv.jdbc.url=jdbc:mysql://11.1.2.24:3306/fv?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#fv.jdbc.username=wlyy
#fv.jdbc.password=jkzlehr@123
#
#health.jdbc.driver=com.mysql.jdbc.Driver
#health.jdbc.url=jdbc:mysql://11.1.2.24:3306/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#health.jdbc.username=wlyy
#health.jdbc.password=jkzlehr@123
#
#jdbc.pool.maxIdle=10
#jdbc.pool.maxActive=50
#
#redis.host=11.1.2.20
#redis.port=6379
##redis.pass=java2000_wl
#
#
#redis.maxIdle=300
#redis.maxActive=600
#redis.maxWait=1000
#redis.testOnBorrow=true
##------------------------------------�����������ݿ�����------------------------------------#
### mysql database setting
#jdbc.driver=com.mysql.jdbc.Driver
#jdbc.url=jdbc:mysql://172.19.103.77/wlyy?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#jdbc.username=root
#jdbc.password=123456
#
##### health index
#health.jdbc.driver=com.mysql.jdbc.Driver
#health.jdbc.url=jdbc:mysql://172.19.103.77/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#health.jdbc.username=root
#health.jdbc.password=123456
#
##### suifang
#fv.jdbc.driver=com.mysql.jdbc.Driver
#fv.jdbc.url=jdbc:mysql://172.19.103.77/fv?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#fv.jdbc.username=root
#fv.jdbc.password=123456
#
##### redis
#redis.host=172.19.103.47
#redis.port=6379
#redis.password=
#---------------------------------���Ի������ݿ�����---------------------------------------#
#### mysql database setting
jdbc.driver=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://172.19.103.85/wlyy?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
jdbc.username=linzhou
jdbc.password=linzhou
##### health index
health.jdbc.driver=com.mysql.jdbc.Driver
health.jdbc.url=jdbc:mysql://172.19.103.85/device?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
health.jdbc.username=linzhou
health.jdbc.password=linzhou
##### suifang
fv.jdbc.driver=com.mysql.jdbc.Driver
fv.jdbc.url=jdbc:mysql://172.19.103.85/fv?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
fv.jdbc.username=linzhou
fv.jdbc.password=linzhou
#
##### redis
redis.host=172.19.103.88
redis.port=6379
redis.password=
#-----------------------------------ͨ������--------------------------------------------#
##### redis
redis.maxIdle=300
redis.maxActive=600
redis.maxWait=1000
redis.testOnBorrow=true
##### connection pool settings
jdbc.pool.maxIdle=10
jdbc.pool.maxActive=50

+ 0 - 238
patient-co-wlyy/src/main/resources/applicationContext.xml

@ -1,238 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
       xmlns:task="http://www.springframework.org/schema/task"
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xmlns:context="http://www.springframework.org/schema/context"
       xmlns:jdbc="http://www.springframework.org/schema/jdbc" xmlns:jee="http://www.springframework.org/schema/jee"
       xmlns:tx="http://www.springframework.org/schema/tx" xmlns:jpa="http://www.springframework.org/schema/data/jpa"
       xmlns:aop="http://www.springframework.org/schema/aop" xmlns:util="http://www.springframework.org/schema/util"
       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
		http://www.springframework.org/schema/jdbc http://www.springframework.org/schema/jdbc/spring-jdbc-4.0.xsd
		http://www.springframework.org/schema/jee http://www.springframework.org/schema/jee/spring-jee-4.0.xsd
		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.0.xsd
		http://www.springframework.org/schema/data/jpa http://www.springframework.org/schema/data/jpa/spring-jpa-1.3.xsd
		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd
		http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd"
       default-lazy-init="true">
    <description>Spring公共配置</description>
    <!-- 使用annotation 自动注册bean, 并保证@Required、@Autowired的属性被注入 -->
    <context:component-scan base-package="com.yihu.wlyy">
        <context:exclude-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
    </context:component-scan>
    <task:annotation-driven/>
    <!-- 此处对于定时时间的配置会被注解中的时间配置覆盖,因此,以注解配置为准 -->
    <!-- task:scheduled-tasks scheduler="followUpScheduler">
        <task:scheduled ref="followUpTask" method="push" cron="0 0 6 * * *"/>  
    </task:scheduled-tasks>
    <task:scheduler id="followUpScheduler" pool-size="10"/ -->
    <!-- Jpa Entity Manager 配置 -->
    <bean id="entityManagerFactory" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean"
          autowire-candidate="default">
        <property name="dataSource" ref="dataSource"/>
        <property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapter"/>
        <property name="packagesToScan" value="com.yihu.wlyy.entity"/>
        <property name="jpaProperties">
            <props>
                <!-- 命名规则 My_NAME->MyName -->
                <prop key="hibernate.ejb.naming_strategy">org.hibernate.cfg.ImprovedNamingStrategy</prop>
                <prop key="hibernate.show_sql">true</prop>
            </props>
        </property>
    </bean>
    <bean id="entityManagerFactoryHealth" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
        <property name="dataSource" ref="dataSourceHealth"/>
        <property name="jpaVendorAdapter" ref="hibernateJpaVendorAdapterHealth"/>
        <property name="packagesToScan" value="com.yihu.wlyy.health.entity"/>
        <property name="jpaProperties">
            <props>
                <!-- 命名规则 My_NAME->MyName -->
                <prop key="hibernate.ejb.naming_strategy">org.hibernate.cfg.ImprovedNamingStrategy</prop>
                <prop key="hibernate.show_sql">true</prop>
            </props>
        </property>
    </bean>
    <bean id="hibernateJpaVendorAdapter" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
        <property name="databasePlatform">
            <bean factory-method="getDialect" class="org.springside.modules.persistence.Hibernates">
                <constructor-arg ref="dataSource"/>
            </bean>
        </property>
    </bean>
    <bean id="hibernateJpaVendorAdapterHealth" class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter">
        <property name="databasePlatform">
            <bean factory-method="getDialect" class="org.springside.modules.persistence.Hibernates">
                <constructor-arg ref="dataSourceHealth"/>
            </bean>
        </property>
    </bean>
    <!-- Spring Data Jpa配置 -->
    <jpa:repositories base-package="com.yihu.wlyy.repository" transaction-manager-ref="transactionManager"
                      entity-manager-factory-ref="entityManagerFactory"/>
    <jpa:repositories base-package="com.yihu.wlyy.health.repository" transaction-manager-ref="transactionManagerHealth"
                      entity-manager-factory-ref="entityManagerFactoryHealth"/>
    <!-- Jpa 事务配置 -->
    <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
        <property name="entityManagerFactory" ref="entityManagerFactory"/>
    </bean>
    <!-- Jpa 事务配置 -->
    <bean id="transactionManagerHealth" class="org.springframework.orm.jpa.JpaTransactionManager">
        <property name="entityManagerFactory" ref="entityManagerFactoryHealth"/>
    </bean>
    <!-- 使用annotation定义事务 -->
    <tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true"/>
    <tx:annotation-driven transaction-manager="transactionManagerHealth" proxy-target-class="true"/>
    <!-- JSR303 Validator定义 -->
    <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
    <bean id="jdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
        <property name="dataSource" ref="dataSource"/>
    </bean>
    <bean id="objectMapper" class="com.fasterxml.jackson.databind.ObjectMapper"/>
    <!--quartz任务调度器名称,调度器只能加载与名称相同的任务-->
    <!--<bean id="quartzScheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean" scope="singleton">-->
    <!--<property name="dataSource" ref="dataSource"/>-->
    <!--<property name="configLocation" value="classpath:/quartz.properties" />-->
    <!--<property name="autoStartup" value="true"/>-->
    <!--</bean>-->
    <bean id="poolConfig" class="redis.clients.jedis.JedisPoolConfig">
        <property name="maxIdle" value="${redis.maxIdle}"/>
        <property name="maxTotal" value="${redis.maxActive}"/>
        <property name="maxWaitMillis" value="${redis.maxWait}"/>
        <property name="testOnBorrow" value="${redis.testOnBorrow}"/>
    </bean>
    <bean id="connectionFactory" class="org.springframework.data.redis.connection.jedis.JedisConnectionFactory">
        <property name="hostName" value="${redis.host}"></property>
        <property name="port" value="${redis.port}"></property>
        <property name="password" value="${redis.password}"></property>
        <property name="database" value="0"></property>
        <property name="poolConfig" ref="poolConfig"></property>
    </bean>
    <bean id="redisTemplate" class="org.springframework.data.redis.core.StringRedisTemplate">
        <property name="connectionFactory" ref="connectionFactory"/>
    </bean>
    <util:properties id="sys" location="classpath*:/system.properties"/>
    <beans>
        <context:property-placeholder ignore-unresolvable="true"
                                      location="classpath*:/application.properties"/>
        <!-- 数据源配置, 使用Tomcat JDBC连接池 -->
        <bean id="dataSourceHealth" class="org.apache.tomcat.jdbc.pool.DataSource" destroy-method="close">
            <!-- Connection Info -->
            <property name="driverClassName" value="${jdbc.driver}"/>
            <property name="url" value="${health.jdbc.url}"/>
            <property name="username" value="${health.jdbc.username}"/>
            <property name="password" value="${health.jdbc.password}"/>
            <!-- Connection Pooling Info -->
            <property name="maxActive" value="${jdbc.pool.maxActive}"/>
            <property name="maxIdle" value="${jdbc.pool.maxIdle}"/>
            <property name="minIdle" value="0"/>
            <property name="defaultAutoCommit" value="false"/>
        </bean>
    </beans>
    <!-- production环境 -->
    <beans profile="production">
        <context:property-placeholder ignore-unresolvable="true"
                                      location="classpath*:/application.properties"/>
        <!-- 数据源配置, 使用Tomcat JDBC连接池 -->
        <bean id="dataSource" class="org.apache.tomcat.jdbc.pool.DataSource" destroy-method="close">
            <!-- Connection Info -->
            <property name="driverClassName" value="${jdbc.driver}"/>
            <property name="url" value="${jdbc.url}"/>
            <property name="username" value="${jdbc.username}"/>
            <property name="password" value="${jdbc.password}"/>
            <!-- Connection Pooling Info -->
            <property name="maxActive" value="${jdbc.pool.maxActive}"/>
            <property name="maxIdle" value="${jdbc.pool.maxIdle}"/>
            <property name="minIdle" value="0"/>
            <property name="defaultAutoCommit" value="false"/>
        </bean>
        <!-- 数据源配置,使用应用服务器的数据库连接池 -->
        <!--<jee:jndi-lookup id="dataSource" jndi-name="java:comp/env/jdbc/ExampleDB" />-->
    </beans>
    <!-- local development环境 -->
    <beans profile="development">
        <context:property-placeholder ignore-resource-not-found="true"
                                      location="classpath*:/application.properties,
          			  classpath*:/application.development.properties"/>
        <!-- Tomcat JDBC连接池 -->
        <bean id="dataSource" class="org.apache.tomcat.jdbc.pool.DataSource" destroy-method="close">
            <property name="driverClassName" value="${jdbc.driver}"/>
            <property name="url" value="${jdbc.url}"/>
            <property name="username" value="${jdbc.username}"/>
            <property name="password" value="${jdbc.password}"/>
            <property name="defaultAutoCommit" value="false"/>
        </bean>
    </beans>
    <!-- functional test 环境 -->
    <beans profile="functional">
        <context:property-placeholder ignore-resource-not-found="true"
                                      location="classpath*:/application.properties,
          			  classpath*:/application.functional.properties,
          			  classpath*:/application.functional-local.properties"/>
        <!-- Tomcat JDBC连接池 -->
        <bean id="dataSource" class="org.apache.tomcat.jdbc.pool.DataSource" destroy-method="close">
            <property name="driverClassName" value="${jdbc.driver}"/>
            <property name="url" value="${jdbc.url}"/>
            <property name="username" value="${jdbc.username}"/>
            <property name="password" value="${jdbc.password}"/>
            <property name="defaultAutoCommit" value="false"/>
        </bean>
        <!-- 初始化数据表结构 -->
        <jdbc:initialize-database data-source="dataSource" ignore-failures="ALL">
            <jdbc:script location="classpath:sql/${db.type}/schema.sql"/>
        </jdbc:initialize-database>
    </beans>
    <!-- unit test环境 -->
    <beans profile="test">
        <context:property-placeholder ignore-resource-not-found="true"
                                      location="classpath*:/application.properties,
          			  classpath*:/application.test.properties"/>
        <!-- Spring Simple连接池 -->
        <bean id="dataSource" class="org.springframework.jdbc.datasource.SimpleDriverDataSource">
            <property name="driverClass" value="${jdbc.driver}"/>
            <property name="url" value="${jdbc.url}"/>
            <property name="username" value="${jdbc.username}"/>
            <property name="password" value="${jdbc.password}"/>
        </bean>
        <!-- 初始化数据表结构 与默认数据-->
        <jdbc:initialize-database data-source="dataSource" ignore-failures="ALL">
            <jdbc:script location="classpath:sql/mysql/schema.sql"/>
            <!-- jdbc:script location="classpath:data/h2/import-data.sql" encoding="UTF-8"/ -->
        </jdbc:initialize-database>
    </beans>
</beans>

BIN
patient-co-wlyy/src/main/resources/fastdfs_lib.jar


BIN
patient-co-wlyy/src/main/resources/kaptcha-2.3.2.jar


BIN
patient-co-wlyy/src/main/resources/onepay-java-sdk.jar


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1275
patient-co-wlyy/src/main/resources/sql/mysql/schema.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1288
patient-co-wlyy/src/main/resources/sql/mysql/ssgg_0425.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1819
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0428.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1871
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0503


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1978
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0505.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 1993
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0507.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2105
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0511.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2128
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0512.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2186
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0514.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2227
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0518.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2266
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0519.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2301
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0524.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2521
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0526.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2503
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0530.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2516
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0531.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2516
patient-co-wlyy/src/main/resources/sql/mysql/wlyy_0601.sql


+ 0 - 117
patient-co-wlyy/src/main/resources/sql/truncate.sql

@ -1,117 +0,0 @@
TRUNCATE TABLE `dm_disease`;
TRUNCATE TABLE `dm_hospital_dept`;
TRUNCATE TABLE `dm_intervene_item_type`;
TRUNCATE TABLE `dm_job`;
TRUNCATE TABLE `dm_medicines`;
TRUNCATE TABLE `dm_relationship`;
TRUNCATE TABLE `dm_rsa`;
TRUNCATE TABLE `dm_sequence`;
TRUNCATE TABLE `dm_service`;
TRUNCATE TABLE `dm_sports`;
TRUNCATE TABLE `dm_sports_type`;
TRUNCATE TABLE `wlyy_advert`;
TRUNCATE TABLE `wlyy_chat_log`;
TRUNCATE TABLE `wlyy_complaint_doctor`;
TRUNCATE TABLE `wlyy_consult`;
TRUNCATE TABLE `wlyy_consult_communication`;
TRUNCATE TABLE `wlyy_consult_communication_reply`;
TRUNCATE TABLE `wlyy_consult_movi`;
TRUNCATE TABLE `wlyy_consult_movi_referral`;
TRUNCATE TABLE `wlyy_consult_public`;
TRUNCATE TABLE `wlyy_consult_public_reply`;
TRUNCATE TABLE `wlyy_consult_team`;
TRUNCATE TABLE `wlyy_consult_team_doctor`;
TRUNCATE TABLE `wlyy_consult_team_log`;
TRUNCATE TABLE `wlyy_doctor`;
TRUNCATE TABLE `wlyy_doctor_address`;
TRUNCATE TABLE `wlyy_doctor_comment`;
TRUNCATE TABLE `wlyy_doctor_medical_records_part`;
TRUNCATE TABLE `wlyy_doctor_medical_records_part_item`;
TRUNCATE TABLE `wlyy_doctor_patient_group_info`;
TRUNCATE TABLE `wlyy_doctor_scheduling`;
TRUNCATE TABLE `wlyy_doctor_scheduling_times`;
TRUNCATE TABLE `wlyy_doctor_service`;
TRUNCATE TABLE `wlyy_doctor_statistics_comment`;
TRUNCATE TABLE `wlyy_doctor_statistics_consult`;
TRUNCATE TABLE `wlyy_doctor_team`;
TRUNCATE TABLE `wlyy_doctor_team_info`;
TRUNCATE TABLE `wlyy_followup_item_record`;
TRUNCATE TABLE `wlyy_followup_item_record_answer`;
TRUNCATE TABLE `wlyy_followup_item_record_question`;
TRUNCATE TABLE `wlyy_followup_item_record_question_option`;
TRUNCATE TABLE `wlyy_followup_plan`;
TRUNCATE TABLE `wlyy_followup_plan_doctor`;
TRUNCATE TABLE `wlyy_followup_plan_stage`;
TRUNCATE TABLE `wlyy_followup_plan_stage_item`;
TRUNCATE TABLE `wlyy_followup_plan_stage_item_question`;
TRUNCATE TABLE `wlyy_followup_plan_stage_item_question_option`;
TRUNCATE TABLE `wlyy_followup_plan_stage_target`;
TRUNCATE TABLE `wlyy_followup_question`;
TRUNCATE TABLE `wlyy_followup_question_option`;
TRUNCATE TABLE `wlyy_followup_summary`;
TRUNCATE TABLE `wlyy_followup_tc`;
TRUNCATE TABLE `wlyy_followup_tc_option`;
TRUNCATE TABLE `wlyy_followup_template`;
TRUNCATE TABLE `wlyy_followup_template_plan`;
TRUNCATE TABLE `wlyy_followup_template_question`;
TRUNCATE TABLE `wlyy_followup_template_question_option`;
TRUNCATE TABLE `wlyy_friends_log`;
TRUNCATE TABLE `wlyy_group_chat_log`;
TRUNCATE TABLE `wlyy_health_edu_article`;
TRUNCATE TABLE `wlyy_health_edu_article_patient`;
TRUNCATE TABLE `wlyy_health_news`;
TRUNCATE TABLE `wlyy_inspect`;
TRUNCATE TABLE `wlyy_inspect_info`;
TRUNCATE TABLE `wlyy_intervene`;
TRUNCATE TABLE `wlyy_medical_edu_article`;
TRUNCATE TABLE `wlyy_medical_edu_article_read`;
TRUNCATE TABLE `wlyy_medical_edu_category`;
TRUNCATE TABLE `wlyy_medical_edu_setting`;
TRUNCATE TABLE `wlyy_message`;
TRUNCATE TABLE `wlyy_message_family_contract`;
TRUNCATE TABLE `wlyy_message_health_index`;
TRUNCATE TABLE `wlyy_orders`;
TRUNCATE TABLE `wlyy_orders_detail`;
TRUNCATE TABLE `wlyy_patient`;
TRUNCATE TABLE `wlyy_patient_course`;
TRUNCATE TABLE `wlyy_patient_device`;
TRUNCATE TABLE `wlyy_patient_family`;
TRUNCATE TABLE `wlyy_patient_friend`;
TRUNCATE TABLE `wlyy_patient_gift`;
TRUNCATE TABLE `wlyy_patient_group`;
TRUNCATE TABLE `wlyy_patient_group_info`;
TRUNCATE TABLE `wlyy_patient_health_guidance`;
TRUNCATE TABLE `wlyy_patient_health_index`;
TRUNCATE TABLE `wlyy_patient_health_record_diet`;
TRUNCATE TABLE `wlyy_patient_health_record_medication`;
TRUNCATE TABLE `wlyy_patient_health_record_sports`;
TRUNCATE TABLE `wlyy_patient_health_standard`;
TRUNCATE TABLE `wlyy_patient_inspection_suggest`;
TRUNCATE TABLE `wlyy_patient_medical_records`;
TRUNCATE TABLE `wlyy_patient_medical_records_item`;
TRUNCATE TABLE `wlyy_patient_orders`;
TRUNCATE TABLE `wlyy_patient_remind`;
TRUNCATE TABLE `wlyy_patient_reservation`;
TRUNCATE TABLE `wlyy_patient_reservation_doctors`;
TRUNCATE TABLE `wlyy_patient_self_inspection`;
TRUNCATE TABLE `wlyy_patient_self_inspection_item`;
TRUNCATE TABLE `wlyy_patient_treatment`;
TRUNCATE TABLE `wlyy_pharmacist`;
TRUNCATE TABLE `wlyy_pharmacist_checked`;
TRUNCATE TABLE `wlyy_points_gift`;
TRUNCATE TABLE `wlyy_points_record`;
TRUNCATE TABLE `wlyy_prescription`;
TRUNCATE TABLE `wlyy_prescription_continue`;
TRUNCATE TABLE `wlyy_prescription_info`;
TRUNCATE TABLE `wlyy_prescription_template`;
TRUNCATE TABLE `wlyy_prescription_template_info`;
TRUNCATE TABLE `wlyy_referral`;
TRUNCATE TABLE `wlyy_sign_contract`;
TRUNCATE TABLE `wlyy_sign_family`;
TRUNCATE TABLE `wlyy_sign_web`;
TRUNCATE TABLE `wlyy_sms`;
TRUNCATE TABLE `wlyy_token`;
TRUNCATE TABLE `wlyy_wx_patient`;
TRUNCATE TABLE `wx_access_token`;
TRUNCATE TABLE `wx_jsapi_ticket`;
TRUNCATE TABLE `wx_menu`;

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2517
patient-co-wlyy/src/main/resources/sql/wlyy_0602.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2515
patient-co-wlyy/src/main/resources/sql/wlyy_0606.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2629
patient-co-wlyy/src/main/resources/sql/wlyy_0612.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2699
patient-co-wlyy/src/main/resources/sql/wlyy_0615.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2700
patient-co-wlyy/src/main/resources/sql/wlyy_0620.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2708
patient-co-wlyy/src/main/resources/sql/wlyy_0622.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2541
patient-co-wlyy/src/main/resources/sql/wlyy_finally_20160627.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2559
patient-co-wlyy/src/main/resources/sql/wlyy_finally_20160628.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2580
patient-co-wlyy/src/main/resources/sql/wlyy_finally_20160629.sql


Fichier diff supprimé car celui-ci est trop grand
+ 0 - 2574
patient-co-wlyy/src/main/resources/sql/wlyy_一期备份_20160714.sql


+ 0 - 293
patient-co-wlyy/src/main/resources/system.properties

@ -1,293 +0,0 @@
#-------------------------共同配置-----------------------------#
# 预约配置参数
guahao_url = http://www.xmsmjk.com/UrpNetService/ReservationNet.asmx
guahao_namespace = http://www.zysoft.com.cn/
# 基卫对接服务地址
jw_url = http://59.61.92.90:8072/wlyy_service
# EHR档案服务地址
ehr_used = false
ehr_services = http://localhost:9009/api/v1.0/
ehr_services_base = http://localhost:10220/api/v1.0/
# 微信图文消息URL
doctor_qrcode_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fssgg%2fhtml%2fdoctor-homepage-new.html&amp;response_type=code&amp;scope=snsapi_base&amp;state={doctorCode}#wechat_redirect
doctor_hos_qrcode_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fqygl%2fhtml%2fsearch-doctor.html&amp;response_type=code&amp;scope=snsapi_base&amp;state={hospital}#wechat_redirect
doctor_subscribe_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fqygl%2fhtml%2fsigning-welcome.html&amp;response_type=code&amp;scope=snsapi_base&amp;state=code#wechat_redirect
doctor_town_qrcode_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fqygl%2fhtml%2fsearch-community.html&amp;response_type=code&amp;scope=snsapi_base&amp;state={town}#wechat_redirect
doctor_qrcode_pic_url={server}/images/familycontract.png
doctor_invitel_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&redirect_uri={server}%2fwx%2fhtml%2fssgg%2fhtml%2fdoctor-homepage-new.html&response_type=code&scope=snsapi_base&state={doctorCode}__{invilogcode}__{currentPatient}__{currentZH}__{currentName}#wechat_redirect
#就诊记录
patient_visit_url = https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fjkda%2fhtml%2fjiuzhenjilu.html&amp;response_type=code&amp;scope=snsapi_base&amp;state=STATE#wechat_redirect
#检查检验
patient_inspect_url =https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fjkda%2fhtml%2fjianchajianyan.html&amp;response_type=code&amp;scope=snsapi_base&amp;state=STATE#wechat_redirect
#社区体检
patient_examination_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fjkda%2fhtml%2fjiankangtijian.html&amp;response_type=code&amp;scope=snsapi_base&amp;state=STATE#wechat_redirect
#处方记录
patient_prescription_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fjkda%2fhtml%2fjiankangtijian.html&amp;response_type=code&amp;scope=snsapi_base&amp;state=STATE#wechat_redirect
#就诊记录
patient_visit_pic ={server}/images/visit.png
#检查检验
patient_inspect_pic ={server}/images/inspect.png
#社区体检
patient_examination_pic={server}/images/examination.png
#处方记录
patient_prescription_pic={server}/images/prescriptionRecords.png
patient_operatinginstrutions_pic_url={server}/images/operatinginstructions.png
patient_booking_pic_url={server}/images/booking.png
patient_device_pic_url={server}/images/device.png
patient_family_pic_url={server}/images/myfamily.png
patient_sign_again_pic_url={server}/images/renew.png
patient_consult_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fintroduction%2fhtml%2fyszx.html&amp;response_type=code&amp;scope=snsapi_base&amp;state=code#wechat_redirect
patient_booking_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fintroduction%2fhtml%2fyygh.html&amp;response_type=code&amp;scope=snsapi_base&amp;state=code#wechat_redirect
patient_device_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fintroduction%2fhtml%2ftzsb.html&amp;response_type=code&amp;scope=snsapi_base&amp;state=code#wechat_redirect
patient_family_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fintroduction%2fhtml%2ffamily.html&amp;response_type=code&amp;scope=snsapi_base&amp;state=code#wechat_redirect
patient_sign_again_url=https://open.weixin.qq.com/connect/oauth2/authorize?appid={appId}&amp;redirect_uri={server}%2fwx%2fhtml%2fxuqian%2fhtml%2finformation.html&amp;response_type=code&amp;scope=snsapi_base&amp;state=code#wechat_redirect
# SMS短信配置
yihu_sms_url=https://smsapi.ums86.com:9600/sms/Api/Send.do
yihu_sms_code=229336
yihu_sms_name=jkzldxjr
yihu_sms_password=jkzldxjrpwd123
yihu_guahao_url=http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
yihu_guahao_appid=sanshi
yihu_guahao_secret=sanshi
# 上传文件配置
upload_temp_path=/var/local/temp
image_path=/var/local/upload/images
voice_path=/var/local/upload/voice
chat_file_path=/var/local/upload/chat
#系统管理员token
admin_uid=admin
admin_token=0a5c5258-8863-4b07-a3f9-88c768528ab4
# 签约到期JOB触发时间,每年7月1日零点
sign_end_job_trigger= 0 0 0 1 7 ?
# 续签提醒JOB触发时间 (每7天一次)
sign_again_job_trigger=59 59 23 7/7 * ?
# 续签提醒JOB停止时间
sign_again_job_end=2017-10-1 00:00:00
# 产检提醒JOB触发时间 (每天6点一次)
prenatal_inspector_job_trigger=0 0 6 * * ?
evaluate_score_job = 0 0 */2 * * ?
#统一支付平台支付成功后页面跳转地址
return_url={server}/wx/html/qygl/html/pay_result.html
#-------------------------开发环境配置-------------------------#
# 服务器基本配置
#server_ip=weixin.xmtyw.cn
#server_port=
#server_domain=wlyy-dev
#server_url=http://weixin.xmtyw.cn/wlyy-dev/
#
## 上传文件配置
#image_server=http://weixin.xmtyw.cn/res/images/
#voice_server=http://weixin.xmtyw.cn/res/voice/
#chat_server=http://weixin.xmtyw.cn/res/chat/
#
## 是否签约检查和签约数据上传
#sign_check_upload=http://172.19.103.87:8011/wlyy_service
#
## IM配置
#im_list_get=http://172.19.103.88:3000/
#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
#
## 微信基本配置
#accId=gh_ffd64560fb21
#appId=wxd03f859efdf0873d
#appSecret=2935b54b53a957d9516c920a544f2537
## 个人微信测试平台基本配置
##appId=wxb3827510b2e15012
##appSecret=c5bdedd909ded9c2ee08028487e6f50d
#
#wechat_base_url=http%3a%2f%2fweixin.xmtyw.cn%2fwlyy-dev
#wechat_token=27eb3bb24f149a7760cf1bb154b08040
#
## 微信模板消息ID
##签约邀请
#doctor_invitel_template=TLWrBtNE2kBJaFCdVzDOOnQC8N2TtRY9ZxEzwZXQcR0
##咨询回复
#template_consult_notice=qSOW0DBxO3qEBm4ucG0Ial0jxsOyD7_f2TFK5e-mQEc
##签约成功
#template_sign_success=hDWV_sknKlhxhOwR5h68OCXbAhRpcgnx9INrT8BybE8
##签约失败
#template_sign_failed=ezgttXE7rG4rAboQK2ituG1dKq4PeyCj3LxGJWO_vOA
##健康指导提醒
#template_health_notice=128RCfyCHi22jW8PZzo7vabKMsA3SBv5VeHaDPr2Bhw
##解约提醒
#template_termination=LrrzHjnIF67ww5uQUvSiv3_pVKJiIK4ZE3fKrvsT0AE
##预约成功
#template_appoint_success=Bo2yqNczSU9zkg4wXoouv9tSeefZ6TziggWL3dTXPYE
##预约取消
#template_appoint_failed=pErTBTdweIdrNRf_1Oo62YtQC0aHwPvtLaCzw44JzCQ
##缴费提醒
#template_expenses_remind=BkTGJ8S18qZ3DfaptAXnZznAk8RJjx9v93og5vyO0bs
##健康教育
#template_healthy_article=LA7erINJ0CSsG2G_ZCrgsDaX3krhsI4qg_NSHEyL_l4
##医生变更
#template_doctor_change=TNIDMjduVKgVL4-k71umYLpHROvFB8K6mmm8aZC_EH8
##问卷调查
#template_doctor_survey=IjQvzBy0PLeft2kN9mdBhACXPE9I_jyJywJ6B-JRxsY
##template_doctor_survey=fgYiMntj1amEkE8_GLUPmAIyssUAroJrNSHqvydt-PQ
#
##群发图文消息图片地址
#renew_path=/usr/local/apache-tomcat-8.0.26/webapps/wlyy/images/renew.png
#sign_path=/usr/local/apache-tomcat-8.0.26/webapps/wlyy/images/familycontract.png
#
#
##健康之路开放平台
#yihu_OpenPlatform_url=http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
#yihu_OpenPlatform_appId=9000276
#yihu_OpenPlatform_secret=OKC8BS1KGXTDE9GPP1EO4VYLUXF8DJ7QUP72H613ZXA
#
## FastDFS文件Http访问地址
#fastdfs_file_url=http://172.19.103.54:80/
#
#im数据库名
#im_dataBase =ichat
#-------------------------测试环境配置-------------------------#
# 服务器基本配置
server_ip=ehr.yihu.com
server_port=
server_domain=wlyy
server_url=http://ehr.yihu.com/wlyy/
# 上传文件配置
image_server=http://ehr.yihu.com/res/images/
voice_server=http://ehr.yihu.com/res/voice/
chat_server=http://ehr.yihu.com/res/chat/
# 是否签约检查和签约数据上传
sign_check_upload=http://172.19.103.85:8011/wlyy_service
# IM配置
im_list_get=http://172.19.103.88:3000/
im_group_server=http://172.19.103.88:3000/api/v1/chats/gm
msg_push_server=http://172.19.103.88:3000/api/v1/chats/sm
# 微信基本配置
accId=gh_ffd64560fb21
appId=wx1f129f7b51701428
appSecret=988f005d8309ed1795939e0f042431fb
wechat_base_url=http%3a%2f%2fehr.yihu.com%2fwlyy
wechat_token=27eb3bb24f149a7760cf1bb154b08040
# 微信模板消息ID
#签约邀请
doctor_invitel_template=uXdBJVbrhKG-WLaCG4s8C4SXSr2kknQ94vKFt-3rIiA
#咨询回复
template_consult_notice=-dr4QNyFoRvVsf8uWxXMC1dRyjwnbUuJwJ21vBLhf18
#签约成功
template_sign_success=VYGj8OUKj6FH4i4_nZS2UAHurJxQHx-7_OBPILIdB8s
#签约失败
template_sign_failed=m221Jrkm0UUY00ExTCpQNTB8t_1U_V4LR9Bg8BgH9-o
#健康指导提醒
template_health_notice=5Nts8lA_at9Cd1JuTK-qDxx95lchpcmUfPTEwYDgXYQ
#解约提醒
template_termination=qZm1NwSueAsbHaOf9DrnLoSj0X5gZuh9W7aDYzLWNds
#预约成功
template_appoint_success=-vU5x2tGyk1zUngBrEqMfnFqqMa6M8J98w8k5MCSUYM
#预约取消
template_appoint_failed=r-bVEKgXVyl8O96saoJXlLd7DX1zW7fXA4a0PZHxiQM
#缴费提醒
template_expenses_remind=pZby4Mz3H5angmjGTuvXzo9lwlaVfEiqORwI8soI-5E
#健康教育
template_healthy_article=aO_qqk5nAXaGXhsikPVLNelqzwlrp1LTPfIQ1qRMpxo
#医生变更
template_doctor_change=V5h0F84t972kUzQvWy8qYrgdaYGJVj10pFeFVl19Nb8
#问卷调查
template_doctor_survey=OqQXrb-e43_TJpq_70_K_y6vYJgY5mpjFYY4c5RWFP4
#群发图文消息图片地址
renew_path=/usr/local/apache-tomcat-8.0.36/webapps/wlyy/images/renew.png
sign_path=/usr/local/apache-tomcat-8.0.36/webapps/wlyy/images/familycontract.png
# FastDFS文件Http访问地址
fastdfs_file_url=http://172.19.103.54:80/
#健康之路开放平台
yihu_OpenPlatform_url=http://ssotest.yihu.cn/OpenPlatform/cgiBin/1.0/
yihu_OpenPlatform_appId=9000276
yihu_OpenPlatform_secret=OKC8BS1KGXTDE9GPP1EO4VYLUXF8DJ7QUP72H613ZXA
#im数据库名
im_dataBase = im_new
#-------------------------正式环境配置-------------------------#
## 服务器基本配置
#server_ip=www.xmtyw.cn
#server_port=
#server_domain=wlyy
#server_url=http://www.xmtyw.cn/wlyy/
#
## 上传文件配置
#image_server=http://www.xmtyw.cn/res/images/
#voice_server=http://www.xmtyw.cn/res/voice/
#chat_server=http://www.xmtyw.cn/res/chat/
#
## 是否签约检查和签约数据上传
#sign_check_upload=http://59.61.92.90:8072/wlyy_service
#
## IM配置
#im_list_get=http://120.41.253.95:3000/
#im_group_server=http://120.41.253.95:3000/api/v1/chats/gm
#msg_push_server=http://120.41.253.95:3000/api/v1/chats/sm
#
## 微信基本配置
#accId=gh_ffd64560fb21
#appId=wxad04e9c4c5255acf
#appSecret=ae77c48ccf1af5d07069f5153d1ac8d3
#wechat_token=27eb3bb24f149a7760cf1bb154b08040
#wechat_base_url=http%3a%2f%2fwww.xmtyw.cn%2fwlyy
#
## 微信模板消息ID
##签约邀请
#doctor_invitel_template=MQn79bx1ofb6hekhmRIuqLU7KjySJQzaBzrimgqVrzA
##咨询回复
#template_consult_notice=0mF_vHj-ILx8EH8DwzmAi7LqzjqYiU9IrSRRmziTZyc
##签约成功
#template_sign_success=0D2vYZVRzFz15p9Y_pkZ1DKutDq8UOsks79FXUKS0tA
##签约失败
#template_sign_failed=My2VNERjJt4NXR4Ibh42pdrP6B6ka8rQxZeWinQh99s
##健康指导提醒
#template_health_notice=uv31ES_VCmq3tBYtyGmEQvIwU_zh9LDhF3bFpbIUt5g
##解约提醒
#template_termination=C0tdXtA_8k-Cy4a1EkzQuI877vqaqAtRkc-e_Gsd7sk
##预约成功
#template_appoint_success=FY3Pqa66tHIE1Fv-irbFBPOh5cYP71fkOzfZKH4S-Fo
##预约取消
#template_appoint_failed=tldWEb9AN7p_RoHoD8ml0GxWW3V1V_mpEEhp2v6p56s
##缴费提醒
#template_expenses_remind=AcrlihhoGbm22A8cdFFDQ4u38ptRw0aiIPf-aGvNxMM
##健康教育
#template_healthy_article=a5-ZGf-IUUULsuRNoHWQiBMU6pSYhLgPPqV67SjdLRo
##医生变更
#template_doctor_change=dtzSHImbPKfwcrjWlJEjAw3lGlvrLjsobSOE8g4adZA
##问卷调查
#template_doctor_survey=8ZWKJmoJ7VR7Uk4YS7aa0Z94QzCkxsyTW6R4CHhUJII
#
##群发图文消息图片地址
#renew_path=/usr/local/tomcat8/webapps/wlyy/images/renew.png
#sign_path=/usr/local/tomcat8/webapps/wlyy/images/familycontract.png
#
## FastDFS文件Http访问地址
#fastdfs_file_url=http://www.xmtyw.cn/
#
##健康之路开放平台
#yihu_OpenPlatform_url=http://api.yihu.com.cn/OpenPlatform/cgiBin/1.0/
#yihu_OpenPlatform_appId=9000276
#yihu_OpenPlatform_secret=2JGL19AH3JS55MQY6ZOFJE1JZJ1OF23GWV67MCDQV74
#
##im数据库名
#im_dataBase =ichat

+ 0 - 13
patient-co-wlyy/src/main/webapp/WEB-INF/decorators.xml

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/2002/xmlspec/dtd/2.10/xmlspec.dtd">
<decorators defaultdir="/WEB-INF/layouts/">
	<excludes>
		<pattern>/static/*</pattern>
		<pattern>/api/*</pattern>
		<pattern>/*</pattern>
	</excludes>
	
	<decorator name="default" page="default.jsp">
		<pattern>/*</pattern>
	</decorator>
</decorators>

+ 0 - 95
patient-co-wlyy/src/main/webapp/WEB-INF/spring-mvc.xml

@ -1,95 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://www.springframework.org/schema/beans"
	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	   xmlns:task="http://www.springframework.org/schema/task"
	   xmlns:context="http://www.springframework.org/schema/context"
	   xmlns:mvc="http://www.springframework.org/schema/mvc" xmlns:aop="http://www.springframework.org/schema/aop"
	   xsi:schemaLocation="http://www.springframework.org/schema/mvc http://www.springframework.org/schema/mvc/spring-mvc-4.0.xsd
		 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
		 http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.0.xsd
        http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.0.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
	<!-- 自动扫描且只扫描@Controller -->
	<context:component-scan base-package="com.yihu.wlyy" >
		<context:include-filter type="annotation" expression="org.springframework.stereotype.Controller"/>
	</context:component-scan>
	<aop:aspectj-autoproxy proxy-target-class="true" expose-proxy="true"> </aop:aspectj-autoproxy>
	<task:annotation-driven />
    <mvc:resources mapping="swagger-ui.html" location="classpath:/META-INF/resources/"/>
    <mvc:resources mapping="/webjars/**" location="classpath:/META-INF/resources/webjars/"/>
    <!-- Enables swagger ui-->
    <mvc:resources mapping="swagger-ui.html" location="classpath:/META-INF/resources/"/>
    <mvc:resources mapping="/webjars/**" location="classpath:/META-INF/resources/webjars/"/>
    <!-- Include a swagger configuration-->
    <bean name="applicationSwaggerConfig" class="com.yihu.wlyy.web.swagger.SwaggerConfig"/>
	<mvc:annotation-driven>
		<mvc:message-converters register-defaults="true">
			<!-- 将StringHttpMessageConverter的默认编码设为UTF-8 -->
			<bean class="org.springframework.http.converter.StringHttpMessageConverter">
		    	<constructor-arg value="UTF-8" />
			</bean>
			<!-- 将Jackson2HttpMessageConverter的默认格式化输出设为true -->
			<bean class="org.springframework.http.converter.json.MappingJackson2HttpMessageConverter">
                <property name="prettyPrint" value="true"/>
            </bean>			
  		</mvc:message-converters>
	</mvc:annotation-driven>
	
	<!-- 定义JSP文件的位置 --> 
	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
		<property name="prefix" value="/WEB-INF/views/"/>
		<property name="suffix" value=".jsp"/>
	</bean>
	
			
	<!-- 容器默认的DefaultServletHandler处理 所有静态内容与无RequestMapping处理的URL-->	
	<mvc:default-servlet-handler/>
	
	<!-- 定义无需Controller的url<->view直接映射 -->
	<mvc:view-controller path="/" view-name="redirect:/index"/>
	
	<!-- 将Controller抛出的异常转到特定View, 保持SiteMesh的装饰效果 -->
	<bean class="org.springframework.web.servlet.handler.SimpleMappingExceptionResolver">  
		<property name="exceptionMappings">  
			<props>  
				<prop key="java.lang.Throwable">error/500</prop>
            </props>  
		</property>  
    </bean>
    
    <!-- 文件上传配置 -->
    <bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver">
		<property name="defaultEncoding">
			<value>UTF-8</value>
		</property>
		<property name="maxUploadSize">
			<!-- 上传文件大小限制为31M,50*1024*1024 -->
			<value>52428800</value>
		</property>
		<property name="maxInMemorySize">
			<value>4096</value>
		</property>
	</bean>
	<!--<mvc:interceptors>
		<mvc:interceptor>
	        <mvc:mapping path="/patient/**"/>
	        <bean class="com.yihu.wlyy.interceptors.PatientInterceptor"/>
	    </mvc:interceptor>
	    <mvc:interceptor>
	        <mvc:mapping path="/doctor/**"/>
	        <bean class="com.yihu.wlyy.interceptors.DoctorInterceptor"/>
	    </mvc:interceptor>
	    <mvc:interceptor>
	        <mvc:mapping path="/user/**"/>
	        <bean class="com.yihu.wlyy.interceptors.UserInterceptor"/>
	    </mvc:interceptor>
	</mvc:interceptors>-->
</beans>

+ 0 - 16
patient-co-wlyy/src/main/webapp/WEB-INF/views/error/404.jsp

@ -1,16 +0,0 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%response.setStatus(200);%>
<!DOCTYPE html>
<html>
<head>
	<title>404 - 页面不存在</title>
</head>
<body>
	<h2>404 - 页面不存在.</h2>
	<p><a href="<c:url value="/"/>">返回首页</a></p>
</body>
</html>

+ 0 - 21
patient-co-wlyy/src/main/webapp/WEB-INF/views/error/500.jsp

@ -1,21 +0,0 @@
<%@ page contentType="text/html;charset=UTF-8" isErrorPage="true" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ page import="org.slf4j.Logger,org.slf4j.LoggerFactory" %>
<%	
	//设置返回码200,避免浏览器自带的错误页面
	response.setStatus(200);
	//记录日志
	Logger logger = LoggerFactory.getLogger("500.jsp");
	logger.error(exception.getMessage(), exception);
%>
<!DOCTYPE html>
<html>
<head>
	<title>500 - 系统内部错误</title>
</head>
<body>
	<h2>500 - 系统发生内部错误.</h2>
</body>
</html>

+ 0 - 4
patient-co-wlyy/src/main/webapp/WEB-INF/views/index.jsp

@ -1,4 +0,0 @@
<%@ page contentType="text/html;charset=UTF-8" %>
<%
	response.sendRedirect(request.getContextPath()+"/html/index.html");
%>

+ 0 - 72
patient-co-wlyy/src/main/webapp/WEB-INF/web.xml

@ -1,72 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
	xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
	version="2.5">
  <display-name>wlyy</display-name>
  <context-param>
     <!-- classpath*:/applicationContext-shiro.xml -->
    <param-name>contextConfigLocation</param-name>
    <param-value>
			classpath*:/applicationContext.xml
		</param-value>
  </context-param>
  <context-param>
    <param-name>spring.profiles.active</param-name>
    <param-value>production</param-value>
  </context-param>
  <listener>
    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
  </listener>
  <filter>
    <filter-name>encodingFilter</filter-name>
    <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
    <init-param>
      <param-name>encoding</param-name>
      <param-value>UTF-8</param-value>
    </init-param>
    <init-param>
      <param-name>forceEncoding</param-name>
      <param-value>true</param-value>
    </init-param>
  </filter>
  <filter-mapping>
    <filter-name>encodingFilter</filter-name>
    <url-pattern>/*</url-pattern>
  </filter-mapping>
  <filter>
    <filter-name>openEntityManagerInViewFilter</filter-name>
    <filter-class>org.springframework.orm.jpa.support.OpenEntityManagerInViewFilter</filter-class>
  </filter>
  <filter-mapping>
    <filter-name>openEntityManagerInViewFilter</filter-name>
    <url-pattern>/*</url-pattern>
  </filter-mapping>
  <servlet>
    <servlet-name>springServlet</servlet-name>
    <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class>
    <init-param>
      <param-name>contextConfigLocation</param-name>
      <param-value>/WEB-INF/spring-mvc.xml</param-value>
    </init-param>
    <load-on-startup>1</load-on-startup>
  </servlet>
  <servlet-mapping>
    <servlet-name>springServlet</servlet-name>
    <url-pattern>/</url-pattern>
  </servlet-mapping>
  <session-config>
    <session-timeout>20</session-timeout>
  </session-config>
  <!--<error-page>-->
    <!--<exception-type>java.lang.Throwable</exception-type>-->
    <!--<location>/WEB-INF/views/error/500.jsp</location>-->
  <!--</error-page>-->
  <!--<error-page>-->
    <!--<error-code>500</error-code>-->
    <!--<location>/WEB-INF/views/error/500.jsp</location>-->
  <!--</error-page>-->
  <!--<error-page>-->
    <!--<error-code>404</error-code>-->
    <!--<location>/WEB-INF/views/error/404.jsp</location>-->
  <!--</error-page>-->
</web-app>

patient-co-analysis/pom.xml → patient-co/patient-co-analysis/pom.xml


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/Application.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/Application.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/config/SchedulingConfig.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/config/SchedulingConfig.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/config/kafka/KafkaConsumerConfig.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/config/kafka/KafkaConsumerConfig.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/config/kafka/KafkaProducerConfig.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/config/kafka/KafkaProducerConfig.java


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


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/controller/KafKaTest.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/controller/KafKaTest.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/entity/UserPortrait.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/entity/UserPortrait.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/BusinessTypeEnum.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/BusinessTypeEnum.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/ETLConstantData.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/ETLConstantData.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/ILogTransform.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/ILogTransform.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/LogDataTransform.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/LogDataTransform.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/ConsultLogTransform.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/ConsultLogTransform.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/HealthArchiveLogTransform.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/HealthArchiveLogTransform.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/HealthIndexTransform.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/HealthIndexTransform.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/RegisterLogTransform.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/transform/RegisterLogTransform.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/util/IdcardUtil.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/etl/util/IdcardUtil.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/listener/LabelDataListener.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/listener/LabelDataListener.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/BusinessDataModel.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/BusinessDataModel.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/DataModel.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/DataModel.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/OperatorDataModel.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/OperatorDataModel.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/emun/BusinessType.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/model/emun/BusinessType.java


patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/repository/UserPortraitDao.java → patient-co/patient-co-analysis/src/main/java/com/yihu/wlyy/analysis/repository/UserPortraitDao.java


patient-co-analysis/src/main/resources/application.yml → patient-co/patient-co-analysis/src/main/resources/application.yml


patient-co-analysis/src/main/resources/city.properties → patient-co/patient-co-analysis/src/main/resources/city.properties


patient-co-analysis/src/main/resources/quartz.properties → patient-co/patient-co-analysis/src/main/resources/quartz.properties


patient-co-figure/pom.xml → patient-co/patient-co-figure/pom.xml


patient-co-figure/src/main/java/com/yihu/figure/Application.java → patient-co/patient-co-figure/src/main/java/com/yihu/figure/Application.java


patient-co-figure/src/main/java/com/yihu/figure/config/SwaggerConfig.java → patient-co/patient-co-figure/src/main/java/com/yihu/figure/config/SwaggerConfig.java


patient-co-figure/src/main/java/com/yihu/figure/config/quartz/JobFactory.java → patient-co/patient-co-figure/src/main/java/com/yihu/figure/config/quartz/JobFactory.java


patient-co-figure/src/main/java/com/yihu/figure/config/quartz/SchedulerConfig.java → patient-co/patient-co-figure/src/main/java/com/yihu/figure/config/quartz/SchedulerConfig.java


patient-co-figure/src/main/java/com/yihu/figure/config/war/ServletInitializer.java → patient-co/patient-co-figure/src/main/java/com/yihu/figure/config/war/ServletInitializer.java


patient-co-figure/src/main/java/com/yihu/figure/controller/BaseController.java → patient-co/patient-co-figure/src/main/java/com/yihu/figure/controller/BaseController.java


patient-co-figure/src/main/java/com/yihu/figure/controller/DiseaseController.java → patient-co/patient-co-figure/src/main/java/com/yihu/figure/controller/DiseaseController.java


patient-co-figure/src/main/java/com/yihu/figure/controller/SuggestController.java → patient-co/patient-co-figure/src/main/java/com/yihu/figure/controller/SuggestController.java


patient-co-figure/src/main/java/com/yihu/figure/controller/data/DataController.java → patient-co/patient-co-figure/src/main/java/com/yihu/figure/controller/data/DataController.java


patient-co-figure/src/main/java/com/yihu/figure/controller/drug/MedicineController.java → patient-co/patient-co-figure/src/main/java/com/yihu/figure/controller/drug/MedicineController.java


patient-co-figure/src/main/java/com/yihu/figure/controller/health/HealthEduArticleController.java → patient-co/patient-co-figure/src/main/java/com/yihu/figure/controller/health/HealthEduArticleController.java


+ 0 - 0
patient-co-figure/src/main/java/com/yihu/figure/controller/health/HealthIndexController.java


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff