jiangjiazhi / regional-platform

Commit 88922d3f87e2925aba53040e493abca90d638044

Authored by wtt almost 5 years ago

Exists in master and in 6 other branches

update

Showing 5 changed files with 121 additions and 6 deletions

platform-common/src/main/java/com/lyms/platform/common/enums/CheckMonthQhdBTGEnums.java
platform-dal/src/main/java/com/lyms/platform/pojo/BabyEyeCheck.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyEyeCheckController.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/BabyEyeCheckService.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java

	1	+package com.lyms.platform.common.enums;
	2	+
	3	+import com.lyms.platform.common.utils.StringUtils;
	4	+
	5	+/**
	6	+ * 秦皇岛不通过查询条件
	7	+ */
	8	+public enum CheckMonthQhdBTGEnums {
	9	+
	10	+ eyeAppearance("eyeAppearance", "眼外观"),
	11	+ redReflexQhd("redReflexQhd", "红光反射"),
	12	+ blinkReflex("blinkReflex", "瞬目反射"),
	13	+ redBallTest("redBallTest", "红球试验"),
	14	+ behaviorObservation("behaviorObservation", "视物行为观察"),
	15	+ refractiveScreening("refractiveScreening", "屈光筛查"),
	16	+ eyePositionExamination("eyePositionExamination", "眼位检查"),
	17	+ eyeMovement("eyeMovement", "眼球运动");
	18	+
	19	+
	20	+ private String id;
	21	+ private String name;
	22	+
	23	+ public static CheckMonthQhdBTGEnums get(String id) {
	24	+ CheckMonthQhdBTGEnums[] values = CheckMonthQhdBTGEnums.values();
	25	+ for (CheckMonthQhdBTGEnums value : values) {
	26	+ if (value.getId().equals(id)) {
	27	+ return value;
	28	+ }
	29	+ }
	30	+ return null;
	31	+ }
	32	+
	33	+ public static String getName(String id) {
	34	+ if(StringUtils.isEmpty(id)) {
	35	+ return null;
	36	+ }
	37	+ CheckMonthQhdBTGEnums[] values = CheckMonthQhdBTGEnums.values();
	38	+ for (CheckMonthQhdBTGEnums value : values) {
	39	+ if (value.id.equals(id)) {
	40	+ return value.name;
	41	+ }
	42	+ }
	43	+ return null;
	44	+ }
	45	+
	46	+ CheckMonthQhdBTGEnums(String id, String name){
	47	+ this.id = id;
	48	+ this.name = name;
	49	+ }
	50	+
	51	+ public String getId() {
	52	+ return id;
	53	+ }
	54	+
	55	+ public void setId(String id) {
	56	+ this.id = id;
	57	+ }
	58	+
	59	+ public String getName() {
	60	+ return name;
	61	+ }
	62	+
	63	+ public void setName(String name) {
	64	+ this.name = name;
	65	+ }
	66	+
	67	+}

...	...	@@ -22,6 +22,8 @@
22	22	* @Author: 武涛涛
23	23	* @Date: 2020/7/20 9:27
24	24	*/
	25	+ // false不合作
	26	+ private boolean uncooperative;
25	27	//类型默认是旧版本，1新版本20200720
26	28	private String edition;
27	29	// 眼外观 1通过 2不通过
...	...	@@ -760,6 +762,14 @@
760	762
761	763	public String getRedReflex() {
762	764	return redReflex;
	765	+ }
	766	+
	767	+ public boolean isUncooperative() {
	768	+ return uncooperative;
	769	+ }
	770	+
	771	+ public void setUncooperative(boolean uncooperative) {
	772	+ this.uncooperative = uncooperative;
763	773	}
764	774
765	775	public void setRedReflex(String redReflex) {

...	...	@@ -121,8 +121,10 @@
121	121	@TokenRequired
122	122	@RequestMapping(method = RequestMethod.GET)
123	123	public BaseResponse list(Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, HttpServletRequest request,
124		- Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin) {
125		- return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin);
	124	+ Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin,String noPassIds) {
	125	+ return babyEyeCheckService.list(getUserId(request), startDate, endDate, doctor, key,
	126	+ currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, page, limit,
	127	+ bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin,noPassIds);
126	128	}
127	129
128	130	@ResponseBody

...	...	@@ -24,7 +24,10 @@
24	24
25	25	BaseResponse delete(String id, Integer userId);
26	26
27		- BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin);
	27	+ BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key,
	28	+ Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive,
	29	+ String positiveIds, Integer page, Integer limit, Date bookStartDate, Date bookEndDate, String apparatusPositive,
	30	+ String doctorPositive, String yin,String noPassIds);
28	31
29	32	BaseResponse query(Integer userId, String babyId);
30	33	BaseResponse queryQhd(Integer userId, String babyId);

...	...	@@ -436,6 +436,7 @@
436	436	* @Author: 武涛涛
437	437	* @Date: 2020/7/20 13:40
438	438	*/
	439	+ map.put("uncooperative", babyEyeCheck.isUncooperative());//false不合作
