diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java index 2f1a4da..fed803a 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/service/impl/BaseServiceImpl.java @@ -236,6 +236,34 @@ public class BaseServiceImpl implements IBaseService { */ public String getSmsPrefix(SmsConfigModel config,String doctorId) { + String prefix = ""; + //是否收费，孕妇，儿童，产妇 {"pregnant":"true","baby":"false","puerperant":"true"} + if (StringUtils.isNotEmpty(config.getIsCharge())) + { + prefix = config.getAreaPrefix(); + String isCharge = config.getIsCharge(); + Map chargeMap = JsonUtil.getMap(isCharge); + if (chargeMap != null && chargeMap.size() > 0) + { + String pregnant = chargeMap.get("pregnant"); + if (StringUtils.isNotEmpty(pregnant) && "true".equals(pregnant)) + { + prefix = getPrefix(config,doctorId); + } + } + } + + return prefix; + } + + /** + * 获取医院前缀或者可是前缀 + * @param config + * @param doctorId + * @return + */ + private String getPrefix(SmsConfigModel config,String doctorId) + { String messagePrefix = config.getHospitalPrefix(); //前缀类型 0医院前缀 1科室前缀 if (config.getPrefixType() != null && config.getPrefixType() == 1) @@ -247,6 +275,7 @@ public class BaseServiceImpl implements IBaseService { } + /** * /通过医生查询科室前缀 * @param doctorId diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index 39a762c..c203676 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -447,7 +447,7 @@ public class TempleteMsgGenerateWorker implements Runnable { for (String id : idset) { - //查询符合条件的产妇 + //查询符合条件的孕妇 patientsQuery.setId(id); List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); if (CollectionUtils.isNotEmpty(patients)) diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/QhdDjq.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/QhdDjq.java index 10fb334..d1bf2ce 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/QhdDjq.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/pojo/QhdDjq.java @@ -44,6 +44,17 @@ public class QhdDjq { //备注 private String remark; + //姓名 + private String patName; + + public String getPatName() { + return patName; + } + + public void setPatName(String patName) { + this.patName = patName; + } + public String getSerialNumber() { return serialNumber; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java index f4b7880..eb9afd9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponPrintController.java @@ -236,6 +236,7 @@ public class CouponPrintController extends BaseController{ if (CollectionUtils.isNotEmpty(list)) { Patients patient = list.get(0); + model.setPatName(patient.getUsername()); model.setPatIdCardNo(patient.getCardNo()); model.setPatCardNo(patient.getVcCardNo()); model.setPatPhoneNumber(patient.getPhone()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java index edf2fa4..de725c2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/SyncDataTaskService.java @@ -42,6 +42,18 @@ import java.util.*; @Service("syncDataTaskService") public class SyncDataTaskService { + private static final Map urls = new HashMap<>(); + + static + { + urls.put("area-lc-api.healthbaby.com.cn:55581","聊城"); + urls.put("area-dz-api.healthbaby.com.cn:12356","德州"); + urls.put("area-qhd-api.healthbaby.com.cn:18019","秦皇岛"); + urls.put("area-nc-api.healthbaby.com.cn:12356","南充"); + urls.put("area-laoling-api.healthbaby.com.cn:12356","乐陵"); + urls.put("rp-hbnq-api.healthbaby.com.cn:18019","内丘"); + } + @Autowired private SyncDataService syncDataService; @@ -133,245 +145,58 @@ public class SyncDataTaskService { } } - /** - * 该方法是定时去取秦皇岛要同步的数据 - * 定时任务配置applicationContext.xml - */ - public void qhdfySyncDataSSL() { - - try{ - - String json = HttpClientUtil.doPost("https://area-qhd-api.healthbaby.com.cn:18019/findSyncData", new HashMap(), "utf-8"); - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(json)) - { - List list = JsonUtil.toList(json, SyncDataModel.class); - System.out.println("qdhfy syncdata size = "+ list.size()); - - - int batchSize = 200; - int end = 0; - for (int i = 0; i < list.size(); i += batchSize) { - end = (end + batchSize); - if (end > list.size()) { - end = list.size(); - } - System.out.println("qhdfy start:" + i + ",end:" + end); - final List tempList = list.subList(i, end); - new Thread(new Runnable() { - @Override - public void run() { - if (CollectionUtils.isNotEmpty(tempList)) - { - StringBuffer ids = new StringBuffer(); - for (SyncDataModel model : tempList) { - boolean boo = mongoSyncService.syncData(model.getAction(), model.getDataId(), model.getClassName(), model.getJsonData()); - if (boo) { - ids.append(model.getId()); - ids.append(","); - } - } - if (ids.length() > 0) { - Map params = new HashMap(); - params.put("ids", ids.toString()); - String result = HttpClientUtil.doPost("https://area-qhd-api.healthbaby.com.cn:18019/updateSyncData", params, "utf-8"); - System.out.println("exc result = "+ result); - } - } - } - }).start(); - } - } - }catch(Exception ex){ - ExceptionUtils.catchException(ex, "qhdfySyncDataSSL Error."); - } - } - /** - * 同步德州妇幼的数据到线上 + * 同步区域数据到线上服务器 * 定时任务配置applicationContext.xml + * */ - public void dzfySyncDataSSL() { - - try{ - String json = HttpClientUtil.doPost("https://area-dz-api.healthbaby.com.cn:12356/findSyncData", new HashMap(), "utf-8"); - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(json)) - { - List list = JsonUtil.toList(json, SyncDataModel.class); - System.out.println("dzfy syncdata size = "+ list.size()); - int batchSize = 200; - int end = 0; - for (int i = 0; i < list.size(); i += batchSize) { - end = (end + batchSize); - if (end > list.size()) { - end = list.size(); - } - System.out.println("dzfy start:" + i + ",end:" + end); - final List tempList = list.subList(i, end); - new Thread(new Runnable() { - @Override - public void run() { - if (CollectionUtils.isNotEmpty(tempList)) - { - StringBuffer ids = new StringBuffer(); - for (SyncDataModel model : tempList) { - boolean boo = mongoSyncService.syncData(model.getAction(), model.getDataId(), model.getClassName(), model.getJsonData()); - if (boo) { - ids.append(model.getId()); - ids.append(","); - } - } - if (ids.length() > 0) { - Map params = new HashMap(); - params.put("ids", ids.toString()); - String result = HttpClientUtil.doPost("https://area-dz-api.healthbaby.com.cn:12356/updateSyncData", params, "utf-8"); - System.out.println("exc result = "+ result); - } - } + public void syncDataSSL() + { + for (final String url : urls.keySet()) + { + try{ + String areaName = urls.get(url); + String json = HttpClientUtil.doPost("https://"+url+"/findSyncData", new HashMap(), "utf-8"); + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(json)) + { + List list = JsonUtil.toList(json, SyncDataModel.class); + System.out.println(areaName+" syncdata size = "+ list.size()); + int batchSize = 200; + int end = 0; + for (int i = 0; i < list.size(); i += batchSize) { + end = (end + batchSize); + if (end > list.size()) { + end = list.size(); } - }).start(); - } - } - }catch(Exception ex){ - ExceptionUtils.catchException(ex, "dzfySyncDataSSL Error."); - } - } - - - /** - * 同步南充中心医院的数据到线上 - * 定时任务配置applicationContext.xml - */ - public void nczxyySyncDataSSL() { - - try{ - String json = HttpClientUtil.doPost("https://area-nc-api.healthbaby.com.cn:12356/findSyncData", new HashMap(), "utf-8"); - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(json)) - { - List list = JsonUtil.toList(json, SyncDataModel.class); - System.out.println("nczxyy syncdata size = "+ list.size()); - int batchSize = 200; - int end = 0; - for (int i = 0; i < list.size(); i += batchSize) { - end = (end + batchSize); - if (end > list.size()) { - end = list.size(); - } - System.out.println("nczxyy start:" + i + ",end:" + end); - final List tempList = list.subList(i, end); - new Thread(new Runnable() { - @Override - public void run() { - if (CollectionUtils.isNotEmpty(tempList)) - { - StringBuffer ids = new StringBuffer(); - for (SyncDataModel model : tempList) { - boolean boo = mongoSyncService.syncData(model.getAction(), model.getDataId(), model.getClassName(), model.getJsonData()); - if (boo) { - ids.append(model.getId()); - ids.append(","); + final List tempList = list.subList(i, end); + new Thread(new Runnable() { + @Override + public void run() { + if (CollectionUtils.isNotEmpty(tempList)) + { + StringBuffer ids = new StringBuffer(); + for (SyncDataModel model : tempList) { + boolean boo = mongoSyncService.syncData(model.getAction(), model.getDataId(), model.getClassName(), model.getJsonData()); + if (boo) { + ids.append(model.getId()); + ids.append(","); + } } - } - if (ids.length() > 0) { - Map params = new HashMap(); - params.put("ids", ids.toString()); - String result = HttpClientUtil.doPost("https://area-nc-api.healthbaby.com.cn:12356/updateSyncData", params, "utf-8"); - System.out.println("exc result = "+ result); - } - } - } - }).start(); - } - } - }catch(Exception ex){ - ExceptionUtils.catchException(ex, "nczxyySyncDataSSL Error."); - } - } - - /** - * 同步聊城东昌区妇幼数据到线上 - * 定时任务配置applicationContext.xml - */ - public void lcdcqfySyncDataSSL() { - - try{ - String json = HttpClientUtil.doPost("https://area-lc-api.healthbaby.com.cn:55581/findSyncData", new HashMap(), "utf-8"); - if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(json)) - { - List list = JsonUtil.toList(json, SyncDataModel.class); - System.out.println("lcdcqfy syncdata size = "+ list.size()); - int batchSize = 200; - int end = 0; - for (int i = 0; i < list.size(); i += batchSize) { - end = (end + batchSize); - if (end > list.size()) { - end = list.size(); - } - System.out.println("lcdcqfy start:" + i + ",end:" + end); - final List tempList = list.subList(i, end); - new Thread(new Runnable() { - @Override - public void run() { - if (CollectionUtils.isNotEmpty(tempList)) - { - StringBuffer ids = new StringBuffer(); - for (SyncDataModel model : tempList) { - boolean boo = mongoSyncService.syncData(model.getAction(), model.getDataId(), model.getClassName(), model.getJsonData()); - if (boo) { - ids.append(model.getId()); - ids.append(","); + if (ids.length() > 0) { + Map params = new HashMap(); + params.put("ids", ids.toString()); + HttpClientUtil.doPost("https://" + url + "/updateSyncData", params, "utf-8"); } } - if (ids.length() > 0) { - Map params = new HashMap(); - params.put("ids", ids.toString()); - String result = HttpClientUtil.doPost("https://area-lc-api.healthbaby.com.cn:55581/updateSyncData", params, "utf-8"); - System.out.println("lcdcqfy exc result = "+ result); - } } - } - }).start(); + }).start(); + } } + }catch(Exception ex){ + ExceptionUtils.catchException(ex, url+": syncData Error."); } - }catch(Exception ex){ - ExceptionUtils.catchException(ex, "lcdcqfy Error."); } - } - - - /** - * 定时任务配置applicationContext.xml - * - */ - public void syncDataSSL() - { - new Thread(new Runnable() { - @Override - public void run() { - qhdfySyncDataSSL(); - } - },"qhdfy-thread").start(); - - - new Thread(new Runnable() { - @Override - public void run() { - dzfySyncDataSSL(); - } - },"dzfy-thread").start(); - - new Thread(new Runnable() { - @Override - public void run() { - nczxyySyncDataSSL(); - } - },"nczxyy-thread").start(); - new Thread(new Runnable() { - @Override - public void run() { - lcdcqfySyncDataSSL(); - } - },"lcdcqfy-thread").start(); } diff --git a/platform-operate-api/src/main/resources/database.properties b/platform-operate-api/src/main/resources/database.properties index 6a45f18..fe8f579 100644 --- a/platform-operate-api/src/main/resources/database.properties +++ b/platform-operate-api/src/main/resources/database.properties @@ -66,7 +66,6 @@ sequence.index=20000000 sequence.min.size=300 sequence.schedule.expression=0 */1 * * * ? - # άַɷʽ 1= 2=(ĵַor.code.create.url) or.code.create.type=1