From d968d404f1cb9c7561ae09d4380827c1be887aec Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Mon, 15 May 2017 15:49:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=AF=B9=E6=AF=94=E8=A7=84=E5=88=99=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/BabyPatientExtendEarServiceImpl.java      | 25 +++++---
 .../permission/service/impl/CouponServiceImpl.java | 23 +++++--
 .../main/resources/mainOrm/master/CouponMapper.xml |  2 +-
 .../lyms/platform/common/enums/AbortionEnums.java  | 37 +++++++++++
 .../platform/common/utils/BasicConfigUtil.java     |  9 +++
 .../com/lyms/platform/common/utils/EnumUtil.java   | 53 +++++++++++++++
 .../lyms/platform/common/utils/PropertiesUtil.java | 75 ++++++++++++++++++++++
 .../operate/web/controller/EarController.java      | 11 +++-
 .../src/main/resources/database.properties         |  2 +-
 9 files changed, 218 insertions(+), 19 deletions(-)
 create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/AbortionEnums.java
 create mode 100644 platform-common/src/main/java/com/lyms/platform/common/utils/BasicConfigUtil.java
 create mode 100644 platform-common/src/main/java/com/lyms/platform/common/utils/EnumUtil.java
 create mode 100644 platform-common/src/main/java/com/lyms/platform/common/utils/PropertiesUtil.java

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java
index b353c75..9e0f40e 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/BabyPatientExtendEarServiceImpl.java
@@ -1,21 +1,27 @@
 package com.lyms.platform.permission.service.impl;
 
+import com.lyms.platform.common.enums.AbortionEnums;
 import com.lyms.platform.common.enums.FmTypeEnums;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.RespBuilder;
-import com.lyms.platform.common.utils.SystemConfig;
+import com.lyms.platform.common.utils.EnumUtil;
 import com.lyms.platform.permission.dao.master.BabyPatientExtendEarMapper;
 import com.lyms.platform.permission.model.BabyPatientExtendEar;
 import com.lyms.platform.permission.model.BabyPatientExtendEarBirth;
 import com.lyms.platform.permission.model.BabyPatientExtendEarFamily;
 import com.lyms.platform.permission.model.BabyPatientExtendEarMother;
 import com.lyms.platform.permission.service.BabyPatientExtendEarService;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+import com.lyms.platform.pojo.BasicConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 @Service
 public class BabyPatientExtendEarServiceImpl implements BabyPatientExtendEarService {
 
@@ -34,12 +40,13 @@ public class BabyPatientExtendEarServiceImpl implements BabyPatientExtendEarServ
 
     @Override
     public BaseObjectResponse getConfigs() {
-        FmTypeEnums[] fmTypes = FmTypeEnums.values();
-        for (FmTypeEnums fmType : fmTypes) {
-            JSONObject jsonObject = JSONObject.fromObject(fmType);
-            System.err.println(">> " + jsonObject);
-        }
-        return null;
+        Map<String, Object> restMap = new HashMap<>();
+        restMap.put("fmType", EnumUtil.buildEnumJson(FmTypeEnums.class)); /** 分娩方式 */
+        restMap.put("aborType", EnumUtil.buildEnumJson(AbortionEnums.class)); /** 流产方式 */
+        List<BasicConfig> basicConfigs = mongoTemplate.find(Query.query(Criteria.where("").is("")), BasicConfig.class);
+
+
+        return RespBuilder.buildSuccess(restMap);
     }
 
 }
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
index eeb8c40..68b4ae9 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java
@@ -5,6 +5,8 @@ import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.RespBuilder;
 import com.lyms.platform.common.result.ResponseCode;
 import com.lyms.platform.common.utils.DateUtil;
+import com.lyms.platform.common.utils.PropertiesUtil;
+import com.lyms.platform.common.utils.PropertiesUtils;
 import com.lyms.platform.permission.dao.master.CouponMapper;
 import com.lyms.platform.permission.model.CouponInfo;
 import com.lyms.platform.permission.model.Organization;
