diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BoneService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BoneService.java
index 219865e..374ba54 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BoneService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BoneService.java
@@ -20,19 +20,19 @@ import java.util.List;
 @Service
 public class BoneService {
     @Autowired
-    private IBoneDao BoneDao;
+    private IBoneDao boneDao;
 
-    public List<BoneModel> queryBoneList(BoneQuery BoneQuery) {
+    public List<BoneModel> queryBoneList(BoneQuery boneQuery) {
 
-        MongoQuery query = BoneQuery.convertToQuery();
-        if (StringUtils.isNotEmpty(BoneQuery.getNeed())) {
-            BoneQuery.mysqlBuild(BoneDao.queryBoneListCount(query));
-            query.start(BoneQuery.getOffset()).end(BoneQuery.getLimit());
+        MongoQuery query = boneQuery.convertToQuery();
+        if (StringUtils.isNotEmpty(boneQuery.getNeed())) {
+            boneQuery.mysqlBuild(boneDao.queryBoneListCount(query));
+            query.start(boneQuery.getOffset()).end(boneQuery.getLimit());
         }
-        query.addOrder(Sort.Direction.DESC, StringUtils.isNotEmpty(BoneQuery.getSort()) ? BoneQuery.getSort() : "created");
+        query.addOrder(Sort.Direction.DESC, StringUtils.isNotEmpty(boneQuery.getSort()) ? boneQuery.getSort() : "created");
 
 
-        return BoneDao.queryBoneList(query);
+        return boneDao.queryBoneList(query);
     }
 
 
@@ -46,10 +46,10 @@ public class BoneService {
     }
 
     public void update(BoneModel model) {
-        BoneDao.updateBone(new MongoQuery(new MongoCondition("id", model.getId(), MongoOper.IS)), model);
+        boneDao.updateBone(new MongoQuery(new MongoCondition("id", model.getId(), MongoOper.IS)), model);
     }
 
     public void add(BoneModel model) {
-        BoneDao.addBone(model);
+        boneDao.addBone(model);
     }
 }
diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java
index 381f6f4..a947098 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java
@@ -31,7 +31,7 @@ public class LymsEncodeUtil {
 
         String key1 = "Lymsh@2020";
 
-        String d = aesEncrypt("2020-04-01",key1);
+        String d = aesEncrypt("2020-04-03",key1);
         System.out.println("加密：" + d);
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java
index 5b529f2..63ac556 100644
--- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java
+++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java
@@ -189,6 +189,7 @@ public class LisService {
             {
                 String wId = com.lyms.platform.common.utils.StringUtils.uuid();
                 Set<String> sets = new HashSet<>();
+                //军婚
                 if (residentsArchiveModel.getMilitary() != null && residentsArchiveModel.getMilitary() == 1)
                 {
                     sets.addAll(itemsWamenj.keySet());
@@ -208,7 +209,7 @@ public class LisService {
                     ps.setString(6, residentsArchiveModel.getBirthday() != null ? DateUtil.getAge(residentsArchiveModel.getBirthday())+"" : "");
                     ps.setString(7, "岁");
                     ps.setString(8, key);
-                    ps.setString(9, itemsWamen.get(key));
+                    ps.setString(9, (residentsArchiveModel.getMilitary() != null && residentsArchiveModel.getMilitary() == 1) ? itemsWamenj.get(key) : itemsWamen.get(key));
                     ps.setString(10, com.lyms.platform.common.utils.StringUtils.uuid());
                     ps.setString(11,"0");
                     ps.setString(12,residentsArchiveModel.getPhone());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java
index f061211..e908ce3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java
@@ -59,7 +59,7 @@ public class BoneFacade {
     public BaseResponse queryBoneList(String queryNo, Integer start, Integer end,String startTime,String endTime, Integer age, String vcCardNo,Integer type ,Integer result,Integer page, Integer limit, Integer userId) {
 
 
-        List dataList = new ArrayList();
+        List dataList = new LinkedList();
         String hospitalId = autoMatchFacade.getHospitalId(userId);
         BoneQuery query =  new BoneQuery();
         query.setResult(result);
diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties
index 8790085..3d50ab1 100644
--- a/platform-operate-api/src/main/resources/database.properties
+++ b/platform-operate-api/src/main/resources/database.properties
@@ -49,7 +49,7 @@ run.mode=2
 #1 ����  2 ����
 run.region=1
 
-
+#LymsEncodeUtil
 #login.licence=B2D619F59C36D662B56E009CDD3DAF62
 
 #���ӹ���ԱĬ����������