diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java index 924592c..1fa9f03 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CancerScreeningModel.java @@ -139,7 +139,7 @@ public class CancerScreeningModel extends BaseModel { //分类右 private Map rxlFly; //建议 - private String rxlJy; + private Map rxlJy; //检查机构 private String rxlJcdw; //检査人员 @@ -152,7 +152,7 @@ public class CancerScreeningModel extends BaseModel { //乳腺X线评估右 private Map rxlPgy; //建议 - private String rxJy; + private Map rxJy; //(五〉最终随访结果 //随访情况 private String sfQk; @@ -678,14 +678,6 @@ public class CancerScreeningModel extends BaseModel { this.rxlFly = rxlFly; } - public String getRxlJy() { - return rxlJy; - } - - public void setRxlJy(String rxlJy) { - this.rxlJy = rxlJy; - } - public String getRxlJcdw() { return rxlJcdw; } @@ -718,11 +710,19 @@ public class CancerScreeningModel extends BaseModel { this.rxlPgy = rxlPgy; } - public String getRxJy() { + public Map getRxlJy() { + return rxlJy; + } + + public void setRxlJy(Map rxlJy) { + this.rxlJy = rxlJy; + } + + public Map getRxJy() { return rxJy; } - public void setRxJy(String rxJy) { + public void setRxJy(Map rxJy) { this.rxJy = rxJy; } diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index bb5ed2e..b52a75f 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -241,7 +241,7 @@ public class Patients extends BaseModel { private Date dueDate; //末次月经 private Date lastMenses; - //分娩日期 + //分娩日期 癌症 private Date fmDate; @SuppressWarnings("unused") diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java index aaf0df3..f8dfb4a 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java @@ -138,7 +138,7 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ //分类右 private Map rxlFly; //建议 - private String rxlJy; + private Map rxlJy; //检查机构 private String rxlJcdw; //检査人员 @@ -151,7 +151,7 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ //乳腺X线评估右 private Map rxlPgy; //建议 - private String rxJy; + private Map rxJy; //(五〉最终随访结果 //随访情况 private String sfQk; @@ -689,14 +689,18 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ this.rxlFly = rxlFly; } - public String getRxlJy() { + public Map getRxlJy() { return rxlJy; } - public void setRxlJy(String rxlJy) { + public void setRxlJy(Map rxlJy) { this.rxlJy = rxlJy; } + public void setRxJy(Map rxJy) { + this.rxJy = rxJy; + } + public String getRxlJcdw() { return rxlJcdw; } @@ -737,14 +741,10 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ this.rxlPgy = rxlPgy; } - public String getRxJy() { + public Map getRxJy() { return rxJy; } - public void setRxJy(String rxJy) { - this.rxJy = rxJy; - } - public String getSfQk() { return sfQk; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java index 9d99234..2df6567 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java @@ -51,7 +51,7 @@ public class CancerScreeningController extends BaseController { * @return */ @ResponseBody - @RequestMapping(value="/resCanScrList/{id}",method = RequestMethod.GET) + @RequestMapping(value="/resCanScrList/{residentId}",method = RequestMethod.GET) @TokenRequired public BaseResponse getResIdCancerScreenList(@PathVariable String residentId) { return cancerScreenService.getResIdCancerScreenList(residentId); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index e8d7c6d..fc375db 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -164,6 +164,8 @@ public class CancerScreeningFacade { cancerScr.setHospitalId(hospitalId); //操作人的id cancerScr.setOperator(id); + //有效 + cancerScr.setYn(YnEnums.YES.getId()); cancerScreenService.addOneCancerScreen(cancerScr); return new BaseResponse("成功", ErrorCodeConstants.SUCCESS); }else{