jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 025cff69a212bb1a01b4af0f2ae4aae200be813e

Authored by jiangjiazhi
2 parents 4a3688aef1 154bd7523a
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java View file @ 025cff6
... ... @@ -979,7 +979,10 @@
979 979 MongoCondition con3 = MongoCondition.newInstance("mphone", queryNo, MongoOper.IS);
980 980 MongoCondition con4 = MongoCondition.newInstance("name", queryNo, MongoOper.LIKE);
981 981 if (c != null) {
982   - c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria());
  982 + //http://jira.healthbaby.com.cn/browse/WEB-2773
  983 + c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria();
  984 + c.getCriteriaObject().putAll(c1.getCriteria().getCriteriaObject());
  985 +// c = c.andOperator(c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria());
983 986 } else {
984 987 c = c1.orCondition(new MongoCondition[]{con1, con2, con3, con4}).getCriteria();
985 988 }
... ... @@ -994,6 +997,8 @@
994 997 }
995 998  
996 999 if (c != null) {
  1000 + System.out.println( c.getCriteriaObject().toString());
  1001 + System.out.println( condition.toMongoQuery().convertToMongoQuery().toString());
997 1002 return new MongoCondition(c.andOperator(condition.getCriteria())).toMongoQuery();
998 1003 }
999 1004 return condition.toMongoQuery();
platform-operate-api/src/main/java/com/lyms/hospitalapi/Cdfy/CdGwInterface.java View file @ 025cff6
... ... @@ -4591,16 +4591,27 @@
4591 4591  
4592 4592  
4593 4593 public void handleWork() {
4594   - java.util.Date end = new java.util.Date();
  4594 + /*java.util.Date end = new java.util.Date();
4595 4595  
4596 4596 Calendar ca = Calendar.getInstance();
4597 4597 ca.setTime(end);
4598 4598 ca.add(Calendar.DATE,-1);
4599   - java.util.Date start = ca.getTime();
  4599 + java.util.Date start = ca.getTime();*/
4600 4600 //java.util.Date start = new java.util.Date(end.getTime()-1000*60*60);
4601 4601  
4602   - String startDate = DateUtil.getyyyy_MM_dd_hms(start);
4603   - String endDate = DateUtil.getyyyy_MM_dd_hms(end);
  4602 +
  4603 + Calendar c = Calendar.getInstance();
  4604 + c.setTime(new java.util.Date());
  4605 + c.add(Calendar.DATE, -1);
  4606 + java.util.Date before = c.getTime();
  4607 + String start = DateUtil.getYyyyMmDd(before)+" 00:00:00";
  4608 + String end = DateUtil.getYyyyMmDd(before)+" 23:59:59";
  4609 +
  4610 + /*String startDate = DateUtil.getyyyy_MM_dd_hms(start);
  4611 + String endDate = DateUtil.getyyyy_MM_dd_hms(end);*/
  4612 +
  4613 + String startDate = start;
  4614 + String endDate = end;
4604 4615 System.out.println("start=" + startDate + "end=" + endDate);
4605 4616 saveYf(startDate, endDate);
4606 4617 saveChuZhen(startDate, endDate);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ 025cff6
... ... @@ -2156,6 +2156,14 @@
2156 2156 return null;
2157 2157 }
2158 2158  
  2159 + @RequestMapping(value = "/cd/dingshirenwu")
  2160 + public void ceshi(){
  2161 + cdGwInterface.handleWork();
  2162 + }
  2163 +
  2164 +
  2165 +
  2166 +
2159 2167 @RequestMapping(value = "/update/servicestatus")
2160 2168 @ResponseBody
2161 2169 public BaseObjectResponse updatePatientServiceStatus(@RequestParam(value = "t", defaultValue = "1") String type) {