shiyang / regional-platform

Download as
Browse Code »

Commit b0aa5b132c4624cd57d4091380abfbf087056f21

Authored by baohanddd
2 parents d8d335d9cd 15a612050b
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 35 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/ISmsTemplateDao.java View file @ b0aa5b1
... ... @@ -17,5 +17,6 @@
17 17  
18 18 public List<SmsTemplateModel> querySmsTemplates(MongoQuery mongoQuery);
19 19  
  20 + int queryBabyManageCount(MongoQuery mongoQuery);
20 21 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/SmsTemplateDaoImpl.java View file @ b0aa5b1
1 1 package com.lyms.platform.biz.dal.impl;
2 2  
3   -import com.lyms.platform.biz.dal.ISmsConfigDao;
4 3 import com.lyms.platform.biz.dal.ISmsTemplateDao;
5 4 import com.lyms.platform.common.dao.BaseMongoDAOImpl;
6 5 import com.lyms.platform.common.dao.operator.MongoCondition;
7 6 import com.lyms.platform.common.dao.operator.MongoOper;
8 7 import com.lyms.platform.common.dao.operator.MongoQuery;
9   -import com.lyms.platform.pojo.SmsConfigModel;
10 8 import com.lyms.platform.pojo.SmsTemplateModel;
11 9 import org.springframework.stereotype.Repository;
12 10  
... ... @@ -29,6 +27,11 @@
29 27 @Override
30 28 public List<SmsTemplateModel> querySmsTemplates(MongoQuery mongoQuery) {
31 29 return find(mongoQuery.convertToMongoQuery());
  30 + }
  31 +
  32 + @Override
  33 + public int queryBabyManageCount(MongoQuery mongoQuery) {
  34 + return (int) count(mongoQuery.convertToMongoQuery());
32 35 }
33 36 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverService.java View file @ b0aa5b1
1 1 package com.lyms.platform.biz.service;
2 2  
3 3 import com.lyms.platform.biz.dal.IMatDeliverDao;
  4 +import com.lyms.platform.common.enums.YnEnums;
4 5 import com.lyms.platform.pojo.MaternalDeliverModel;
5 6 import com.lyms.platform.query.MatDeliverQuery;
6 7 import org.springframework.beans.factory.annotation.Autowired;
  8 +import org.springframework.data.domain.Sort;
7 9 import org.springframework.stereotype.Service;
8 10  
  11 +import java.util.Date;
9 12 import java.util.List;
10 13  
11 14 /**
12 15  
13 16  
... ... @@ -27,16 +30,20 @@
27 30 * @return
28 31 */
29 32 public MaternalDeliverModel addMatDeliver(MaternalDeliverModel deliverModel) {
  33 + deliverModel.setYn(YnEnums.YES.getId());
  34 + deliverModel.setCreated(new Date());
  35 + deliverModel.setModified(new Date());
30 36 return iMatDeliverDao.addMatDeliver(deliverModel);
31 37 }
32 38  
33 39 public List<MaternalDeliverModel> query(MatDeliverQuery deliverQuery){
34   - return iMatDeliverDao.queryWithList(deliverQuery.convertToQuery());
  40 + return iMatDeliverDao.queryWithList(deliverQuery.convertToQuery().addOrder(Sort.Direction.DESC,"created"));
35 41 }
36 42 public void deleteOne(String id){
37 43 iMatDeliverDao.deleteOne(id);
38 44 }
39 45 public void updateOne(MaternalDeliverModel deliverModel,String id){
  46 + deliverModel.setModified(new Date());
40 47 iMatDeliverDao.updateOneById(deliverModel, id);
41 48 }
42 49  
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/SmsTemplateService.java View file @ b0aa5b1
... ... @@ -2,9 +2,13 @@
2 2  
3 3  
4 4 import com.lyms.platform.biz.dal.ISmsTemplateDao;
  5 +import com.lyms.platform.common.dao.operator.MongoQuery;
  6 +import com.lyms.platform.common.enums.YnEnums;
5 7 import com.lyms.platform.pojo.SmsTemplateModel;
6 8 import com.lyms.platform.query.SmsTemplateQuery;
  9 +import org.apache.commons.lang.StringUtils;
7 10 import org.springframework.beans.factory.annotation.Autowired;
  11 +import org.springframework.data.domain.Sort;
8 12 import org.springframework.stereotype.Service;
9 13  
10 14 import java.util.List;
... ... @@ -25,8 +29,20 @@
25 29 smsTemplateDao.updateSmsTemplate(model,id);
26 30 }
27 31  
28   - public List<SmsTemplateModel> querySmsTemplates(SmsTemplateQuery query) {
29   - return smsTemplateDao.querySmsTemplates(query.convertToQuery());
  32 + public List<SmsTemplateModel> querySmsTemplates(SmsTemplateQuery templateQuery) {
  33 + MongoQuery query = templateQuery.convertToQuery();
  34 + if (StringUtils.isNotEmpty(templateQuery.getNeed())) {
  35 + templateQuery.mysqlBuild(smsTemplateDao.queryBabyManageCount(templateQuery.convertToQuery()));
  36 + query.start(templateQuery.getOffset()).end(templateQuery.getLimit());
  37 + }
  38 +
  39 + return smsTemplateDao.querySmsTemplates(query.addOrder(Sort.Direction.DESC, "created"));
  40 + }
  41 +
  42 + public void deleteTempById(String id) {
  43 + SmsTemplateModel model = new SmsTemplateModel();
  44 + model.setYn(YnEnums.NO.getId());
  45 + smsTemplateDao.updateSmsTemplate(model,id);
30 46 }
31 47 }
platform-common/src/main/java/com/lyms/platform/common/enums/ChanQResultEnums.java View file @ b0aa5b1
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +/**
  4 + * 产前诊断结果
  5 + *
  6 + * Created by Administrator on 2016/6/29 0029.
  7 + */
  8 +public enum ChanQResultEnums {
  9 +
  10 +
  11 + O("已检查",1),O1("未检查",0);
  12 + private ChanQResultEnums(String name,Integer id){
  13 + this.id=id;
  14 + this.name=name;
  15 + }
  16 +
  17 + public static String getTitle(int id){
  18 + for(ChanQResultEnums chanQResultEnums:values()){
  19 + if(chanQResultEnums.getId()==id){
  20 + return chanQResultEnums.getName();
  21 + }
  22 + }
  23 + return null;
  24 + }
  25 + private Integer id;
  26 + private String name;
  27 +
  28 + public Integer getId() {
  29 + return id;
  30 + }
  31 +
  32 + public void setId(Integer id) {
  33 + this.id = id;
  34 + }
  35 +
  36 + public String getName() {
  37 + return name;
  38 + }
  39 +
  40 + public void setName(String name) {
  41 + this.name = name;
  42 + }
  43 +
  44 + public static enum CqResult{
  45 + O("阳性",1),O1("阴性",0);
  46 + private CqResult(String name,Integer id){
  47 + this.id=id;
  48 + this.name=name;
  49 + }
  50 + private Integer id;
  51 + private String name;
  52 +
  53 + public Integer getId() {
  54 + return id;
  55 + }
  56 +
  57 + public void setId(Integer id) {
  58 + this.id = id;
  59 + }
  60 +
  61 + public String getName() {
  62 + return name;
  63 + }
  64 +
  65 + public void setName(String name) {
  66 + this.name = name;
  67 + }
  68 + }
  69 +}