@@ -349,7 +351,7 @@ public class CouponServiceImpl implements CouponService {
         Date startDate = null;
         Date endDate = null;
         if(typeMap.get(PREGNANT_WOMAN).contains(couponType)) {/** 孕妇: 根据末次月经对比 midDate = 末次月经时间 */
-            List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("type").is(1).and("hospitalId").is(hospitalId).and("pid").is(userId)), Patients.class);
+            List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("pid").is(userId)), Patients.class);
             if(CollectionUtils.isEmpty(patients)) {
                 BabyModel baby = mongoTemplate.findOne(Query.query(Criteria.where("pid").is(userId)), BabyModel.class);
                 if(baby != null) {/** 孕妇没查到就查儿童 */
@@ -359,7 +361,7 @@ public class CouponServiceImpl implements CouponService {
                     return false;
                 }
             }
-            midDate = patients.get(0).getLastMenses();
+            midDate = patients.get(0).getFmDate();
         } else {/** 产妇或者儿童：根据分娩时间对比 midDate = 分娩时间 */
             List<Patients> patients = mongoTemplate.find(Query.query(Criteria.where("type").is(3).and("hospitalId").is(hospitalId).and("pid").is(userId))
                     .with(new Sort(Sort.Direction.DESC, "fmDate")), Patients.class);
@@ -375,10 +377,10 @@ public class CouponServiceImpl implements CouponService {
             if(unitType == 1) { /** 孕周: startDate = lastMenses + start*7、 endDate = lastMenses + end*7 + 6*/
                 startDate = DateUtils.addDays(midDate, start * 7);
                 endDate = DateUtils.addDays(midDate, end * 7 + 6);
-            } else if(unitType == 2) { /** 天数 stratDate = lastMenses + start、 endDate = lastMenses + end  */
+            } else if(unitType == 2) { /** 天数 stratDate = 孕妇:fmDate/儿童:birth + start、 endDate = lastMenses + end  */
                 startDate = DateUtils.addDays(midDate, start);
                 endDate = DateUtils.addDays(midDate, end);
-            } else if(unitType == 3) { /** 月龄 startDate = lastMenses + start、 endDate =  lastMenses + end + 1 如果是31号 计算出来的月份没有31号 取最后一天*/
+            } else if(unitType == 3) { /** 月龄 startDate = fmDate/birth + start、 endDate =  fmDate/birth + end + 1 如果是31号 计算出来的月份没有31号 取最后一天*/
                 startDate = DateUtils.addMonths(midDate, start);
                 endDate = DateUtils.addMonths(midDate, end + 1);
             }
@@ -398,12 +400,19 @@ public class CouponServiceImpl implements CouponService {
 
         Map<String, Object> restMap = new HashMap<>();
         restMap.put("topName", couponMapper.findTopName(hospitalId));
-        restMap.put("couponInfos", couponMapper.findInfo(param));
-        restMap.put("url", url);
-
+        List<Map<String, Object>> couponInfos = couponMapper.findInfo(param);
+        for (Map<String,Object> map : couponInfos) {
+            map.put("url", PropertiesUtil.getInstance().getDefault("or.code.url", map.get("sequence_id").toString()));
+        }
+        restMap.put("couponInfos", couponInfos);
         return RespBuilder.buildSuccess(restMap);
     }
 
+    public static void main(String[] args) {
+        System.out.println(PropertiesUtils.getPropertyValue("or.code.url"));
+    }
+
+
     @Override
     public BaseObjectResponse use(String hospitalId, String code, Integer userId) {
         Map<String, Object> param = new HashMap<>();
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
index 0bc7753..d749d24 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -59,7 +59,7 @@
     </select>
 
     <select id="findInfo" parameterType="map" resultType="map">
-        select b.name, b.title, b.show_start, b.show_end, b.unit_type, b.content, a.sequence_id, a.status
+        select a.create_date, b.name, b.title, b.show_start, b.show_end, b.unit_type, b.content, a.sequence_id, a.status
         from coupon_info a, coupon_template b, coupon_type c
         where a.user_id = #{userId} and a.create_hospital_id = #{hospitalId} and a.coupon_template_id = b.id and b.type_id=c.id
         order by c.type, b.coupon_order
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/AbortionEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/AbortionEnums.java
new file mode 100644
index 0000000..da25c06
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/AbortionEnums.java
@@ -0,0 +1,37 @@
+package com.lyms.platform.common.enums;
+
+/**
+ * @Author: litao
+ * @Date: 2017/5/15 0015 14:17
+ * @Version: V1.0
+ */
+public enum AbortionEnums {
+    SPONTANEOUS("1", "自然流产"),
+    MEDICINE("2", "药物流产"),
+    ARTIFICIAL("3", "人工流产");
+
+    AbortionEnums(String id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    private String id;
+    private String name;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/BasicConfigUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/BasicConfigUtil.java
new file mode 100644
index 0000000..2fc6368
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/BasicConfigUtil.java
@@ -0,0 +1,9 @@
+package com.lyms.platform.common.utils;
+
+/**
+ * @Author: litao
+ * @Date: 2017/5/15 0015 15:18
+ * @Version: V1.0
+ */
+public class BasicConfigUtil {
+}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/EnumUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/EnumUtil.java
new file mode 100644
index 0000000..6018a5a
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/EnumUtil.java
@@ -0,0 +1,53 @@
+package com.lyms.platform.common.utils;
+
+import com.lyms.platform.common.enums.FmTypeEnums;
+import org.apache.commons.beanutils.PropertyUtils;
+
+import java.security.InvalidParameterException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: litao
+ * @Date: 2017/5/15 0015 11:01
+ * @Version: V1.0
+ */
+public class EnumUtil {
+
+    private static final String DEFAULT_KEY_NAME = "id";
+    private static final String DEFAULT_VALUE_NAME = "name";
+
+    public static <T> List<Map<String, Object>> buildEnumJson(Class<T> clazz) {
+        return buildEnumJson(clazz, DEFAULT_KEY_NAME, DEFAULT_VALUE_NAME);
+    }
+
+    public static <T> List<Map<String, Object>> buildEnumJson(Class<T> clazz, String codeName, String valueName) {
+        List<Map<String, Object>> list = new ArrayList<>();
+
+        if (!clazz.isEnum()) {
+            throw new InvalidParameterException("请传入枚举类型参数");
+        }
+
+        org.springframework.util.Assert.notNull(codeName, "key不能为null");
+        org.springframework.util.Assert.notNull(valueName, "value不能为null");
+
+        try {
+            T[] enumConstants = clazz.getEnumConstants();
+            for (T ec : enumConstants) {
+                Object key = PropertyUtils.getProperty(ec,codeName);
+                Object value = PropertyUtils.getProperty(ec,valueName);
+                if(key != null && value != null) {
+                    Map<String, Object> tempMap = new HashMap<>();
+                    tempMap.put(key.toString(), value);
+                    list.add(tempMap);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return list;
+    }
+
+}
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/PropertiesUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/PropertiesUtil.java
new file mode 100644
index 0000000..3bff7d8
--- /dev/null
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/PropertiesUtil.java
@@ -0,0 +1,75 @@
+package com.lyms.platform.common.utils;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Properties;
+
+public class PropertiesUtil {
+	private static PropertiesUtil propertiesUtil;
+	private static Map<String,Properties> propertiesMap;
+	private static Logger logger = LoggerFactory.getLogger(PropertiesUtil.class);
+
+	private static final String DEFAULT_DATABASE_NAME = "database";
+	private static final String CONFIG_NAME = "config";
+
+	
+	public static PropertiesUtil getInstance() {
+		if(propertiesUtil == null) {
+			synchronized (PropertiesUtil.class) {
+				if(propertiesUtil == null) {
+					propertiesUtil = new PropertiesUtil();
+					propertiesMap = new HashMap<>();
+				}
+			}
+		}
+		return propertiesUtil;
+	}
+
+	
+	/**
+	 * 加载配置文件 不用带properties
+	 * @param name
+	 */
+	private Properties load(String name) {
+		Properties properties = null;
+		try {
+			properties = propertiesMap.get(name);
+			if(properties == null) {
+				properties = new Properties();
+				properties.load(PropertiesUtil.class.getResourceAsStream("/" + name + ".properties"));
+				propertiesMap.put(name, properties);
+			}
+		} catch (Exception e) {
+			logger.error("读取配置文件 {} 失败:", name, e.fillInStackTrace());
+		}
+		return properties;
+	}
+	
+	public String get(String fileName, String keyName, String... params) {
+        String value = load(fileName).getProperty(keyName);
+        if(StringUtils.isNotBlank(value) && params != null) {
+            value = format(value, params);
+        }
+        return value;
+	}
+
+	/**
+	 * 默认读取 database 配置文件里面的
+	 * @param keyName
+	 * @param params
+	 * @return
+	 */
+	public String getDefault(String keyName, String... params) {
+		return get(DEFAULT_DATABASE_NAME, keyName, params);
+	}
+
+	public String format(String key, String... params) {
+        return MessageFormat.format(key, params);
+    }
+
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
index 387b8e3..68a349c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EarController.java
@@ -2,7 +2,10 @@ package com.lyms.platform.operate.web.controller;
 
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
+import com.lyms.platform.common.enums.FmTypeEnums;
 import com.lyms.platform.common.result.BaseObjectResponse;
+import com.lyms.platform.common.result.RespBuilder;
+import com.lyms.platform.common.utils.EnumUtil;
 import com.lyms.platform.permission.model.BabyPatientExtendEar;
 import com.lyms.platform.permission.model.BabyPatientExtendEarBirth;
 import com.lyms.platform.permission.model.BabyPatientExtendEarFamily;
@@ -45,9 +48,15 @@ public class EarController extends BaseController {
      * 获取 添加儿童建档界面的 下拉列表数据
      * @return
      */
-    @RequestMapping(method = RequestMethod.GET)
+    @RequestMapping(value = "/config", method = RequestMethod.GET)
     @ResponseBody
     public BaseObjectResponse config() {
         return babyPatientExtendEarService.getConfigs();
     }
+
+    @RequestMapping("/test")
+    @ResponseBody
+    public BaseObjectResponse test() {
+        return RespBuilder.buildSuccess(EnumUtil.buildEnumJson(FmTypeEnums.class));
+    }
 }
diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties
index 6f86a06..cb68f0a 100644
--- a/platform-operate-api/src/main/resources/database.properties
+++ b/platform-operate-api/src/main/resources/database.properties
@@ -85,4 +85,4 @@ sequence.min.size=300
 sequence.schedule.expression=0 */1 * * * ?
 
 # 二维码地址
-or.code.url=https://rp-api.healthbaby.com.cn/scan?cid=xxx&hid=xx
\ No newline at end of file
+or.code.url=https://rp-api.healthbaby.com.cn/scan?code={0}
\ No newline at end of file
-- 
1.8.3.1