jiangjiazhi / regional-platform

Authored by liquanyu over 7 years ago

Exists in master and in 6 other branches

Showing 8 changed files with 57 additions and 2 deletions

...	...	@@ -7,6 +7,7 @@
7	7	import com.lyms.platform.common.enums.SieveStatusEnums;
8	8	import com.lyms.platform.common.enums.YnEnums;
9	9	import com.lyms.platform.common.utils.DateUtil;
	10	+import com.lyms.platform.common.utils.PropertiesUtils;
10	11	import com.lyms.platform.pojo.*;
11	12	import com.lyms.platform.query.*;
12	13	import org.apache.commons.collections.CollectionUtils;
...	...	@@ -26,6 +27,9 @@
26	27	@Service
27	28	public class PatientsService {
28	29	private Logger logger = LoggerFactory.getLogger("SIEVE-JOB");
	30	+
	31	+ public static final String his_version = PropertiesUtils.getPropertyValue("his_version");
	32	+
29	33	@Autowired
30	34	private IPatientDao iPatientDao;
31	35	@Autowired
...	...	@@ -178,6 +182,12 @@
178	182
179	183	Date endDate = DateUtil.addDay(DateUtil.formatDate(new Date()), -105);
180	184	Date start = DateUtil.addDay(DateUtil.formatDate(new Date()), -146);
	185	+ //诸城产筛范围未11到 20+6
	186	+ if(his_version != null && "21".equals(his_version))
	187	+ {
	188	+ endDate = DateUtil.addDay(DateUtil.formatDate(new Date()), -76);
	189	+ }
	190	+
181	191	PatientsQuery patientsQuery = new PatientsQuery();
182	192	patientsQuery.setLastMensesEnd(endDate);
183	193	patientsQuery.setLastMensesStart(start);

...	...	@@ -21,6 +21,8 @@
21	21	//该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
22	22	private String lisCheckItems;
23	23
	24	+ //诸城妇幼复诊特有字段随机血糖单位mmol/L
	25	+ private String randomBloodSugar;
24	26
25	27	public String getLisCheckItems() {
26	28	return lisCheckItems;
...	...	@@ -98,6 +100,14 @@
98	100
99	101	public void setTreatmentOpinion2Types(List<String> treatmentOpinion2Types) {
100	102	this.treatmentOpinion2Types = treatmentOpinion2Types;
	103	+ }
	104	+
	105	+ public String getRandomBloodSugar() {
	106	+ return randomBloodSugar;
	107	+ }
	108	+
	109	+ public void setRandomBloodSugar(String randomBloodSugar) {
	110	+ this.randomBloodSugar = randomBloodSugar;
101	111	}
102	112
103	113	private String id;

...	...	@@ -113,7 +113,7 @@
113	113	rolePermissionMapsService.addRolePermissionMaps(rolePermissionMaps);
114	114
115	115	operateLogFacade.addAddOptLog(getUserId(request),
116		- roles.getOrgId(), permissions, OptActionEnums.ADD.getId(), "管理员角色权限配置");
	116	+ roles.getOrgId(), rolePermissionMaps, OptActionEnums.ADD.getId(), "管理员角色权限配置");
117	117	}
118	118	}
119	119	stopWatch.stop();

...	...	@@ -411,7 +411,6 @@
411	411	@ResponseBody
412	412	public String addSieveJob() {
413	413	patientsService.addSieveJob();
414		- ;
415	414	return "finish";
416	415	}
417	416

...	...	@@ -47,6 +47,9 @@
47	47	public class AntenatalExaminationFacade {
48	48
49	49	private static final Logger logger = LoggerFactory.getLogger(AntenatalExaminationFacade.class);
	50	+
	51	+ public static final String his_version = PropertiesUtils.getPropertyValue("his_version");
	52	+
50	53	@Autowired
51	54	private AntenatalExaminationService antenatalExaminationService;
52	55	@Autowired
...	...	@@ -1948,6 +1951,11 @@
1948	1951	}
1949	1952	int day = DateUtil.getDays(date, new Date());
1950	1953	int start = 15 * 7 + 3;
	1954	+ if (his_version != null && "21".equals(his_version))
	1955	+ {
	1956	+ start = 11 * 7 ;
	1957	+ }
	1958	+
1951	1959	int end = 20 * 7 + 6;
1952	1960	if (day >= start && day <= end) {
1953	1961	SieveApplyOrderQuery sieveApplyOrderQuery = new SieveApplyOrderQuery();

...	...	@@ -2068,6 +2068,9 @@
2068	2068	//聊城东昌府区妇幼保健医院才用
2069	2069	map.put("lisCheckItems",data.getLisCheckItems());
2070	2070
	2071	+ //诸城妇幼复诊特有字段随机血糖单位mmol/L
	2072	+ map.put("randomBloodSugar",StringUtils.isNotEmpty(data.getRandomBloodSugar()) ? data.getRandomBloodSugar()+UnitConstants.MMOLL : "");
	2073	+
2071	2074	br.setErrorcode(ErrorCodeConstants.SUCCESS);
2072	2075	br.setErrormsg("成功");
2073	2076	br.setData(map);

...	...	@@ -22,6 +22,9 @@
22	22	//该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
23	23	private String lisCheckItems;
24	24
	25	+ //诸城妇幼复诊特有字段随机血糖单位mmol/L
	26	+ private String randomBloodSugar;
	27	+
25	28	public String getLisCheckItems() {
26	29	return lisCheckItems;
27	30	}
...	...	@@ -185,6 +188,14 @@
185	188	//甲状腺功能
186	189	private String jzxgn;
187	190
	191	+ public String getRandomBloodSugar() {
	192	+ return randomBloodSugar;
	193	+ }
	194	+
	195	+ public void setRandomBloodSugar(String randomBloodSugar) {
	196	+ this.randomBloodSugar = randomBloodSugar;
	197	+ }
	198	+
188	199	public String getZyqbdjc() {
189	200	return zyqbdjc;
190	201	}
...	...	@@ -384,6 +395,7 @@
384	395	examinationModel.setNextCheckTime(DateUtil.parseYMD(nextCheckTime));
385	396	}
386	397	examinationModel.setcDueWeek(cDueWeek);
	398	+ examinationModel.setRandomBloodSugar(randomBloodSugar);
387	399	return examinationModel;
388	400	}
389	401

...	...	@@ -20,6 +20,10 @@
20	20	//该字段是针对聊城东昌区妇幼保健医院保存当天孕妇的lis检查项
21	21	private String lisCheckItems;
22	22
	23	+
	24	+ //诸城妇幼复诊特有字段随机血糖单位mmol/L
	25	+ private String randomBloodSugar;
	26	+
23	27	public String getLisCheckItems() {
24	28	return lisCheckItems;
25	29	}
...	...	@@ -86,6 +90,14 @@
86	90	this.treatmentOpinion2 = treatmentOpinion2;
87	91	}
88	92
	93	+ public String getRandomBloodSugar() {
	94	+ return randomBloodSugar;
	95	+ }
	96	+
	97	+ public void setRandomBloodSugar(String randomBloodSugar) {
	98	+ this.randomBloodSugar = randomBloodSugar;
	99	+ }
	100	+
89	101	private String barCode;
90	102	private String id;
91	103	private String isSieve;
...	...	@@ -348,6 +360,7 @@
348	360	setType(destModel.getType());
349	361	setTypeYc(destModel.getTypeYc());
350	362	setLisCheckItems(destModel.getLisCheckItems());
	363	+ setRandomBloodSugar(destModel.getRandomBloodSugar());
351	364	return this;
352	365	}
353	366