platform-common/src/main/java/com/lyms/platform/common/enums/ExpEnums.java View file @ b0aa5b1
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +import java.util.ArrayList;
  4 +import java.util.HashMap;
  5 +import java.util.List;
  6 +import java.util.Map;
  7 +
  8 +/**
  9 + *
  10 + * 体验类型
  11 + *
  12 + * @author Administrator
  13 + *
  14 + */
  15 +public enum ExpEnums {
  16 +
  17 + SGY(0,"体验3个月服务"),ETFW(1,"体验儿童服务");
  18 +
  19 + private ExpEnums(int id, String name) {
  20 + this.id = id;
  21 + this.name = name;
  22 + }
  23 +
  24 + public static String getNameById(int id){
  25 + for(ExpEnums sex : values()){
  26 + if(id==sex.id){
  27 + return sex.getName();
  28 + }
  29 + }
  30 + return "";
  31 + }
  32 +
  33 + public static List<Map> getExpEnums() {
  34 + List<Map> list = new ArrayList<>();
  35 + for (ExpEnums e : ExpEnums.values()) {
  36 + Map rootMap = new HashMap();
  37 + rootMap.put("id", e.getId());
  38 + rootMap.put("name", e.getName());
  39 + list.add(rootMap);
  40 + }
  41 + return list;
  42 + }
  43 +
  44 + private int id;
  45 +
  46 + private String name;
  47 +
  48 + public int getId() {
  49 + return id;
  50 + }
  51 +
  52 + public String getName() {
  53 + return name;
  54 + }
  55 +}
platform-common/src/main/java/com/lyms/platform/common/enums/FmTypeEnums.java View file @ b0aa5b1
1 1 package com.lyms.platform.common.enums;
2 2  
  3 +import java.util.ArrayList;
  4 +import java.util.HashMap;
  5 +import java.util.List;
  6 +import java.util.Map;
  7 +
3 8 /**
4 9 * 分娩方式枚举
5 10 * <p>
... ... @@ -11,6 +16,17 @@
11 16 private FmTypeEnums(String name, String id) {
12 17 this.id = id;
13 18 this.name = name;
  19 + }
  20 +
  21 + public static List<Map> getFmTypeEnums() {
  22 + List<Map> list = new ArrayList<>();
  23 + for (FmTypeEnums e : FmTypeEnums.values()) {
  24 + Map rootMap = new HashMap();
  25 + rootMap.put("id", e.getId());
  26 + rootMap.put("name", e.getName());
  27 + list.add(rootMap);
  28 + }
  29 + return list;
14 30 }
15 31  
16 32 private String id;
platform-common/src/main/java/com/lyms/platform/common/enums/SendDateEnums.java View file @ b0aa5b1
... ... @@ -13,16 +13,36 @@
13 13 public enum SendDateEnums {
14 14  
15 15  
16   - GL(0,"公历"),NL(1,"农历"),TSRQ(2,"特殊日期"),SLRQ(3,"生理日期");
  16 + GL(0,"公历","0,1,2","0,1"),NL(1,"农历","0,1,2","0,1"),TSRQ(2,"特殊日期","2","1"),SLRQ(3,"生理日期","0","1");
17 17  
18   - SendDateEnums(int id, String name) {
  18 + SendDateEnums(int id, String name,String freq,String serviceObj) {
19 19 this.id = id;
20 20 this.name = name;
21 21 }
22 22  
23 23 private int id;
24 24 private String name;
  25 + //发送频次
  26 + private String freq;
  27 + //发送对象
  28 + private String serviceObj;
25 29  
  30 + public String getFreq() {
  31 + return freq;
  32 + }
  33 +
  34 + public void setFreq(String freq) {
  35 + this.freq = freq;
  36 + }
  37 +
  38 + public String getServiceObj() {
  39 + return serviceObj;
  40 + }
  41 +
  42 + public void setServiceObj(String serviceObj) {
  43 + this.serviceObj = serviceObj;
  44 + }
  45 +
26 46 public String getName() {
27 47 return name;
28 48 }
29 49  
30 50  
31 51  
... ... @@ -40,17 +60,28 @@
40 60 }
41 61  
42 62  
43   - public static List<Map> getSendFrequency() {
  63 + public static List<Map> getSendFrequency(Integer serviceObj,Integer freq) {
44 64  
45 65 List<Map> list = new ArrayList<>();
46 66 for (SendDateEnums e : SendDateEnums.values()) {
47   - Map rootMap = new HashMap();
48   - rootMap.put("id", e.getId());
49   - rootMap.put("name", e.getName());
50 67  
51   - list.add(rootMap);
  68 + if(e.getFreq().contains(String.valueOf(freq)) && e.getServiceObj().contains(String.valueOf(serviceObj))) {
  69 + Map rootMap = new HashMap();
  70 + rootMap.put("id", e.getId());
  71 + rootMap.put("name", e.getName());
  72 + list.add(rootMap);
  73 + }
52 74 }
53 75 return list;
  76 + }
  77 +
  78 + public static String getNameById(int id){
  79 + for(SendDateEnums enums:values()){
  80 + if(id==enums.getId()){
  81 + return enums.getName();
  82 + }
  83 + }
  84 + return "";
54 85 }
55 86 }
platform-common/src/main/java/com/lyms/platform/common/enums/SendFrequencyEnums.java View file @ b0aa5b1
... ... @@ -52,5 +52,17 @@
52 52 }
53 53 return list;
54 54 }
  55 +
  56 + public static String getNameById(Integer id){
  57 + if (id != null)
  58 + {
  59 + for(SendFrequencyEnums enums:values()){
  60 + if(id==enums.getId()){
  61 + return enums.getName();
  62 + }
  63 + }
  64 + }
  65 + return "";
  66 + }
55 67 }
platform-common/src/main/java/com/lyms/platform/common/enums/SendTimeEnums.java View file @ b0aa5b1
... ... @@ -13,7 +13,7 @@
13 13 public enum SendTimeEnums {
14 14  
15 15  
16   - DT(0,"当天"),NL(1,"前一天"),TSRQ(2,"前两天"),SLRQ(3,"前三天");
  16 + DT(0,"当天"),QYT(1,"前一天"),QLT(2,"前两天"),QST(3,"前三天");
17 17  
18 18 SendTimeEnums(int id, String name) {
19 19 this.id = id;
... ... @@ -51,6 +51,16 @@
51 51 list.add(rootMap);
52 52 }
53 53 return list;
  54 + }
  55 +
  56 + public static String getNameById(int id) {
  57 + for (SendTimeEnums e : SendTimeEnums.values()) {
  58 + if(e.getId() == id)
  59 + {
  60 + return e.getName();
  61 + }
  62 + }
  63 + return "";
54 64 }
55 65 }
platform-common/src/main/java/com/lyms/platform/common/enums/ServiceObjEnums.java View file @ b0aa5b1
... ... @@ -51,5 +51,21 @@
51 51 }
52 52 return list;
53 53 }
  54 +
  55 + /**
  56 + * 通过id查询
  57 + * @param id
  58 + * @return
  59 + */
  60 + public static String getServiceObjById(int id) {
  61 +
  62 + for (ServiceObjEnums e : ServiceObjEnums.values()) {
  63 + if (e.getId() == id)
  64 + {
  65 + return e.getName();
  66 + }
  67 + }
  68 + return "";
  69 + }
