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 eac2019..201b5b2 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 @@ -415,6 +415,17 @@ public class Patients extends BaseModel { */ private Integer cesareanTimeType; + //秦皇岛乳房检查状态0：未做,1：已做。 是否检查 + private String breastType; + + public String getBreastType() { + return breastType; + } + + public void setBreastType(String breastType) { + this.breastType = breastType; + } + public Integer getCesareanTimeType() { return cesareanTimeType; } diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java index c036180..730b871 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java @@ -397,6 +397,17 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { */ private String prodDoctor; + //秦皇岛乳房检查状态0：未做,1：已做。 是否检查 + private String breastType; + + public String getBreastType() { + return breastType; + } + + public void setBreastType(String breastType) { + this.breastType = breastType; + } + public String getProdDoctor() { return prodDoctor; } @@ -814,6 +825,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery { condition=condition.and("firstCheckId",null,MongoOper.IS); } } + //筛选乳房列表是否做过检查0,1 + if(StringUtils.isNotEmpty(breastType)){ + condition = condition.and("breastType", breastType, MongoOper.IS); + } Criteria c1 = null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java index a5a32d3..6b4fc12 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BreastController.java @@ -10,8 +10,10 @@ import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.operate.web.facade.BreastFacade; import com.lyms.platform.operate.web.request.AntenatalExaminationQueryRequest; import com.lyms.platform.operate.web.request.BreastRequest; +import com.lyms.platform.pojo.Patients; import com.lyms.platform.query.BreastModelQuery; import com.lyms.platform.query.FamilyPlanningModelQuery; +import com.lyms.platform.query.PatientsQuery; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -167,5 +169,31 @@ public class BreastController extends BaseController { return breastFacade.queryAllNew(breastModelQuery,getUserId(request)); } + /** + * 秦皇岛乳房管理列表 + * @param patientsQuery + * @param request + * @return + */ + @RequestMapping(value = "/queryBreastManage", method = RequestMethod.GET) + @ResponseBody + @TokenRequired + public BaseResponse queryBreastManage(PatientsQuery patientsQuery, HttpServletRequest request) { + return breastFacade.queryBreastManage(patientsQuery,getUserId(request)); + } + /** + * 秦皇岛乳房管理列表-修改检查状态 + * @param patients + * @param request + * @return + */ + @RequestMapping(value = "/updateBreastType", method = RequestMethod.POST) + @ResponseBody + @TokenRequired + public BaseResponse updateBreastType(Patients patients, HttpServletRequest request) { + BaseResponse baseResponse = breastFacade.updateBreastType(patients); + return baseResponse; + } + } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java index dae7215..ca2fc24 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BreastFacade.java @@ -14,6 +14,7 @@ import com.lyms.platform.operate.web.request.BreastRequest; import com.lyms.platform.operate.web.result.BabyHighRiskBabyResult; import com.lyms.platform.operate.web.result.BreastResult; import com.lyms.platform.operate.web.result.FamilyPlanningResult; +import com.lyms.platform.operate.web.result.QuanPatientsResult; import com.lyms.platform.operate.web.service.impl.BaseServiceImpl; import com.lyms.platform.operate.web.utils.CollectionUtils; import com.lyms.platform.operate.web.utils.CommonsHelper; @@ -27,6 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.*; +import java.util.regex.Pattern; /** * 乳腺检查 逻辑处理 @@ -485,6 +487,54 @@ public class BreastFacade extends BaseServiceImpl { } + public BaseResponse queryBreastManage(PatientsQuery patientsQuery, Integer userId) { + BaseObjectResponse br = new BaseObjectResponse(); + String hospitalId = autoMatchFacade.getHospitalId(userId); + + List patientsList = new ArrayList <>(); + patientsQuery.setNeed("true"); + patientsQuery.setYn(YnEnums.YES.getId()); + patientsQuery.setHospitalId(hospitalId); + patientsQuery.setType(1);//只查孕妇 + Calendar curr = Calendar.getInstance();//创建Calendar 的实例 + curr.add(Calendar.DAY_OF_MONTH,-7*27);//当前时间减去27周 + patientsQuery.setLastMensesEnd(curr.getTime());//通过末次月经推算。当前时间减去27周，小于等于推算的时间。 + patientsList = patientsService.queryPatient1(patientsQuery,"created"); + + List > listMapResult =new ArrayList<>(); + for (Patients patients : patientsList) { + QuanPatientsResult quanPatientsResult=new QuanPatientsResult(); + quanPatientsResult.convertToResult(patients); + Map map=new HashMap<>(); + map.put("id",quanPatientsResult.getId()); + map.put("cardNo",quanPatientsResult.getCardNo()); + map.put("name",quanPatientsResult.getName()); + map.put("age",quanPatientsResult.getAge()); + map.put("phone",patients.getPhone());//没有电话保密，需要保密quanPatientsResult.getPhone() + map.put("dueWeek",quanPatientsResult.getDueWeek());//convertToResult(patients)算出的孕周 + map.put("breastType",quanPatientsResult.getBreastType()); + listMapResult.add(map); + } + br.setData(listMapResult); + br.setPageInfo(patientsQuery.getPageInfo()); + br.setErrorcode(ErrorCodeConstants.SUCCESS); + br.setErrormsg("成功"); + return br; + } + public BaseResponse updateBreastType(Patients patients) { + BaseResponse br=new BaseResponse(); + if (StringUtils.isEmpty(patients.getId())) { + return br.setErrorcode(ErrorCodeConstants.PARAMETER_ERROR).setErrormsg("ID不能为空"); + } + try { + patientsService.updatePatient(patients); + } catch (Exception e) { + e.printStackTrace(); + br.setErrormsg(e.getMessage()); + } + return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); + + } } \ No newline at end of file diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java index 5d0862f..d917c07 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java @@ -98,6 +98,17 @@ public class QuanPatientsResult implements IBasicResultConvert