From 1bed29433f3d08cb762d14747b1b30a58a9bceef Mon Sep 17 00:00:00 2001 From: "rui.zhang" Date: Fri, 8 Apr 2016 15:31:47 +0800 Subject: [PATCH] platform permission fix bug --- .../platform/common/enums/PatientsTypeEnum.java | 36 ++++++ .../lyms/platform/common/enums/SampleTypeEnum.java | 40 ++++++ .../com/lyms/platform/common/enums/SexEnum.java | 34 ++++++ .../java/com/lyms/platform/pojo/ReferValue.java | 135 +++++++++++++-------- .../com/lyms/platform/query/ReferConfigQuery.java | 29 +++++ .../operate/web/controller/EnumsController.java | 101 +++++++++++++++ .../web/controller/ReferConfigController.java | 21 +++- .../operate/web/controller/TestController.java | 89 ++++++++++++++ 8 files changed, 427 insertions(+), 58 deletions(-) create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/PatientsTypeEnum.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/SampleTypeEnum.java create mode 100644 platform-common/src/main/java/com/lyms/platform/common/enums/SexEnum.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java create mode 100644 platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/PatientsTypeEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientsTypeEnum.java new file mode 100644 index 0000000..0734aa5 --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/PatientsTypeEnum.java @@ -0,0 +1,36 @@ +package com.lyms.platform.common.enums; + +/** + * 病人类型 + * Created by Zhang.Rui on 2016/4/7. + */ +public enum PatientsTypeEnum { + CR(1,"成人"),CRNAN(2,"成人男"),CRNV(3, "成人女") + ,XSR(4,"新生儿"),YINGR(5,"婴儿"),YOUR(6,"幼儿"),ET(7,"儿童"); + + private Integer id; + private String text; + + + PatientsTypeEnum(int id, String text) { + this.id=id; + this.text = text; + } + + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SampleTypeEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SampleTypeEnum.java new file mode 100644 index 0000000..30696ae --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SampleTypeEnum.java @@ -0,0 +1,40 @@ +package com.lyms.platform.common.enums; + +/** + * 样本类型 + * Created by Zhang.Rui on 2016/4/7. + */ +public enum SampleTypeEnum { + XY(1,"血液"), NY(2,"尿液"),FB(3,"粪便"), + TY(4, "痰液"), NJY(5,"脑脊液"),JMQY(6,"浆膜腔液"), + GJY(7,"关节液"), GS(8,"骨髓"),JY(9,"精液"), + QLXY(10,"前列腺液"),YDFMW(11,"阴道分泌物"),RZ(12,"乳汁"), + QT(13,"其他"); + + private Integer id; + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + private String text; + + + SampleTypeEnum(int id, String text) { + this.id=id; + this.text = text; + } + +} diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SexEnum.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SexEnum.java new file mode 100644 index 0000000..2ff0b2e --- /dev/null +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SexEnum.java @@ -0,0 +1,34 @@ +package com.lyms.platform.common.enums; + +/** + * 性别 + * Created by Zhang.Rui on 2016/4/7. + */ +public enum SexEnum { + MAN(1,"男"), WOMAN(0,"女"); + + private Integer id; + private String text; + + + SexEnum(int id, String text) { + this.id=id; + this.text = text; + } + + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } +} diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java index 0e133d6..e277464 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferValue.java @@ -32,28 +32,73 @@ public class ReferValue extends BaseModel{ private String code; private String sample; //样本 private String sampleDesc; //样本说明 - private int sex; + private String sex; private String feature; //病人特征 - private int ageDepartment; //年龄单位 - private int beginAge; - private int endAge; + private String ageDepartment; //年龄单位 + private String beginAge; + private String endAge; private String unit; //项目单位 private String charRefer; //字符参考 private String min; //下限 private String max; //上限 - private String emergencyMin;//危机下限 - private String emergencyMax;//危机上限 + private String emergencyChar; //危机字符 - private String deal; //处理 - private String serviceContent;//服务内容 - private int department; //科室 - private int assayConfigId; //化验项ID + private String emergencyMin;//危机下限 + private String emergencyMinDeal; //危机下限处理 + private String emergencyMinServiceContent;//危机下限服务内容 + + private String emergencyMax;//危机上限 + private String emergencyMaxDeal; //危机上限限处理 + private String emergencyMaxServiceContent;//危机上限服务内容 + private String department; //科室 + private String assayConfigId; //化验项ID private String standardCode;//标准代码 private Integer yn; + + public String getSex() { + return sex; + } + + public void setSex(String sex) { + this.sex = sex; + } + + public String getAgeDepartment() { + return ageDepartment; + } + + public void setAgeDepartment(String ageDepartment) { + this.ageDepartment = ageDepartment; + } + + public String getBeginAge() { + return beginAge; + } + + public void setBeginAge(String beginAge) { + this.beginAge = beginAge; + } + + public String getEndAge() { + return endAge; + } + + public void setEndAge(String endAge) { + this.endAge = endAge; + } + + public String getDepartment() { + return department; + } + + public void setDepartment(String department) { + this.department = department; + } + public Integer getYn() { return yn; } @@ -78,11 +123,11 @@ public class ReferValue extends BaseModel{ this.standardCode = standardCode; } - public int getAssayConfigId() { + public String getAssayConfigId() { return assayConfigId; } - public void setAssayConfigId(int assayConfigId) { + public void setAssayConfigId(String assayConfigId) { this.assayConfigId = assayConfigId; } @@ -126,14 +171,6 @@ public class ReferValue extends BaseModel{ this.sampleDesc = sampleDesc; } - public int getSex() { - return sex; - } - - public void setSex(int sex) { - this.sex = sex; - } - public String getFeature() { return feature; } @@ -142,29 +179,8 @@ public class ReferValue extends BaseModel{ this.feature = feature; } - public int getAgeDepartment() { - return ageDepartment; - } - public void setAgeDepartment(int ageDepartment) { - this.ageDepartment = ageDepartment; - } - public int getBeginAge() { - return beginAge; - } - - public void setBeginAge(int beginAge) { - this.beginAge = beginAge; - } - - public int getEndAge() { - return endAge; - } - - public void setEndAge(int endAge) { - this.endAge = endAge; - } public String getUnit() { return unit; @@ -222,27 +238,40 @@ public class ReferValue extends BaseModel{ this.emergencyChar = emergencyChar; } - public String getDeal() { - return deal; + public static long getSerialVersionUID() { + return serialVersionUID; } - public void setDeal(String deal) { - this.deal = deal; + public String getEmergencyMinDeal() { + return emergencyMinDeal; } - public String getServiceContent() { - return serviceContent; + public void setEmergencyMinDeal(String emergencyMinDeal) { + this.emergencyMinDeal = emergencyMinDeal; } - public void setServiceContent(String serviceContent) { - this.serviceContent = serviceContent; + public String getEmergencyMinServiceContent() { + return emergencyMinServiceContent; } - public int getDepartment() { - return department; + public void setEmergencyMinServiceContent(String emergencyMinServiceContent) { + this.emergencyMinServiceContent = emergencyMinServiceContent; } - public void setDepartment(int department) { - this.department = department; + public String getEmergencyMaxDeal() { + return emergencyMaxDeal; + } + + public void setEmergencyMaxDeal(String emergencyMaxDeal) { + this.emergencyMaxDeal = emergencyMaxDeal; + } + + public String getEmergencyMaxServiceContent() { + return emergencyMaxServiceContent; + } + + public void setEmergencyMaxServiceContent(String emergencyMaxServiceContent) { + this.emergencyMaxServiceContent = emergencyMaxServiceContent; } + } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferConfigQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferConfigQuery.java index 5ea4081..2052eb0 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferConfigQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferConfigQuery.java @@ -15,13 +15,18 @@ import javax.validation.constraints.NotNull; public class ReferConfigQuery extends BaseQuery { @NotNull(message = "医院ID不能为空") private Integer hospitalId; + private String id; private Integer codeType;//1:项目代码2:标准代码 3:项目名称 private String keyword; private Integer referVal;//1已设置2未设置3全部 private Integer emergencyVal;//1已设置2未设置3全部 + private Integer yn; + + public MongoQuery convertToQuery() { MongoCondition condition = MongoCondition.newInstance(); + if (null != hospitalId) { condition.and("hospitalId", hospitalId, MongoOper.IS); } @@ -48,9 +53,33 @@ public class ReferConfigQuery extends BaseQuery { condition.and("emergencyChar", null, MongoOper.IS); } } + + if(null != yn) { + condition.and("yn", yn, MongoOper.IS); + } + if(null != id) { + condition.and("id", id, MongoOper.IS); + } + return condition.toMongoQuery(); } + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public Integer getYn() { + return yn; + } + + public void setYn(Integer yn) { + this.yn = yn; + } + public Integer getHospitalId() { return hospitalId; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java new file mode 100644 index 0000000..9c389cd --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java @@ -0,0 +1,101 @@ +package com.lyms.platform.operate.web.controller; + +import com.lyms.platform.common.enums.AgeUnitEnums; +import com.lyms.platform.common.enums.PatientsTypeEnum; +import com.lyms.platform.common.enums.SampleTypeEnum; +import com.lyms.platform.common.enums.SexEnum; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by Zhang.Rui on 2016/4/7. + */ +@Controller +public class EnumsController { + + /** + * 获取性别枚举 + */ + @RequestMapping(value = "/sexEnum", method = RequestMethod.GET) + @ResponseBody + public List getSexEnum() { + List list = new ArrayList<>(); + Map m = null; + for (SexEnum e : SexEnum.values()) { + m = new HashMap<>(); + m.put("id", String.valueOf(e.getId())); + m.put("text", e.getText()); + list.add(m); + } + return list; + } + + /** + * 获取病人类型枚举 + */ + @RequestMapping(value = "/sampleTypeEnum", method = RequestMethod.GET) + @ResponseBody + public List getSampleTypeEnum() { + List list = new ArrayList<>(); + Map m = null; + for (SampleTypeEnum e : SampleTypeEnum.values()) { + m = new HashMap<>(); + m.put("id", String.valueOf(e.getId())); + m.put("text", e.getText()); + list.add(m); + } + return list; + } + + /** + * 获取样本类型枚举 + */ + @RequestMapping(value = "/patientsTypeEnum", method = RequestMethod.GET) + @ResponseBody + public List getPatientsTypeEnum() { + List list = new ArrayList<>(); + Map m = null; + for (PatientsTypeEnum e : PatientsTypeEnum.values()) { + m = new HashMap<>(); + m.put("id", String.valueOf(e.getId())); + m.put("text", e.getText()); + list.add(m); + } + return list; + } + + /** + * 获取年龄单位 + */ + @RequestMapping(value = "/ageUnitEnum", method = RequestMethod.GET) + @ResponseBody + public List getAgeUnitEnum() { + List list = new ArrayList<>(); + Map m = null; + for (AgeUnitEnums e : AgeUnitEnums.values()) { + m = new HashMap<>(); + m.put("id", String.valueOf(e.getId())); + m.put("text", e.getTitle()); + list.add(m); + } + return list; + } + + + + public static void main(String a[]) { + + for (PatientsTypeEnum e : PatientsTypeEnum.values()) { + + System.out.println(e.getText()); + } + } + +} diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java index 254c4ac..17b53a3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ReferConfigController.java @@ -4,6 +4,8 @@ import java.util.List; import javax.validation.Valid; +import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.pojo.AssayConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.PathVariable; @@ -31,26 +33,33 @@ public class ReferConfigController extends RestController{ @Autowired AssayConfigService assayConfigService; + + + @ResponseBody - @RequestMapping(value = "referConfig",method = RequestMethod.GET) - public BaseListResponse queryRefer(@RequestBody @Valid ReferConfigQuery referConfigQuery) { + @RequestMapping(value = "/referConfig",method = RequestMethod.GET) + public BaseListResponse queryRefer( @Valid ReferConfigQuery referConfigQuery) { + referConfigQuery.setYn(YnEnums.YES.getId()); List referValueList = referConfigService.queryRefer(referConfigQuery); BaseListResponse baseListResponse = new BaseListResponse(); baseListResponse.setData(referValueList).setErrormsg("成功").setErrorcode(ErrorCodeConstants.SUCCESS); return baseListResponse; } - @RequestMapping(value = "referConfig",method = RequestMethod.POST) + @RequestMapping(value = "/referConfig",method = RequestMethod.POST) @ResponseBody public BaseResponse addRefer(@RequestBody @Valid ReferValue referValue) { //添加前先设置项目代码， 标准代码 + + + referConfigService.addRefer(referValue); return new BaseResponse() .setErrorcode(ErrorCodeConstants.SUCCESS) .setErrormsg("添加成功!"); } - @RequestMapping(value = "referConfig/{id}",method = RequestMethod.DELETE) + @RequestMapping(value = "/referConfig/{id}",method = RequestMethod.DELETE) @ResponseBody public BaseResponse delRefer(@PathVariable String id) { ReferValue referValue = new ReferValue(); @@ -61,7 +70,7 @@ public class ReferConfigController extends RestController{ .setErrormsg("删除成功!"); } - @RequestMapping(value = "referConfig/{id}",method = RequestMethod.PUT) + @RequestMapping(value = "/referConfig/{id}",method = RequestMethod.PUT) @ResponseBody public BaseResponse updateRefer(@RequestBody @Valid ReferValue referValue, @PathVariable String id) { //更新前先设置项目代码， 标准代码 @@ -73,4 +82,6 @@ public class ReferConfigController extends RestController{ } + + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java new file mode 100644 index 0000000..877f407 --- /dev/null +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/TestController.java @@ -0,0 +1,89 @@ +package com.lyms.platform.operate.web.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.ResponseBody; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by Zhang.Rui on 2016/4/8. + * 测试数据, 假数据 + */ +@Controller +public class TestController { + + /** + * 获取科室 + */ + @RequestMapping(value = "/hospitalDepartmentTest", method = RequestMethod.GET) + @ResponseBody + public List getDepartment() { + List list = new ArrayList<>(); + Map m = new HashMap<>(); + + m = new HashMap<>(); + m.put("id", String.valueOf(1)); + m.put("name", "妇产科"); + list.add(m); + + m = new HashMap<>(); + m.put("id", String.valueOf(2)); + m.put("name", "眼科"); + list.add(m); + + m = new HashMap<>(); + m.put("id", String.valueOf(3)); + m.put("name", "五官科"); + list.add(m); + + m = new HashMap<>(); + m.put("id", String.valueOf(4)); + m.put("name", "胸腔科"); + list.add(m); + + return list; + } + + + /** + * 获取医院 + */ + @RequestMapping(value = "/hospitalsTest", method = RequestMethod.GET) + @ResponseBody + public List getSampleTypeEnum() { + List list = new ArrayList<>(); + Map m = new HashMap<>(); + + m = new HashMap<>(); + m.put("id", String.valueOf(1)); + m.put("name", "秦皇岛安琪儿医院"); + list.add(m); + + m = new HashMap<>(); + m.put("id", String.valueOf(2)); + m.put("name", "成都市妇幼保健医院"); + list.add(m); + + m = new HashMap<>(); + m.put("id", String.valueOf(3)); + m.put("name", "成都市九龙医院"); + list.add(m); + + m = new HashMap<>(); + m.put("id", String.valueOf(4)); + m.put("name", "成都人民医院"); + list.add(m); + + m = new HashMap<>(); + m.put("id", String.valueOf(10)); + m.put("name", "成都脑瘤医院"); + list.add(m); + + return list; + } +} -- 1.8.3.1