54 70 }
platform-common/src/main/java/com/lyms/platform/common/enums/ServiceStatusEnums.java View file @ b0aa5b1
... ... @@ -21,8 +21,14 @@
21 21 ADD_OPEN(3,"开通",1),
22 22 UNSUBSCRIBE(4,"退订",1),
23 23 SUSPEND(5,"暂停",1),
24   - ADD_OVERDUE(6,"过期",1);
  24 + ADD_OVERDUE(6,"过期",1),
25 25  
  26 + //全部
  27 + ALL(103,"全部",100),
  28 + ALL_OPEN(7,"开通",100),
  29 + ALL_NO_OPEN(8,"不开通",100),
  30 + ALL_OVERDUE(9,"过期",100);
  31 +
26 32 private ServiceStatusEnums(int id, String name,int pid){
27 33 this.name=name;
28 34 this.id =id;
29 35  
30 36  
... ... @@ -51,17 +57,33 @@
51 57 }
52 58  
53 59  
54   - public static List<Map<String,String>> getServiceStatusAllList()
  60 + public static List<Map<String,String>> getServiceStatusByPid(int pid)
55 61 {
56 62 List<Map<String,String>> list = new ArrayList<>();
57 63 for(ServiceStatusEnums s : ServiceStatusEnums.values()) {
58   - Map<String,String> map = new HashMap<>();
59   - map.put("id", String.valueOf(s.getId()));
60   - map.put("name", s.getName());
61   - map.put("pid", String.valueOf(s.getPid()));
62   - list.add(map);
  64 + if (s.getPid() == pid)
  65 + {
  66 + Map<String,String> map = new HashMap<>();
  67 + map.put("id", String.valueOf(s.getId()));
  68 + map.put("name", s.getName());
  69 + map.put("pid", String.valueOf(s.getPid()));
  70 + list.add(map);
  71 + }
  72 +
63 73 }
64 74 return list;
  75 + }
  76 +
  77 + public static String getNameByPid(int id)
  78 + {
  79 + for(ServiceStatusEnums s : ServiceStatusEnums.values()) {
  80 + if (s.getId() == id)
  81 + {
  82 + return s.getName();
  83 + }
  84 +
  85 + }
  86 + return "";
65 87 }
66 88  
67 89 public String getName() {
platform-common/src/main/java/com/lyms/platform/common/enums/SexTypeEnums.java View file @ b0aa5b1
1 1 package com.lyms.platform.common.enums;
2 2  
  3 +import java.util.ArrayList;
  4 +import java.util.HashMap;
  5 +import java.util.List;
  6 +import java.util.Map;
  7 +
3 8 /**
4 9 *
5 10 * 性别枚举
... ... @@ -23,6 +28,17 @@
23 28 }
24 29 }
25 30 return "";
  31 + }
  32 +
  33 + public static List<Map> getSexTypeEnums() {
  34 + List<Map> list = new ArrayList<>();
  35 + for (SexTypeEnums e : SexTypeEnums.values()) {
  36 + Map rootMap = new HashMap();
  37 + rootMap.put("id", e.getId());
  38 + rootMap.put("name", e.getName());
  39 + list.add(rootMap);
  40 + }
  41 + return list;
26 42 }
27 43  
28 44 private int id;
platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java View file @ b0aa5b1
  1 +package com.lyms.platform.common.enums;
  2 +
  3 +/**
  4 + *
  5 + * 产筛枚举
  6 + *
  7 + * Created by Administrator on 2016/6/29 0029.
  8 + */
  9 +public enum SieveEnums {
  10 + O("低风险",0),O1("临界值",1),O2("高风险",2);
  11 + private SieveEnums(String name,int id){
  12 + this.id
  13 + =id;
  14 + this.name=name;
  15 + }
  16 + private Integer id;
  17 + private String name;
  18 +
  19 + public Integer getId() {
  20 + return id;
  21 + }
  22 +
  23 + public void setId(Integer id) {
  24 + this.id = id;
  25 + }
  26 +
  27 + public String getName() {
  28 + return name;
  29 + }
  30 +
  31 + public void setName(String name) {
  32 + this.name = name;
  33 + }
  34 +}
platform-common/src/main/java/com/lyms/platform/common/enums/SmsServiceEnums.java View file @ b0aa5b1
... ... @@ -110,7 +110,35 @@
110 110  
111 111 }
112 112  
  113 +
