diff --git a/platform-biz-service/src/main/resources/mainOrm/master/AssistBuildMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/AssistBuildMapper.xml index 3faf4a4..6965fb9 100644 --- a/platform-biz-service/src/main/resources/mainOrm/master/AssistBuildMapper.xml +++ b/platform-biz-service/src/main/resources/mainOrm/master/AssistBuildMapper.xml @@ -23,6 +23,9 @@ and phone = #{phone,jdbcType=VARCHAR} + + and hospital_id = #{hospitalId,jdbcType=VARCHAR} + diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java index b246e71..6c20c90 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java @@ -292,6 +292,17 @@ public class Patients extends BaseModel { //面部信息 private String face; + //辅助建档医生id + private String assistUserId; + + public String getAssistUserId() { + return assistUserId; + } + + public void setAssistUserId(String assistUserId) { + this.assistUserId = assistUserId; + } + public List getChildExtAddrs() { return childExtAddrs; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java index c1c38bd..8a83446 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java @@ -5,22 +5,25 @@ import com.lyms.platform.biz.service.PatientsService; import com.lyms.platform.common.annotation.TokenRequired; import com.lyms.platform.common.base.BaseController; import com.lyms.platform.common.base.LoginContext; +import com.lyms.platform.common.constants.ErrorCodeConstants; import com.lyms.platform.common.enums.YnEnums; +import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.result.RespBuilder; -import com.lyms.platform.common.utils.JsonUtil; -import com.lyms.platform.common.utils.MessageUtil; -import com.lyms.platform.common.utils.PropertiesUtils; -import com.lyms.platform.common.utils.StringUtils; +import com.lyms.platform.common.utils.*; import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.RemoteFacade; +import com.lyms.platform.permission.service.AssistBuildService; import com.lyms.platform.pojo.ArchiveData; +import com.lyms.platform.pojo.AssistBuildUserModel; import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.ArchiveDataQuery; import com.lyms.platform.query.PatientsQuery; +import net.sf.json.JSONObject; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.httpclient.HttpClient; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Sort; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -29,10 +32,7 @@ import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * Created by riecard on 2016/10/18. @@ -47,6 +47,9 @@ public class RemoteController extends BaseController { private ArchiveDataServicer archiveDataServicer; @Autowired + private AssistBuildService assistBuildService; + + @Autowired private AutoMatchFacade autoMatchFacade; @Autowired @@ -134,6 +137,50 @@ public class RemoteController extends BaseController { } } + + @RequestMapping(value = "/queryTodayArchiveList", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseObjectResponse queryTodayArchiveList(HttpServletRequest request, + @RequestParam(required = false) Integer assistUserId){ + Integer userId = getUserId(request); + String hospitalId = autoMatchFacade.getHospitalId(userId); + ArchiveDataQuery query = new ArchiveDataQuery(); + query.setHospitalId(hospitalId); + if (assistUserId != null) + { + query.setAssistUserId(String.valueOf(assistUserId)); + } + + query.setCreatedStart(DateUtil.formatDate(new Date())); + query.setCreatedEnd(DateUtil.addDay(DateUtil.formatDate(new Date()), 1)); + + List dataList = new ArrayList<>(); + + List list = archiveDataServicer.query(query, Sort.Direction.DESC,"created"); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(list)) + { + Map param = new HashMap<>(); + for (ArchiveData archiveData : list) + { + Map map = new HashMap(); + + map.put("userName",archiveData.getName()); + map.put("cardNo",archiveData.getIdCard()); + map.put("phone",archiveData.getPhone()); + map.put("created", DateUtil.getyyyy_MM_dd_hms(archiveData.getCreated())); + + param.put("id", archiveData.getAssistUserId()); + List userModels = assistBuildService.queryAssistBuildUsers(param); + if (com.lyms.platform.operate.web.utils.CollectionUtils.isNotEmpty(userModels)) { + map.put("assistUser", userModels.get(0).getUserName()); + } + dataList.add(map); + } + } + return new BaseObjectResponse().setData(dataList).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + } + @RequestMapping(value = "/bookArchive",method = RequestMethod.POST) public void addBookArchive(HttpServletResponse response, String idCard, diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 910b5a6..6cf34ea 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1485,11 +1485,11 @@ public class BabyBookbuildingFacade { ADD_SERVICE(1,"增值服务");*/ List list = new ArrayList<>(); Map resultMap = new HashMap<>(); - resultMap.put("id", 0); + resultMap.put("id", "0"); resultMap.put("name", "儿保小助理"); list.add(resultMap); Map resultMap2 = new HashMap<>(); - resultMap2.put("id", 1); + resultMap2.put("id", "1"); resultMap2.put("name", "精准医疗指导"); list.add(resultMap2); return list; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 9a25caf..0dee4a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -275,7 +275,7 @@ public class BookbuildingFacade { } } - Patients patient = getPatientsData(yunRequest); + final Patients patient = getPatientsData(yunRequest); //承德市妇幼通过就诊卡号查询到病人id保存下来 @@ -418,12 +418,25 @@ public class BookbuildingFacade { yunBookbuildingService.addFilePath(filePath); } + ArchiveDataQuery query = new ArchiveDataQuery(); + query.setIdCard(tempP.getCardNo()); + + List list = archiveDataServicer.query(query, Sort.Direction.DESC,"created"); + ArchiveData archiveData = new ArchiveData(); archiveData.setBuildDate(new Date()); - archiveData.setId(tempP.getHospitalId() +":"+tempP.getCardNo()); + archiveData.setId(tempP.getHospitalId() + ":" + tempP.getCardNo()); archiveDataServicer.update(archiveData); - + if (CollectionUtils.isNotEmpty(list)) + { + Patients patients = new Patients(); + if (list.get(0).getAssistUserId() != null && tempP.getId() != null) + { + patients.setAssistUserId(list.get(0).getAssistUserId()); + yunBookbuildingService.updatePregnant(patients,tempP.getId()); + } + } } }); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 760d70e..69db5a0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -16,6 +16,7 @@ import com.lyms.platform.operate.web.request.BasePageQueryRequest; import com.lyms.platform.operate.web.result.PatientSerResult; import com.lyms.platform.permission.model.*; import com.lyms.platform.permission.service.*; +import com.lyms.platform.pojo.AssistBuildUserModel; import com.lyms.platform.pojo.BabyModel; import com.lyms.platform.pojo.BasicConfig; import com.lyms.platform.pojo.Patients; @@ -69,6 +70,9 @@ public class PatientServiceFacade { private static List tiRuoBasicConfigList; + @Autowired + private AssistBuildService assistBuildService; + public BaseResponse babyServiceInit(Integer userId) { Map map = new HashMap(); //服务类型 @@ -151,6 +155,26 @@ public class PatientServiceFacade { map.put("hospSer", hospitalServiceContents); + + Map param = new HashMap<>(); + param.put("hospitalId", hospitalId); + + List list = new ArrayList<>(); + List userModels = assistBuildService.queryAssistBuildUsers(param); + if (CollectionUtils.isNotEmpty(userModels)) + { + for (AssistBuildUserModel model : userModels) + { + Map data = new HashMap(); + data.put("id",model.getId()); + data.put("assistUserName",model.getUserName()); + list.add(data); + } + } + + map.put("assistBuildUsers", list); + + return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map); }