shiyang / regional-platform

Download as
Browse Code ยป

Commit 3bd30c39233d83e865eb1ab2ff79cf51e8f292f0

Authored by liquanyu
2 parents d6b7a584e9 0975633eb1
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ 3bd30c3
... ... @@ -431,14 +431,14 @@
431 431 boolean isAddStart = Boolean.FALSE;
432 432 Criteria c = null;
433 433 if(null!=lastMensesStart){
434   - c = Criteria.where("lastMenses").gte(dueDateStart);
  434 + c = Criteria.where("lastMenses").gte(lastMensesStart);
435 435 isAddStart = Boolean.TRUE;
436 436 }
437   - if (null != lastMensesStart) {
  437 + if (null != lastMensesEnd) {
438 438 if (isAddStart) {
439   - c = c.lte(lastMensesStart);
  439 + c = c.lte(lastMensesEnd);
440 440 } else {
441   - c = Criteria.where("lastMenses").lte(lastMensesStart);
  441 + c = Criteria.where("lastMenses").lte(lastMensesEnd);
442 442 }
443 443 isAddStart = Boolean.TRUE;
444 444 }
platform-data-api/src/main/resources/log4j.properties View file @ 3bd30c3
... ... @@ -11,4 +11,14 @@
11 11 log4j.appender.FILEOUT.Append=true
12 12 log4j.appender.FILEOUT.layout=org.apache.log4j.PatternLayout
13 13 log4j.appender.FILEOUT.layout.ConversionPattern=[%-5p]_%d{yyyy-MM-dd HH:mm:ss} :%m%n
  14 +
  15 +
  16 +log4j.logger.task= INFO, task
  17 +log4j.appender.task=org.apache.log4j.DailyRollingFileAppender
  18 +log4j.appender.task.File=${catalina.base}/logs/task.log
  19 +log4j.appender.task.DatePattern='.'yyyy-MM-dd
  20 +log4j.appender.task.MaxFileSize=1024000KB
  21 +log4j.appender.task.MaxBackupIndex=10
  22 +log4j.appender.task.layout=org.apache.log4j.PatternLayout
  23 +log4j.appender.task.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss,SSS} [%t] [%c] [%p] - %m%n
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java View file @ 3bd30c3
... ... @@ -185,7 +185,7 @@
185 185 if (riskColorMap.containsKey(entry.getKey())) {
186 186 Data data = new Data();
187 187 data.setValue(entry.getValue());
188   - data.setItemStyle(new ItemStyle(new Normal(null,colormap.get(entry.getKey())),null));
  188 + data.setItemStyle(new ItemStyle(new Normal(true,riskColorMap.get(entry.getKey())),null));
189 189 groupRiskDataList.add(data);
190 190 } else {
191 191 groupRiskDataList.add(entry.getValue());
platform-reportData/src/main/java/com/lymsh/platform/reportdata/model/echarts/AxisPointer.java View file @ 3bd30c3
... ... @@ -10,6 +10,15 @@
10 10 private String type;
11 11 private List<Object> boundaryGap;
12 12 private List<Object> data;
  13 + private Integer interval = 0;
  14 +
  15 + public Integer getInterval() {
  16 + return interval;
  17 + }
  18 +
  19 + public void setInterval(Integer interval) {
  20 + this.interval = interval;
  21 + }
13 22  
14 23 public List<Object> getData() {
15 24 return data;