diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java index 3ecafdf..6bc4bee 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/DateUtils.java @@ -1,5 +1,6 @@ package com.lyms.platform.msg.utils; +import com.lyms.platform.common.utils.DateUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -231,6 +232,7 @@ public class DateUtils { return Math.abs(result); } public static void main(String[] args) { - System.out.println( getWeekOfDate(new Date())); + System.out.println(DateUtil.getyyyy_MM_dd(DateUtil.addDay(new Date(),33))); + System.out.println(DateUtil.daysBetween(DateUtil.addDay(DateUtil.addDay(new Date(),33),-33),new Date())); } } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyDiseaseMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyDiseaseMsgGenerateWorker.java index 1b8009db..7f67d2f 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyDiseaseMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/BabyDiseaseMsgGenerateWorker.java @@ -136,10 +136,10 @@ public class BabyDiseaseMsgGenerateWorker implements Runnable { { for (MessageContent message : amsSmses) { -// boolean isExist = SaveMessageService.isExistMsg(baby.getId(), message.getId()); -// if (isExist) { -// continue; -// } + boolean isExist = SaveMessageService.isExistMsg(baby.getId(), message.getId()); + if (isExist) { + continue; + } //开通一个月 按照ams短信配置的天数来发送 if ("1".equals(baby.getOpenDiseaseType())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index afcad62..bb54db7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -21,6 +21,7 @@ import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.*; import com.lyms.platform.operate.web.service.BabyAfterVisitService; +import com.lyms.platform.operate.web.service.ICommonServer; import com.lyms.platform.operate.web.service.ITrackDownService; import com.lyms.platform.operate.web.utils.*; import com.lyms.platform.permission.model.*; @@ -105,6 +106,10 @@ public class BabyBookbuildingFacade { @Autowired private PatientsService patientsService; + + @Autowired + private ICommonServer commonServer; + @Autowired private MatDeliverService matDeliverService; @@ -2051,7 +2056,15 @@ public class BabyBookbuildingFacade { results.add(result); } } + else + { + if ("2100001377".equals(param.getHospitalId())) + { + //查询出生证明的儿童信息用于建档， + map.put("certBabyInfo", getCertBabyInfo(param.getCardNo())); + } + } puerperaQuery.setPhoneOrCert(param.getCardNo()); } else if ((param.getHospitalId() != null & !StringUtils.isEmpty(param.getVcCardNo())) || StringUtils.isNotEmpty(param.getEncoded()) //编码 @@ -2259,6 +2272,19 @@ public class BabyBookbuildingFacade { return objectResponse; } + + /** + * 获取出生证明儿童信息用于建档 + * @param cardNo + * @return + */ + private List getCertBabyInfo(String cardNo) + { + List list = commonServer.getBabyInfoByCardNo(cardNo); + return list; + } + + /** * 秦皇岛儿童建档要求使用编码可以查询到档案信息，保存那会只给lyms_baby加编码了所以这里先查 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CertBabyResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CertBabyResult.java new file mode 100644 index 0000000..2124d3a --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CertBabyResult.java @@ -0,0 +1,134 @@ +package com.lyms.platform.operate.web.result; + +/** + * Created by Administrator on 2020-11-17. + */ +public class CertBabyResult { + + private String babyName;//儿童姓名 + private String babySex;//儿童性别 + private String babyBirth;//儿童生日 + private String cardNo;//母亲身份证 + private String mname;//母亲姓名 + private String mphone;//母亲手机号码 + private String fname;//父亲姓名 + private String fcardNo;//父亲身份证号码 + //private String mfolk;//母亲名族 + private String pregweek;//分娩孕周 + private String pregday;//分娩天数 + private String weight;//体重 + private String height;//身高 + private String birthDept;//分娩医院 + + public String getBabyName() { + return babyName; + } + + public void setBabyName(String babyName) { + this.babyName = babyName; + } + + public String getBabySex() { + return babySex; + } + + public void setBabySex(String babySex) { + this.babySex = babySex; + } + + public String getBabyBirth() { + return babyBirth; + } + + public void setBabyBirth(String babyBirth) { + this.babyBirth = babyBirth; + } + + public String getCardNo() { + return cardNo; + } + + public void setCardNo(String cardNo) { + this.cardNo = cardNo; + } + + public String getMname() { + return mname; + } + + public void setMname(String mname) { + this.mname = mname; + } + + public String getMphone() { + return mphone; + } + + public void setMphone(String mphone) { + this.mphone = mphone; + } + + public String getFname() { + return fname; + } + + public void setFname(String fname) { + this.fname = fname; + } + + public String getFcardNo() { + return fcardNo; + } + + public void setFcardNo(String fcardNo) { + this.fcardNo = fcardNo; + } +// +// public String getMfolk() { +// return mfolk; +// } +// +// public void setMfolk(String mfolk) { +// this.mfolk = mfolk; +// } + + public String getPregweek() { + return pregweek; + } + + public void setPregweek(String pregweek) { + this.pregweek = pregweek; + } + + public String getPregday() { + return pregday; + } + + public void setPregday(String pregday) { + this.pregday = pregday; + } + + public String getWeight() { + return weight; + } + + public void setWeight(String weight) { + this.weight = weight; + } + + public String getHeight() { + return height; + } + + public void setHeight(String height) { + this.height = height; + } + + public String getBirthDept() { + return birthDept; + } + + public void setBirthDept(String birthDept) { + this.birthDept = birthDept; + } +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ICommonServer.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ICommonServer.java index df90dad..1876e86 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ICommonServer.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/ICommonServer.java @@ -2,6 +2,9 @@ package com.lyms.platform.operate.web.service; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.request.CommonRequest; +import com.lyms.platform.operate.web.result.CertBabyResult; + +import java.util.List; public interface ICommonServer { @@ -37,4 +40,10 @@ public interface ICommonServer { BaseResponse queryKidsInfo(String cardNo); + /** + * 从出生证明获取儿童档案信息 + * @param cardNo + * @return + */ + List getBabyInfoByCardNo(String cardNo); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CommonServerImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CommonServerImpl.java index b6a4b43..cb2794b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CommonServerImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CommonServerImpl.java @@ -5,7 +5,10 @@ import java.util.*; import com.lyms.platform.common.enums.SexEnum; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.ResponseCode; +import com.lyms.platform.common.utils.*; +import com.lyms.platform.operate.web.result.CertBabyResult; import com.lyms.platform.pojo.*; +import net.sf.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -18,8 +21,6 @@ import org.springframework.stereotype.Service; import com.lyms.platform.biz.service.BasicConfigService; import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.result.BaseResponse; -import com.lyms.platform.common.utils.DateUtil; -import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.request.CommonRequest; import com.lyms.platform.operate.web.request.PatientBaseInfoRequest; import com.lyms.platform.operate.web.service.ICommonServer; @@ -36,6 +37,8 @@ import com.lyms.platform.permission.model.FolviteQuery; @Service public class CommonServerImpl implements ICommonServer { + String CERT_URL = PropertiesUtils.getPropertyValue("cert_url"); + @Autowired private MongoTemplate mongoTemplate; @@ -323,4 +326,29 @@ public class CommonServerImpl implements ICommonServer { baseResponse.setErrormsg(ResponseCode.SUCCESS.getMsg()); return baseResponse; } + + @Override + public List getBabyInfoByCardNo(String cardNo) { + if (StringUtils.isNotEmpty(CERT_URL)) + { + Map param = new HashMap<>(1); + param.put("cardNo", cardNo); + String url = CERT_URL+"/cp/openApi/babyInfo/getBabyInfoByCardNo"; + String json = HttpClientUtil.doGet(url, param, "utf-8", ""); + if (StringUtils.isNotEmpty(json)) + { + JSONObject jsonObject = JsonUtil.getObj(json); + if (jsonObject.get("errorcode") != null && Integer.valueOf(String.valueOf(jsonObject.get("errorcode"))) == 0) + { + String dataJson = jsonObject.getJSONArray("data").toString(); + if (StringUtils.isNotEmpty(dataJson) && !"[]".equals(dataJson)) + { + List results = JsonUtil.toList(dataJson,CertBabyResult.class); + return results; + } + } + } + } + return null; + } } diff --git a/platform-operate-api/src/main/resources/config.properties b/platform-operate-api/src/main/resources/config.properties index 3c4b9bb..df5f01d 100644 --- a/platform-operate-api/src/main/resources/config.properties +++ b/platform-operate-api/src/main/resources/config.properties @@ -42,4 +42,6 @@ huada_syscode=HENGSHUI huada_secret=hengshui-123 dzlc_url=http://192.168.210.12:9090 -hospitalId=2100002042 \ No newline at end of file +hospitalId=2100002042 + +cert_url=https://try-cert-api.healthbaby.com.cn \ No newline at end of file