jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 105f4bc6b561c7796c8cec9535401533a30dc039

Authored by yangfei
2 parents d3978e25de b3a4bb902b
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java View file @ 105f4bc
... ... @@ -21,6 +21,7 @@
21 21 import com.lyms.platform.operate.web.utils.CommonsHelper;
22 22 import com.lyms.platform.operate.web.utils.FunvCommonUtil;
23 23 import com.lyms.platform.operate.web.utils.UnitConstants;
  24 +import com.lyms.platform.operate.web.utils.UnitUtils;
24 25 import com.lyms.platform.permission.model.Organization;
25 26 import com.lyms.platform.permission.model.Users;
26 27 import com.lyms.platform.permission.service.OrganizationService;
... ... @@ -339,8 +340,8 @@
339 340 checkupResult.setYiGanEKangYuan(result.getYiGanEKangYuan());
340 341 checkupResult.setYiGanEKangTi(result.getYiGanEKangTi());
341 342 checkupResult.setYiGanHeXinKangTi(result.getYiGanHeXinKangTi());
342   - checkupResult.setXueQingJiGan(result.getXueQingJiGan());
343   - checkupResult.setXueNiaoSuDan(result.getXueNiaoSuDan());
  343 + checkupResult.setXueQingJiGan(UnitUtils.unitSplice(result.getXueQingJiGan(), UnitConstants.UMOLL));
  344 + checkupResult.setXueNiaoSuDan(UnitUtils.unitSplice(result.getXueNiaoSuDan(), UnitConstants.MMOLL));
344 345 checkupResult.setShiYanJieGuo(result.getShiYanJieGuo());
345 346 checkupResult.setHiv(result.getHiv());
346 347 checkupResult.setLinBing(result.getLinBing());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java View file @ 105f4bc
... ... @@ -1281,8 +1281,8 @@
1281 1281 map.put("ygekt", FunvCommonUtil.checkYiGan(data.getYgekt()));
1282 1282 map.put("yghxkt", FunvCommonUtil.checkYiGan(data.getYghxkt()));
1283 1283  
1284   - map.put("xqjq", UnitUtils.unitSplice(data.getXqjq(), UnitConstants.UL));
1285   - map.put("xnsd", UnitUtils.unitSplice(data.getXnsd(), UnitConstants.UL));
  1284 + map.put("xqjq", UnitUtils.unitSplice(data.getXqjq(), UnitConstants.UMOLL));
  1285 + map.put("xnsd", UnitUtils.unitSplice(data.getXnsd(), UnitConstants.MMOLL));
1286 1286  
1287 1287 map.put("syjg", FunvCommonUtil.checkYiGan(data.getSyjg()));
1288 1288 map.put("hivkt", FunvCommonUtil.checkYiGan(data.getHivkt()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java View file @ 105f4bc
... ... @@ -1069,7 +1069,6 @@
1069 1069 @Override
1070 1070 public BaseObjectResponse patient(Integer userId, String year, String provinceId, String cityId, String areaId) {
1071 1071 String hospitalId = autoMatchFacade.getHospitalId(userId);
1072   -
1073 1072 Set<String> patientIds = new HashSet<>();
1074 1073  
1075 1074 /*Criteria criteria = Criteria.where("created").gte(DateUtil.getYearDate(year))
1076 1075  
1077 1076  
... ... @@ -1115,11 +1114,20 @@
1115 1114 }
1116 1115  
1117 1116 /** 增加年份条件限制 */
1118   - criteria = Criteria.where("created").gte(DateUtil.getYearDate(year))
  1117 + criteria = Criteria.where("bookbuildingDate").gte(DateUtil.getYearDate(year))
1119 1118 .lt(DateUtil.getNextYearDate(year))
1120 1119 .and("hospitalId").is(hospitalId);
  1120 +
1121 1121 if(StringUtils.isNotEmpty(provinceId)) {
1122 1122 criteria.and("provinceId").in(CollectionUtils.asList(provinceId));
  1123 + }
  1124 +
  1125 + if(StringUtils.isNotEmpty(cityId)) {
  1126 + criteria.and("cityId").in(CollectionUtils.asList(cityId));
  1127 + }
  1128 +
  1129 + if(StringUtils.isNotEmpty(areaId)) {
  1130 + criteria.and("areaId").in(CollectionUtils.asList(areaId));
1123 1131 }
1124 1132  
1125 1133 List<Patients> patients = mongoTemplate.find(Query.query(criteria), Patients.class);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/UnitConstants.java View file @ 105f4bc
... ... @@ -19,7 +19,7 @@
19 19 public static final String UL = " U/L";
20 20 public static final String TEN_LKG = "&times;10<sup>9</sup>/L";
21 21 // public static final String TEN_LKG = " 10^9/L";
22   - public static final String UMOLL = " umol/L";
  22 + public static final String UMOLL = " μmol/L";
23 23 public static final String ZHEN = " 针";
24 24 public static final String ML = " ml";
25 25 public static final String G = " g";