diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
index e239c75..1864968 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/OrganizationServiceImpl.java
@@ -335,7 +335,10 @@ public class OrganizationServiceImpl extends DataAccessLayerService implements O
@Override
public String getAreaCode(String areaName) {
- String code = masterOrganizationMapper.getAreaCode(areaName);
+ String code ="";
+ if(StringUtils.isNotEmpty(areaName)) {
+ code = masterOrganizationMapper.getAreaCode(areaName);
+ }
return StringUtils.isNotEmpty(code) ? code : "110100";
}
@Override
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java
index f4b3f5f..0ee7480 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/LivelihoodProjectsController.java
@@ -62,4 +62,30 @@ public class LivelihoodProjectsController extends BaseController {
@RequestParam(required = false) String endDate) {
return livelihoodProjectsFacade.getMsgcC101(startDate,endDate);
}
+
+ /**
+ * 儿童档案C102
+ * @param startDate
+ * @param endDate
+ * @return
+ */
+ @RequestMapping(value = "/getMsgcC102", method = RequestMethod.GET)
+ @ResponseBody
+ public BaseObjectResponse getMsgcC102(@RequestParam(required = false) String startDate,
+ @RequestParam(required = false) String endDate) {
+ return livelihoodProjectsFacade.getMsgcC102(startDate,endDate);
+ }
+
+ /**
+ * 孕产妇专项档案C201
+ * @param startDate
+ * @param endDate
+ * @return
+ */
+ @RequestMapping(value = "/getMsgcC201", method = RequestMethod.GET)
+ @ResponseBody
+ public BaseObjectResponse getMsgcC201(@RequestParam(required = false) String startDate,
+ @RequestParam(required = false) String endDate) {
+ return livelihoodProjectsFacade.getMsgcC201(startDate,endDate);
+ }
}
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java
index 7c5bde1..6f733cc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LivelihoodProjectsFacade.java
@@ -1,7 +1,9 @@
package com.lyms.platform.operate.web.facade;
import com.lyms.hospitalapi.lhxfy.model.enums.NationEnums;
+import com.lyms.platform.biz.service.BabyBookbuildingService;
import com.lyms.platform.biz.service.BasicConfigService;
+import com.lyms.platform.biz.service.PatientsService;
import com.lyms.platform.biz.service.ResidentsArchiveService;
import com.lyms.platform.common.constants.ErrorCodeConstants;
import com.lyms.platform.common.enums.CdGwNationEnums;
@@ -14,9 +16,9 @@ import com.lyms.platform.operate.web.utils.CommonsHelper;
import com.lyms.platform.permission.model.Users;
import com.lyms.platform.permission.service.OrganizationService;
import com.lyms.platform.permission.service.UsersService;
-import com.lyms.platform.pojo.BasicConfig;
-import com.lyms.platform.pojo.MaternalDeliverModel;
-import com.lyms.platform.pojo.ResidentsArchiveModel;
+import com.lyms.platform.pojo.*;
+import com.lyms.platform.query.BabyModelQuery;
+import com.lyms.platform.query.PatientsQuery;
import com.lyms.platform.query.ResidentsArchiveQuery;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
@@ -29,9 +31,9 @@ import org.springframework.stereotype.Component;
import java.util.*;
/**
- * 分娩记录信息
+ * 民生工程数据接口
*
- * Created by Administrator on 2016/6/17 0017.
+ * Created by shy on 2022/6/7
*/
@Component
public class LivelihoodProjectsFacade {
@@ -45,6 +47,10 @@ public class LivelihoodProjectsFacade {
private UsersService usersService;
@Autowired
private OrganizationService organizationService;
+ @Autowired
+ private BabyBookbuildingService babyBookbuildingService;
+ @Autowired
+ private PatientsService patientsService;
public BaseObjectResponse getMsgcC101(String startDate, String endDate) {
@@ -54,6 +60,10 @@ public class LivelihoodProjectsFacade {
if (StringUtils.isNotEmpty(startDate) && StringUtils.isNotEmpty(endDate)) {
query.setBuildDateStart(DateUtil.getDayFirstSecond(DateUtil.parseYMD(startDate)));
query.setBuildDateEnd(DateUtil.getDayLastSecond(DateUtil.parseYMD(endDate)));
+ }else {
+ //默认获取当天数据
+ query.setBuildDateStart(DateUtil.getDayFirstSecond(new Date()));
+ query.setBuildDateEnd(DateUtil.getDayLastSecond(new Date()));
}
//只查询女性
query.setSex(SystemConfig.WOMAN_ID);
@@ -61,202 +71,213 @@ public class LivelihoodProjectsFacade {
List modelList = residentsArchiveService.queryResident(query);
List