jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 32737a1a6d554c8c929f16ab629e4f3b4718fd45

Authored by shiyang
1 parent fe57588e79
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 2 changed files with 40 additions and 31 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitModel.java View file @ 32737a1
... ... @@ -67,7 +67,9 @@
67 67 //阴道活检诊断
68 68 private String ydhjzd;
69 69  
70   - //常规推荐
  70 + /**
  71 + *常规推荐
  72 + */
71 73 //随访时间段（1年内追访、3年内随访、5年内随访）
72 74 //阴道镜检查
73 75 //阴道镜治疗
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 32737a1
... ... @@ -801,40 +801,47 @@
801 801 //宫颈追访业务 type:1：新增、2：修改
802 802 public void cervixVisitAdd(CervicalCancerRequest cervicalCancerRequest,int type) {
803 803 try {
804   - if(null!=cervicalCancerRequest){
  804 + if(null!=cervicalCancerRequest && MapUtils.isNotEmpty(cervicalCancerRequest.getFormData()) &&
  805 + (null!=cervicalCancerRequest.getFormData().get("hpv")||
  806 + null!=cervicalCancerRequest.getFormData().get("xbx")||
  807 + null!=cervicalCancerRequest.getFormData().get("cin")||
  808 + null!=cervicalCancerRequest.getFormData().get("cin23")||
  809 + null!=cervicalCancerRequest.getFormData().get("hpvym")||
  810 + null!=cervicalCancerRequest.getFormData().get("xshpv")||
  811 + null!=cervicalCancerRequest.getFormData().get("hpvjc")||
  812 + null!=cervicalCancerRequest.getFormData().get("xsxbx")||
  813 + null!=cervicalCancerRequest.getFormData().get("ydhjzd")
  814 + )){
805 815 CervixVisitModel cervixVisitModel=new CervixVisitModel();
806 816 //下次预约时间逻辑
807 817 cervixVisitModel.setNextAfterVisitTime(cervicalCancerRequest.getCreated());
808 818 //宫颈检查追访项
809   - if(MapUtils.isNotEmpty(cervicalCancerRequest.getFormData())){
810   - if(null!=cervicalCancerRequest.getFormData().get("hpv")){
811   - cervixVisitModel.setHpv(cervicalCancerRequest.getFormData().get("hpv").toString());
812   - }
813   - if(null!=cervicalCancerRequest.getFormData().get("xbx")){
814   - cervixVisitModel.setXbx(cervicalCancerRequest.getFormData().get("xbx").toString());
815   - }
816   - if(null!=cervicalCancerRequest.getFormData().get("cin")){
817   - cervixVisitModel.setCin(cervicalCancerRequest.getFormData().get("cin").toString());
818   - }
819   - if(null!=cervicalCancerRequest.getFormData().get("cin23")){
820   - cervixVisitModel.setCin23(cervicalCancerRequest.getFormData().get("cin23").toString());
821   - }
822   - if(null!=cervicalCancerRequest.getFormData().get("hpvym")){
823   - cervixVisitModel.setHpvym(cervicalCancerRequest.getFormData().get("hpvym").toString());
824   - }
825   - if(null!=cervicalCancerRequest.getFormData().get("xshpv")){
826   - cervixVisitModel.setXshpv(cervicalCancerRequest.getFormData().get("xshpv").toString());
827   - }
828   - if(null!=cervicalCancerRequest.getFormData().get("hpvjc")){
829   - cervixVisitModel.setHpvjc(cervicalCancerRequest.getFormData().get("hpvjc").toString());
830   - }
831   - if(null!=cervicalCancerRequest.getFormData().get("xsxbx")){
832   - cervixVisitModel.setXsxbx(cervicalCancerRequest.getFormData().get("xsxbx").toString());
833   - }
834   - if(null!=cervicalCancerRequest.getFormData().get("ydhjzd")){
835   - cervixVisitModel.setYdhjzd(cervicalCancerRequest.getFormData().get("ydhjzd").toString());
836   - }
837   -
  819 + if(null!=cervicalCancerRequest.getFormData().get("hpv")){
  820 + cervixVisitModel.setHpv(cervicalCancerRequest.getFormData().get("hpv").toString());
  821 + }
  822 + if(null!=cervicalCancerRequest.getFormData().get("xbx")){
  823 + cervixVisitModel.setXbx(cervicalCancerRequest.getFormData().get("xbx").toString());
  824 + }
  825 + if(null!=cervicalCancerRequest.getFormData().get("cin")){
  826 + cervixVisitModel.setCin(cervicalCancerRequest.getFormData().get("cin").toString());
  827 + }
  828 + if(null!=cervicalCancerRequest.getFormData().get("cin23")){
  829 + cervixVisitModel.setCin23(cervicalCancerRequest.getFormData().get("cin23").toString());
  830 + }
  831 + if(null!=cervicalCancerRequest.getFormData().get("hpvym")){
  832 + cervixVisitModel.setHpvym(cervicalCancerRequest.getFormData().get("hpvym").toString());
  833 + }
  834 + if(null!=cervicalCancerRequest.getFormData().get("xshpv")){
  835 + cervixVisitModel.setXshpv(cervicalCancerRequest.getFormData().get("xshpv").toString());
  836 + }
  837 + if(null!=cervicalCancerRequest.getFormData().get("hpvjc")){
  838 + cervixVisitModel.setHpvjc(cervicalCancerRequest.getFormData().get("hpvjc").toString());
  839 + }
  840 + if(null!=cervicalCancerRequest.getFormData().get("xsxbx")){
  841 + cervixVisitModel.setXsxbx(cervicalCancerRequest.getFormData().get("xsxbx").toString());
  842 + }
  843 + if(null!=cervicalCancerRequest.getFormData().get("ydhjzd")){
  844 + cervixVisitModel.setYdhjzd(cervicalCancerRequest.getFormData().get("ydhjzd").toString());
838 845 }
839 846 if(type==1) {
840 847 cervixVisitModel.setParentId(cervicalCancerRequest.getId());