jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 76d26dfe595b70ac914f32c6be06fe3954459cb2

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

update

Showing 2 changed files with 122 additions and 9 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/CervixVisitModel.java View file @ 76d26df
... ... @@ -43,9 +43,29 @@
43 43 //编号
44 44 private String code;
45 45 /**
46   - * 宫颈检查项
  46 + * 既往史
47 47 */
48   - private Map <String, Object> formData;
  48 + //HPV检查
  49 + private String hpv;
  50 + //细胞学
  51 + private String xbx;
  52 + //CIN
  53 + private String cin;
  54 + //CIN2/3
  55 + private String cin23;
  56 + //HPV疫苗注射
  57 + private String hpvym;
  58 + /**
  59 + * 现时情况（xshpv、hpvjc互斥字段。）
  60 + */
  61 + //HPV
  62 + private String xshpv;
  63 + //HPV检测手段
  64 + private String hpvjc;
  65 + //细胞学
  66 + private String xsxbx;
  67 + //阴道活检诊断
  68 + private String ydhjzd;
49 69  
50 70 //常规推荐
51 71 //随访时间段（1年内追访、3年内随访、5年内随访）
52 72  
... ... @@ -70,14 +90,7 @@
70 90 private Date created;
71 91 private Date modified;
72 92  
73   - public Map<String, Object> getFormData() {
74   - return formData;
75   - }
76 93  
77   - public void setFormData(Map<String, Object> formData) {
78   - this.formData = formData;
79   - }
80   -
81 94 public String getId() {
82 95 return id;
83 96 }
... ... @@ -245,6 +258,78 @@
245 258  
246 259 public void setModified(Date modified) {
247 260 this.modified = modified;
  261 + }
  262 +
  263 + public String getHpv() {
  264 + return hpv;
  265 + }
  266 +
  267 + public void setHpv(String hpv) {
  268 + this.hpv = hpv;
  269 + }
  270 +
  271 + public String getXbx() {
  272 + return xbx;
  273 + }
  274 +
  275 + public void setXbx(String xbx) {
  276 + this.xbx = xbx;
  277 + }
  278 +
  279 + public String getCin() {
  280 + return cin;
  281 + }
  282 +
  283 + public void setCin(String cin) {
  284 + this.cin = cin;
  285 + }
  286 +
  287 + public String getCin23() {
  288 + return cin23;
  289 + }
  290 +
  291 + public void setCin23(String cin23) {
  292 + this.cin23 = cin23;
  293 + }
  294 +
  295 + public String getHpvym() {
  296 + return hpvym;
  297 + }
  298 +
  299 + public void setHpvym(String hpvym) {
  300 + this.hpvym = hpvym;
  301 + }
  302 +
  303 + public String getXshpv() {
  304 + return xshpv;
  305 + }
  306 +
  307 + public void setXshpv(String xshpv) {
  308 + this.xshpv = xshpv;
  309 + }
  310 +
  311 + public String getHpvjc() {
  312 + return hpvjc;
  313 + }
  314 +
  315 + public void setHpvjc(String hpvjc) {
  316 + this.hpvjc = hpvjc;
  317 + }
  318 +
  319 + public String getXsxbx() {
  320 + return xsxbx;
  321 + }
  322 +
  323 + public void setXsxbx(String xsxbx) {
  324 + this.xsxbx = xsxbx;
  325 + }
  326 +
  327 + public String getYdhjzd() {
  328 + return ydhjzd;
  329 + }
  330 +
  331 + public void setYdhjzd(String ydhjzd) {
  332 + this.ydhjzd = ydhjzd;
248 333 }
249 334 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 76d26df
... ... @@ -805,6 +805,34 @@
805 805 CervixVisitModel cervixVisitModel=new CervixVisitModel();
806 806 //下次预约时间逻辑
807 807 cervixVisitModel.setNextAfterVisitTime(cervicalCancerRequest.getCreated());
  808 + //宫颈检查追访项
  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("hpvjc")){
  826 + cervixVisitModel.setHpvjc(cervicalCancerRequest.getFormData().get("hpvjc").toString());
  827 + }
  828 + if(null!=cervicalCancerRequest.getFormData().get("xsxbx")){
  829 + cervixVisitModel.setXsxbx(cervicalCancerRequest.getFormData().get("xsxbx").toString());
  830 + }
  831 + if(null!=cervicalCancerRequest.getFormData().get("ydhjzd")){
  832 + cervixVisitModel.setYdhjzd(cervicalCancerRequest.getFormData().get("ydhjzd").toString());
  833 + }
  834 +
  835 + }
808 836 if(type==1) {
809 837 cervixVisitModel.setParentId(cervicalCancerRequest.getId());
810 838 cervixVisitModel.setHospitalId(cervicalCancerRequest.getHospitalId());