diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterUsersMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterUsersMapper.java index 5ccda02..8236391 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterUsersMapper.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterUsersMapper.java @@ -3,6 +3,8 @@ package com.lyms.platform.permission.dao.master; import com.lyms.platform.permission.model.UserScore; import com.lyms.platform.permission.model.Users; import com.lyms.platform.permission.model.UsersQuery; +import org.apache.ibatis.annotations.Param; +import org.springframework.web.bind.annotation.RequestParam; import java.util.List; @@ -16,9 +18,11 @@ public interface MasterUsersMapper { public Users getUsers(Integer id); public int queryUsersCount(UsersQuery query); + public int queryUsersCount2(UsersQuery query); public List queryUsers(UsersQuery query); + public List queryUsers2(UsersQuery query); public List getUsersByLoginCenterId(Integer id); @@ -27,4 +31,7 @@ public interface MasterUsersMapper { void addUserScore(UserScore userScore); Integer findUserAvgScore(Integer userId); + + Integer getUserId(@Param("orgId") String orgId, @Param("doctorName") String name); + } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java index 27beada..969a4e2 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/UsersService.java @@ -26,4 +26,6 @@ public interface UsersService { void addUserScore(UserScore userScore); Integer findUserAvgScore(Integer i); + + Integer getUserId(String hospitalId, String doctorName); } \ No newline at end of file diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java index 1df7fef..2d91375 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/UsersServiceImpl.java @@ -110,6 +110,14 @@ public class UsersServiceImpl extends DataAccessLayerService implements UsersSer @Override public Integer findUserAvgScore(Integer userId) { - return usersMapper.findUserAvgScore(userId); + return usersMapper.findUserAvgScore(userId); + + } + + @Override + public Integer getUserId(String hospitalId, String doctorName) { + return usersMapper.getUserId(hospitalId, doctorName); } + + } \ No newline at end of file diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml index 2e5a995..e4ce35f 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterUsers.xml @@ -337,4 +337,9 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p WHERE user_id=#{userId} + + \ No newline at end of file diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java index 8a408f4..a6441c9 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/StringUtils.java @@ -198,7 +198,7 @@ public final class StringUtils { res[i] = addr.charAt(i); } - for (int i = addr.indexOf("市")+1; i < chars.length; i++) { + for (int i = addr.indexOf("市") + 1; i < chars.length; i++) { res[i] = '*'; } return new String(res); @@ -208,7 +208,7 @@ public final class StringUtils { } } return addr; -} + } /** * 证件号加密处理 @@ -281,16 +281,16 @@ public final class StringUtils { } - public static String replaceName(String name, String repalceStr,String doctor) { + public static String replaceName(String name, String repalceStr, String doctor) { if (StringUtils.isNotEmpty(repalceStr)) { - return repalceStr.replace("{{姓名}}", name).replace("{{医生名称}}",doctor); + return repalceStr.replace("{{姓名}}", name).replace("{{医生名称}}", doctor); } return repalceStr; } - public static String replaceNameRisk(String name, String risk,String repalceStr,String doctor) { + public static String replaceNameRisk(String name, String risk, String repalceStr, String doctor) { if (StringUtils.isNotEmpty(repalceStr)) { - return repalceStr.replace("{{姓名}}", name).replace("{{高危因素}}", risk).replace("{{医生名称}}",doctor); + return repalceStr.replace("{{姓名}}", name).replace("{{高危因素}}", risk).replace("{{医生名称}}", doctor); } return repalceStr; } @@ -305,7 +305,7 @@ public final class StringUtils { public static String unitHandle(Object value, String unit) { - if (value==null || "/".equals(value)){ + if (value == null || "/".equals(value)) { return null; } return value.toString() + unit; @@ -323,6 +323,7 @@ public final class StringUtils { } return list; } + // public static void main(String[] arg) { // System.out.print(encryPhone("18382670036")); // } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java index ad94a4d..a2d6e77 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MeasureInfoController.java @@ -8,6 +8,7 @@ import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.operate.web.facade.MeasureInfoFacade; import com.lyms.platform.operate.web.facade.TempFacade; import com.lyms.platform.operate.web.request.*; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.BloodSugar; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -31,6 +32,7 @@ public class MeasureInfoController extends BaseController { @Autowired private TempFacade tempFacade; + /** * 血糖和脉搏 身高和体重的值列表 * valueType 值类型： 1 体重和身高 2 血压和脉搏 3 体温 4血糖 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index c77aa5f..d1af54f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -1383,4 +1383,5 @@ public class UsersController extends BaseController { objectResponse.setErrormsg("成功"); return objectResponse; } + } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index b3d6791..7ca5c2c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -12,10 +12,7 @@ import com.lyms.platform.common.result.RespBuilder; import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.operate.web.request.MeasureAllInfoRequest; -import com.lyms.platform.operate.web.request.MeasureBabyInfoRequest; -import com.lyms.platform.operate.web.request.MeasureInfoRequest; -import com.lyms.platform.operate.web.request.NutritionInfoRequest; +import com.lyms.platform.operate.web.request.*; import com.lyms.platform.operate.web.result.MeasureBaseInfoResult; import com.lyms.platform.operate.web.result.MeasureInfoResult; import com.lyms.platform.operate.web.service.PatientWeightService; @@ -27,6 +24,7 @@ import com.lyms.platform.permission.model.Organization; import com.lyms.platform.permission.service.MeasureDataInfoService; import com.lyms.platform.permission.service.MeasureUserInfoService; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.*; import net.sf.json.JSONObject; @@ -93,6 +91,11 @@ public class MeasureInfoFacade { @Autowired private AutoMatchFacade autoMatchFacade; + @Autowired + private UsersService usersService; + + @Autowired + private BabyBookbuildingFacade babyBookbuildingFacade; @Autowired private ArchiveDataServicer archiveDataServicer; @@ -1424,18 +1427,65 @@ public class MeasureInfoFacade { public BaseObjectResponse getBabyMeasureInfo(String certType, String certNo, String hospitalId) { BaseObjectResponse br = new BaseObjectResponse(); + Criteria criteria = Criteria.where("yn").ne(0); BabyModelQuery query = new BabyModelQuery(); query.setHospitalId(hospitalId); query.setYn(YnEnums.YES.getId()); if ("2".equals(certType)) { query.setVcCardNo(certNo); + criteria.and("vcCardNo").is(certNo); } else { //通过母亲身份证或者电话查询 + criteria.orOperator(Criteria.where("mommyCertificateNum").is(certNo), Criteria.where("mommyPhone").is(certNo)); query.setQueryNo(certNo); } - List models = babyBookbuildingService.queryBabyBuildByCond(query); + Integer userId = usersService.getUserId(hospitalId, "快捷建档"); + List babyAppointmentBuildModels = null; if (CollectionUtils.isEmpty(models)) { + babyAppointmentBuildModels = mongoTemplate.find(Query.query(criteria), BabyAppointmentBuildModel.class); + if (CollectionUtils.isNotEmpty(babyAppointmentBuildModels)) { + Map data = new HashMap(); + List babies = new ArrayList<>(); + Map mother = new HashMap(); + for (BabyAppointmentBuildModel buildModel : babyAppointmentBuildModels) { + BabyBookbuildingAddRequest bookbuildingAddRequest = new BabyBookbuildingAddRequest(); + if (buildModel != null) { + bookbuildingAddRequest.setBabyName(buildModel.getBabyName()); + bookbuildingAddRequest.setMommyName(buildModel.getMommyName()); + bookbuildingAddRequest.setMommyCertificateNum(buildModel.getMommyCertificateNum()); + bookbuildingAddRequest.setMommyPhone(buildModel.getMommyPhone()); + bookbuildingAddRequest.setMommyCertificateTypeId(buildModel.getMommyCertificateTypeId()); + bookbuildingAddRequest.setSex(buildModel.getBabyGender()); + bookbuildingAddRequest.setBabyBirthday(DateUtil.getyyyy_MM_dd(buildModel.getBabyBirthday())); + bookbuildingAddRequest.setVcCardNo(buildModel.getVcCardNo()); + bookbuildingAddRequest.setHospitalId(hospitalId); + BaseObjectResponse response = babyBookbuildingFacade.addBabyBookbuilding(bookbuildingAddRequest, userId); + if (response.getErrorcode() != 0) { + return br.setErrormsg("建档不成功!"); + } + mother.put("motherCardNo", buildModel.getMommyCertificateNum()); + mother.put("motherPhone", buildModel.getMommyPhone()); + mother.put("motherName", buildModel.getMommyName()); + mother.put("motherAge", com.lyms.platform.common.utils.StringUtils.getBirthDay(buildModel.getMommyCertificateNum())); + Map map = new HashMap(); + if (response.getErrorcode() == 0) { + map.put("id", response.getData().toString()); + } + map.put("babyName", buildModel.getBabyName()); + map.put("sex", SexEnum.getTextById(buildModel.getBabyGender())); + map.put("birth", DateUtil.getyyyy_MM_dd(buildModel.getBabyBirthday())); + map.put("vcCardNo", buildModel.getVcCardNo()); + babies.add(map); + } + } + data.put("babies", babies); + data.put("mother", mother); + br.setData(data); + return br; + } + } + if (CollectionUtils.isEmpty(models) && CollectionUtils.isEmpty(babyAppointmentBuildModels)) { br.setErrorcode(ErrorCodeConstants.USER_NOT_EXISTS); br.setErrormsg("没有儿童档案，请到儿童中心创建档案"); return br;