From a9747ccd4133c31abb78a00f28418adb3ca22574 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 15 Jun 2017 10:36:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/permission/model/UsersQuery.java | 9 + .../main/resources/mainOrm/master/MasterUsers.xml | 7 + .../java/com/lyms/platform/pojo/AntExChuModel.java | 66 +++++++ .../platform/pojo/AntenatalExaminationModel.java | 62 +++++++ .../controller/AntenatalExaminationController.java | 26 +-- .../web/controller/StopPregnancyController.java | 12 +- .../web/facade/AntenatalExaminationFacade.java | 56 ++++++ .../operate/web/facade/StopPregnancyFacade.java | 48 +++++ .../operate/web/request/AntExAddRequest.java | 68 ++++++++ .../operate/web/request/AntExcAddRequest.java | 194 +++++++++++++++------ 10 files changed, 479 insertions(+), 69 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java index bb90879..7e0ae27 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java @@ -31,6 +31,7 @@ public class UsersQuery extends BaseQuery { private String remarks; private Date lastLoginTime; private Integer ksId; + private List zhichenIds; private String keyword; private Integer roleId; @@ -40,6 +41,14 @@ public class UsersQuery extends BaseQuery { return otherAccount; } + public List getZhichenIds() { + return zhichenIds; + } + + public void setZhichenIds(List zhichenIds) { + this.zhichenIds = zhichenIds; + } + public Date getGteCreated() { return gteCreated; } diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml index e6c1650..3d99b68 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml @@ -203,6 +203,13 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p and remarks = #{remarks,jdbcType=VARCHAR} + + AND zhiChenId IN + + #{title} + + and last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 4c68b28..e4194ba 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -119,6 +119,72 @@ public class AntExChuModel extends BaseModel { */ private String diagnosisOther; + + //早孕期病毒检测 + private String zyqbd; + //nt检查 + private String ntjc; + //产前筛查 + private String cqsc; + //胎儿系统排畸b吵 + private String text; + //75gODTT + private String s75god; + //甲状腺功能 + private String jzxgn; + + public static long getSerialVersionUID() { + return serialVersionUID; + } + + public String getZyqbd() { + return zyqbd; + } + + public void setZyqbd(String zyqbd) { + this.zyqbd = zyqbd; + } + + public String getNtjc() { + return ntjc; + } + + public void setNtjc(String ntjc) { + this.ntjc = ntjc; + } + + public String getCqsc() { + return cqsc; + } + + public void setCqsc(String cqsc) { + this.cqsc = cqsc; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public String getS75god() { + return s75god; + } + + public void setS75god(String s75god) { + this.s75god = s75god; + } + + public String getJzxgn() { + return jzxgn; + } + + public void setJzxgn(String jzxgn) { + this.jzxgn = jzxgn; + } + public String getGonggaoSelect() { return gonggaoSelect; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java index 8bdf03c..9ed1a5c 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntenatalExaminationModel.java @@ -113,6 +113,68 @@ public class AntenatalExaminationModel extends BaseModel { //操作人 private Integer operator; + + //早孕期病毒检测 + private String zyqbd; + //nt检查 + private String ntjc; + //产前筛查 + private String cqsc; + //胎儿系统排畸b吵 + private String text; + //75gODTT + private String s75god; + //甲状腺功能 + private String jzxgn; + + public String getZyqbd() { + return zyqbd; + } + + public void setZyqbd(String zyqbd) { + this.zyqbd = zyqbd; + } + + public String getNtjc() { + return ntjc; + } + + public void setNtjc(String ntjc) { + this.ntjc = ntjc; + } + + public String getCqsc() { + return cqsc; + } + + public void setCqsc(String cqsc) { + this.cqsc = cqsc; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public String getS75god() { + return s75god; + } + + public void setS75god(String s75god) { + this.s75god = s75god; + } + + public String getJzxgn() { + return jzxgn; + } + + public void setJzxgn(String jzxgn) { + this.jzxgn = jzxgn; + } + public String getGongGaoSelect() { return gongGaoSelect; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java index e2f0845..91c1adb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java @@ -23,10 +23,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.util.StopWatch; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -102,9 +99,9 @@ public class AntenatalExaminationController extends BaseController { @ResponseBody public BaseResponse queryHisCheckList2(String cardNo, int ftype,HttpServletRequest request) { if ("1".equals(HIS_VERSION)) { - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(hisServiceV1.queryCheckListupdate(cardNo,ftype)); + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(hisServiceV1.queryCheckListupdate(cardNo, ftype)); } else if ("2".equals(HIS_VERSION)) { - return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(hisServiceV2.queryCheckListupdate(cardNo,ftype)); + return new BaseListResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setData(hisServiceV2.queryCheckListupdate(cardNo, ftype)); } else if ("3".equals(HIS_VERSION)) { return new BaseResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("没有数据"); } else if ("4".equals(HIS_VERSION)) { @@ -308,9 +305,16 @@ public class AntenatalExaminationController extends BaseController { return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION); } - - - - - + /** + * 获取最后一次重大检查结果 + * + * @param request + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/last") + @TokenRequired + public BaseResponse getLastCheck(HttpServletRequest request,@RequestParam("pid")String pid){ + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return antenatalExaminationFacade.getLastCheck(loginState.getId(),pid); + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java index 5b35ee2..9ae36d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StopPregnancyController.java @@ -66,5 +66,15 @@ public class StopPregnancyController extends BaseController { LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); return stopPregnancyFacade.queryInPerson(loginState.getId()); } - + /** + * 返回该医院可选择的录入人 + * @return + */ + @RequestMapping(method = RequestMethod.GET, value = "/queryInPerson2") + @ResponseBody + @TokenRequired + public BaseResponse queryInPerson2(HttpServletRequest request) { + LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); + return stopPregnancyFacade.queryInPerson2(loginState.getId()); + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index b2993db..a9747b7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -2137,6 +2137,62 @@ public class AntenatalExaminationFacade { return highScoreResult; } + public BaseResponse getLastCheck(Integer userId,String pid){ + AntExQuery antExQuery1 = new AntExQuery(); + String hospitalId = autoMatchFacade.getHospitalId(userId); + antExQuery1.setHospitalId(hospitalId); + antExQuery1.setPid(pid); + antExQuery1.setYn(YnEnums.YES.getId()); + List examinationModelList = antenatalExaminationService.queryAntenatalExamination(antExQuery1.convertToQuery().addOrder(Sort.Direction.DESC, "created")); + Map m =new HashMap(); + if(CollectionUtils.isNotEmpty(examinationModelList)){ + for(AntenatalExaminationModel model:examinationModelList){ + String zybd=model.getZyqbd(); + String ntjc= model.getNtjc(); + String cqsc= model.getCqsc(); + String text= model.getText(); + String s75god= model.getS75god(); + String jzxgn= model.getJzxgn(); + if(StringUtils.isNotEmpty(zybd)||StringUtils.isNotEmpty(ntjc)||StringUtils.isNotEmpty(cqsc)|| + StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75god)||StringUtils.isNotEmpty(jzxgn)){ + m.put("zybd",zybd); + m.put("ntjc",ntjc); + m.put("cqsc",cqsc); + m.put("text",text); + m.put("s75god",s75god); + m.put("jzxgn",jzxgn); + break; + } + } + } + AntExChuQuery antExChuQuery =new AntExChuQuery(); + antExQuery1.setHospitalId(hospitalId); + antExQuery1.setPid(pid); + antExQuery1.setYn(YnEnums.YES.getId()); + List chuModelList= antenatalExaminationService.queryAntExChu(antExChuQuery); + if(CollectionUtils.isNotEmpty(chuModelList)){ + for(AntExChuModel chu:chuModelList){ + String zybd=chu.getZyqbd(); + String ntjc= chu.getNtjc(); + String cqsc= chu.getCqsc(); + String text= chu.getText(); + String s75god= chu.getS75god(); + String jzxgn= chu.getJzxgn(); + if(StringUtils.isNotEmpty(zybd)||StringUtils.isNotEmpty(ntjc)||StringUtils.isNotEmpty(cqsc)|| + StringUtils.isNotEmpty(text)||StringUtils.isNotEmpty(s75god)||StringUtils.isNotEmpty(jzxgn)){ + m.put("zybd",zybd); + m.put("ntjc",ntjc); + m.put("cqsc",cqsc); + m.put("text",text); + m.put("s75god",s75god); + m.put("jzxgn",jzxgn); + break; + } + } + } + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("").setData(m); + } + public BaseResponse getEnums() { Map map = new HashMap<>(); map.put("getFetPosition", getFetPosition()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java index 74fcc9b..ac0df3d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/StopPregnancyFacade.java @@ -399,4 +399,52 @@ public class StopPregnancyFacade { objectResponse.setErrormsg("成功"); return objectResponse; } + + + /** + * 返回该医院可选择的录入人 + * + * @return + */ + public BaseResponse queryInPerson2(Integer id) { + List list = new ArrayList<>(); + if (id != null) { + UsersQuery query = new UsersQuery(); + query.setYn(YnEnums.YES.getId()); + query.setEnable(1); + query.setId(id); + List lis =new ArrayList<>(); + lis.add(1); + lis.add(2); + lis.add(3); + lis.add(4); + lis.add(5); + query.setZhichenIds(lis); + List dbusers = usersService.queryUsers(query); + + if (CollectionUtils.isNotEmpty(dbusers)) { + Users dbuser = dbusers.get(0); + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setYn(YnEnums.YES.getId()); + usersQuery.setOrgId(dbuser.getOrgId()); + usersQuery.setEnable(1); + List users = usersService.queryUsers(usersQuery); + + if (CollectionUtils.isNotEmpty(users)) { + for (Users user : users) { + Map pmap = new HashMap(); + pmap.put("id", user.getId()); + pmap.put("name", user.getName()); + list.add(pmap); + } + } + } + + } + BaseObjectResponse objectResponse = new BaseObjectResponse(); + objectResponse.setData(list); + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS); + objectResponse.setErrormsg("成功"); + return objectResponse; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index ea4adc9..07e11d2 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -97,6 +97,68 @@ public class AntExAddRequest implements IBasicRequestConvert * Created by Administrator on 2016/6/20 0020. */ @Form @@ -24,7 +23,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { @NotEmpty(message = "孕妇id不能为空") private String parentId; - private String barCode; + private String barCode; private String id; @@ -35,19 +34,19 @@ public class AntExcAddRequest implements IBasicRequestConvert { private String lastMenses; // 既往史 - private Map pastHistory ; + private Map pastHistory; // 家族史 - private Map familyHistory ; + private Map familyHistory; //个人史 private Map personalHistory; //疫苗接种史 - private Map ymjzHistory ; + private Map ymjzHistory; //药物过敏史 - private Map ywgmHistory ; + private Map ywgmHistory; //妇科手术史 - private Map fksxHistory ; + private Map fksxHistory; // 叶酸服用 - private Map ysfyHistory ; + private Map ysfyHistory; //本次妊娠情况 private Map cestationInfo; //丈夫健康情况 @@ -66,17 +65,17 @@ public class AntExcAddRequest implements IBasicRequestConvert { //死胎 private Integer stillbirth; //死产 - private Integer stillChan ; + private Integer stillChan; //新生儿死亡 private Integer neoDeath; //出生缺陷 private Integer birthDefect; // 身高 - private String height; + private String height; //体重 - private String weight ; + private String weight; //孕前体重 - private String yqWeight ; + private String yqWeight; //体重指数 private String baricIndex; //心脏 @@ -109,7 +108,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { //胎数 private List placentas; //高危因素 - private List highrisk ; + private List highrisk; //高危评分 private String highriskSocre; // 其他高危 @@ -128,67 +127,69 @@ public class AntExcAddRequest implements IBasicRequestConvert { //下次产检时间 private String nextCheckTime; //前端计算出来的孕周 - private String cDueWeek; + private String cDueWeek; - /**辅助检查结果录入 **/ + /** + * 辅助检查结果录入 + **/ //血红蛋白值 - private String xhdb; + private String xhdb; //白细胞计数值 - private String bxbjs ; + private String bxbjs; // 血小板 - private String platelet ; + private String platelet; //血常规其他 - private String chgOther; + private String chgOther; //尿蛋白 - private String ndb; + private String ndb; //尿糖 - private String nt; + private String nt; //尿同体 - private String urineKetone; - //尿潜血 - private String bld ; + private String urineKetone; + //尿潜血 + private String bld; //尿常规其他 - private String ncgOther; - private String abo; - private String rh; + private String ncgOther; + private String abo; + private String rh; // 血糖1 - private String bloodSugar; + private String bloodSugar; // B超 - private String bChao ; + private String bChao; // 胎数 - private String tireNumber ; + private String tireNumber; //血清谷丙转氨酶 - private String xqgbzam ; + private String xqgbzam; //血清谷草转氨酶 - private String xqgczam ; + private String xqgczam; //白蛋白 - private String albumin ; + private String albumin; //总胆红素 - private String totalBilirubin; + private String totalBilirubin; //结合胆红素 - private String jhBilirubin ; + private String jhBilirubin; // 乙肝表面抗原 - private String ygbmky ; + private String ygbmky; //乙肝表面抗体 - private String ygbmkt ; + private String ygbmkt; //乙肝e抗原 - private String ygeky ; + private String ygeky; // 乙肝e抗体 - private String ygekt ; + private String ygekt; // 乙肝核心抗体 - private String yghxkt ; + private String yghxkt; //血清肌 - private String xqjq ; + private String xqjq; //血尿素氮 - private String xnsd ; + private String xnsd; //梅毒血清实验 - private String mdxqsy; + private String mdxqsy; //hit抗体检测 private String hivkt; //阴道分泌物 - private Map ydfmw; + private Map ydfmw; //阴道清洁度 - private String ydqjd; + private String ydqjd; //实验结果 private String syjg; //引产 @@ -197,6 +198,67 @@ public class AntExcAddRequest implements IBasicRequestConvert { private Integer gongwaiyun; //药物流产次数 private Integer yaowu; + //早孕期病毒检测 + private String zyqbd; + //nt检查 + private String ntjc; + //产前筛查 + private String cqsc; + //胎儿系统排畸b吵 + private String text; + //75gODTT + private String s75god; + //甲状腺功能 + private String jzxgn; + + public String getZyqbd() { + return zyqbd; + } + + public void setZyqbd(String zyqbd) { + this.zyqbd = zyqbd; + } + + public String getNtjc() { + return ntjc; + } + + public void setNtjc(String ntjc) { + this.ntjc = ntjc; + } + + public String getCqsc() { + return cqsc; + } + + public void setCqsc(String cqsc) { + this.cqsc = cqsc; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public String getS75god() { + return s75god; + } + + public void setS75god(String s75god) { + this.s75god = s75god; + } + + public String getJzxgn() { + return jzxgn; + } + + public void setJzxgn(String jzxgn) { + this.jzxgn = jzxgn; + } + //自然流产 private Integer abortionZR; //人工流产 @@ -865,7 +927,6 @@ public class AntExcAddRequest implements IBasicRequestConvert { } - public String getProdDoctor() { return prodDoctor; } @@ -875,7 +936,6 @@ public class AntExcAddRequest implements IBasicRequestConvert { } - public String getTireNumber1() { return tireNumber1; } @@ -974,7 +1034,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { @Override public AntExChuModel convertToDataModel() { - AntExChuModel antExChuModel=new AntExChuModel(); + AntExChuModel antExChuModel = new AntExChuModel(); antExChuModel.setYinchan(yinchan); antExChuModel.setGongwaiyun(gongwaiyun); antExChuModel.setYaowu(yaowu); @@ -982,6 +1042,26 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setBirthDefectTodo(birthDefectTodo); antExChuModel.setDiagnosisOther(diagnosisOther); antExChuModel.setBg(bg); + +// //早孕期病毒检测 +// private String zyqbd; +// //nt检查 +// private String ntjc; +// //产前筛查 +// private String cqsc; +// //胎儿系统排畸b吵 +// private String text; +// //75gODTT +// private String s75god; +// //甲状腺功能 +// private String jzxgn; + + antExChuModel.setZyqbd(zyqbd); + antExChuModel.setNtjc(ntjc); + antExChuModel.setCqsc(cqsc); + antExChuModel.setText(text); + antExChuModel.setS75god(s75god); + antExChuModel.setJzxgn(jzxgn); antExChuModel.setBarCode(barCode); antExChuModel.setId(id); antExChuModel.setParentId(parentId); @@ -1026,7 +1106,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setCervical(cervical); antExChuModel.setUterus(uterus); antExChuModel.setFujian(fujian); - if(null!=hHealthInfo){ + if (null != hHealthInfo) { antExChuModel.sethHealthInfo(JsonUtil.obj2JsonString(hHealthInfo)); } // antExChuModel.setMdxqsy(mdxqsy); @@ -1053,31 +1133,31 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setFuwei(fuwei); antExChuModel.setTireNumber1(tireNumber1); antExChuModel.setPlacentas(placentas); - if(null!=bp){ + if (null != bp) { antExChuModel.setBp(JsonUtil.obj2JsonString(bp)); } - if(null!=highrisk){ + if (null != highrisk) { antExChuModel.setHighrisk(JsonUtil.array2JsonString(highrisk)); } antExChuModel.setHighriskSocre(highriskSocre); antExChuModel.setOtherHighRisk(JsonUtil.obj2JsonString(otherHighRisk)); - if(null!=diagnosis){ + if (null != diagnosis) { antExChuModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis)); } antExChuModel.setTreatOpinion(treatOpinion); antExChuModel.setDirOpinion(guide); antExChuModel.setProdDoctor(prodDoctor); - if(null!=checkTime){ + if (null != checkTime) { antExChuModel.setCheckTime(DateUtil.parseYMD(checkTime)); } - if(null!=nextCheckTime){ + if (null != nextCheckTime) { antExChuModel.setNextCheckTime(DateUtil.parseYMD(nextCheckTime)); } antExChuModel.setcDueWeek(cDueWeek); - if(StringUtils.isNotEmpty(lastMenses)){ + if (StringUtils.isNotEmpty(lastMenses)) { antExChuModel.setLastMenses(DateUtil.parseYMD(lastMenses)); } - if(StringUtils.isNotEmpty(dueDate)){ + if (StringUtils.isNotEmpty(dueDate)) { antExChuModel.setDueDate(DateUtil.parseYMD(dueDate)); } -- 1.8.3.1