113 114 /**
  115 + * 只要子节点
  116 + * @param id
  117 + * @return
  118 + */
  119 + public static List<Map> getSmsServiceLeaf(int id)
  120 + {
  121 +
  122 + List<Map> list = new ArrayList<>();
  123 + for (SmsServiceEnums e : SmsServiceEnums.values()) {
  124 + if(e.getPid() == id) {
  125 + Map rootMap = new HashMap();
  126 + rootMap.put("id",e.getId());
  127 + rootMap.put("name",e.getName());
  128 + rootMap.put("pid", e.getPid());
  129 + if (!isLeaf(e.getId()))
  130 + {
  131 + list.add(rootMap);
  132 + }
  133 +
  134 +
  135 + }
  136 + }
  137 + return list;
  138 +
  139 + }
  140 +
  141 + /**
114 142 * 判断是否有子节点
115 143 * @param id
116 144 * @return
... ... @@ -142,6 +170,22 @@
142 170 }
143 171 }
144 172 return list;
  173 + }
  174 +
  175 +
  176 + /**
  177 + * 通过id查询消息类型名称
  178 + * @param id
  179 + * @return
  180 + */
  181 + public static String getSmsServiceById(int id)
  182 + {
  183 + for (SmsServiceEnums e : SmsServiceEnums.values()) {
  184 + if(e.getId() == id) {
  185 + return e.getName();
  186 + }
  187 + }
  188 + return "";
145 189 }
146 190  
147 191 }
platform-common/src/main/java/com/lyms/platform/common/enums/SpecialDateEnums.java View file @ b0aa5b1
... ... @@ -13,31 +13,43 @@
13 13 public enum SpecialDateEnums {
14 14  
15 15  
16   - JD(0,"建档",2,"0,1,2"),
17   - FWJS(1,"服务结束",2,"0,1,2"),
18   - MMSR(2,"妈妈生日",2,"1"),
19   - ZFSR(3,"丈夫生日",2,"1"),
20   - ETSR(4,"儿童生日",2,"2"),
21   - ETMY(5,"儿童满月",2,"2"),
22   - ETBS(6,"儿童百岁",2,"2"),
23   - FM(7,"分娩",2,"3"),
  16 + JD(0,"建档",2,"0,1,2","0"),
  17 + FWJS(1,"服务结束",2,"0,1,2","0"),
  18 + MMSR(2,"妈妈生日",2,"1","2"),
  19 + ZFSR(3,"丈夫生日",2,"1","2"),
  20 + ETSR(4,"儿童生日",2,"2","2"),
  21 + ETMY(5,"儿童满月",2,"2","0"),
  22 + ETBS(6,"儿童百岁",2,"2","0"),
  23 + FM(7,"分娩",2,"3","0"),
24 24  
25   - YZ(10,"孕周",3,"1"),
26   - ETTS(11,"儿童天数",3,"2"),
27   - ETYL(12,"儿童月龄",3,"2"),
28   - CHTS(13,"产后天数",3,"3");
29   - SpecialDateEnums(int id, String name,int pid,String serviceObj) {
  25 + YZ(10,"孕周",3,"1","0"),
  26 + ETTS(11,"儿童天数",3,"2","0"),
  27 + ETYL(12,"儿童月龄",3,"2","0"),
  28 + CHTS(13,"产后天数",3,"3","0");
  29 + SpecialDateEnums(int id, String name,int pid,String serviceObj,String freq) {
30 30 this.id = id;
31 31 this.name = name;
32 32 this.pid = pid;
33 33 this.serviceObj = serviceObj;
  34 + this.freq = freq;
34 35 }
35 36  
  37 +
36 38 private int id;
37 39 private String name;
38 40 private int pid;
39 41 private String serviceObj;
  42 + //发送频次
  43 + private String freq;
40 44  
  45 + public String getFreq() {
  46 + return freq;
  47 + }
  48 +
  49 + public void setFreq(String freq) {
  50 + this.freq = freq;
  51 + }
  52 +
41 53 public int getPid() {
42 54 return pid;
43 55 }
44 56  
45 57  
... ... @@ -71,11 +83,21 @@
71 83 }
72 84  
73 85  
74   - public static List<Map> getSpecialDateByServiceObj(int serviceObj,int sendDateType) {
75 86  
  87 + public static String getNameById(int id){
  88 + for(SpecialDateEnums enums:values()){
  89 + if(id==enums.getId()){
  90 + return enums.getName();
  91 + }
  92 + }
  93 + return "";
  94 + }
  95 +
  96 + public static List<Map> getSpecialDateByServiceObj(Integer serviceObj,Integer sendDateType,Integer freq) {
  97 +
76 98 List<Map> list = new ArrayList<>();
77 99 for (SpecialDateEnums e : SpecialDateEnums.values()) {
78   - if(e.getServiceObj().contains(String.valueOf(serviceObj)) && e.getPid() == sendDateType)
  100 + if(e.getServiceObj().contains(String.valueOf(serviceObj)) && e.getPid() == sendDateType && e.getFreq().contains(String.valueOf(freq)))
79 101 {
80 102 Map rootMap = new HashMap();
81 103 rootMap.put("id", e.getId());
platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java View file @ b0aa5b1
... ... @@ -301,6 +301,21 @@
301 301 return rightNow.getTime();
302 302 }
303 303  
  304 + public static Date addMonth(Date srcDate, int month) {
  305 + Calendar rightNow = Calendar.getInstance();
  306 + rightNow.setTime(srcDate);
  307 + rightNow.add(Calendar.DAY_OF_MONTH, month);
  308 + return rightNow.getTime();
  309 + }
  310 +
  311 + public static Date addYear(Date srcDate, int year) {
  312 + Calendar rightNow = Calendar.getInstance();
  313 + rightNow.setTime(srcDate);
  314 + rightNow.add(Calendar.DAY_OF_YEAR, year);
  315 + return rightNow.getTime();
  316 + }
  317 +
  318 +
304 319 /**
305 320 * 获取当天还剩多少秒
306 321 *
platform-dal/src/main/java/com/lyms/platform/pojo/BabyModel.java View file @ b0aa5b1
... ... @@ -183,7 +183,16 @@
183 183 private Date nextDate;
184 184  
185 185  
  186 + //体验类型
  187 + private Integer expType;
186 188  
  189 + public Integer getExpType() {
  190 + return expType;
  191 + }
  192 +
  193 + public void setExpType(Integer expType) {
  194 + this.expType = expType;
  195 + }
187 196  
188 197 public Date getNextDate() {
189 198 return nextDate;
platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java View file @ b0aa5b1
... ... @@ -2,6 +2,7 @@
2 2  
3 3 import org.springframework.data.mongodb.core.mapping.Document;
4 4  
  5 +import java.util.Date;
5 6 import java.util.List;
6 7  
7 8 /**
... ... @@ -94,6 +95,25 @@
94 95 //接生医生
95 96 private String deliverDoctor;
96 97 private Integer yn;
  98 + private Date created;
  99 + private Date modified;
  100 +
  101 + public Date getCreated() {
  102 + return created;
  103 + }
  104 +
  105 + public void setCreated(Date created) {
  106 + this.created = created;
  107 + }
  108 +
  109 + public Date getModified() {
  110 + return modified;
  111 + }
  112 +
  113 + public void setModified(Date modified) {
  114 + this.modified = modified;
  115 + }
  116 +
97 117 public static class ExtPlacenta{
98 118 //胎盘娩出方式
99 119 private String tpmcType;
platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java View file @ b0aa5b1
  1 +package com.lyms.platform.pojo;
  2 +
  3 +import com.lyms.platform.common.result.BaseModel;
  4 +import org.springframework.data.mongodb.core.mapping.Document;
  5 +
  6 +import java.util.Date;
  7 +
  8 +/**
  9 + * 产前筛查
  10 + *
  11 + * Created by Administrator on 2016/6/29 0029.
  12 + */
  13 +@Document(collection = "lyms_sieve")
  14 +public class SieveModel extends BaseModel {
  15 +
  16 + private String id;
  17 + //患者id
  18 + private String parentId;
  19 + //姓名
  20 + private String name;
  21 + //末次月经
  22 + private Date lastMenses;
  23 + //胎数
  24 + private Integer tireNumber;
  25 + //整体风险
  26 + private Integer ztfx;
  27 + //联系方式
  28 + private String phone;
  29 + //申请孕周
  30 + private String dueWeek;
  31 + //产前诊断 1 已检查 0 未检查
  32 + private Integer cqStatus;
  33 + //产前诊断结果
  34 + private String cqResult;
  35 + //妊娠结局
  36 + private String renShenResult;
  37 + private Date created;
  38 + private Date modified;
  39 +}
platform-dal/src/main/java/com/lyms/platform/query/SmsTemplateQuery.java View file @ b0aa5b1
... ... @@ -7,6 +7,8 @@
7 7 import com.lyms.platform.common.dao.operator.MongoQuery;
8 8 import org.bson.types.ObjectId;
9 9  
  10 +import java.util.Date;
  11 +
10 12 /**
11 13 * 短信模板配置查询对象
12 14 *
... ... @@ -28,6 +30,37 @@
28 30 private Integer hospitalId;
29 31  
30 32  
  33 + //发送对象 枚举定义参考 ServiceObjEnums
  34 + private Integer serviceObj;
  35 +
  36 + //服务类型 参见枚举 ServiceTypeEnums
  37 + private Integer serviceType;
  38 +
  39 + //服务状态 参见枚举ServiceStatusEnums
  40 + private Integer serviceStatus;
  41 +
  42 + //消息类型 参见枚举 SmsServiceEnums
  43 + private Integer smsType;
  44 +
  45 + //发送频次 参见枚举 SendFrequencyEnums
  46 + private Integer sendFrequency;
  47 +
  48 + //发送日期类型 参见枚举类 SendDateEnums
  49 + private Integer sendDateType;
  50 +
  51 +
  52 +
  53 + //特殊日期 发送类型
  54 + private Integer specialDateType;
  55 +
  56 +
  57 + //发送时间 参见枚举类 SendTimeEnums
  58 + private Integer sendTimeType;
  59 +
  60 + //内容
  61 + private String content;
  62 +
  63 +
31 64 @Override
32 65 public MongoQuery convertToQuery() {
33 66 MongoCondition condition = MongoCondition.newInstance();
... ... @@ -40,6 +73,22 @@
40 73 }
41 74 if (-1 != yn) {
42 75 condition = condition.and("yn", yn, MongoOper.IS);
  76 + }
  77 +
  78 + if (null != smsType) {
  79 + condition = condition.and("smsType", smsType, MongoOper.IS);
  80 + }
  81 +
  82 + if (null != serviceType) {
  83 + condition = condition.and("serviceType", serviceType, MongoOper.IS);
  84 + }
  85 +
  86 + if (null != serviceObj) {
  87 + condition = condition.and("serviceObj", serviceObj, MongoOper.IS);
  88 + }
  89 +
  90 + if (null != content) {
  91 + condition = condition.and("content", content, MongoOper.LIKE);
43 92 }
44 93 return condition.toMongoQuery();
45 94 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BabyBookbuildingController.java View file @ b0aa5b1
... ... @@ -159,7 +159,7 @@
159 159 */
160 160 @RequestMapping(value = "/queryBabyList", method = RequestMethod.POST)
161 161 @ResponseBody
162   - public BaseResponse queryBabyList(@RequestBody BabyManageRequest request){
  162 + public BaseListResponse queryBabyList(@RequestBody BabyManageRequest request){
163 163 return babyBookbuildingFacade.queryBabyList(request);
164 164 }
165 165  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java View file @ b0aa5b1
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.common.enums.*;
4 4 import com.lyms.platform.permission.model.Organization;
5 5 import org.springframework.stereotype.Controller;
  6 +import org.springframework.web.bind.annotation.PathVariable;
6 7 import org.springframework.web.bind.annotation.RequestMapping;
7 8 import org.springframework.web.bind.annotation.RequestMethod;
8 9 import org.springframework.web.bind.annotation.ResponseBody;
... ... @@ -190,6 +191,104 @@
190 191 }
191 192 return list;
192 193 }
  194 +
  195 +
  196 + /**
  197 + * 获取发送对象
  198 + * @return
  199 + */
  200 + @RequestMapping(value = "/getAllServiceObjs", method = RequestMethod.GET)
  201 + @ResponseBody
  202 + public List<Map> getSmsTempEnums() {
  203 + return ServiceObjEnums.getServiceObjs();
  204 + }
  205 +
  206 +
  207 + /**
  208 + * 服务类型
  209 + * @return
  210 + */
  211 + @RequestMapping(value = "/getAllServiceType", method = RequestMethod.GET)
  212 + @ResponseBody
  213 + public List<Map<String,String>> getAllServiceType() {
  214 + List<Map<String,String>> list = ServiceTypeEnums.getServiceTypeAllList();
  215 + return list;
  216 + }
  217 +
  218 + /**
  219 + * 服务类型
  220 + * @return
  221 + */
  222 + @RequestMapping(value = "/getServiceStatusByPid/{pid}", method = RequestMethod.GET)
  223 + @ResponseBody
  224 + public List<Map<String,String>> getServiceStatusByPid(@PathVariable("pid") Integer pid) {
  225 + List<Map<String,String>> list = ServiceStatusEnums.getServiceStatusByPid(pid);
  226 + return list;
  227 + }
  228 +
  229 + /**
  230 + * 获取消息类型
  231 + * @param serviceObjId
  232 + * @return
  233 + */
  234 + @RequestMapping(value = "/getSmsTypeByObjId/{serviceObjId}", method = RequestMethod.GET)
  235 + @ResponseBody
  236 + public List<Map> getAllServiceStatus(@PathVariable("serviceObjId") Integer serviceObjId) {
  237 + List<Map> list = SmsServiceEnums.getSmsServiceByServiceObj(serviceObjId);
  238 + return list;
  239 + }
  240 +
  241 + /**
  242 + * 特殊日期类型查询
  243 + * @param serviceObjId 服务对象
  244 + * @param sendDateType 日期类型
  245 + * @param freq 发送频次
  246 + * @return
  247 + */
  248 + @RequestMapping(value = "/getSpecialType/{serviceObjId}/{sendDateType}/{freq}", method = RequestMethod.GET)
  249 + @ResponseBody
  250 + public List<Map> getSpecialType(@PathVariable("serviceObjId") Integer serviceObjId,@PathVariable("sendDateType") Integer sendDateType,@PathVariable("freq") Integer freq) {
  251 + List<Map> list =SpecialDateEnums.getSpecialDateByServiceObj(serviceObjId, sendDateType,freq);
  252 + return list;
  253 + }
  254 +
  255 +
  256 + /**
  257 + * 发送时间类型
  258 + * @param serviceObjId 服务短信
  259 + * @param freq 发送频次
  260 + * @return
  261 + */
  262 + @RequestMapping(value = "/getDateType/{serviceObjId}/{freq}", method = RequestMethod.GET)
  263 + @ResponseBody
  264 + public List<Map> getDateType(@PathVariable("serviceObjId") Integer serviceObjId,@PathVariable("freq") Integer freq) {
  265 + List<Map> list =SendDateEnums.getSendFrequency(serviceObjId,freq);
  266 + return list;
  267 + }
  268 +
  269 +
  270 + /**
  271 + * 获取发送频率
  272 + * @return
  273 + */
  274 + @RequestMapping(value = "/getSendFrequency", method = RequestMethod.GET)
  275 + @ResponseBody
  276 + public List<Map> getSendFrequency() {
  277 + List<Map> list =SendFrequencyEnums.getSendFrequency();
  278 + return list;
  279 + }
  280 +
  281 + /**
  282 + * 发送时间
  283 + * @return
  284 + */
  285 + @RequestMapping(value = "/getSendTime", method = RequestMethod.GET)
  286 + @ResponseBody
  287 + public List<Map> getSendTime() {
  288 + List<Map> list =SendTimeEnums.getSendTime();
  289 + return list;
  290 + }
  291 +
193 292 public static void main(String a[]) {
194 293  
195 294 for (PatientsTypeEnum e : PatientsTypeEnum.values()) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostReviewController.java View file @ b0aa5b1
... ... @@ -9,10 +9,7 @@
9 9 import org.apache.commons.lang.StringUtils;
10 10 import org.springframework.beans.factory.annotation.Autowired;
11 11 import org.springframework.stereotype.Controller;
12   -import org.springframework.web.bind.annotation.RequestMapping;
13   -import org.springframework.web.bind.annotation.RequestMethod;
14   -import org.springframework.web.bind.annotation.RequestParam;
15   -import org.springframework.web.bind.annotation.ResponseBody;
  12 +import org.springframework.web.bind.annotation.*;
16 13  
17 14 import javax.validation.Valid;
18 15  
... ... @@ -33,7 +30,9 @@
33 30 *
34 31 * @return
35 32 */
36   - public BaseResponse addPostReview(@Valid PostReviewRequest postReviewRequest){
  33 + @RequestMapping(method = RequestMethod.POST,value = "/postreview")
  34 + @ResponseBody
  35 + public BaseResponse addPostReview(@Valid @RequestBody PostReviewRequest postReviewRequest){
37 36 return postReviewFacade.addPostReview(postReviewRequest);
38 37 }
39 38  
... ... @@ -44,6 +43,8 @@
44 43 *
45 44 * @return
46 45 */
  46 + @RequestMapping(method = RequestMethod.GET,value = "/postreviewlist")
  47 + @ResponseBody
47 48 public BaseResponse queryPostReviewList(@Valid PostReviewQueryRequest postReviewQueryRequest){
48 49 return postReviewFacade.queryPostList(postReviewQueryRequest);
49 50 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsTemplateController.java View file @ b0aa5b1
1 1 package com.lyms.platform.operate.web.controller;
2 2  
3 3 import com.lyms.platform.common.base.BaseController;
  4 +import com.lyms.platform.common.result.BaseListResponse;
4 5 import com.lyms.platform.common.result.BaseObjectResponse;
5 6 import com.lyms.platform.common.result.BaseResponse;
6 7 import com.lyms.platform.common.utils.StringUtils;
7 8  
... ... @@ -57,9 +58,20 @@
57 58 */
58 59 @RequestMapping(method = RequestMethod.POST, value = "/querySmsTempList")
59 60 @ResponseBody
60   - public BaseObjectResponse querySmsTemps(@RequestBody SmsTemplateRequest request) {
  61 + public BaseListResponse querySmsTemps(@RequestBody SmsTemplateRequest request) {
61 62 return smsTemplateFacade.querySmsTemps(request);
62 63 }
63 64  
  65 +
  66 + /**
  67 + * 删除模板
  68 + * @param id
  69 + * @return
  70 + */
  71 + @RequestMapping(method = RequestMethod.GET, value = "/deleteTempById/{id}")
  72 + @ResponseBody
  73 + public BaseResponse deleteTempById(@PathVariable("id") String id) {
  74 + return smsTemplateFacade.deleteTempById(id);
  75 + }
64 76 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java View file @ b0aa5b1
... ... @@ -273,7 +273,7 @@
273 273 map.put("organizations",convert());
274 274 return new BaseObjectResponse().setData(map).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
275 275 }
276   - private List convert(){
  276 + public List convert(){
277 277 List<Organization> organization = organizationService.queryHospital();
278 278 List data = new ArrayList();
279 279 if(CollectionUtils.isNotEmpty(organization)){
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ b0aa5b1
... ... @@ -130,10 +130,14 @@
130 130 //1 转入 0转出
131 131 if ("1".equals(applyOrderQueryRequest.getType())) {
132 132 List data = autoMatchFacade.matchOrgId(userId);
133   - referralApplyOrderQuery.setTransferredHospital(data.get(0) + "");
  133 + if (CollectionUtils.isNotEmpty(data)) {
  134 + referralApplyOrderQuery.setTransferredHospital(data.get(0) + "");
  135 + }
134 136 } else if ("0".equals(applyOrderQueryRequest.getType())) {
135 137 List data = autoMatchFacade.matchOrgId(userId);
136   - referralApplyOrderQuery.setOutHospitalId(data.get(0) + "");
  138 + if (CollectionUtils.isNotEmpty(data)) {
  139 + referralApplyOrderQuery.setOutHospitalId(data.get(0) + "");
  140 + }
137 141 }
138 142 List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);
139 143  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java View file @ b0aa5b1
... ... @@ -2,9 +2,7 @@
2 2  
3 3 import com.lyms.platform.biz.service.*;
4 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
5   -import com.lyms.platform.common.enums.ServiceStatusEnums;
6   -import com.lyms.platform.common.enums.ServiceTypeEnums;
7   -import com.lyms.platform.common.enums.YnEnums;
  5 +import com.lyms.platform.common.enums.*;
8 6 import com.lyms.platform.common.result.BaseListResponse;
9 7 import com.lyms.platform.common.result.BaseObjectResponse;
10 8 import com.lyms.platform.common.result.BaseResponse;
... ... @@ -25,7 +23,6 @@
25 23 import org.springframework.beans.factory.annotation.Autowired;
26 24 import org.springframework.stereotype.Component;
27 25  
28   -import javax.management.StringValueExp;
29 26 import java.util.*;
30 27  
31 28 /**
... ... @@ -55,6 +52,8 @@
55 52 @Autowired
56 53 private YunBookbuildingService yunBookbuildingService;
57 54  
  55 + @Autowired
  56 + private AntenatalExaminationFacade antenatalExaminationFacade;
58 57  
59 58 /**
60 59 * 修改儿童建档
... ... @@ -230,7 +229,18 @@
230 229 bm.setExpVip(b.getExpVip());
231 230 bm.setMremark(b.getMremark());
232 231 bm.setDiagnose(b.getDiagnose());
233   - bm.setVipEndTime(DateUtil.parseYMD(b.getVipEndTime()));
  232 +
  233 + if (b.getExpType() == ExpEnums.SGY.getId())
  234 + {
  235 + Date vipEndTime = DateUtil.addMonth(DateUtil.parseYMD(b.getBuildDate()),3);
  236 + bm.setVipEndTime(vipEndTime);
  237 + }
  238 + else
  239 + {
  240 + Date vipEndTime = DateUtil.addYear(DateUtil.parseYMD(b.getBabyBirthday()),3);
  241 + bm.setVipEndTime(vipEndTime);
  242 + }
  243 +
234 244 bm.setServiceStatus(b.getServiceStatus());
235 245  
236 246 bm.setDueDate(DateUtil.parseYMD(b.getDueDate()));
... ... @@ -244,6 +254,7 @@
244 254 bm.setHospitalId(b.getHospitalId());
245 255 bm.setApgarScore(JsonUtil.obj2JsonString(b.getApgar()));
246 256  
  257 + bm.setExpType(b.getExpType());
247 258  
248 259 bm.setCurrentHighRisk(b.getHighRisk());
249 260  
... ... @@ -338,7 +349,7 @@
338 349 result.setExpVip(model.getExpVip());
339 350 result.setMremark(model.getMremark() == null ? "" : model.getMremark());
340 351 result.setDiagnose(model.getDiagnose());
341   - result.setVipEndTime(DateUtil.getyyyy_MM_dd(model.getVipEndTime()));
  352 + //result.setVipEndTime(DateUtil.getyyyy_MM_dd(model.getVipEndTime()));
342 353 result.setServiceStatus(String.valueOf(model.getServiceStatus()));
343 354  
344 355  
... ... @@ -347,6 +358,7 @@
347 358 result.setServiceType(String.valueOf(model.getServiceType()));
348 359 result.setVcCardNo(model.getVcCardNo());
349 360 result.setHospitalId(model.getHospitalId());
  361 + result.setExpType(model.getExpType());
350 362 return result;
351 363 }
352 364  
... ... @@ -409,6 +421,24 @@
409 421 List serviceStatus = ServiceStatusEnums.getServiceStatusList();
410 422 map.put("serviceStatus", serviceStatus);
411 423  
  424 + //医院
  425 + List hospitals = antenatalExaminationFacade.convert();
  426 + map.put("hospitals", hospitals);
  427 +
  428 + //分娩方式
  429 + List fmType = FmTypeEnums.getFmTypeEnums();
  430 + map.put("fmType", fmType);
  431 +
  432 + //性别
  433 + List sexType = SexTypeEnums.getSexTypeEnums();
  434 + map.put("sexType", sexType);
  435 +
  436 + //体验类型
  437 + List expType = ExpEnums.getExpEnums();
  438 + map.put("expType", expType);
  439 +
  440 +
  441 +
412 442 BaseObjectResponse objectResponse = new BaseObjectResponse();
413 443 objectResponse.setData(map);
414 444 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
... ... @@ -597,7 +627,7 @@
597 627 * @param request
598 628 * @return
599 629 */
600   - public BaseResponse queryBabyList(BabyManageRequest request) {
  630 + public BaseListResponse queryBabyList(BabyManageRequest request) {
601 631  
602 632 BabyModelQuery babyQuery = new BabyModelQuery();
603 633 babyQuery.setYn(YnEnums.YES.getId());
604 634  
... ... @@ -651,9 +681,10 @@
651 681 list.add(result);
652 682 }
653 683 }
654   - BaseObjectResponse objectResponse = new BaseObjectResponse();
  684 + BaseListResponse objectResponse = new BaseListResponse();
655 685 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
656 686 objectResponse.setData(list);
  687 + objectResponse.setPageInfo(babyQuery.getPageInfo());
657 688 objectResponse.setErrormsg("成功");
658 689 return objectResponse;
659 690 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostReviewFacade.java View file @ b0aa5b1
1 1 package com.lyms.platform.operate.web.facade;
2 2  
  3 +import com.lyms.platform.biz.service.MatDeliverService;
3 4 import com.lyms.platform.biz.service.PatientsService;
4 5 import com.lyms.platform.biz.service.PostReviewService;
5 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
6 7  
7 8  
... ... @@ -11,10 +12,13 @@
11 12 import com.lyms.platform.operate.web.request.PostReviewRequest;
12 13 import com.lyms.platform.operate.web.result.PostReviewListResult;
13 14 import com.lyms.platform.operate.web.result.PostReviewResult;
  15 +import com.lyms.platform.pojo.MaternalDeliverModel;
14 16 import com.lyms.platform.pojo.Patients;
15 17 import com.lyms.platform.pojo.PostReviewModel;
  18 +import com.lyms.platform.query.MatDeliverQuery;
16 19 import com.lyms.platform.query.PatientsQuery;
17 20 import com.lyms.platform.query.PostReviewQuery;
  21 +import org.apache.commons.collections.CollectionUtils;
18 22 import org.apache.commons.lang.StringUtils;
19 23 import org.springframework.beans.factory.annotation.Autowired;
20 24 import org.springframework.stereotype.Component;
21 25  
22 26  
... ... @@ -33,12 +37,14 @@
33 37 private PostReviewService postReviewService;
34 38 @Autowired
35 39 private PatientsService patientsService;
  40 + @Autowired
  41 + private MatDeliverService matDeliverService;
36 42  
37 43 public BaseResponse addPostReview(PostReviewRequest postReviewRequest) {
38   - if(StringUtils.isEmpty(postReviewRequest.getId())){
  44 + if (StringUtils.isEmpty(postReviewRequest.getId())) {
39 45 postReviewService.addPostReview(postReviewRequest.convertToDataModel());
40   - }else{
41   - postReviewService.updatePostById(postReviewRequest.convertToDataModel(),postReviewRequest.getId());
  46 + } else {
  47 + postReviewService.updatePostById(postReviewRequest.convertToDataModel(), postReviewRequest.getId());
42 48 }
43 49 return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
44 50 }
45 51  
... ... @@ -55,9 +61,17 @@
55 61 postReviewQuery.setParentId(patientsList.getId());
56 62 postReviewQuery.setYn(YnEnums.YES.getId());
57 63 List<PostReviewModel> postReviewModels = postReviewService.findWithList(postReviewQuery);
58   - if (null != postReviewModels) {
59   - postReviewListResult.convertToResult(postReviewModels, patientsList);
  64 + MatDeliverQuery matDeliverQuery = new MatDeliverQuery();
  65 + matDeliverQuery.setParentId(patientsList.getId());
  66 + matDeliverQuery.setYn(YnEnums.YES.getId());
  67 +
  68 + List<MaternalDeliverModel> list = matDeliverService.query(matDeliverQuery);
  69 + String dueDate="";
  70 + if(CollectionUtils.isNotEmpty(list)){
  71 + dueDate= list.get(0).getDueDate();
  72 +
60 73 }
  74 + postReviewListResult.convertToResult(postReviewModels, patientsList,dueDate);
61 75 }
62 76 return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(postReviewListResult);
63 77 }
... ... @@ -70,6 +84,8 @@
70 84 */
71 85 public BaseResponse findById(String id) {
72 86 PostReviewModel postReviewModel = postReviewService.findOneById(id);
  87 +
  88 +
73 89 Assert.notNull(postReviewModel, "没有对应的数据.");
74 90 PostReviewResult postReviewResult = new PostReviewResult();
75 91 postReviewResult.convertToResult(postReviewModel);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsTemplateFacade.java View file @ b0aa5b1
... ... @@ -2,7 +2,8 @@
2 2  
3 3 import com.lyms.platform.biz.service.SmsTemplateService;
4 4 import com.lyms.platform.common.constants.ErrorCodeConstants;
5   -import com.lyms.platform.common.enums.YnEnums;
  5 +import com.lyms.platform.common.enums.*;
  6 +import com.lyms.platform.common.result.BaseListResponse;
6 7 import com.lyms.platform.common.result.BaseObjectResponse;
7 8 import com.lyms.platform.common.result.BaseResponse;
8 9 import com.lyms.platform.common.utils.DateUtil;
... ... @@ -146,8 +147,88 @@
146 147 * @param request
147 148 * @return
148 149 */
149   - public BaseObjectResponse querySmsTemps(SmsTemplateRequest request) {
150   - return null;
  150 + public BaseListResponse querySmsTemps(SmsTemplateRequest request) {
  151 +
  152 + SmsTemplateQuery query = new SmsTemplateQuery();
  153 + query.setYn(YnEnums.YES.getId());
  154 + query.setNeed("1");
  155 + if (request.getServiceObj() != null && request.getServiceObj() == 0)
  156 + {
  157 + //查询全部
  158 + request.setServiceObj(null);
  159 + }
  160 +
  161 +// if (request.getSmsType() != null && request.getSmsType() == 0)
  162 +// {
  163 +//
  164 +// }
  165 + if (request.getServiceType() != null && request.getServiceType() == 100)
  166 + {
  167 + request.setServiceType(null);
  168 + }
  169 +
  170 + if (request.getServiceStatus() != null && (request.getServiceStatus() == 101 || request.getServiceStatus() == 102 || request.getServiceStatus() == 103))
  171 + {
  172 + request.setServiceType(null);
  173 + }
  174 +
  175 + List<SmsTemplateModel> templates = smsTemplateService.querySmsTemplates(query);
  176 + List<Map> results = new ArrayList<>();
  177 + if (CollectionUtils.isNotEmpty(templates))
  178 + {
  179 + for(SmsTemplateModel temp : templates)
  180 + {
  181 + Map result = new HashMap();
  182 + result.put("id",temp.getId());
  183 + result.put("smsTypeName", SmsServiceEnums.getSmsServiceById(temp.getSmsType()));
  184 +
  185 + String serviceObjName = ServiceObjEnums.getServiceObjById(temp.getServiceObj());
  186 +
  187 + result.put("serviceObjName", serviceObjName);
  188 + result.put("serviceTypeName", ServiceTypeEnums.getTitleById(temp.getServiceType()));
  189 +
  190 + result.put("serviceStatusName", ServiceStatusEnums.getNameByPid(temp.getServiceStatus()));
  191 + result.put("content", temp.getContent());
  192 +
  193 + //发送频次
  194 + Integer sendFreq = temp.getSendFrequency();
  195 +
  196 + String sendDate = SendDateEnums.getNameById(temp.getSendDateType());
  197 +
  198 +
  199 + String dateRange = temp.getStart() == null ? "" : (temp.getStart() + " "+ temp.getEnd());
  200 +
  201 + String splDate = temp.getSpecialDateType() == null ? "" : SpecialDateEnums.getNameById(temp.getSpecialDateType());
  202 + String str = SendFrequencyEnums.getNameById(temp.getSendFrequency())+ " " + sendDate+" "+splDate+ " " +dateRange;
  203 +
  204 +
  205 +
  206 + result.put("sendDate",str);
  207 + result.put("sendTimes", SendTimeEnums.getNameById(temp.getSendTimeType()));
  208 + result.put("status",temp.getStatus() == 0 ? "未启用" : "启用");
  209 + }
  210 + }
  211 +
  212 + BaseListResponse objectResponse = new BaseListResponse();
  213 + objectResponse.setData(results);
  214 + objectResponse.setPageInfo(query.getPageInfo());
  215 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  216 + objectResponse.setErrormsg("成功");
  217 + return objectResponse;
  218 +
  219 + }
  220 +
  221 + /**
  222 + * 删除模板
  223 + * @param id
  224 + * @return
  225 + */
  226 + public BaseResponse deleteTempById(String id) {
  227 + smsTemplateService.deleteTempById(id);
  228 + BaseResponse objectResponse = new BaseResponse();
  229 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  230 + objectResponse.setErrormsg("成功");
  231 + return objectResponse;
151 232 }
152 233 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyBookbuildingAddRequest.java View file @ b0aa5b1
... ... @@ -124,6 +124,9 @@
124 124 //会员截止时间
125 125 private String vipEndTime;
126 126  
  127 + //体验类型
  128 + private Integer expType;
  129 +
127 130 //高危因素
128 131 //private String highRiskReason;
129 132  
... ... @@ -137,6 +140,13 @@
137 140 this.deliverOrg = deliverOrg;
138 141 }
139 142  
  143 + public Integer getExpType() {
  144 + return expType;
  145 + }
  146 +
  147 + public void setExpType(Integer expType) {
  148 + this.expType = expType;
  149 + }
140 150  
141 151 public Integer getServiceStatus() {
142 152 return serviceStatus;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PostReviewRequest.java View file @ b0aa5b1
... ... @@ -88,7 +88,7 @@
88 88 //产检日期
89 89 private String checkTime;
90 90 //下次产检时间
91   - private String nextCheckTime;
  91 + private Map nextCheckTime;
92 92  
93 93  
94 94  
95 95  
... ... @@ -141,11 +141,11 @@
141 141 this.dirOpinion = dirOpinion;
142 142 }
143 143  
144   - public String getNextCheckTime() {
  144 + public Map getNextCheckTime() {
145 145 return nextCheckTime;
146 146 }
147 147  
148   - public void setNextCheckTime(String nextCheckTime) {
  148 + public void setNextCheckTime(Map nextCheckTime) {
149 149 this.nextCheckTime = nextCheckTime;
150 150 }
151 151  
... ... @@ -329,7 +329,7 @@
329 329 postReviewModel.setDirOpinion(dirOpinion);
330 330 postReviewModel.setProdDoctor(prodDoctor);
331 331 postReviewModel.setCheckTime(checkTime);
332   - postReviewModel.setNextCheckTime(nextCheckTime);
  332 + postReviewModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime));
333 333 return postReviewModel;
334 334 }
335 335 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/BabyBuildResult.java View file @ b0aa5b1
... ... @@ -126,6 +126,17 @@
126 126 //是否高危 0 非高危 1高危
127 127 private Integer highRisk;
128 128  
  129 + //体验类型
  130 + private Integer expType;
  131 +
  132 + public Integer getExpType() {
  133 + return expType;
  134 + }
  135 +
  136 + public void setExpType(Integer expType) {
  137 + this.expType = expType;
  138 + }
  139 +
129 140 public String getMremark() {
130 141 return mremark;
131 142 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewListResult.java View file @ b0aa5b1
... ... @@ -37,9 +37,19 @@
37 37 private String remarks;
38 38 //末次月经
39 39 private String lastMenses;
  40 + //分娩时间
  41 + private String dueDate;
40 42 //<!---------基本信息----------->
41 43 private List data = new ArrayList();
42 44  
  45 + public String getDueDate() {
  46 + return dueDate;
  47 + }
  48 +
  49 + public void setDueDate(String dueDate) {
  50 + this.dueDate = dueDate;
  51 + }
  52 +
43 53 public List getRiskFactor() {
44 54 return riskFactor;
45 55 }
... ... @@ -128,7 +138,8 @@
128 138 this.yChanQi = yChanQi;
129 139 }
130 140  
131   - public PostReviewListResult convertToResult(List<PostReviewModel> destModel,Patients patients) {
  141 + public PostReviewListResult convertToResult(List<PostReviewModel> destModel,Patients patients,String dueDate) {
  142 + setDueDate(dueDate);
132 143 setId(patients.getId());
133 144 try {
134 145 if(null!=patients.getBirth()){
... ... @@ -165,7 +176,7 @@
165 176  
166 177 public AntData(PostReviewModel model){
167 178 this.id=model.getId();
168   - this.dueWeek="产后"+model.getDay()+"天";
  179 + this.dueWeek=model.getDay();
169 180 this.checkTime=model.getCheckTime();
170 181 }
171 182 public String getCheckTime() {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PostReviewResult.java View file @ b0aa5b1
... ... @@ -85,13 +85,13 @@
85 85 //产检日期
86 86 private String checkTime;
87 87 //下次产检时间
88   - private String nextCheckTime;
  88 + private Map nextCheckTime;
89 89  
90 90  
91 91 public PostReviewResult convertToResult(PostReviewModel postReviewModel) {
92 92 setId(postReviewModel.getId());
93 93 setParentId(postReviewModel.getParentId());
94   - setDay("产后" + postReviewModel.getDay() + "天");
  94 + setDay(postReviewModel.getDay());
95 95 setHealthStatus(postReviewModel.getHealthStatus());
96 96 setPsychology(postReviewModel.getPsychology());
97 97 setWeight(postReviewModel.getWeight());
... ... @@ -114,7 +114,7 @@
114 114 setDirOpinion(postReviewModel.getDirOpinion());
115 115 setProdDoctor(postReviewModel.getProdDoctor());
116 116 setCheckTime(postReviewModel.getCheckTime());
117   - setNextCheckTime(postReviewModel.getNextCheckTime());
  117 + setNextCheckTime(JsonUtil.str2Obj(postReviewModel.getNextCheckTime(),Map.class));
118 118 return this;
119 119 }
120 120  
121 121  
... ... @@ -167,11 +167,11 @@
167 167 this.dirOpinion = dirOpinion;
168 168 }
169 169  
170   - public String getNextCheckTime() {
  170 + public Map getNextCheckTime() {
171 171 return nextCheckTime;
172 172 }
173 173  
174   - public void setNextCheckTime(String nextCheckTime) {
  174 + public void setNextCheckTime(Map nextCheckTime) {
175 175 this.nextCheckTime = nextCheckTime;
176 176 }
177 177