jiangjiazhi / regional-platform

Commit 5cf77c48c13c0188866720024726b9a90d27281d

Authored by jiangjiazhi over 8 years ago

Exists in master and in 8 other branches

修改转诊

Showing 5 changed files with 50 additions and 12 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SieveService.java
platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java

...	...	@@ -243,6 +243,7 @@
243	243	if (CollectionUtils.isEmpty(list)) {
244	244	SieveModel sieveModel = convertToModel(patients);
245	245	sieveModel.setFrom("1");
	246	+ SieveService.handOrder(sieveModel);
246	247	sieveDao.addChanQianSieve(sieveModel);
247	248	} else {
248	249	//修改孕妇基本信息

...	...	@@ -116,6 +116,24 @@
116	116	// }
117	117	}
118	118
	119	+ /**
	120	+ *
	121	+ * 修正产筛order
	122	+ *
	123	+ */
	124	+ public void correctSieveOrder(){
	125	+ SieveQuery sieveQuery = new SieveQuery();
	126	+ sieveQuery.setYn(YnEnums.YES.getId());
	127	+ sieveQuery.setStatus(SieveStatusEnums.O.getId());
	128	+ List<SieveModel> modelList= queryList(sieveQuery);
	129	+ if(CollectionUtils.isNotEmpty(modelList)){
	130	+ for(SieveModel sieveModel:modelList){
	131	+ handOrder(sieveModel);
	132	+ updateOneChanQianDiaSieve(sieveModel);
	133	+ }
	134	+ }
	135	+ }
	136	+
