jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 49b1f2eb99ae60529f8ae12c899cfce4ee35e900

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

威海分娩记录修改

Showing 4 changed files with 35 additions and 85 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java View file @ 49b1f2e
... ... @@ -1363,6 +1363,34 @@
1363 1363 private Integer twining ;//缠绕
1364 1364 private String tightness;//松紧程度
1365 1365  
  1366 + private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
  1367 + private String placentalQs;//胎盘缺损g
  1368 + private String ccm;//粗糙面
  1369 +
  1370 + public String getPlacentalComplete() {
  1371 + return placentalComplete;
  1372 + }
  1373 +
  1374 + public void setPlacentalComplete(String placentalComplete) {
  1375 + this.placentalComplete = placentalComplete;
  1376 + }
  1377 +
  1378 + public String getPlacentalQs() {
  1379 + return placentalQs;
  1380 + }
  1381 +
  1382 + public void setPlacentalQs(String placentalQs) {
  1383 + this.placentalQs = placentalQs;
  1384 + }
  1385 +
  1386 + public String getCcm() {
  1387 + return ccm;
  1388 + }
  1389 +
  1390 + public void setCcm(String ccm) {
  1391 + this.ccm = ccm;
  1392 + }
  1393 +
1366 1394 public String getTightness() {
1367 1395 return tightness;
1368 1396 }
1369 1397  
1370 1398  
... ... @@ -1760,37 +1788,14 @@
1760 1788  
1761 1789 private String bedNum;//床号
1762 1790 private String bhNum;//住院号
1763   - private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
  1791 + /*private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
1764 1792 private String placentalQs;//胎盘缺损g
1765   - private String ccm;//粗糙面
  1793 + private String ccm;//粗糙面*/
1766 1794 private String fhqk;//缝合情况（1：皮内缝合；2：外缝针）
1767 1795 private String szxz;//水肿血肿
1768 1796 private String jmkz;//静脉扩张
1769 1797 private String zyDiagnosis;//主要诊断
1770 1798  
1771   - public String getPlacentalComplete() {
1772   - return placentalComplete;
1773   - }
1774   -
1775   - public void setPlacentalComplete(String placentalComplete) {
1776   - this.placentalComplete = placentalComplete;
1777   - }
1778   -
1779   - public String getPlacentalQs() {
1780   - return placentalQs;
1781   - }
1782   -
1783   - public void setPlacentalQs(String placentalQs) {
1784   - this.placentalQs = placentalQs;
1785   - }
1786   -
1787   - public String getCcm() {
1788   - return ccm;
1789   - }
1790   -
1791   - public void setCcm(String ccm) {
1792   - this.ccm = ccm;
1793   - }
1794 1799  
1795 1800 public String getFhqk() {
1796 1801 return fhqk;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 49b1f2e
... ... @@ -2781,9 +2781,6 @@
2781 2781 map.put("gjOther",data.getGjOther());
2782 2782 map.put("bedNum",data.getBedNum());
2783 2783 map.put("bhNum",data.getBhNum());
2784   - map.put("placentalComplete",data.getPlacentalComplete());
2785   - map.put("placentalQs",data.getPlacentalQs());
2786   - map.put("ccm",data.getCcm());
2787 2784 map.put("fhqk",data.getFhqk());
2788 2785 map.put("szxz",data.getSzxz());
2789 2786 map.put("jmkz",data.getJmkz());
... ... @@ -2929,6 +2926,9 @@
2929 2926 extMap.put("qdfz",temp.getQdfz());
2930 2927 extMap.put("twining",temp.getTwining());
2931 2928 extMap.put("tightness",temp.getTightness());
  2929 + extMap.put("placentalComplete",temp.getPlacentalComplete());
  2930 + extMap.put("placentalQs",temp.getPlacentalQs());
  2931 + extMap.put("ccm",temp.getCcm());
2932 2932 /****************************/
2933 2933  
2934 2934 ExtPlacentaList.add(extMap);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java View file @ 49b1f2e
... ... @@ -342,9 +342,9 @@
342 342  
343 343 private String bedNum;//床号
344 344 private String bhNum;//住院号
345   - private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
  345 + /*private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
346 346 private String placentalQs;//胎盘缺损g
347   - private String ccm;//粗糙面
  347 + private String ccm;//粗糙面*/
348 348 private String fhqk;//缝合情况（1：皮内缝合；2：外缝针）
349 349 private String szxz;//水肿血肿
350 350 private String jmkz;//静脉扩张
... ... @@ -429,9 +429,6 @@
429 429  
430 430 maternalDeliverModel.setBedNum(bedNum);
431 431 maternalDeliverModel.setBhNum(bhNum);
432   - maternalDeliverModel.setPlacentalComplete(placentalComplete);
433   - maternalDeliverModel.setPlacentalQs(placentalQs);
434   - maternalDeliverModel.setCcm(ccm);
435 432 maternalDeliverModel.setFhqk(fhqk);
436 433 maternalDeliverModel.setSzxz(szxz);
437 434 maternalDeliverModel.setJmkz(jmkz);
... ... @@ -440,29 +437,6 @@
440 437 return maternalDeliverModel;
441 438 }
442 439  
443   - public String getPlacentalComplete() {
444   - return placentalComplete;
445   - }
446   -
447   - public void setPlacentalComplete(String placentalComplete) {
448   - this.placentalComplete = placentalComplete;
449   - }
450   -
451   - public String getPlacentalQs() {
452   - return placentalQs;
453   - }
454   -
455   - public void setPlacentalQs(String placentalQs) {
456   - this.placentalQs = placentalQs;
457   - }
458   -
459   - public String getCcm() {
460   - return ccm;
461   - }
462   -
463   - public void setCcm(String ccm) {
464   - this.ccm = ccm;
465   - }
466 440  
467 441 public String getFhqk() {
468 442 return fhqk;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java View file @ 49b1f2e
... ... @@ -141,38 +141,12 @@
141 141  
142 142 private String bedNum;//床号
143 143 private String bhNum;//住院号
144   - private String placentalComplete;//胎盘完整性（0,：完整；1：基本完整；2：不完整）
145   - private String placentalQs;//胎盘缺损g
146   - private String ccm;//粗糙面
147 144 private String fhqk;//缝合情况（1：皮内缝合；2：外缝针）
148 145 private String szxz;//水肿血肿
149 146 private String jmkz;//静脉扩张
150 147 private String zyDiagnosis;//主要诊断
151 148  
152   - public String getPlacentalComplete() {
153   - return placentalComplete;
154   - }
155 149  
156   - public void setPlacentalComplete(String placentalComplete) {
157   - this.placentalComplete = placentalComplete;
158   - }
159   -
160   - public String getPlacentalQs() {
161   - return placentalQs;
162   - }
163   -
164   - public void setPlacentalQs(String placentalQs) {
165   - this.placentalQs = placentalQs;
166   - }
167   -
168   - public String getCcm() {
169   - return ccm;
170   - }
171   -
172   - public void setCcm(String ccm) {
173   - this.ccm = ccm;
174   - }
175   -
176 150 public String getFhqk() {
177 151 return fhqk;
178 152 }
... ... @@ -494,9 +468,6 @@
494 468  
495 469 setBedNum(destModel.getBedNum());
496 470 setBhNum(destModel.getBhNum());
497   - setPlacentalComplete(destModel.getPlacentalComplete());
498   - setPlacentalQs(destModel.getPlacentalQs());
499   - setCcm(destModel.getCcm());
500 471 setFhqk(destModel.getFhqk());
501 472 setSzxz(destModel.getSzxz());
502 473 setJmkz(destModel.getJmkz());