diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/SequenceConstant.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/SequenceConstant.java
index f5ea7b4..4a032d1 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/SequenceConstant.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/SequenceConstant.java
@@ -14,4 +14,8 @@ public class SequenceConstant {
public static final String CUSTOM_TYPE = "CUSTOM_TYPE";
public static final String CUSTOM_CONTENT= "CUSTOM_CONTENT";
+
+ public static final String PRIENT_TYPE = "PRIENT_QUEUE";
+ public static final String PRIENT_REMARK = "是否打印过";
+
}
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
index aa7a484..cc24e71 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/CouponMapper.xml
@@ -692,7 +692,10 @@
#{uid}
- and create_date > #{startDate}
+ and create_date >= #{startDate}
+
+
+ and create_date #{endDate}
order by create_date desc
) a group by a.ymd, a.user_id
diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java
index fc20053..a2d4e91 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/BasisEnums.java
@@ -9,7 +9,8 @@ public enum BasisEnums {
A("1", "早孕B超"),
B("2", "排卵日期"),
C("3", "同房日期"),
- D("4", "中孕B超");
+ D("4", "中孕B超"),
+ E("5", "其他");
BasisEnums(String id, String name) {
this.id = id;
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 315b3f6..7a09b69 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
@@ -17,14 +17,33 @@ public class Patients extends BaseModel {
private static final long serialVersionUID = SerialIdEnum.Patients.getCid();
-
+ // 纠正末次月经
+ private String fuckLastMens;
// 末次月经纠正依据
private String lastMenstrualPeriodBasis;
+ // 末次月经纠正依据
+ private String lastMenstrualPeriodBasisOther;
// 末次月经纠正医生ID
private String lastMenstrualPeriodBasisDoctorId;
// 末次月经纠正时间
private String lastMenstrualPeriodBasisDate;
+ public String getFuckLastMens() {
+ return fuckLastMens;
+ }
+
+ public String getLastMenstrualPeriodBasisOther() {
+ return lastMenstrualPeriodBasisOther;
+ }
+
+ public void setLastMenstrualPeriodBasisOther(String lastMenstrualPeriodBasisOther) {
+ this.lastMenstrualPeriodBasisOther = lastMenstrualPeriodBasisOther;
+ }
+
+ public void setFuckLastMens(String fuckLastMens) {
+ this.fuckLastMens = fuckLastMens;
+ }
+
public String getLastMenstrualPeriodBasis() {
return lastMenstrualPeriodBasis;
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
index 9116a01..fe00755 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
@@ -35,15 +35,14 @@ public class ViewController extends BaseController {
/**
- * 获取初诊复诊是否打印过
+ * 获取数据是否打印过
* type = 1 初诊
* type = 2 复诊
*/
@RequestMapping(value = "/get/prient", method = RequestMethod.GET)
@ResponseBody
- @TokenRequired
- public BaseObjectResponse getIsPrient(@RequestParam String id, @RequestParam Integer type) {
- return viewFacade.getIsPrient(id, type);
+ public BaseObjectResponse getIsPrient(@RequestParam String id) {
+ return viewFacade.getIsPrient(id);
}
/**
@@ -53,9 +52,8 @@ public class ViewController extends BaseController {
*/
@RequestMapping(value = "/prient", method = RequestMethod.GET)
@ResponseBody
- @TokenRequired
- public BaseObjectResponse prient(@RequestParam String id, @RequestParam Integer type) {
- return viewFacade.prient(id, type);
+ public BaseObjectResponse prient(@RequestParam String id) {
+ return viewFacade.prient(id);
}
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 7512144..d572cc7 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
@@ -1070,6 +1070,10 @@ public class BookbuildingFacade {
List expYunEnums = ExpYunEnums.getExpYunEnums();
typeMap.put("expYunEnums", expYunEnums);
+ // 末次月经纠正依据
+ List> basis = EnumUtil.toJson(BasisEnums.class);
+ typeMap.put("basisEnmus", basis);
+
list.add(typeMap);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 6b46c93..5be4714 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -1,5 +1,6 @@
package com.lyms.platform.operate.web.facade;
+import com.lyms.platform.biz.SequenceConstant;
import com.lyms.platform.biz.service.*;
import com.lyms.platform.common.constants.ErrorCodeConstants;
import com.lyms.platform.common.enums.*;
@@ -29,6 +30,7 @@ import org.apache.commons.collections.MapUtils;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.math.NumberUtils;
+import org.bson.types.ObjectId;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
import org.springframework.data.mongodb.core.MongoTemplate;
@@ -3699,27 +3701,20 @@ public class ViewFacade {
return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.NO_DATA).setErrormsg("未查询到数据");
}
- public BaseObjectResponse getIsPrient(String id, Integer type) {
- if(type == 1) {
- AntExChuModel chuModel = mongoTemplate.findById(id, AntExChuModel.class);
- if(chuModel != null) {
- return RespBuilder.buildSuccess("isPrient", chuModel.getIsPrient() == null ? false : true);
- }
- } else if (type == 2){
- AntenatalExaminationModel examinationModel = mongoTemplate.findById(id, AntenatalExaminationModel.class);
- if(examinationModel != null) {
- return RespBuilder.buildSuccess("isPrient", examinationModel.getIsPrient() == null ? false : true);
- }
- }
- return RespBuilder.buildSuccess((type == 1 ? "初诊" : "复诊") + "数据未找到");
+ public BaseObjectResponse getIsPrient(String id) {
+ return RespBuilder.buildSuccess(mongoTemplate.exists(Query.query(Criteria.where("value").is(id).and("type").is(SequenceConstant.PRIENT_TYPE)), PlantformConfigModel.class));
}
- public BaseObjectResponse prient(String id, Integer type) {
- if(type == 1) {
- mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), Update.update("isPrient", 1), AntExChuModel.class);
- } else if (type == 2){
- mongoTemplate.updateFirst(Query.query(Criteria.where("id").is(id)), Update.update("isPrient", 1), AntenatalExaminationModel.class);
+ public BaseObjectResponse prient(String id) {
+ if(mongoTemplate.exists(Query.query(Criteria.where("value").is(id).and("type").is(SequenceConstant.PRIENT_TYPE)), PlantformConfigModel.class)) {
+ return RespBuilder.buildSuccess("已经打印过");
}
+ PlantformConfigModel plantformConfigModel = new PlantformConfigModel();
+ plantformConfigModel.setType(SequenceConstant.PRIENT_TYPE);
+ plantformConfigModel.setRemark(SequenceConstant.PRIENT_REMARK);
+ plantformConfigModel.setCreateDate(new Date());
+ plantformConfigModel.setValue(id);
+ mongoTemplate.save(plantformConfigModel);
return RespBuilder.buildSuccess();
}
}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index 9606584..e3d96eb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -902,8 +902,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
map.put("week", DateUtil.getWeekDesc(p.getLastMenses(), new Date()));
map.put("doctorName", couponMapper.getUserName(p.getBookbuildingDoctor()));
String hName = hospitalNameCache.get(p.getHospitalId());
- if(StringUtils.isNotEmpty(hName)) {
+ if(StringUtils.isEmpty(hName)) {
hName = couponMapper.findHospitalNameById(p.getHospitalId());
+ hospitalNameCache.put(p.getHospitalId(), hName);
}
map.put("hospitalName", hName);
map.put("checkTime", getCheckTimeByUsedId(patients, antExChuModels, antenatalExaminationModels, maternalDeliverModels, deliverModels, postReviewModels, usedId));
@@ -1193,9 +1194,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
if(param.get("hospitalId") instanceof ArrayList) {
List hids = (List) param.get("hospitalId");
if(CollectionUtils.isEmpty(hids)) {
- param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); /** 模拟根据登陆人id 查询出来的医院 */
+ param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + "")));
}
- param.put("hospitalId", hids); /** 模拟根据登陆人id 查询出来的医院 */
+ param.put("hospitalId", hids);
} else {
if(StringUtils.isBlank((String) param.get("hospitalId"))) {
param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); /** 模拟根据登陆人id 查询出来的医院 */
@@ -1204,7 +1205,6 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
}
}
-
/*
if(StringUtils.isBlank((String) param.get("hospitalId"))) {
param.put("hospitalId", accessPermissionFacade.getCurrentUserHospPermissions(Integer.parseInt(param.get("userId") + ""))); *//** 模拟根据登陆人id 查询出来的医院 *//*
@@ -1285,7 +1285,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
List sendUserIds2 = new ArrayList<>();
if(CollectionUtils.isNotEmpty(sendUserIds)) {
// List> mulitPatienInfo = couponMapper.findMulitPatienInfo(sendUserIds); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */
- List> mulitPatienInfo = couponMapper.findMulitPatienInfo(CollectionUtils.createMap("userIds", sendUserIds, "startDate", param.get("startDate"))); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */
+ List> mulitPatienInfo = couponMapper.findMulitPatienInfo(CollectionUtils.createMap("userIds", sendUserIds, "startDate", param.get("startDate"), "endDate", param.get("endDate"))); /** 查询需要添加人数的总数, 例如A发了两次优惠券 那么这里返回需要加的值为1 */
for (Map m : mulitPatienInfo) {
Long count = (Long) m.get("count");
sendUserIds2.add((String) m.get("user_id"));
@@ -1684,7 +1684,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
param2.put("hid", param.get("hospitalId"));
param2.put("uids", ids);
List> userSendInfo = couponMapper.findUserSendInfoByUids(param2);
-
+ System.out.println(ids);
// Integer count = couponMapper.findUserSendInfoCount(param);
for (Map map : userSendInfo) {
String userId = (String) map.get("user_id");