From 5cf77c48c13c0188866720024726b9a90d27281d Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 17 Nov 2016 14:25:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E8=AF=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/biz/service/PatientsService.java | 1 + .../lyms/platform/biz/service/SieveService.java | 20 +++++++++++++- .../java/com/lyms/platform/pojo/SieveModel.java | 2 +- .../operate/web/controller/TestController.java | 32 +++++++++++++++------- .../operate/web/facade/BookbuildingFacade.java | 7 +++++ 5 files changed, 50 insertions(+), 12 deletions(-) diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java index 337b73a..07b3327 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java @@ -243,6 +243,7 @@ public class PatientsService { if (CollectionUtils.isEmpty(list)) { SieveModel sieveModel = convertToModel(patients); sieveModel.setFrom("1"); + SieveService.handOrder(sieveModel); sieveDao.addChanQianSieve(sieveModel); } else { //修改孕妇基本信息 diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java index fd7986c..f317bed 100644 --- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java +++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java @@ -116,6 +116,24 @@ public class SieveService { // } } + /** + * + * 修正产筛order + * + */ + public void correctSieveOrder(){ + SieveQuery sieveQuery = new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setStatus(SieveStatusEnums.O.getId()); + List modelList= queryList(sieveQuery); + if(CollectionUtils.isNotEmpty(modelList)){ + for(SieveModel sieveModel:modelList){ + handOrder(sieveModel); + updateOneChanQianDiaSieve(sieveModel); + } + } + } + public static void handOrder(SieveModel sieveModel) { int days = DateUtil.getDays(sieveModel.getLastMenses(), DateUtil.formatDate(new Date())); int order = 100; @@ -133,7 +151,7 @@ public class SieveService { public static void main(String[] args) { SieveModel sieveModel = new SieveModel(); - sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-2")); + sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-5")); sieveModel.setStatus(1); handOrder(sieveModel); System.out.print(sieveModel.getOrder()); diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java index 36fe92b..2fb864b 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java @@ -52,7 +52,7 @@ public class SieveModel extends BaseModel { //申请产筛时间 private Date applyDate; //排序字段 - private int order; + private Integer order; private String csRemarkTypeId; private String detail; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java index 9e7a1fc..b240055 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -4,6 +4,7 @@ import com.lyms.hospitalapi.qhdfy.QhdfyHisService; import com.lyms.platform.biz.JdbcUtil; import com.lyms.platform.biz.service.AssayConfigService; import com.lyms.platform.biz.service.PatientsService; +import com.lyms.platform.biz.service.SieveService; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.service.SyncDataTaskService; import com.lyms.platform.pojo.AssayConfig; @@ -32,7 +33,7 @@ public class TestController { @Autowired - private MongoTemplate mongoTemplate; + private MongoTemplate mongoTemplate; @Autowired private PatientsService patientsService; @@ -42,6 +43,8 @@ public class TestController { @Autowired private SyncDataTaskService syncDataTaskService; + @Autowired + private SieveService sieveService; /** * 获取科室 @@ -50,7 +53,7 @@ public class TestController { @ResponseBody public List getDepartment() { List list = new ArrayList<>(); - Map m = new HashMap<>(); + Map m = new HashMap<>(); m = new HashMap<>(); m.put("id", String.valueOf(1)); @@ -83,7 +86,7 @@ public class TestController { @ResponseBody public List getSampleTypeEnum() { List list = new ArrayList<>(); - Map m = new HashMap<>(); + Map m = new HashMap<>(); m = new HashMap<>(); m.put("id", String.valueOf(1)); @@ -116,8 +119,8 @@ public class TestController { @RequestMapping(value = "/syncData", method = RequestMethod.GET) @ResponseBody - public String syncData(@RequestParam(required = true) final String oracleHid,@RequestParam(required = true) final Integer mysqlHid) { - final MongoTemplate template = mongoTemplate; + public String syncData(@RequestParam(required = true) final String oracleHid, @RequestParam(required = true) final Integer mysqlHid) { + final MongoTemplate template = mongoTemplate; JdbcUtil.initData(mysqlHid); System.out.println("initData------"); @@ -142,21 +145,24 @@ public class TestController { @RequestMapping(value = "/addSieveJob", method = RequestMethod.GET) @ResponseBody public String addSieveJob() { - patientsService.addSieveJob();; + patientsService.addSieveJob(); + ; return "finish"; } @RequestMapping(value = "/autoMatDeliver", method = RequestMethod.GET) @ResponseBody public String autoMatDeliver() { - patientsService.autoMatDeliver();; + patientsService.autoMatDeliver(); + ; return "finish"; } @RequestMapping(value = "/delSieve", method = RequestMethod.GET) @ResponseBody public String delSieve() { - patientsService.delSieve();; + patientsService.delSieve(); + ; return "finish"; } @@ -175,7 +181,7 @@ public class TestController { public String assayconfiginit(String json) { try { List list = JsonUtil.toList(json, AssayConfig.class); - for (AssayConfig config:list) { + for (AssayConfig config : list) { assayConfigService.save(config); } } catch (Exception e) { @@ -188,7 +194,7 @@ public class TestController { try { String json = FileUtils.readFileToString(new File("d:/assayconfig.json")); List list = JsonUtil.toList(json, AssayConfig.class); - for (AssayConfig config:list) { + for (AssayConfig config : list) { System.out.println(JsonUtil.obj2JsonString(config)); } } catch (IOException e) { @@ -231,4 +237,10 @@ public class TestController { return "syncQhdSieve finish"; } + @RequestMapping(value = "/execsieveorder", method = RequestMethod.GET) + @ResponseBody + public String sieveOrder() { + sieveService.correctSieveOrder(); + return "sieveOrder finish"; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index f4b00bf..578aca8 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -97,6 +97,8 @@ public class BookbuildingFacade { @Autowired private SyncDataService syncDataService; + @Autowired + private SieveService sieveService; /** * 添加孕妇建档 @@ -963,6 +965,11 @@ public class BookbuildingFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.DONT_DELETE).setErrormsg("孕妇存在检查记录,不能删除建档"); } yunBookbuildingService.deletePregnantById(id); + //删除建档需要删除产筛数据 + SieveQuery sieveQuery=new SieveQuery(); + sieveQuery.setYn(YnEnums.YES.getId()); + sieveQuery.setParentId(id); + sieveService.deleteById(sieveQuery); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } -- 1.8.3.1