shiyang / regional-platform

Download as
Browse Code »

Commit dc5208d5589afe2e555c4b29a72557d508de62b0

Authored by jiangjiazhi
1 parent 5f304af402
Exists in master and in 1 other branch nobuildprocess

修改产检删除

Showing 1 changed file with 24 additions and 10 deletions

platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java View file @ dc5208d
... ... @@ -108,17 +108,29 @@
108 108 //医院id
109 109 private List<String> hospitalList;
110 110  
111   - //档案编号
112   - private String fileCode;
  111 + //0 隐藏 1 显示
  112 + private String enable="1";
  113 + //区域来源
  114 + private String source;
113 115  
114   - public String getFileCode() {
115   - return fileCode;
  116 + public String getSource() {
  117 + return source;
116 118 }
117 119  
118   - public void setFileCode(String fileCode) {
119   - this.fileCode = fileCode;
  120 + public void setSource(String source) {
  121 + this.source = source;
120 122 }
121 123  
  124 + public String getEnable() {
  125 + return enable;
  126 + }
  127 +
  128 + public void setEnable(String enable) {
  129 + this.enable = enable;
  130 + }
  131 +
  132 +
  133 +
122 134 public String getProvinceRegisterId() {
123 135 return provinceRegisterId;
124 136 }
125 137  
... ... @@ -749,14 +761,14 @@
749 761 }
750 762 if (buildType != -1) {
751 763 MongoCondition mongoCondition = MongoCondition.newInstance("buildType", 3, MongoOper.IS);
752   - MongoCondition condition1 = mongoCondition.and("enable", "1", MongoOper.IS);
  764 + MongoCondition condition1 = mongoCondition.and("enable", enable, MongoOper.IS);
753 765  
754 766 MongoCondition condition12 = MongoCondition.newInstance("buildType", buildType, MongoOper.NE);
755 767  
756 768 condition = condition.orCondition(new MongoCondition[]{condition12, condition1});
757 769 } else if (null != buildTypeList) {
758 770 MongoCondition mongoCondition = MongoCondition.newInstance("buildType", 3, MongoOper.IS);
759   - MongoCondition condition1 = mongoCondition.and("enable", "1", MongoOper.IS);
  771 + MongoCondition condition1 = mongoCondition.and("enable", enable, MongoOper.IS);
760 772 MongoCondition condition2 = MongoCondition.newInstance("buildType", buildTypeList, MongoOper.IN);
761 773 condition = condition.orCondition(new MongoCondition[]{condition1, condition2});
762 774 }
... ... @@ -856,8 +868,7 @@
856 868 MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
857 869 MongoCondition con2 = MongoCondition.newInstance("username", queryNo, MongoOper.IS);
858 870 MongoCondition con3 = MongoCondition.newInstance("cardNo", queryNo, MongoOper.IS);
859   - MongoCondition con4 = MongoCondition.newInstance("fileCode", queryNo, MongoOper.IS);
860   - c1= c.orCondition(new MongoCondition[]{con1, con2, con3,con4}).getCriteria();
  871 + c1= c.orCondition(new MongoCondition[]{con1, con2, con3}).getCriteria();
861 872 }
862 873  
863 874 if (lastCheckEmployeeId != null) {
... ... @@ -875,6 +886,9 @@
875 886  
876 887 if (null != serviceType) {
877 888 condition = condition.and("serviceType", serviceType, MongoOper.IS);
  889 + }
  890 + if(null!=source){
  891 + condition = condition.and("source", source, MongoOper.IS);
878 892 }
879 893  
880 894 if (null != serviceStatus) {