Commit bc715618eb64d62a6a4bd8f9eaf6cc1152e295cb

Authored by liquanyu
1 parent 22f7b2169b

建档预产期修改

Showing 2 changed files with 67 additions and 28 deletions

platform-job-index/src/main/java/com/lyms/platform/job/index/service/SyncDataService.java View file @ bc71561
... ... @@ -320,7 +320,9 @@
320 320 type = 3;
321 321 }
322 322  
323   - patients.setDueDate(DateUtil.addDay(DataUtil.getDate(map.get("P_LASTMENSTRUALPERIOD")), 42 * 7));
  323 + Date dueDate = DateUtil.addDay(DateUtil.addMonth(DataUtil.getDate(map.get("P_LASTMENSTRUALPERIOD")), 9), 7);
  324 +
  325 + patients.setDueDate(dueDate);
324 326 person.setCreated(new Date());
325 327  
326 328 person.setId(String.valueOf(map.get("PID")));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java View file @ bc71561
... ... @@ -4,9 +4,14 @@
4 4 import com.lyms.platform.biz.JdbcUtil;
5 5 import com.lyms.platform.biz.service.AssayConfigService;
6 6 import com.lyms.platform.biz.service.PatientsService;
  7 +import com.lyms.platform.common.enums.YnEnums;
  8 +import com.lyms.platform.common.utils.DateUtil;
7 9 import com.lyms.platform.common.utils.JsonUtil;
8 10 import com.lyms.platform.operate.web.service.SyncDataTaskService;
9 11 import com.lyms.platform.pojo.AssayConfig;
  12 +import com.lyms.platform.pojo.Patients;
  13 +import com.lyms.platform.query.PatientsQuery;
  14 +import org.apache.commons.collections.CollectionUtils;
10 15 import org.apache.commons.io.FileUtils;
11 16 import org.springframework.beans.factory.annotation.Autowired;
12 17 import org.springframework.data.mongodb.core.MongoTemplate;
... ... @@ -18,10 +23,8 @@
18 23  
19 24 import java.io.File;
20 25 import java.io.IOException;
21   -import java.util.ArrayList;
22   -import java.util.HashMap;
23   -import java.util.List;
24   -import java.util.Map;
  26 +import java.text.CollationElementIterator;
  27 +import java.util.*;
25 28  
26 29 /**
27 30 * Created by Zhang.Rui on 2016/4/8.
28 31  
29 32  
... ... @@ -114,31 +117,31 @@
114 117 }
115 118  
116 119  
117   - @RequestMapping(value = "/syncData", method = RequestMethod.GET)
118   - @ResponseBody
119   - public String syncData(@RequestParam(required = true) final String oracleHid,@RequestParam(required = true) final Integer mysqlHid) {
120   - final MongoTemplate template = mongoTemplate;
  120 +// @RequestMapping(value = "/syncData", method = RequestMethod.GET)
  121 +// @ResponseBody
  122 +// public String syncData(@RequestParam(required = true) final String oracleHid,@RequestParam(required = true) final Integer mysqlHid) {
  123 +// final MongoTemplate template = mongoTemplate;
  124 +//
  125 +// JdbcUtil.initData(mysqlHid);
  126 +// System.out.println("initData------");
  127 +//
  128 +// new Thread(new Runnable() {
  129 +// @Override
  130 +// public void run() {
  131 +// System.out.print("同步开始儿童>>>>>>>>>>>>>>>>>>>>>>>>>");
  132 +// JdbcUtil.syncDataBaby(oracleHid, template);
  133 +// System.out.print("同步结束儿童>>>>>>>>>>>>>>>>>>>>>>>>>");
  134 +// }
  135 +// }).start();
  136 +//
  137 +//
  138 +//// System.out.println("同步开始孕妇1>>>>>>>>>>>>>>>>>>>>>>>>>");
  139 +//// JdbcUtil.syncDataPat(oracleHid, template);
  140 +//// System.out.println("同步结束孕妇1>>>>>>>>>>>>>>>>>>>>>>>>>");
  141 +// return "starting...........";
  142 +// }
121 143  
122   - JdbcUtil.initData(mysqlHid);
123   - System.out.println("initData------");
124 144  
125   - new Thread(new Runnable() {
126   - @Override
127   - public void run() {
128   - System.out.print("同步开始儿童>>>>>>>>>>>>>>>>>>>>>>>>>");
129   - JdbcUtil.syncDataBaby(oracleHid, template);
130   - System.out.print("同步结束儿童>>>>>>>>>>>>>>>>>>>>>>>>>");
131   - }
132   - }).start();
133   -
134   -
135   -// System.out.println("同步开始孕妇1>>>>>>>>>>>>>>>>>>>>>>>>>");
136   -// JdbcUtil.syncDataPat(oracleHid, template);
137   -// System.out.println("同步结束孕妇1>>>>>>>>>>>>>>>>>>>>>>>>>");
138   - return "starting...........";
139   - }
140   -
141   -
142 145 @RequestMapping(value = "/addSieveJob", method = RequestMethod.GET)
143 146 @ResponseBody
144 147 public String addSieveJob() {
... ... @@ -229,6 +232,40 @@
229 232 public String sieveResult1() {
230 233 syncDataTaskService.syncQhdSieve();
231 234 return "syncQhdSieve finish";
  235 + }
  236 +
  237 + /**
  238 + * 更新医院的孕妇的建档的预产期
  239 + * @param hospitalId
  240 + * @return
  241 + */
  242 + @RequestMapping(value = "/updateDueDate", method = RequestMethod.GET)
  243 + @ResponseBody
  244 + public String updateDueDate(@RequestParam(required = true) String hospitalId) {
  245 + PatientsQuery patientsQuery1 = new PatientsQuery();
  246 + patientsQuery1.setYn(YnEnums.YES.getId());
  247 + patientsQuery1.setHospitalId(hospitalId);
  248 + List<Patients> pats = patientsService.queryPatient(patientsQuery1);
  249 + if (CollectionUtils.isNotEmpty(pats))
  250 + {
  251 + for (Patients pat : pats)
  252 + {
  253 + if (pat != null && pat.getLastMenses() != null)
  254 + {
  255 + Date dueDate = DateUtil.addDay(DateUtil.addMonth(pat.getLastMenses(), 9), 7);
  256 + if (!DateUtil.getyyyy_MM_dd(dueDate).equals(DateUtil.getyyyy_MM_dd(pat.getDueDate())))
  257 + {
  258 + System.out.println(pat.getPhone());
  259 + pat.setDueDate(dueDate);
  260 + patientsService.updatePatient(pat);
  261 + }
  262 +
  263 + }
  264 +
  265 + }
  266 + }
  267 +
  268 + return "update finish";
232 269 }
233 270  
234 271 }