liquanyu / regional-platform

Download as
Browse Code »

Commit aa92118d138e64a7d256aac548a3231c27651d44

Authored by liquanyu
1 parent d3771079b2
Exists in master and in 1 other branch dev

update

Showing 5 changed files with 15 additions and 14 deletions

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/BoneService.java View file @ aa92118
... ... @@ -20,19 +20,19 @@
20 20 @Service
21 21 public class BoneService {
22 22 @Autowired
23   - private IBoneDao BoneDao;
  23 + private IBoneDao boneDao;
24 24  
25   - public List<BoneModel> queryBoneList(BoneQuery BoneQuery) {
  25 + public List<BoneModel> queryBoneList(BoneQuery boneQuery) {
26 26  
27   - MongoQuery query = BoneQuery.convertToQuery();
28   - if (StringUtils.isNotEmpty(BoneQuery.getNeed())) {
29   - BoneQuery.mysqlBuild(BoneDao.queryBoneListCount(query));
30   - query.start(BoneQuery.getOffset()).end(BoneQuery.getLimit());
  27 + MongoQuery query = boneQuery.convertToQuery();
  28 + if (StringUtils.isNotEmpty(boneQuery.getNeed())) {
  29 + boneQuery.mysqlBuild(boneDao.queryBoneListCount(query));
  30 + query.start(boneQuery.getOffset()).end(boneQuery.getLimit());
31 31 }
32   - query.addOrder(Sort.Direction.DESC, StringUtils.isNotEmpty(BoneQuery.getSort()) ? BoneQuery.getSort() : "created");
  32 + query.addOrder(Sort.Direction.DESC, StringUtils.isNotEmpty(boneQuery.getSort()) ? boneQuery.getSort() : "created");
33 33  
34 34  
35   - return BoneDao.queryBoneList(query);
  35 + return boneDao.queryBoneList(query);
36 36 }
37 37  
38 38  
39 39  
... ... @@ -46,11 +46,11 @@
46 46 }
47 47  
48 48 public void update(BoneModel model) {
49   - BoneDao.updateBone(new MongoQuery(new MongoCondition("id", model.getId(), MongoOper.IS)), model);
  49 + boneDao.updateBone(new MongoQuery(new MongoCondition("id", model.getId(), MongoOper.IS)), model);
50 50 }
51 51  
52 52 public void add(BoneModel model) {
53   - BoneDao.addBone(model);
  53 + boneDao.addBone(model);
54 54 }
55 55 }
platform-common/src/main/java/com/lyms/platform/common/utils/LymsEncodeUtil.java View file @ aa92118
... ... @@ -31,7 +31,7 @@
31 31  
32 32 String key1 = "Lymsh@2020";
33 33  
34   - String d = aesEncrypt("2020-04-01",key1);
  34 + String d = aesEncrypt("2020-04-03",key1);
35 35 System.out.println("加密：" + d);
36 36 }
37 37  
platform-operate-api/src/main/java/com/lyms/hospitalapi/lcfy/LisService.java View file @ aa92118
... ... @@ -189,6 +189,7 @@
189 189 {
190 190 String wId = com.lyms.platform.common.utils.StringUtils.uuid();
191 191 Set<String> sets = new HashSet<>();
  192 + //军婚
192 193 if (residentsArchiveModel.getMilitary() != null && residentsArchiveModel.getMilitary() == 1)
193 194 {
194 195 sets.addAll(itemsWamenj.keySet());
... ... @@ -208,7 +209,7 @@
208 209 ps.setString(6, residentsArchiveModel.getBirthday() != null ? DateUtil.getAge(residentsArchiveModel.getBirthday())+"" : "");
209 210 ps.setString(7, "岁");
210 211 ps.setString(8, key);
211   - ps.setString(9, itemsWamen.get(key));
  212 + ps.setString(9, (residentsArchiveModel.getMilitary() != null && residentsArchiveModel.getMilitary() == 1) ? itemsWamenj.get(key) : itemsWamen.get(key));
212 213 ps.setString(10, com.lyms.platform.common.utils.StringUtils.uuid());
213 214 ps.setString(11,"0");
214 215 ps.setString(12,residentsArchiveModel.getPhone());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BoneFacade.java View file @ aa92118
... ... @@ -59,7 +59,7 @@
59 59 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) {
60 60  
61 61  
62   - List dataList = new ArrayList();
  62 + List dataList = new LinkedList();
63 63 String hospitalId = autoMatchFacade.getHospitalId(userId);
64 64 BoneQuery query = new BoneQuery();
65 65 query.setResult(result);
platform-operate-api/src/main/resources/database.properties View file @ aa92118
... ... @@ -49,7 +49,7 @@
49 49 #1 区域 2 单机
50 50 run.region=1
51 51  
52   -
  52 +#LymsEncodeUtil
53 53 #login.licence=B2D619F59C36D662B56E009CDD3DAF62
54 54  
55 55 #添加管理员默认所属机构