119	137	public static void handOrder(SieveModel sieveModel) {
120	138	int days = DateUtil.getDays(sieveModel.getLastMenses(), DateUtil.formatDate(new Date()));
121	139	int order = 100;
...	...	@@ -133,7 +151,7 @@
133	151
134	152	public static void main(String[] args) {
135	153	SieveModel sieveModel = new SieveModel();
136		- sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-2"));
	154	+ sieveModel.setLastMenses(DateUtil.parseYMD("2016-7-5"));
137	155	sieveModel.setStatus(1);
138	156	handOrder(sieveModel);
139	157	System.out.print(sieveModel.getOrder());

...	...	@@ -52,7 +52,7 @@
52	52	//申请产筛时间
53	53	private Date applyDate;
54	54	//排序字段
55		- private int order;
	55	+ private Integer order;
56	56
57	57	private String csRemarkTypeId;
58	58	private String detail;

...	...	@@ -4,6 +4,7 @@
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.biz.service.SieveService;
7	8	import com.lyms.platform.common.utils.JsonUtil;
8	9	import com.lyms.platform.operate.web.service.SyncDataTaskService;
9	10	import com.lyms.platform.pojo.AssayConfig;
...	...	@@ -32,7 +33,7 @@
32	33
33	34
34	35	@Autowired
35		- private MongoTemplate mongoTemplate;
	36	+ private MongoTemplate mongoTemplate;
36	37
37	38	@Autowired
38	39	private PatientsService patientsService;
...	...	@@ -42,6 +43,8 @@
42	43
43	44	@Autowired
44	45	private SyncDataTaskService syncDataTaskService;
	46	+ @Autowired
	47	+ private SieveService sieveService;
45	48
46	49	/**
47	50	* 获取科室
...	...	@@ -50,7 +53,7 @@
50	53	@ResponseBody
51	54	public List getDepartment() {
52	55	List<Object> list = new ArrayList<>();
53		- Map<String, String> m = new HashMap<>();
	56	+ Map<String, String> m = new HashMap<>();
54	57
55	58	m = new HashMap<>();
56	59	m.put("id", String.valueOf(1));
...	...	@@ -83,7 +86,7 @@
83	86	@ResponseBody
84	87	public List getSampleTypeEnum() {
85	88	List<Object> list = new ArrayList<>();
86		- Map<String, String> m = new HashMap<>();
	89	+ Map<String, String> m = new HashMap<>();
87	90
88	91	m = new HashMap<>();
89	92	m.put("id", String.valueOf(1));
...	...	@@ -116,8 +119,8 @@
116	119
117	120	@RequestMapping(value = "/syncData", method = RequestMethod.GET)
118	121	@ResponseBody
119		- public String syncData(@RequestParam(required = true) final String oracleHid,@RequestParam(required = true) final Integer mysqlHid) {
120		- final MongoTemplate template = mongoTemplate;
	122	+ public String syncData(@RequestParam(required = true) final String oracleHid, @RequestParam(required = true) final Integer mysqlHid) {
	123	+ final MongoTemplate template = mongoTemplate;
121	124
122	125	JdbcUtil.initData(mysqlHid);
123	126	System.out.println("initData------");
124	127
125	128
...	...	@@ -142,21 +145,24 @@
142	145	@RequestMapping(value = "/addSieveJob", method = RequestMethod.GET)
143	146	@ResponseBody
144	147	public String addSieveJob() {
145		- patientsService.addSieveJob();;
	148	+ patientsService.addSieveJob();
	149	+ ;
146	150	return "finish";
147	151	}
148	152
149	153	@RequestMapping(value = "/autoMatDeliver", method = RequestMethod.GET)
150	154	@ResponseBody
151	155	public String autoMatDeliver() {
152		- patientsService.autoMatDeliver();;
	156	+ patientsService.autoMatDeliver();
	157	+ ;
153	158	return "finish";
154	159	}
155	160
156	161	@RequestMapping(value = "/delSieve", method = RequestMethod.GET)
157	162	@ResponseBody
158	163	public String delSieve() {
159		- patientsService.delSieve();;
	164	+ patientsService.delSieve();
	165	+ ;
160	166	return "finish";
161	167	}
162	168
...	...	@@ -175,7 +181,7 @@
175	181	public String assayconfiginit(String json) {
176	182	try {
177	183	List<AssayConfig> list = JsonUtil.toList(json, AssayConfig.class);
178		- for (AssayConfig config:list) {
	184	+ for (AssayConfig config : list) {
179	185	assayConfigService.save(config);
180	186	}
181	187	} catch (Exception e) {
...	...	@@ -188,7 +194,7 @@
188	194	try {
189	195	String json = FileUtils.readFileToString(new File("d:/assayconfig.json"));
190	196	List<AssayConfig> list = JsonUtil.toList(json, AssayConfig.class);
191		- for (AssayConfig config:list) {
	197	+ for (AssayConfig config : list) {
192	198	System.out.println(JsonUtil.obj2JsonString(config));
193	199	}
194	200	} catch (IOException e) {
...	...	@@ -231,5 +237,11 @@
231	237	return "syncQhdSieve finish";
232	238	}
233	239
	240	+ @RequestMapping(value = "/execsieveorder", method = RequestMethod.GET)
	241	+ @ResponseBody
	242	+ public String sieveOrder() {
	243	+ sieveService.correctSieveOrder();
	244	+ return "sieveOrder finish";
	245	+ }
234	246	}

...	...	@@ -97,6 +97,8 @@
97	97
98	98	@Autowired
99	99	private SyncDataService syncDataService;
	100	+ @Autowired
	101	+ private SieveService sieveService;
100	102
101	103	/**
102	104	* 添加孕妇建档
...	...	@@ -963,6 +965,11 @@
963	965	return new BaseResponse().setErrorcode(ErrorCodeConstants.DONT_DELETE).setErrormsg("孕妇存在检查记录,不能删除建档");
964	966	}
965	967	yunBookbuildingService.deletePregnantById(id);
	968	+ //删除建档需要删除产筛数据
	969	+ SieveQuery sieveQuery=new SieveQuery();
	970	+ sieveQuery.setYn(YnEnums.YES.getId());
	971	+ sieveQuery.setParentId(id);
	972	+ sieveService.deleteById(sieveQuery);
966	973	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
967	974	}
968	975