From 85e04ef9d7854df99826e8489954f93f9fb31a6d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 1 Aug 2017 15:03:04 +0800 Subject: [PATCH] update code --- .../permission/dao/master/CouponMapper.java | 4 + .../lyms/platform/permission/model/CouponInfo.java | 22 ++ .../platform/permission/service/CouponService.java | 5 + .../permission/service/impl/CouponServiceImpl.java | 23 ++ .../main/resources/mainOrm/master/CouponMapper.xml | 16 +- .../lyms/platform/common/result/RespBuilder.java | 3 + .../lyms/platform/common/result/ResponseCode.java | 1 + .../lyms/platform/common/utils/HttpClientUtil.java | 9 +- .../lyms/hospitalapi/Nczxyy/NczxyyLisService.java | 4 +- .../java/com/lyms/hospitalapi/pojo/QhdDjq.java | 260 +++++++++++---------- .../web/controller/CouponPrintController.java | 235 ++++++++++++++++--- .../web/controller/SmsConfigController.java | 14 +- .../platform/operate/web/utils/CommonsHelper.java | 29 +++ .../web/utils/HospitalCouponPrintUtils.java | 57 +---- .../platform/operate/web/utils/HttpClientUtil.java | 37 ++- .../operate/web/utils/MessageCenterService.java | 36 ++- 16 files changed, 513 insertions(+), 242 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java index dcbacde..fd1a143 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/CouponMapper.java @@ -90,4 +90,8 @@ public interface CouponMapper { String getUserName(String doctor); String getHospitalName(String visitHospitalId); + + Map findCouponByCode(Map param); + + int updateCouponStatus(Map param); } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CouponInfo.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CouponInfo.java index dd384d3..535c826 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CouponInfo.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/CouponInfo.java @@ -65,10 +65,32 @@ public class CouponInfo { */ private String operatorUseId; + //临时使用状态 0未使用 1使用 默认为0 + private Integer tempStatus; + + //临时使用医院 + private String tempHospitalId; + public CouponInfo() { id = UUID.randomUUID().toString().replace("-", ""); } + public Integer getTempStatus() { + return tempStatus; + } + + public void setTempStatus(Integer tempStatus) { + this.tempStatus = tempStatus; + } + + public String getTempHospitalId() { + return tempHospitalId; + } + + public void setTempHospitalId(String tempHospitalId) { + this.tempHospitalId = tempHospitalId; + } + public String getId() { return id; } diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java index f694838..b112448 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java @@ -1,6 +1,7 @@ package com.lyms.platform.permission.service; import com.lyms.platform.common.result.BaseObjectResponse; +import com.lyms.platform.permission.model.CouponInfo; import java.util.List; import java.util.Map; @@ -40,4 +41,8 @@ public interface CouponService{ void invalid(String personId, String couponTypes); String findByUsedId(String usedId); + + Map findCouponByCode(Map param); + + int updateCouponStatus(Map param); } 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 68f5fea..a8bdd86 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 @@ -319,6 +319,18 @@ public class CouponServiceImpl implements CouponService { if(!validateArea(data.get("area_type").toString(), couponInfo.getCreateHospitalId(), hospitalId)) { return RespBuilder.buildErro(ResponseCode.COUPON_AREA_NO_USE, patientsInfo); } + + //验证优惠劵是否临时使用了 该功能属于秦皇岛区域 + if (couponInfo.getTempStatus() != null && couponInfo.getTempStatus() == 1) + { + //验证临时使用的医院是不是当前登陆的医院 + if (StringUtils.isNotEmpty(couponInfo.getTempHospitalId()) && !couponInfo.getTempHospitalId().equals(hospitalId)) + { + RespBuilder.buildErro(ResponseCode.COUPON_IS_USED); + } + } + + return RespBuilder.buildSuccess(patientsInfo); } @@ -448,6 +460,17 @@ public class CouponServiceImpl implements CouponService { } @Override + public Map findCouponByCode(Map param) { + + return couponMapper.findCouponByCode(param); + } + + @Override + public int updateCouponStatus(Map param) { + return couponMapper.updateCouponStatus(param); + } + + @Override public List> queryCouponItemsByType(Map params) { return couponMapper.queryCouponItemsByType(params); } 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 3897e52..22d8429 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml @@ -15,10 +15,12 @@ + + - sequence_id,create_date,use_date, operator_use_id, user_id,create_user_id,coupon_template_id,create_hospital_id,used_id,used_hospital_id,status + sequence_id,create_date,use_date, operator_use_id, user_id,create_user_id,coupon_template_id,create_hospital_id,used_id,used_hospital_id,status,temp_hospital_id,temp_status + + + + + update coupon_info set temp_status = 1,temp_hospital_id=#{hospitalId} where sequence_id = #{code} + + \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java b/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java index 7f18668..185e524 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java +++ b/platform-common/src/main/java/com/lyms/platform/common/result/RespBuilder.java @@ -26,6 +26,9 @@ public class RespBuilder { } else { resp.setData(createMap(data)); } + + resp.setErrorcode(ResponseCode.SUCCESS.getCode()); + resp.setErrormsg(ResponseCode.SUCCESS.getMsg()); } return resp; } diff --git a/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java b/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java index 7ea38bf..e6c24c0 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java +++ b/platform-common/src/main/java/com/lyms/platform/common/result/ResponseCode.java @@ -28,6 +28,7 @@ public enum ResponseCode { COUPON_TIME_OUT(1003, "当前优惠券不在使用时间范围内"), COUPON_IS_USERD(1004, "优惠券已被使用"), COUPON_IS_DISABLED(1005, "优惠券已被禁用"), + COUPON_IS_USED(1006, "当前优惠劵已经在其他医院使用，不能重复使用"), NEED_BUILD(1101, "未找到建档信息"); diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java index eb65bd9..34cbdb7 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/HttpClientUtil.java @@ -113,7 +113,7 @@ public class HttpClientUtil { if(response != null){ int statusCode = response.getStatusLine().getStatusCode(); - System.out.println("return code = "+ HttpStatus.SC_OK); + System.out.println("return code = "+ statusCode); if (statusCode != HttpStatus.SC_OK) { return null; } @@ -151,7 +151,7 @@ public class HttpClientUtil { httpPost.setEntity(stringEntity); response = httpClient.execute(httpPost); int statusCode = response.getStatusLine().getStatusCode(); - System.out.println("return code = "+ HttpStatus.SC_OK); + System.out.println("return code = "+ statusCode); if (statusCode != HttpStatus.SC_OK) { return null; } @@ -177,15 +177,12 @@ public class HttpClientUtil { public static void main(String[] args) throws Exception { Map map = new HashMap(); - map.put("patientIds","59687f1de4b0b4e56acd1f81"); map.put("page","1"); map.put("limit","10"); long start = System.currentTimeMillis(); - String s = doGet("https://area-lc-api.healthbaby.com.cn:55581/getAppLis", map, "utf-8","3d19960bf3e81e7d816c4f26051c49ba"); + String s = doGet("https://area-qhd-api.healthbaby.com.cn:18019/getNoSendLis", map, "utf-8","3d19960bf3e81e7d816c4f26051c49ba"); - List list = JsonUtil.toList(s, SyncDataModel.class); long end = System.currentTimeMillis(); System.out.print(end -start); - System.out.println(s); } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java index 1f04cec..4ad773b 100644 --- a/platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java +++ b/platform-operate-api/src/main/java/com/lyms/hospitalapi/Nczxyy/NczxyyLisService.java @@ -237,7 +237,7 @@ public class NczxyyLisService { SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd"); String EndDate=df.format(new Date()); c.setTime(new Date()); - c.add(Calendar.YEAR, -1); + c.add(Calendar.YEAR, -12); Date date = c.getTime(); String StartDate=df.format(date); final String url="http://mihp.nc120.cn/PlatformService/platform/api"; @@ -366,7 +366,7 @@ public class NczxyyLisService { public static void main(String[] args) { - List list = queryLisCheckList("1002332625"); + List list = queryLisCheckList("1002064489"); System.out.println(list.size()); } } 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 b117ec1..10fb334 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 @@ -1,221 +1,223 @@ package com.lyms.hospitalapi.pojo; -import java.text.SimpleDateFormat; -import java.util.Date; /** * Created by Administrator on 2017/7/11. */ public class QhdDjq { - private Integer ID; //ID - - private String Pat_ID_CardNo; //身份这证号 - - private String Pat_PhoneNumber; //手机号码 - - private String Pat_CardNo; //健康卡号，社保卡号 - - private String TokenCard_No; //产检券号 - - private String TokenCard_Pwd; //消费密码 - - private Integer CardStatus; //1 正常 9作废 默认1 - - private String LMP_Date; //末次月经 - - private String Exp_Date; //有效期（最晚使用时间默认设置成末次月经+300天） - - private Integer Gravidity; //孕次 - - private Double CardBalance; //卡面金额 - - private Double CardAmont; //余额 - - private String PostHos; //办卡医院 - - private String PostDoc; //办卡医生 - - private String AreaFrom; //所属县区 - - private String ApplyInfo; //办卡原因 - - private String ApplyTime; //办卡日期 - - private String Remark; //备注 - - public QhdDjq(){} - - - public QhdDjq(Integer ID,String Pat_ID_CardNo,String Pat_PhoneNumber,String Pat_CardNo,String TokenCard_No,String TokenCard_Pwd, - Integer CardStatus,String LMP_Date,String Exp_Date,Integer Gravidity,Double CardBalance,Double CardAmont,String PostHos, - String PostDoc,String AreaFrom,String ApplyInfo,String ApplyTime,String Remark){ - - this.ID=ID; - this.Pat_ID_CardNo=Pat_ID_CardNo; - this.Pat_PhoneNumber=Pat_PhoneNumber; - this.Pat_CardNo=Pat_CardNo; - this.TokenCard_No=TokenCard_No; - this.TokenCard_Pwd=TokenCard_Pwd; - this.CardStatus=CardStatus; - this.LMP_Date=LMP_Date; - this.Exp_Date=Exp_Date; - this.Gravidity=Gravidity; - this.CardBalance=CardBalance; - this.CardAmont=CardAmont; - this.PostHos=PostHos; - this.PostDoc=PostDoc; - this.AreaFrom=AreaFrom; - this.ApplyInfo=ApplyInfo; - this.ApplyTime=ApplyTime; - this.Remark=Remark; + private Integer id; + //身份证号 + private String patIdCardNo; + //手机号码 + private String patPhoneNumber; + //健康卡、社保卡号 + private String patCardNo; + //产检卷号 + private String tokenCardNo; + //消费密码 + private String tokenCardPwd; + //1 正常 9作废 默认1 + private String cardStatus; + //序号 + private String serialNumber; + //末次月经 + private String lmpDate; + //有效期 + private String expDate; + //孕次 + private String gravidity; + //卡面金额 + private String cardBalance; + //序号 + private String cardAmont; + //产检券打印医生 + private String postDoc; + //产检券发放医院 + private String postHos; + //所属县区 + private String areaFrom; + //产检 + private String applyInfo; + //产检券打使用时间 + private String applyTime; + //备注 + private String remark; + public String getSerialNumber() { + return serialNumber; } + public void setSerialNumber(String serialNumber) { + this.serialNumber = serialNumber; + } - - - public Integer getID() { - return ID; + public Integer getId() { + return id; } - public void setID(Integer ID) { - this.ID = ID; + public void setId(Integer id) { + this.id = id; } - public String getPat_ID_CardNo() { - return Pat_ID_CardNo; + public String getPatIdCardNo() { + return patIdCardNo; } - public void setPat_ID_CardNo(String pat_ID_CardNo) { - Pat_ID_CardNo = pat_ID_CardNo; + public void setPatIdCardNo(String patIdCardNo) { + this.patIdCardNo = patIdCardNo; } - public String getPat_PhoneNumber() { - return Pat_PhoneNumber; + public String getPatPhoneNumber() { + return patPhoneNumber; } - public void setPat_PhoneNumber(String pat_PhoneNumber) { - Pat_PhoneNumber = pat_PhoneNumber; + public void setPatPhoneNumber(String patPhoneNumber) { + this.patPhoneNumber = patPhoneNumber; } - public String getPat_CardNo() { - return Pat_CardNo; + public String getPatCardNo() { + return patCardNo; } - public void setPat_CardNo(String pat_CardNo) { - Pat_CardNo = pat_CardNo; + public void setPatCardNo(String patCardNo) { + this.patCardNo = patCardNo; } - public String getTokenCard_No() { - return TokenCard_No; + public String getTokenCardNo() { + return tokenCardNo; } - public void setTokenCard_No(String tokenCard_No) { - TokenCard_No = tokenCard_No; + public void setTokenCardNo(String tokenCardNo) { + this.tokenCardNo = tokenCardNo; } - public String getTokenCard_Pwd() { - return TokenCard_Pwd; + public String getTokenCardPwd() { + return tokenCardPwd; } - public void setTokenCard_Pwd(String tokenCard_Pwd) { - TokenCard_Pwd = tokenCard_Pwd; + public void setTokenCardPwd(String tokenCardPwd) { + this.tokenCardPwd = tokenCardPwd; } - public Integer getCardStatus() { - return CardStatus; + public String getCardStatus() { + return cardStatus; } - public void setCardStatus(Integer cardStatus) { - CardStatus = cardStatus; + public void setCardStatus(String cardStatus) { + this.cardStatus = cardStatus; } - public String getLMP_Date() { - return LMP_Date; + public String getLmpDate() { + return lmpDate; } - public void setLMP_Date(String LMP_Date) { - this.LMP_Date = LMP_Date; + public void setLmpDate(String lmpDate) { + this.lmpDate = lmpDate; } - public String getExp_Date() { - return Exp_Date; + public String getExpDate() { + return expDate; } - public void setExp_Date(String exp_Date) { - Exp_Date = exp_Date; + public void setExpDate(String expDate) { + this.expDate = expDate; } - public Integer getGravidity() { - return Gravidity; + public String getGravidity() { + return gravidity; } - public void setGravidity(Integer gravidity) { - Gravidity = gravidity; + public void setGravidity(String gravidity) { + this.gravidity = gravidity; } - public Double getCardBalance() { - return CardBalance; + public String getCardBalance() { + return cardBalance; } - public void setCardBalance(Double cardBalance) { - CardBalance = cardBalance; + public void setCardBalance(String cardBalance) { + this.cardBalance = cardBalance; } - public Double getCardAmont() { - return CardAmont; + public String getCardAmont() { + return cardAmont; } - public void setCardAmont(Double cardAmont) { - CardAmont = cardAmont; + public void setCardAmont(String cardAmont) { + this.cardAmont = cardAmont; } - public String getPostHos() { - return PostHos; + public String getPostDoc() { + return postDoc; } - public void setPostHos(String postHos) { - PostHos = postHos; + public void setPostDoc(String postDoc) { + this.postDoc = postDoc; } - public String getPostDoc() { - return PostDoc; + public String getPostHos() { + return postHos; } - public void setPostDoc(String postDoc) { - PostDoc = postDoc; + public void setPostHos(String postHos) { + this.postHos = postHos; } public String getAreaFrom() { - return AreaFrom; + return areaFrom; } public void setAreaFrom(String areaFrom) { - AreaFrom = areaFrom; + this.areaFrom = areaFrom; } public String getApplyInfo() { - return ApplyInfo; + return applyInfo; } public void setApplyInfo(String applyInfo) { - ApplyInfo = applyInfo; + this.applyInfo = applyInfo; } public String getApplyTime() { - return ApplyTime; + return applyTime; } public void setApplyTime(String applyTime) { - ApplyTime = applyTime; + this.applyTime = applyTime; } public String getRemark() { - return Remark; + return remark; } public void setRemark(String remark) { - Remark = remark; + this.remark = remark; + } + + @Override + public String toString() { + return "QhdDjq{" + + "id=" + id + + ", patIdCardNo='" + patIdCardNo + '\'' + + ", patPhoneNumber='" + patPhoneNumber + '\'' + + ", patCardNo='" + patCardNo + '\'' + + ", tokenCardNo='" + tokenCardNo + '\'' + + ", tokenCardPwd='" + tokenCardPwd + '\'' + + ", cardStatus='" + cardStatus + '\'' + + ", serialNumber='" + serialNumber + '\'' + + ", lmpDate='" + lmpDate + '\'' + + ", expDate='" + expDate + '\'' + + ", gravidity='" + gravidity + '\'' + + ", cardBalance='" + cardBalance + '\'' + + ", cardAmont='" + cardAmont + '\'' + + ", postDoc='" + postDoc + '\'' + + ", postHos='" + postHos + '\'' + + ", areaFrom='" + areaFrom + '\'' + + ", applyInfo='" + applyInfo + '\'' + + ", applyTime='" + applyTime + '\'' + + ", remark='" + remark + '\'' + + '}'; } } 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 3a2c393..454399a 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 @@ -2,14 +2,38 @@ package com.lyms.platform.operate.web.controller; import java.text.SimpleDateFormat; import java.util.Date; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import com.lyms.hospitalapi.pojo.QhdDjq; +import com.lyms.platform.biz.service.AntenatalExaminationService; +import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.base.BaseController; +import com.lyms.platform.common.base.LoginContext; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; +import com.lyms.platform.operate.web.utils.CommonsHelper; +import com.lyms.platform.permission.model.CouponInfo; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.CouponService; +import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; +import com.lyms.platform.pojo.AntExChuModel; +import com.lyms.platform.pojo.BasicConfig; +import com.lyms.platform.query.AntExChuQuery; +import com.lyms.platform.query.PatientsQuery; +import org.apache.commons.collections.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import com.lyms.platform.biz.service.PatientsService; @@ -23,21 +47,36 @@ import com.lyms.platform.pojo.Patients; @Controller @RequestMapping("/couponPrint") -public class CouponPrintController { +public class CouponPrintController extends BaseController{ - - @Autowired - private PatientsService patientsService; - private static final String shanDong_DeZhou_fuYou_hopitalId = "1000000114"; public static final String shanDong_Dezhou_youHuiQuan_money_Number = PropertiesUtils.getPropertyValue("shanDong_Dezhou_youHuiQuan_money_Number"); - - - /** + + @Autowired + private CouponService couponService; + + @Autowired + private AutoMatchFacade autoMatchFacade; + + @Autowired + private PatientsService patientsService; + + @Autowired + private UsersService usersService; + @Autowired + private OrganizationService organizationService; + + @Autowired + private BasicConfigService basicConfigService; + + @Autowired + private AntenatalExaminationService antenatalExaminationService; + + + + /** * 产检券打印触发后台操作 - * @param userId - * @param hospitalId * @return */ @RequestMapping(method = RequestMethod.POST,value = "/printTrigger") @@ -71,45 +110,165 @@ public class CouponPrintController { } } + /** + * 优惠劵查询 + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET,value = "/queryCouponByCode") + @TokenRequired + @ResponseBody + public BaseObjectResponse queryCouponByCode(HttpServletRequest request, + @RequestParam(required = true)String code) { + + String hospitalId = autoMatchFacade.getHospitalId(getUserId(request)); + + Map result = new HashMap<>(); + //获取优惠劵类型 + Map param = new HashMap<>(); + param.put("hospitalId", hospitalId); + param.put("code", code); + Map couponInfo = couponService.findCouponByCode(param); + + Object type = couponInfo.get("type"); + //验证优惠劵是否可以使用 + BaseObjectResponse objectResponse = couponService.validate(code, Integer.parseInt(type.toString()), hospitalId); + if (objectResponse.getErrorcode() != ResponseCode.SUCCESS.getCode()) + { + return objectResponse; + } + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setPid(couponInfo.get("pId")); + patientsQuery.setYn(YnEnums.YES.getId()); + List list = patientsService.queryPatient1(patientsQuery, "created"); + if (CollectionUtils.isNotEmpty(list)) + { + Patients patient = list.get(0); + result.put("couponCode",code); //优惠劵 + result.put("createDate",couponInfo.get("createDate"));//发放时间 + result.put("hospitalName",CommonsHelper.getHospitalName(patient.getHospitalId(), organizationService));//医院名称 + result.put("userName",patient.getUsername()); //用户名 + + String areaName = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(patient.getHospitalId())) { + Organization organization = organizationService.getOrganization(Integer.parseInt(patient.getHospitalId())); + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { + String areaId = organization.getAreaId(); + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(areaId); + areaName = basicConfig.getName(); + } + } + result.put("areaName",areaName);//区域 + String certeType = ""; + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(patient.getPcerteTypeId()); + if (StringUtils.isNotEmpty(patient.getPcerteTypeId())) + { + certeType = basicConfig.getName(); + } + result.put("certeType",certeType);//证件类型 + result.put("cardNo",patient.getCardNo()); //证件号码 + } + objectResponse.setData(result); + return objectResponse; + } + /** - * 产检券打印触发后台操作（秦皇岛产检券） + * 秦皇岛优惠劵消费 * @param request * @return */ - @RequestMapping(method = RequestMethod.POST,value = "/QhdprintTrigger") + @RequestMapping(method = RequestMethod.POST,value = "/qhdCouponUse") @ResponseBody @TokenRequired - public BaseObjectResponse QhdprintTrigger(HttpServletRequest request){ - - QhdDjq qhddjq =new QhdDjq(1,"1","1","1","1","1",1,"2017-7-12","",1,1.0,1.0,"1","1","1","1","1","aa"); - Integer ID=qhddjq.getID(); - String Pat_ID_CardNo=qhddjq.getPat_ID_CardNo(); - String Pat_PhoneNumber=qhddjq.getPat_PhoneNumber(); - String Pat_CardNo=qhddjq.getPat_CardNo(); - String TokenCard_No=qhddjq.getTokenCard_No(); - String TokenCard_Pwd=qhddjq.getTokenCard_Pwd(); - Integer CardStatus=qhddjq.getCardStatus(); - String LMP_Date=qhddjq.getLMP_Date(); - String Exp_Date=qhddjq.getExp_Date(); - Integer Gravidity=qhddjq.getGravidity(); - Double CardBalance=qhddjq.getCardBalance(); - Double CardAmont=qhddjq.getCardAmont(); - String PostHos=qhddjq.getPostHos(); - String PostDoc=qhddjq.getPostDoc(); - String AreaFrom=qhddjq.getAreaFrom(); - String ApplyInfo=qhddjq.getApplyInfo(); - String ApplyTime=qhddjq.getApplyTime(); - String Remark=qhddjq.getRemark(); - String result = HospitalCouponPrintUtils.getQhddjq(ID,Pat_ID_CardNo,Pat_PhoneNumber,Pat_CardNo,TokenCard_No,TokenCard_Pwd, - CardStatus,LMP_Date,Exp_Date,Gravidity,CardBalance,CardAmont,PostHos,PostDoc,AreaFrom,ApplyInfo,ApplyTime,Remark); + public BaseObjectResponse qhdCouponUse(HttpServletRequest request, + @RequestParam(required = true)String code){ + + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + String hospitalId = autoMatchFacade.getHospitalId(loginState.getId()); + + //获取优惠劵类型 + Map param = new HashMap<>(); + param.put("hospitalId",hospitalId); + param.put("code", code); + Map couponInfo = couponService.findCouponByCode(param); + + Object type = couponInfo.get("type"); + //验证优惠劵是否可以使用 + BaseObjectResponse objectResponse = couponService.validate(code,Integer.parseInt(type.toString()),hospitalId); + if (objectResponse.getErrorcode() != ResponseCode.SUCCESS.getCode()) + { + return objectResponse; + } + + PatientsQuery patientsQuery = new PatientsQuery(); + patientsQuery.setPid(couponInfo.get("pId")); + patientsQuery.setYn(YnEnums.YES.getId()); + List list = patientsService.queryPatient1(patientsQuery, "created"); + QhdDjq model = new QhdDjq(); + if (CollectionUtils.isNotEmpty(list)) + { + Patients patient = list.get(0); + model.setPatIdCardNo(patient.getCardNo()); + model.setPatCardNo(patient.getVcCardNo()); + model.setPatPhoneNumber(patient.getPhone()); + model.setTokenCardNo(code); + model.setCardStatus("1");//1 正常 9作废 默认1（必须填写） + model.setLmpDate(DateUtil.getyyyy_MM_dd_hms(patient.getLastMenses())); + + AntExChuQuery antExChuQuery1 = new AntExChuQuery(); + antExChuQuery1.setParentId(patient.getId()); + antExChuQuery1.setYn(YnEnums.YES.getId()); + List data = antenatalExaminationService.queryAntExChu(antExChuQuery1); + Integer gravidity = 1; //孕次 + if (CollectionUtils.isNotEmpty(data)) + { + AntExChuModel chuModel = data.get(0); + if (chuModel != null && chuModel.getPregnancyTimes() != null) + { + gravidity = chuModel.getPregnancyTimes(); + } + } + + model.setGravidity(String.valueOf(gravidity)); + Object order = couponInfo.get("couponOrder"); + model.setSerialNumber(order == null ? "0" : order.toString()); + + String hospital = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(patient.getHospitalId())) { + Organization organization = organizationService.getOrganization(Integer.parseInt(patient.getHospitalId())); + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { + hospital = organization.getName(); + String areaId = organization.getAreaId(); + BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(areaId); + String areaName = basicConfig.getName(); + model.setAreaFrom(areaName); + } + } + model.setPostHos(hospital); + + String checkDoctor = CommonsHelper.getUserName(patient.getBookbuildingDoctor(),usersService); + + model.setPostDoc(checkDoctor); + model.setApplyInfo("产检"); + model.setApplyTime(DateUtil.getyyyy_MM_dd_hms(new Date())); + model.setRemark(""); + + } + System.out.println(model.toString()); +// String result = HospitalCouponPrintUtils.qhdCouponUse(model); + String result= "0"; + System.out.print(result); if("0".equals(result)){ + int count = couponService.updateCouponStatus(param); + System.out.println("update coupon count " + count); return RespBuilder.buildErro(ResponseCode.SUCCESS); - }else{ - return RespBuilder.buildErro(ResponseCode.ERROR); + }else if ("1".equals(result)){ + return RespBuilder.buildErro(ResponseCode.COUPON_IS_USERD); } - + return RespBuilder.buildErro(ResponseCode.ERROR); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java index 7b4a728..6cbf4b4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SmsConfigController.java @@ -252,13 +252,13 @@ public class SmsConfigController extends BaseController { /** * 查询推送消息列表 - * @param hospitalId - * @param phone - * @param smsType - * @param smsStatus - * @param objType - * @param planTime - * @param actualTime + * @param hospitalId 医院id + * @param phone 手机号码 + * @param smsType 消息类型 + * @param smsStatus 消息状态 + * @param objType 发送对象 + * @param planTime 计划发送时间 + * @param actualTime 实际发送时间 * @param page * @param limit * @return diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java index abd168b..dd6e05b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/CommonsHelper.java @@ -1,8 +1,13 @@ package com.lyms.platform.operate.web.utils; import com.lyms.platform.biz.service.BasicConfigService; +import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.operate.web.result.Address; import com.lyms.platform.operate.web.result.AddressInner; +import com.lyms.platform.permission.model.Organization; +import com.lyms.platform.permission.model.Users; +import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.Patients; @@ -115,4 +120,28 @@ public final class CommonsHelper { addressInner.setName(config.getName()); return addressInner; } + + public static String getHospitalName(String hospitalId,OrganizationService organizationService) + { + String hospital = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(hospitalId)) { + Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); + if (organization != null && organization.getYn() == YnEnums.YES.getId()) { + hospital = organization.getName(); + } + } + return hospital; + } + + public static String getUserName(String userId,UsersService usersService) + { + String checkDoctor = ""; + if (org.apache.commons.lang.StringUtils.isNotEmpty(userId)) { + Users users = usersService.getUsers(Integer.parseInt(userId)); + if (users != null && users.getYn() == YnEnums.YES.getId()) { + checkDoctor = users.getName(); + } + } + return checkDoctor; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java index c6b9be0..f82c115 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HospitalCouponPrintUtils.java @@ -1,5 +1,7 @@ package com.lyms.platform.operate.web.utils; +import com.lyms.hospitalapi.pojo.QhdDjq; +import com.lyms.platform.common.utils.JsonUtil; import org.apache.http.HttpEntity; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpPost; @@ -93,58 +95,13 @@ public class HospitalCouponPrintUtils { /** - * - * @param ID 自增 - * @param Pat_ID_CardNo 身份证号（必须填写） - * @param Pat_PhoneNumber 手机号码（必须填写手机号码） - * @param Pat_CardNo 健康卡、社保卡号（必须填写） - * @param TokenCard_No 产检卷号（印刷在产检卷上）（必须填写） - * @param TokenCard_Pwd 消费密码（不填写） - * @param CardStatus 1 正常 9作废 默认1（必须填写） - * @param LMP_Date 末次月经（必须填写） - * @param Exp_Date 有效期（最晚使用时间默认设置成末次月经+300天） - * @param Gravidity 孕次（必须填写） - * @param CardBalance 卡面金额（不填写） - * @param Serial_Number 序号（不填写） - * @param PostHos 产检券发放医院（必须填写） - * @param PostDoc 产检券打印医生（必须填写） - * @param AreaFrom 所属县区（必须填写） - * @param ApplyInfo （产检） - * @param ApplyTime 产检券打印时间 - * @param Remark 备注信息 + *秦皇岛消费优惠劵 * @return */ - public static String getQhddjq(Integer ID,String Pat_ID_CardNo,String Pat_PhoneNumber,String Pat_CardNo,String TokenCard_No,String TokenCard_Pwd, - Integer CardStatus,String LMP_Date,String Exp_Date,Integer Gravidity,Double CardBalance,Double CardAmont,String PostHos, - String PostDoc,String AreaFrom,String ApplyInfo,String ApplyTime,String Remark){ - - Map params = new HashMap<>(); - params.put("ID",ID.toString()); - params.put("Pat_ID_CardNo",Pat_ID_CardNo); - params.put("Pat_PhoneNumber",Pat_PhoneNumber); - params.put("Pat_CardNo",Pat_CardNo); - params.put("TokenCard_No",TokenCard_No); - params.put("TokenCard_Pwd",TokenCard_Pwd); - params.put("CardStatus",CardStatus.toString()); - params.put("LMP_Date",LMP_Date); - params.put("Exp_Date",Exp_Date); - params.put("Gravidity",Gravidity.toString()); - params.put("CardBalance",CardBalance.toString()); - params.put("CardAmont",CardAmont.toString()); - params.put("PostHos",PostHos); - params.put("PostDoc",PostDoc); - params.put("AreaFrom",AreaFrom); - params.put("ApplyInfo",ApplyInfo); - params.put("ApplyTime",ApplyTime); - params.put("Remark",Remark); - - - String result = HttpClientUtil.doPost(DJQ_URL, params, "UTF-8"); - System.out.println("result== "+result); + public static String qhdCouponUse(QhdDjq model){ + String json = JsonUtil.obj2Str(model); + String result = HttpClientUtil.doPost("http://localhost:9090/his/insertQhdfycjDjq", json, "utf-8"); + System.out.println("result= "+result); return result; } - - - - } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java index 9db12d6..28b5c23 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/HttpClientUtil.java @@ -4,6 +4,8 @@ package com.lyms.platform.operate.web.utils; * Created by Administrator on 2017-01-18. */ import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; import java.util.*; import java.util.Map.Entry; @@ -11,10 +13,7 @@ import com.lyms.platform.common.pojo.SyncDataModel; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; import com.alibaba.fastjson.JSONObject; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.HttpStatus; -import org.apache.http.NameValuePair; +import org.apache.http.*; import org.apache.http.client.HttpClient; import org.apache.http.client.config.RequestConfig; import org.apache.http.client.entity.UrlEncodedFormEntity; @@ -88,6 +87,36 @@ public class HttpClientUtil { } + public static String doPost(String url,String json,String charset){ + HttpClient httpClient = null; + HttpPost httpPost = null; + String result = null; + try{ + httpClient = new SSLClient(); + httpPost = new HttpPost(url); + + StringEntity stringEntity = new StringEntity(json.toString(),charset); + httpPost.setEntity(stringEntity); + stringEntity.setContentEncoding("UTF-8"); + stringEntity.setContentType("application/json"); + HttpResponse response = httpClient.execute(httpPost); + int statusCode = response.getStatusLine().getStatusCode(); + if (statusCode != HttpStatus.SC_OK) { + return null; + } + HttpEntity entity = response.getEntity(); + if (entity == null) { + return null; + } + result = EntityUtils.toString(entity, "utf-8"); + }catch(Exception ex){ + ex.printStackTrace(); + } + return result; + } + + + /** * 发送 SSL POST 请求（HTTPS），JSON形式 * @param apiUrl API接口URL diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java index 0f6f99a..9058eeb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/MessageCenterService.java @@ -47,6 +47,23 @@ public class MessageCenterService { } + public static boolean updateMsgStatus(List configs,String hid) + { + String json = JsonUtil.array2JsonString(configs); + String result = HttpClientUtil.doPostSSL("https://push.stage.platform.healthbaby.com.cn/biz-push-web/push/" + hid, json); + if (StringUtils.isNotEmpty(result)) + { + Map map = JsonUtil.str2Obj(result, Map.class); + if ("0".equals(map.get("errorcode"))) + { + return true; + } + } + return false; + } + + + /** * 线上环境调用 * 保存到短信中心 短信 @@ -249,11 +266,20 @@ public class MessageCenterService { // map.setList(JsonUtil.toList(list, SmsObj.class)); // System.out.print(map); - queryMsgList("216", null,null, - null,null, - null,null, - null,null , - 1,10); +// queryMsgList("216", null,null, +// null,null, +// null,null, +// null,null , +// 1,10); + + List configs = new ArrayList<>(); + Config config = new Config(); + config.setKey("6"); + config.setValue("true"); + configs.add(config); + + + updateMsgStatus(configs,"216"); } } -- 1.8.3.1