jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 75f29ee86803e86e3efdf25a6696e9941d0c4182

Authored by dongqin
2 parents e58b84c059 729791d6e5
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 5 changed files

platform-common/src/main/java/com/lyms/platform/common/enums/SieveEnums.java View file @ 75f29ee
... ... @@ -3,24 +3,27 @@
3 3 import com.lyms.platform.common.utils.StringUtils;
4 4  
5 5 /**
6   - *
7 6 * 产筛枚举
8   - *
  7 + * <p>
9 8 * Created by Administrator on 2016/6/29 0029.
10 9 */
11   -public enum SieveEnums {
12   - O("低风险",0),O1("临界值",1),O2("高风险",2);
13   - private SieveEnums(String name,int id){
  10 +public enum SieveEnums {
  11 + O("低风险", 0), O1("临界值", 1), O2("高风险", 2);
  12 +
  13 + private SieveEnums(String name, int id) {
14 14 this.id
15   - =id;
16   - this.name=name;
  15 + = id;
  16 + this.name = name;
17 17 }
18   - public enum NotifyEnums{
19   - O("待产筛",0),O1("产筛未完成",1),O2("产筛已完成",2),O4("产诊已完成",4);
20   - private NotifyEnums(String name,Integer id){
21   - this.name=name;
22   - this.id=id;
  18 +
  19 + public enum NotifyEnums {
  20 + O("待产筛", 0), O1("产筛未完成", 1), O2("产筛已完成", 2), O4("产诊已完成", 4);
  21 +
  22 + private NotifyEnums(String name, Integer id) {
  23 + this.name = name;
  24 + this.id = id;
23 25 }
  26 +
24 27 private Integer id;
25 28 private String name;
26 29  
27 30  
28 31  
... ... @@ -39,18 +42,20 @@
39 42 public void setName(String name) {
40 43 this.name = name;
41 44 }
42   - public static String getTitle(Integer id){
43   - for(NotifyEnums enums:values()){
44   - if(id==enums.getId()){
  45 +
  46 + public static String getTitle(Integer id) {
  47 + for (NotifyEnums enums : values()) {
  48 + if (id == enums.getId()) {
45 49 return enums.getName();
46 50 }
47 51 }
48 52 return null;
49 53 }
50 54 }
51   - public enum SieveTypeEnums{
52   - XQSC("血清学筛查", "1"),WCSC("无创基因筛查", "2"), ALL("血清学+无创基因", "3");
53 55  
  56 + public enum SieveTypeEnums {
  57 + XQSC("血清学筛查", "1"), WCSC("无创基因筛查", "2"), ALL("血清学+无创基因", "3");
  58 +
54 59 private String id;
55 60 private String name;
56 61  
57 62  
... ... @@ -88,9 +93,10 @@
88 93 }
89 94 }
90 95  
91   - public enum CostTypeEnums{
  96 + public enum CostTypeEnums {
92 97 MF("1", "免费"), ZI("2", "自费");
93   - CostTypeEnums(String id, String name){
  98 +
  99 + CostTypeEnums(String id, String name) {
94 100 this.id = id;
95 101 this.name = name;
96 102 }
... ... @@ -106,6 +112,7 @@
106 112 }
107 113 return null;
108 114 }
  115 +
109 116 private String id;
110 117 private String name;
111 118  
... ... @@ -126,8 +133,8 @@
126 133 }
127 134 }
128 135  
129   - public enum ReportTypeEnums{
130   - ZSBG("1", "正式报告"), CQBG("2","重取报告"), SBBG("3", "失败报告");
  136 + public enum ReportTypeEnums {
  137 + ZSBG("1", "正式报告"), CQBG("2", "重取报告"), SBBG("3", "失败报告"), Kong("4", "-");
131 138  
132 139 ReportTypeEnums(String id, String name) {
133 140 this.id = id;
... ... @@ -137,7 +144,7 @@
137 144 public static String getNameById(String id) {
138 145 for (ReportTypeEnums enums : values()) {
139 146 if (StringUtils.isEmpty(id)) {
140   - return ReportTypeEnums.ZSBG.getName();
  147 + return ReportTypeEnums.Kong.getName();
141 148 }
142 149 if (id.equals(enums.getId())) {
143 150 return enums.getName();
... ... @@ -165,6 +172,7 @@
165 172 this.name = name;
166 173 }
167 174 }
  175 +
168 176 private Integer id;
169 177 private String name;
170 178  
... ... @@ -183,9 +191,10 @@
183 191 public void setName(String name) {
184 192 this.name = name;
185 193 }
186   - public static String getTitle(Integer id){
187   - for(SieveEnums enums:values()){
188   - if(id==enums.getId()){
  194 +
  195 + public static String getTitle(Integer id) {
  196 + for (SieveEnums enums : values()) {
  197 + if (id == enums.getId()) {
189 198 return enums.getName();
190 199 }
191 200 }
platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java View file @ 75f29ee
... ... @@ -610,11 +610,12 @@
610 610 if ("1".equals(reportType)) {
611 611 MongoCondition c = MongoCondition.newInstance();
612 612 MongoCondition con1 = MongoCondition.newInstance("reportType", reportType, MongoOper.IS);
613   - MongoCondition con2 = MongoCondition.newInstance("reportType", false, MongoOper.EXISTS);
  613 + // MongoCondition con2 = MongoCondition.newInstance("reportType", false, MongoOper.EXISTS);
  614 + MongoCondition con3 = MongoCondition.newInstance("sieveType", 2, MongoOper.IS);
614 615 if (c1 != null) {
615   - c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
  616 + c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con3}).getCriteria());
616 617 } else {
617   - c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
  618 + c1 = c.orCondition(new MongoCondition[]{con1, con3}).getCriteria();
618 619 }
619 620 }
620 621 // reportType = 2/重取 3/失败
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/SieveController.java View file @ 75f29ee
... ... @@ -338,8 +338,8 @@
338 338 // TODO 2019/8/26 18:11 dongqing
339 339  
340 340 @RequestMapping(value = "/sieveHistory", method = RequestMethod.GET)
341   - public void SieveHistory(Date startTime, Date endTime, String hospital) {
342   - sieveFacade.SieveHistory(startTime, endTime, hospital);
  341 + public void SieveHistory(Date startTime, Date endTime, String hospital, String provinceId, String cityId, String areaId) {
  342 + sieveFacade.SieveHistory(startTime, endTime, hospital, provinceId, cityId, areaId);
343 343 }
344 344  
345 345  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java View file @ 75f29ee
... ... @@ -544,7 +544,6 @@
544 544  
545 545 //查询产筛list
546 546 List<SieveModel> list = sieveService.queryList1(sieveQuery, "order");
547   -
548 547 int batchSize = 4;
549 548 int end = 0;
550 549 List<Future> listFuture = new ArrayList<>();
551 550  
... ... @@ -2178,29 +2177,53 @@
2178 2177 list.add(dataMap);
2179 2178 }
2180 2179  
2181   - public void SieveHistory(Date startTime, Date endTime, String hospitalId) {
2182   - SieveQuery sieveQuery = new SieveQuery();
2183   - sieveQuery.setHospitalId(hospitalId);
2184   - if (null != startTime && null != endTime) {
2185   - sieveQuery.setCreatedStart(startTime);
2186   - sieveQuery.setCreatedEnd(endTime);
2187   - }
2188   - List<SieveModel> sieveQuery1 = sieveService.queryList(sieveQuery);
2189   - System.out.println("条数" + sieveQuery1.size());
2190   - if (CollectionUtils.isNotEmpty(sieveQuery1)) {
2191   - int batchSize = 100;
2192   - int ends = 0;
2193   - List<Future> futures = new ArrayList<>();
2194   - for (int i = 0; i < sieveQuery1.size(); i += batchSize) {
2195   - ends = (ends + batchSize);
2196   - if (ends > sieveQuery1.size()) {
2197   - ends = sieveQuery1.size();
  2180 + public void SieveHistory(Date startTime, Date endTime, String hospitalId, String provinceId, String cityId, String areaId) {
  2181 + List<String> orgHospitalList = new ArrayList<>();
  2182 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(provinceId)) {
  2183 + OrganizationQuery organizationQuery = new OrganizationQuery();
  2184 + organizationQuery.setYn(YnEnums.YES.getId());
  2185 +
  2186 + organizationQuery.setProvinceId(provinceId);
  2187 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(cityId)) {
  2188 + organizationQuery.setCityId(cityId);
  2189 + if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(areaId)) {
  2190 + organizationQuery.setAreaId(areaId);
2198 2191 }
2199   - List<SieveModel> mlist = sieveQuery1.subList(i, ends);
2200   - Callable c = new SieveHistory(mlist, patientsService, sieveService);
2201   - Future f = commonThreadPool.submit(c);
2202   - if (f != null) {
2203   - futures.add(f);
  2192 + }
  2193 + List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
  2194 + if (CollectionUtils.isNotEmpty(organizations)) {
  2195 + for (Organization org : organizations) {
  2196 + if (null != org.getId()) {
  2197 + orgHospitalList.add(org.getId() + "");
  2198 + }
  2199 + }
  2200 + }
  2201 + SieveQuery sieveQuery = new SieveQuery();
  2202 + if (StringUtils.isNotEmpty(hospitalId)) {
  2203 + sieveQuery.setHospitalId(hospitalId);
  2204 + } else if (null != startTime && null != endTime) {
  2205 + sieveQuery.setCreatedStart(startTime);
  2206 + sieveQuery.setCreatedEnd(endTime);
  2207 + } else if (CollectionUtils.isNotEmpty(organizations)) {
  2208 + sieveQuery.setHospitalIds(orgHospitalList);
  2209 + }
  2210 +
  2211 + List<SieveModel> sieveQuery1 = sieveService.queryList(sieveQuery);
  2212 + if (CollectionUtils.isNotEmpty(sieveQuery1)) {
  2213 + int batchSize = 100;
  2214 + int ends = 0;
  2215 + List<Future> futures = new ArrayList<>();
  2216 + for (int i = 0; i < sieveQuery1.size(); i += batchSize) {
  2217 + ends = (ends + batchSize);
  2218 + if (ends > sieveQuery1.size()) {
  2219 + ends = sieveQuery1.size();
  2220 + }
  2221 + List<SieveModel> mlist = sieveQuery1.subList(i, ends);
  2222 + Callable c = new SieveHistory(mlist, patientsService, sieveService);
  2223 + Future f = commonThreadPool.submit(c);
  2224 + if (f != null) {
  2225 + futures.add(f);
  2226 + }
2204 2227 }
2205 2228 }
2206 2229 /*if (CollectionUtils.isNotEmpty(futures)) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VolumeComponentAnalysisFacade.java View file @ 75f29ee
... ... @@ -109,8 +109,6 @@
109 109 }
110 110 Map<String, Object> basicsInfo = new HashMap<>();
111 111 basicsInfo.put("basicsInfo", volumeComponentAnalysisModel);
112   -
113   -
114 112 }
115 113  
116 114 return null;