439	440	map.put("handleOpinionsIdList", babyEyeCheck.getHandleOpinionsIdList());//医生自定义处理意见 id
440	441	map.put("handleOpinionsId", HandleOpinionsQhdEnums.getName(babyEyeCheck.getHandleOpinionsId()));//处理意见 id,历史数据不做匹配
441	442	map.put("eyeAppearance", babyEyeCheck.getEyeAppearance());//眼外观 1通过 2不通过
...	...	@@ -645,6 +646,7 @@
645	646	BabyEyeCheck babyEyeCheck = mongoTemplate.findById(id, BabyEyeCheck.class);
646	647	Map<String, Object> map = ReflectionUtils.beanToMap(babyEyeCheck);
647	648	map.put("checkTime", DateUtil.getYyyyMmDd(babyEyeCheck.getCheckTime()));
	649	+ map.put("uncooperative", babyEyeCheck.isUncooperative());
648	650	if (StringUtils.isNotEmpty(babyEyeCheck.getCheckMonthId())) {
649	651	//处理老数据
650	652	if("0".equals(babyEyeCheck.getCheckMonthId())){
...	...	@@ -695,7 +697,7 @@
695	697	public BaseResponse list(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart,
696	698	Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds,
697	699	Integer page, Integer limit, Date bookStartDate, Date bookEndDate,
698		- String apparatusPositive, String doctorPositive, String yin) {
	700	+ String apparatusPositive, String doctorPositive, String yin,String noPassIds) {
699	701	boolean b = true;
700	702	String hospitalId = autoMatchFacade.getHospitalId(userId);
701	703	Criteria criteria = Criteria.where("yn").ne("0").and("hospitalId").is(hospitalId);
...	...	@@ -743,6 +745,36 @@
743	745	List<String> babyIds = CollectionUtils.getId(babyModels, "id", String.class);
744	746	criteria.and("babyId").in(babyIds);
745	747	}
	748	+
	749	+ /**
	750	+ * 新加的不通过查询条件
	751	+ * @Author: 武涛涛
	752	+ * @Date: 2020/7/21 21:56
	753	+ */
	754	+ if (StringUtils.isNotEmpty(noPassIds)) {
	755	+ List<String> ids = CollectionUtils.asList(noPassIds, String.class);
	756	+ for (String id : ids) {
	757	+ if("eyeAppearance".equals(id)){
	758	+ criteria.and("eyeAppearance").is("2");
	759	+ }else if("redReflexQhd".equals(id)){
	760	+ criteria.and("redReflexQhd").is("2");
	761	+ }else if("blinkReflex".equals(id)){
	762	+ criteria.and("blinkReflex").is("2");
	763	+ }else if("redBallTest".equals(id)){
	764	+ criteria.and("redBallTest").is("2");
	765	+ }else if("behaviorObservation".equals(id)){
	766	+ criteria.and("behaviorObservation").is("2");
	767	+ }else if("refractiveScreening".equals(id)){
	768	+ criteria.and("refractiveScreening").is("2");
	769	+ }else if("eyePositionExamination".equals(id)){
	770	+ criteria.and("eyePositionExamination").is("2");
	771	+ }else if("eyeMovement".equals(id)){
	772	+ criteria.and("eyeMovement").is("2");
	773	+ }
	774	+ }
	775	+ }
	776	+
	777	+ /end /
746	778	if (positive) {
747	779
748	780	Query query = new Query(criteria);
...	...	@@ -1060,6 +1092,7 @@
1060	1092	List<Map<String, Object>> checkMonth = EnumUtil.toJson(CheckMonthEnums.class); /** 检查月龄 */
1061	1093	List<Map<String, Object>> currentMonth = EnumUtil.toJson(CheckMonthEnums2.class); /** 检查月龄 */
1062	1094	List<Map<String, Object>> checkMonthQhdEnums = EnumUtil.toJson(CheckMonthQhdEnums.class); /** (检查时间 */
	1095	+ List<Map<String, Object>> checkMonthQhdBTGEnums = EnumUtil.toJson(CheckMonthQhdBTGEnums.class); /** 不通过 */
1063	1096	List<Map<String, Object>> positive = new ArrayList<>(); /** 阳性项目 */
1064	1097
1065	1098	if ("197".equals(hospitalId)) {
1066	1099
...	...	@@ -1245,12 +1278,12 @@
1245	1278	}
1246	1279
1247	1280
1248		- return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth, "checkMonthQhdEnums", checkMonthQhdEnums);
	1281	+ return RespBuilder.buildSuccess("checkMonth", checkMonth, "positive", positive, "currentMonth", currentMonth, "checkMonthQhdEnums", checkMonthQhdEnums, "checkMonthQhdBTGEnums", checkMonthQhdBTGEnums);
1249	1282	}
1250	1283
1251	1284	@Override
1252	1285	public void export(Integer userId, Date startDate, Date endDate, String doctor, String key, Integer currentMonthStart, Integer currentMonthEnd, String chechMonth, boolean positive, String positiveIds, HttpServletResponse response, Date bookStartDate, Date bookEndDate, String apparatusPositive, String doctorPositive, String yin) {
1253		- BaseResponse rest = list(userId, startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin);
	1286	+ BaseResponse rest = list(userId, startDate, endDate, doctor, key, currentMonthStart, currentMonthEnd, chechMonth, positive, positiveIds, 1, Integer.MAX_VALUE, bookStartDate, bookEndDate, apparatusPositive, doctorPositive, yin,null);
1254	1287	PageResult pageResult = (PageResult) rest.getObject();
1255	1288	List<Map<String, Object>> datas = (List<Map<String, Object>>) pageResult.getGrid();
1256	1289	Map<String, String> cnames = new LinkedHashMap<>();