jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 8b2845b2ebf8638953b7105c50ee6438c70a74aa

Authored by jiangjiazhi
2 parents d7890b2420 b704536165
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

Merge remote-tracking branch 'origin/master'

Showing 22 changed files

platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IPatientCourseDao.java View file @ 8b2845b
... ... @@ -13,5 +13,7 @@
13 13 public int queryPatientCourseListCount(MongoQuery mongoQuery);
14 14 public void addPatientCourse(PatientCourseModel model);
15 15 public void updatePatientCourse(MongoQuery mongoQuery,PatientCourseModel model);
  16 +
  17 + void deletePatientCourse(String id);
16 18 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/PatientCourseDaoImpl.java View file @ 8b2845b
... ... @@ -2,6 +2,8 @@
2 2  
3 3 import com.lyms.platform.biz.dal.IPatientCourseDao;
4 4 import com.lyms.platform.common.dao.BaseMongoDAOImpl;
  5 +import com.lyms.platform.common.dao.operator.MongoCondition;
  6 +import com.lyms.platform.common.dao.operator.MongoOper;
5 7 import com.lyms.platform.common.dao.operator.MongoQuery;
6 8 import com.lyms.platform.pojo.PatientCourseModel;
7 9 import org.springframework.stereotype.Repository;
... ... @@ -31,6 +33,11 @@
31 33 @Override
32 34 public void updatePatientCourse(MongoQuery mongoQuery,PatientCourseModel model) {
33 35 update(mongoQuery.convertToMongoQuery(),model);
  36 + }
  37 +
  38 + @Override
  39 + public void deletePatientCourse(String id) {
  40 + delete(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery());
34 41 }
35 42 }
platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientCourseService.java View file @ 8b2845b
... ... @@ -36,5 +36,9 @@
36 36 public void updatePatientCourse(PatientCourseModel model) {
37 37 patientCourseDao.updatePatientCourse(new MongoQuery(new MongoCondition("id", model.getId(), MongoOper.IS)), model);
38 38 }
  39 +
  40 + public void deletePatientCourse(String id) {
  41 + patientCourseDao.deletePatientCourse(id);
  42 + }
39 43 }
platform-biz-service/src/main/resources/mainOrm/master/MeasureDataInfoMapper.xml View file @ 8b2845b
... ... @@ -30,6 +30,7 @@
30 30 <result column="created" property="created"/>
31 31 <result column="modified" property="modified"/>
32 32 <result column="today_count" property="todayCount"/>
  33 + <result column="record_content" property="recordContent"/>
33 34 <result column="remark_value" property="remarkValue"/>
34 35 <association property="measureUserInfoModel" javaType="com.lyms.platform.pojo.MeasureUserInfoModel">
35 36 <result column="user_name" property="userName"/>
36 37  
37 38  
... ... @@ -54,16 +55,16 @@
54 55 <insert id="addMeasureDataInfo" parameterType="com.lyms.platform.pojo.MeasureDataInfoModel" >
55 56 INSERT INTO measure_data_info(measure_user_id,
56 57 value_one,value_two,value_three,value_type
57   - ,record_count,created,modified,today_count,remark_value)
  58 + ,record_count,created,modified,today_count,remark_value,record_content)
58 59 VALUES (#{measureUserId},#{valueOne}
59   - ,#{valueTwo},#{valueThree},#{valueType},#{recordCount},#{created},#{modified},#{todayCount},#{remarkValue})
  60 + ,#{valueTwo},#{valueThree},#{valueType},#{recordCount},#{created},#{modified},#{todayCount},#{remarkValue},#{recordContent})
60 61 </insert>
61 62  
62 63 <select id="queryMeasureDataInfoList" parameterType="com.lyms.platform.query.MeasureDataInfoQuery"
63 64 resultMap="measureDataInfoModelMap">
64 65 SELECT id,measure_user_id,
65 66 value_one,value_two,value_three,value_type
66   - ,record_count,created,modified,today_count,remark_value
  67 + ,record_count,created,modified,today_count,remark_value,recordContent
67 68 FROM measure_data_info
68 69 <include refid="queryMeasureDataInfoCondition"/>
69 70 <include refid="orderAndLimit"/>
... ... @@ -77,6 +78,7 @@
77 78 m.value_one,m.value_two,m.value_three,m.value_type,
78 79 m.record_count,m.created,m.modified,
79 80 m.today_count,m.remark_value,
  81 + m.record_content,
80 82 u.user_name,u.cert_type,
81 83 u.cert_no,u.age,u.phone,u.sex,u.vc_card_no,
82 84 u.hospital_id,u.patient_id,u.address,u.face,u.finger
... ... @@ -105,6 +107,11 @@
105 107 <if test="recordCount != null and recordCount >= 0">
106 108 and m.record_count = #{m.recordCount,jdbcType=INTEGER}
107 109 </if>
  110 +
  111 + <if test="modified != null">
  112 + AND date_format(m.modified,'%Y-%m-%d') = #{modified}
  113 + </if>
  114 +
108 115 <if test="createdTimeStart != null">
109 116 AND m.created >= date_format(#{createdTimeStart},'%Y-%m-%d')
110 117 </if>
... ... @@ -207,6 +214,9 @@
207 214 <if test="recordCount != null and recordCount >= 0">
208 215 record_count = #{recordCount,jdbcType=INTEGER},
209 216 </if>
  217 + <if test="recordContent != null">
  218 + record_content = #{recordContent,jdbcType=VARCHAR},
  219 + </if>
210 220 <if test="created != null">
211 221 created = #{created},
212 222 </if>
... ... @@ -257,6 +267,10 @@
257 267 </if>
258 268 <if test="recordCount != null and recordCount >= 0">
259 269 and record_count = #{recordCount,jdbcType=INTEGER}
  270 + </if>
  271 +
  272 + <if test="recordContent != null">
  273 + and record_content = #{recordContent,jdbcType=VARCHAR}
260 274 </if>
261 275 <if test="createdTimeStart != null">
262 276 AND created >= date_format(#{createdTimeStart},'%Y-%m-%d')
platform-common/src/main/java/com/lyms/platform/common/enums/TrackDownDateEnums.java View file @ 8b2845b
... ... @@ -6,11 +6,16 @@
6 6 public enum TrackDownDateEnums {
7 7 A(1, "婚前检查",2),
8 8 B(2, "怀孕建档",3),
9   - C(3, "产前检查",5),
10   - D(4, "产前筛查",5),
  9 + C(3, "产前检查",8),
  10 + D(4, "产前筛查",9),
11 11 E(5, "分娩住院",6),
12   - F(6, "产后访视",7),
13   - G(7, "产后复查",-1);
  12 + F(6, "产后访视",10),
  13 + G(7, "产后复查",11),
  14 + H(8, "产前检查转出",5),
  15 + I(9, "产前筛查转出",5),
  16 + J(10, "产后访视转出",-1),
  17 + K(11, "产后复查转出",-1),
  18 + ;
14 19  
15 20 TrackDownDateEnums(Integer id, String name,Integer nextid) {
16 21 this.id = id;
platform-common/src/main/java/com/lyms/platform/common/enums/WxTempleteIdEnums.java View file @ 8b2845b
... ... @@ -13,7 +13,7 @@
13 13  
14 14 CHAN_JIAN_TI_XING("EngJ9RKaHaPEEc2GapV6dJO-uu8rkqitEQd21yc4EPY","产检提醒"), //产检预约提醒
15 15 ER_TONG_TI_XING("9BUY6THL261MmbVRb9iPZANQwJ5yKNzkE1VGCLPuI94","儿童月龄提醒"), //儿保预约提醒
16   - ER_TONG_YI_MIAO_TIXING("IDcR8sCa12kNj_Bn3LMcx9vk_dUMlLClPdNFOUm9VRtqE","疫苗接种提醒"), //疫苗接种提醒
  16 + ER_TONG_YI_MIAO_TIXING("JV6fUbUSbjuscTsv45xpexFTAQESNWFwXNO-BiHWQFk","疫苗接种提醒"), //疫苗接种提醒
17 17 CHAN_HOU_FU_CHA("jEbeeBKyjcquhFWUUndnRddLqLbK8-QF6yA98cYW_E8","产后复查"),//产后预约和产后复查
18 18  
19 19 GAO_WEI_ZHI_DAO("n6fSC1wYc3jOfGmuI1Vtbut6TlaBPlt5482SqJ8CE4o","高危提醒"),//孕妇高危
platform-dal/src/main/java/com/lyms/platform/pojo/MeasureDataInfoModel.java View file @ 8b2845b
... ... @@ -25,6 +25,9 @@
25 25 //记录总次数
26 26 private Integer recordCount;
27 27  
  28 + //当天血压记录类容
  29 + private String recordContent;
  30 +
28 31 //创建时间
29 32 private Date created;
30 33 //修改时间
... ... @@ -36,6 +39,13 @@
36 39 //备注值
37 40 private String remarkValue;
38 41  
  42 + public String getRecordContent() {
  43 + return recordContent;
  44 + }
  45 +
  46 + public void setRecordContent(String recordContent) {
  47 + this.recordContent = recordContent;
  48 + }
39 49  
40 50 private MeasureUserInfoModel measureUserInfoModel;
41 51  
platform-dal/src/main/java/com/lyms/platform/pojo/TrackDown.java View file @ 8b2845b
... ... @@ -7,7 +7,7 @@
7 7 import java.util.Date;
8 8  
9 9 /**
10   - * 追访
  10 + * 追访详情
11 11 */
12 12 @Document(collection="lyms_track_down")
13 13 public class TrackDown extends BaseModel {
... ... @@ -15,6 +15,11 @@
15 15 private static final long serialVersionUID = SerialIdEnum.TrackDown.getCid();
16 16  
17 17 private String id;
  18 +
  19 + /**
  20 + * 追访ID
  21 + */
  22 + private Date trackDownRecId;
18 23  
19 24 private String parentId;
20 25  
platform-dal/src/main/java/com/lyms/platform/query/MeasureDataInfoQuery.java View file @ 8b2845b
... ... @@ -53,6 +53,7 @@
53 53 private Date modifiedTimeStart;
54 54  
55 55 private Date modifiedTimeEnd;
  56 +
56 57 //面部
57 58 private String face;
58 59  
59 60  
... ... @@ -75,9 +76,9 @@
75 76 private Integer recordCount;
76 77  
77 78 //创建时间
78   - private Date created;
  79 + private String created;
79 80 //修改时间
80   - private Date modified;
  81 + private String modified;
81 82  
82 83 //当天记录次数
83 84 private Integer todayCount;
84 85  
85 86  
... ... @@ -178,12 +179,19 @@
178 179 }
179 180  
180 181  
  182 + public Date getModifiedTimeEnd() {
  183 + return modifiedTimeEnd;
  184 + }
181 185  
182   - public Date getCreated() {
  186 + public void setModifiedTimeEnd(Date modifiedTimeEnd) {
  187 + this.modifiedTimeEnd = modifiedTimeEnd;
  188 + }
  189 +
  190 + public String getCreated() {
183 191 return created;
184 192 }
185 193  
186   - public void setCreated(Date created) {
  194 + public void setCreated(String created) {
187 195 this.created = created;
188 196 }
189 197  
190 198  
... ... @@ -299,11 +307,11 @@
299 307 this.recordCount = recordCount;
300 308 }
301 309  
302   - public Date getModified() {
  310 + public String getModified() {
303 311 return modified;
304 312 }
305 313  
306   - public void setModified(Date modified) {
  314 + public void setModified(String modified) {
307 315 this.modified = modified;
308 316 }
309 317  
platform-dal/src/main/java/com/lyms/platform/query/TrackDownRecordQuery.java View file @ 8b2845b
... ... @@ -6,9 +6,6 @@
6 6 import com.lyms.platform.common.dao.operator.MongoOper;
7 7 import com.lyms.platform.common.dao.operator.MongoQuery;
8 8 import com.lyms.platform.common.utils.StringUtils;
9   -import org.apache.commons.collections.CollectionUtils;
10   -import org.slf4j.Logger;
11   -import org.slf4j.LoggerFactory;
12 9 import org.springframework.data.mongodb.core.query.Criteria;
13 10  
14 11 import java.util.Date;
... ... @@ -35,6 +32,7 @@
35 32 private String streetId;
36 33 private String key;
37 34 private Integer trackType;
  35 + private List trackTypes;
38 36 private String parentId;
39 37 private List<String> pids;
40 38 private String hospitalId;
... ... @@ -49,6 +47,14 @@
49 47 */
50 48 private Date lastMensesEnd;
51 49  
  50 + public List getTrackTypes() {
  51 + return trackTypes;
  52 + }
  53 +
  54 + public void setTrackTypes(List trackTypes) {
  55 + this.trackTypes = trackTypes;
  56 + }
  57 +
52 58 public Date getLastMensesStart() {
53 59 return lastMensesStart;
54 60 }
55 61  
... ... @@ -168,12 +174,16 @@
168 174 if(null!=trackType){
169 175 condition = condition.and("trackType", trackType, MongoOper.IS);
170 176 }
  177 + if (null != trackTypes) {
  178 + condition = condition.and("trackType", trackTypes, MongoOper.IN);
  179 + }
171 180 if(StringUtils.isNotEmpty(parentId)){
172 181 condition = condition.and("parentId", parentId, MongoOper.IS);
173 182 }
174 183 if (null != pids) {
175 184 condition = condition.and("pid", pids, MongoOper.IN);
176 185 }
  186 +
177 187 Criteria c1 = null;
178 188 if (null != lastMensesStart) {
179 189 if (null != c1) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseController.java View file @ 8b2845b
... ... @@ -50,12 +50,37 @@
50 50 public BaseResponse updateCourese(@RequestBody CourseRequest model,
51 51 HttpServletRequest request) {
52 52  
53   - return courseFacade.updateCourese(model,getUserId(request));
  53 + return courseFacade.updateCourese(model, getUserId(request));
54 54 }
55 55  
56 56  
57 57 /**
  58 + * 获取已发布课程列表
  59 + * @param request
  60 + * @return
  61 + */
  62 + @RequestMapping(method = RequestMethod.GET, value = "/getYfbCoureseList")
  63 + @ResponseBody
  64 + @TokenRequired
  65 + public BaseResponse getCoureseList(
  66 + HttpServletRequest request) {
  67 +
  68 + return courseFacade.getCoureseList(null, 2, null, null,
  69 + null, null, null, null, getUserId(request),null);
  70 + }
  71 +
  72 +
  73 +
  74 + /**
58 75 * 课程列表
  76 + * @param courseTypeId 课程类型id
  77 + * @param page
  78 + * @param limit
  79 + * @param status 1待发布，2 已发布，3已结束
  80 + * @param courseName 课程名称
  81 + * @param courseSpeaker 课程主讲
  82 + * @param createdTime 创建时间
  83 + * @param courseTime 课程时间
59 84 * @param request
60 85 * @return
61 86 */
62 87  
... ... @@ -66,12 +91,14 @@
66 91 @RequestParam("page") Integer page,
67 92 @RequestParam("limit") Integer limit,
68 93 @RequestParam(required = false) Integer status,
  94 + @RequestParam(required = false) String courseName,
  95 + @RequestParam(required = false) String courseSpeaker,
69 96 @RequestParam(required = false) String createdTime,
70 97 @RequestParam(required = false) String courseTime,
71 98 HttpServletRequest request) {
72 99  
73   - return courseFacade.getCoureseList(courseTypeId, status,
74   - createdTime, courseTime, page, limit, getUserId(request));
  100 + return courseFacade.getCoureseList(courseTypeId, status,courseName,courseSpeaker,
  101 + createdTime, courseTime, page, limit, getUserId(request),"true");
75 102 }
76 103  
77 104  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CourseTypeController.java View file @ 8b2845b
... ... @@ -51,7 +51,7 @@
51 51 @TokenRequired
52 52 public BaseResponse updateCoureseType(@RequestBody CourseTypeRequest model,
53 53 HttpServletRequest request) {
54   - return courseTypeFacade.updateCoureseType(model);
  54 + return courseTypeFacade.updateCoureseType(model,getUserId(request));
55 55 }
56 56  
57 57  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PatientCourseController.java View file @ 8b2845b
... ... @@ -27,7 +27,7 @@
27 27 * @param request
28 28 * @return
29 29 */
30   - @RequestMapping(method = RequestMethod.POST, value = "/getOrderPatientCourseList")
  30 + @RequestMapping(method = RequestMethod.GET, value = "/getOrderPatientCourseList")
31 31 @ResponseBody
32 32 @TokenRequired
33 33 public BaseResponse getOrderPatientCourseList(@RequestParam(required = false) String courseId,
... ... @@ -49,10 +49,10 @@
49 49 @ResponseBody
50 50 @TokenRequired
51 51 public BaseResponse getSignPatientCourseList(
52   - @RequestParam(required = false) String courseId,
53   - @RequestParam("page") Integer page,
54   - @RequestParam("limit") Integer limit,
55   - HttpServletRequest request) {
  52 + @RequestParam(required = false) String courseId,
  53 + @RequestParam("page") Integer page,
  54 + @RequestParam("limit") Integer limit,
  55 + HttpServletRequest request) {
56 56  
57 57 return patientCourseFacade.getPatientCourseList(2,courseId, page, limit, getUserId(request));
58 58 }
... ... @@ -117,6 +117,22 @@
117 117  
118 118  
119 119 /**
  120 + * 取消预约课程
  121 + * @param id
  122 + * @param request
  123 + * @return
  124 + */
  125 + @RequestMapping(method = RequestMethod.GET, value = "/cancelOrderCourse")
  126 + @ResponseBody
  127 + public BaseResponse cancelOrderCourse(
  128 + @RequestParam(required = true) String id,
  129 + HttpServletRequest request) {
  130 +
  131 + return patientCourseFacade.cancelOrderCourse(id);
  132 + }
  133 +
  134 +
  135 + /**
120 136 * 孕妇签到
121 137 * @param patientCourseId
122 138 * @param request
123 139  
... ... @@ -135,8 +151,12 @@
135 151  
136 152 /**
137 153 * 获取小程序的孕妇学校列表
138   - * @param hospitalIds 相关医院id
  154 + * @param hospitalIds 医院id
139 155 * @param patientId 患者id
  156 + * @param keyword 查询关键字
  157 + * @param status 2 最新课程 3 历史课程
  158 + * @param page
  159 + * @param limit
140 160 * @param request
141 161 * @return
142 162 */
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java View file @ 8b2845b
... ... @@ -6,6 +6,7 @@
6 6 import com.lyms.platform.biz.service.PatientCourseService;
7 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
8 8 import com.lyms.platform.common.enums.CourseStatusEnums;
  9 +import com.lyms.platform.common.enums.OptActionEnums;
9 10 import com.lyms.platform.common.enums.YnEnums;
10 11 import com.lyms.platform.common.result.BaseListResponse;
11 12 import com.lyms.platform.common.result.BaseObjectResponse;
... ... @@ -51,6 +52,9 @@
51 52 @Autowired
52 53 private AutoMatchFacade autoMatchFacade;
53 54  
  55 + @Autowired
  56 + private OperateLogFacade operateLogFacade;
  57 +
54 58 public BaseResponse addCourese(CourseRequest request, Integer userId) {
55 59  
56 60 String hospitalId = autoMatchFacade.getHospitalId(userId);
... ... @@ -65,6 +69,7 @@
65 69 model.setModified(new Date());
66 70 model.setStatus(CourseStatusEnums.DFB.getId());
67 71 courseService.addCourse(model);
  72 + operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), model, OptActionEnums.ADD.getId(), "添加课程");
68 73 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
69 74 objectResponse.setErrormsg("成功");
70 75 return objectResponse;
71 76  
... ... @@ -92,9 +97,9 @@
92 97 return model;
93 98 }
94 99  
95   - public BaseResponse getCoureseList(String courseTypeId, Integer status,
  100 + public BaseResponse getCoureseList(String courseTypeId, Integer status,String courseName,String courseSpeaker,
96 101 String createdTime, String courseTime,
97   - Integer page, Integer limit, Integer userId) {
  102 + Integer page, Integer limit, Integer userId,String isPage) {
98 103  
99 104 String hospitalId = autoMatchFacade.getHospitalId(userId);
100 105 List<CourseResult> results = new ArrayList<>();
101 106  
... ... @@ -121,10 +126,16 @@
121 126 query.setYn(YnEnums.YES.getId());
122 127 query.setCourseTypeId(courseTypeId);
123 128 query.setStatus(status);
124   - query.setPage(page);
125   - query.setLimit(limit);
126   - query.setNeed("true");
  129 + if ("true".equals(isPage))
  130 + {
  131 + query.setPage(page);
  132 + query.setLimit(limit);
  133 + query.setNeed(isPage);
  134 + }
  135 +
127 136 query.setHospitalId(hospitalId);
  137 + query.setCourseSpeaker(courseSpeaker);
  138 + query.setCourseName(courseName);
128 139 List<CourseModel> courseModels = courseService.queryCourseList(query);
129 140  
130 141 CourseTypeQuery courseTypeQuery = new CourseTypeQuery();
131 142  
... ... @@ -139,13 +150,14 @@
139 150 result.setId(model.getId());
140 151  
141 152 String courseType = "";
142   - query.setId(model.getCourseTypeId());
  153 + courseTypeQuery.setId(model.getCourseTypeId());
143 154 List<CourseTypeModel> typeModels = courseTypeService.queryCourseTypeList(courseTypeQuery);
144 155 if (CollectionUtils.isNotEmpty(typeModels))
145 156 {
146 157 courseType = typeModels.get(0).getCourseTypeName();
147 158 }
148 159 result.setCourseType(courseType);
  160 + result.setCourseTypeId(model.getCourseTypeId());
149 161  
150 162 result.setCourseName(model.getCourseName());
151 163 result.setCourseSpeaker(model.getCourseSpeaker());
... ... @@ -156,6 +168,8 @@
156 168 result.setEnrolmentNum(model.getEnrolmentNum());
157 169 result.setSignNum(model.getSignNum());
158 170 result.setStatus(CourseStatusEnums.getNameById(model.getStatus()));
  171 + result.setCourseRemark(model.getCourseRemark());
  172 + result.setCourseDesc(model.getCourseDesc());
159 173  
160 174 String createUser = "";
161 175 Users users = usersService.getUsers(Integer.parseInt(model.getCreateUserId()));
162 176  
... ... @@ -254,9 +268,23 @@
254 268  
255 269 public BaseResponse updateCourese(CourseRequest request, Integer userId) {
256 270 BaseResponse objectResponse = new BaseResponse();
  271 +
  272 + CourseQuery query = new CourseQuery();
  273 + query.setYn(YnEnums.YES.getId());
  274 + query.setId(request.getId());
  275 + CourseModel updateModel = null;
  276 + List<CourseModel> courseModels = courseService.queryCourseList(query);
  277 + if (CollectionUtils.isNotEmpty(courseModels)) {
  278 + updateModel = courseModels.get(0);
  279 + }
  280 +
  281 +
257 282 CourseModel model = getCoureseModel(request);
258 283 model.setModified(new Date());
259 284 courseService.updateCourse(model);
  285 +
  286 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  287 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), updateModel,model, OptActionEnums.UPDATE.getId(), "修改课程");
260 288 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
261 289 objectResponse.setErrormsg("成功");
262 290 return objectResponse;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseTypeFacade.java View file @ 8b2845b
... ... @@ -4,6 +4,7 @@
4 4 import com.lyms.platform.biz.service.CourseService;
5 5 import com.lyms.platform.biz.service.CourseTypeService;
6 6 import com.lyms.platform.common.constants.ErrorCodeConstants;
  7 +import com.lyms.platform.common.enums.OptActionEnums;
7 8 import com.lyms.platform.common.enums.YnEnums;
8 9 import com.lyms.platform.common.result.BaseListResponse;
9 10 import com.lyms.platform.common.result.BaseResponse;
... ... @@ -41,6 +42,9 @@
41 42 @Autowired
42 43 private AutoMatchFacade autoMatchFacade;
43 44  
  45 + @Autowired
  46 + private OperateLogFacade operateLogFacade;
  47 +
44 48 public BaseResponse addCoureseType(CourseTypeRequest request, Integer userId) {
45 49  
46 50 String hospitalId = autoMatchFacade.getHospitalId(userId);
... ... @@ -55,6 +59,10 @@
55 59 model.setModified(new Date());
56 60  
57 61 courseTypeService.addCourseType(model);
  62 +
  63 + operateLogFacade.addAddOptLog(userId,Integer.parseInt(hospitalId), model, OptActionEnums.ADD.getId(), "添加课程类型");
  64 +
  65 +
58 66 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
59 67 objectResponse.setErrormsg("成功");
60 68 return objectResponse;
61 69  
62 70  
... ... @@ -115,11 +123,23 @@
115 123 }
116 124  
117 125  
118   - public BaseResponse updateCoureseType(CourseTypeRequest request) {
  126 + public BaseResponse updateCoureseType(CourseTypeRequest request,Integer userId) {
119 127 BaseResponse objectResponse = new BaseResponse();
120 128 CourseTypeModel model = getCoureseTypeModel(request);
121 129 model.setModified(new Date());
  130 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  131 + CourseTypeQuery query = new CourseTypeQuery();
  132 + query.setId(request.getId());
  133 + query.setYn(YnEnums.YES.getId());
  134 +
  135 +
  136 + List<CourseTypeModel> typeModels = courseTypeService.queryCourseTypeList(query);
  137 + if (CollectionUtils.isNotEmpty(typeModels))
  138 + {
  139 + operateLogFacade.addModifyOptLog(userId, Integer.parseInt(hospitalId), typeModels.get(0), model, OptActionEnums.UPDATE.getId(), "修改课程类型");
  140 + }
122 141 courseTypeService.updateCourseType(model);
  142 +
123 143 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
124 144 objectResponse.setErrormsg("成功");
125 145 return objectResponse;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java View file @ 8b2845b
... ... @@ -140,6 +140,9 @@
140 140 }
141 141 }
142 142 result.setHospitalName(hospital);
  143 +
  144 + result.setRecordContent(model.getRecordContent() == null ? "" : model.getRecordContent());
  145 +
143 146 results.add(result);
144 147 }
145 148 }
146 149  
... ... @@ -252,10 +255,13 @@
252 255 return baseResponse;
253 256 }
254 257 dataInfoModel.setTodayCount(todayCount);
  258 +
  259 + dataInfoModel.setRecordContent((StringUtils.isEmpty(measureDataInfoModel.getRecordContent()) ? "" : measureDataInfoModel.getRecordContent()+ "," ) + measureInfoRequest.getValueOne());
255 260 }
256 261 else
257 262 {
258 263 todayCount = 1;
  264 + dataInfoModel.setRecordContent(measureInfoRequest.getValueOne());
259 265 dataInfoModel.setTodayCount(todayCount);
260 266 }
261 267  
... ... @@ -278,6 +284,7 @@
278 284 dataInfoModel.setModified(new Date());
279 285 dataInfoModel.setTodayCount(todayCount);
280 286 dataInfoModel.setRecordCount(1);
  287 + dataInfoModel.setRecordContent(measureInfoRequest.getValueOne());
281 288 mysqlMeasureDataInfoService.addMeasureDataInfo(dataInfoModel);
282 289 }
283 290 else
284 291  
285 292  
... ... @@ -526,13 +533,14 @@
526 533 return objectResponse;
527 534 }
528 535  
529   - public Map<String,String> getMeasureInfo(String certType,String certNo,String hospitalId)
  536 + public Map<String,Object> getMeasureInfo(String certType,String certNo,String hospitalId)
530 537 {
531   - Map<String,String> measureMap = new HashMap<>();
  538 + Map<String,Object> measureMap = new HashMap<>();
532 539 MeasureDataInfoQuery query = new MeasureDataInfoQuery();
533 540 query.setCertNo(certNo);
534 541 query.setCertType(certType);
535 542 query.setHospitalId(hospitalId);
  543 + query.setModified(DateUtil.getyyyy_MM_dd(new Date()));
536 544 List<MeasureDataInfoModel> list = mysqlMeasureDataInfoService.queryMeasureList(query);
537 545 if (CollectionUtils.isNotEmpty(list))
538 546 {
539 547  
... ... @@ -546,11 +554,12 @@
546 554 }
547 555 else if (dataInfoModel.getValueType() != null && dataInfoModel.getValueType() == 2)
548 556 {
549   - String bloodPressure = dataInfoModel.getValueOne();
550   - if (StringUtils.isNotEmpty(bloodPressure) && bloodPressure.contains("/"))
  557 + String recordContent = dataInfoModel.getRecordContent();
  558 + if (StringUtils.isNotEmpty(recordContent))
551 559 {
552   - measureMap.put("bloodPressure1",dataInfoModel.getValueOne().split("/")[0]);
553   - measureMap.put("bloodPressure2",dataInfoModel.getValueOne().split("/")[1]);
  560 + List<String> recordContents = Arrays.asList(recordContent.split(","));
  561 + Collections.reverse(recordContents);
  562 + measureMap.put("bloodPressure",recordContents);
554 563 }
555 564 measureMap.put("pulse",dataInfoModel.getValueTwo());
556 565 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCourseFacade.java View file @ 8b2845b
... ... @@ -6,14 +6,17 @@
6 6 import com.lyms.platform.biz.service.PatientCourseService;
7 7 import com.lyms.platform.biz.service.PatientsService;
8 8 import com.lyms.platform.common.constants.ErrorCodeConstants;
  9 +import com.lyms.platform.common.enums.CourseStatusEnums;
9 10 import com.lyms.platform.common.enums.YnEnums;
10 11 import com.lyms.platform.common.result.BaseListResponse;
11 12 import com.lyms.platform.common.result.BaseObjectResponse;
12 13 import com.lyms.platform.common.result.BaseResponse;
13 14 import com.lyms.platform.common.utils.DateUtil;
  15 +import com.lyms.platform.operate.web.result.CourseResult;
14 16 import com.lyms.platform.operate.web.result.CourseTypeResult;
15 17 import com.lyms.platform.operate.web.result.PatientCourseResult;
16 18 import com.lyms.platform.permission.model.Organization;
  19 +import com.lyms.platform.permission.model.Users;
17 20 import com.lyms.platform.permission.service.OrganizationService;
18 21 import com.lyms.platform.permission.service.UsersService;
19 22 import com.lyms.platform.pojo.CourseModel;
... ... @@ -62,7 +65,7 @@
62 65  
63 66  
64 67 public BaseResponse getPatientCourseList(Integer status,String courseId, Integer page,
65   - Integer limit, Integer userId) {
  68 + Integer limit, Integer userId) {
66 69  
67 70 String hospitalId = autoMatchFacade.getHospitalId(userId);
68 71  
... ... @@ -86,6 +89,57 @@
86 89 return objectResponse;
87 90 }
88 91  
  92 + private List<CourseResult> getCourseList(CourseQuery query) {
  93 +
  94 + List<CourseModel> courseModels = courseService.queryCourseList(query);
  95 + List<CourseResult> results = new ArrayList<>();
  96 + CourseTypeQuery courseTypeQuery = new CourseTypeQuery();
  97 + courseTypeQuery.setYn(YnEnums.YES.getId());
  98 +
  99 + if (CollectionUtils.isNotEmpty(courseModels))
  100 + {
  101 + for (CourseModel model : courseModels)
  102 + {
  103 + CourseResult result = new CourseResult();
  104 + result.setId(model.getId());
  105 +
  106 + String courseType = "";
  107 + courseTypeQuery.setId(model.getCourseTypeId());
  108 + List<CourseTypeModel> typeModels = courseTypeService.queryCourseTypeList(courseTypeQuery);
  109 + if (CollectionUtils.isNotEmpty(typeModels))
  110 + {
  111 + courseType = typeModels.get(0).getCourseTypeName();
  112 + }
  113 + result.setCourseType(courseType);
  114 + result.setCourseTypeId(model.getCourseTypeId());
  115 +
  116 + result.setCourseName(model.getCourseName());
  117 + result.setCourseSpeaker(model.getCourseSpeaker());
  118 + result.setCourseAddress(model.getCourseAddress());
  119 + result.setCourseTime(DateUtil.gety_m_dhm(model.getCourseTime()));
  120 + result.setTimeLong(model.getTimeLong());
  121 + result.setLimitNum(model.getLimitNum());
  122 + result.setEnrolmentNum(model.getEnrolmentNum());
  123 + result.setSignNum(model.getSignNum());
  124 + result.setStatus(CourseStatusEnums.getNameById(model.getStatus()));
  125 + result.setCourseRemark(model.getCourseRemark());
  126 + result.setCourseDesc(model.getCourseDesc());
  127 +
  128 + String createUser = "";
  129 + Users users = usersService.getUsers(Integer.parseInt(model.getCreateUserId()));
  130 + if (users != null && users.getYn() == YnEnums.YES.getId()) {
  131 + createUser = users.getName();
  132 + }
  133 + result.setCreateUser(createUser);
  134 +
  135 + result.setCreated(DateUtil.getyyyy_MM_dd_hms(model.getCreated()));
  136 + results.add(result);
  137 + }
  138 + }
  139 +
  140 + return results;
  141 + }
  142 +
89 143 public BaseResponse queryOrderPatient(String queryNo,String courseId, Integer userId) {
90 144 String hospitalId = autoMatchFacade.getHospitalId(userId);
91 145  
... ... @@ -143,6 +197,7 @@
143 197  
144 198 private List<PatientCourseResult> getPatientCourse(PatientCourseQuery patientCourseQuery)
145 199 {
  200 +
146 201 List<PatientCourseResult> results = new ArrayList<>();
147 202 List<PatientCourseModel> patientCourseModels = patientCourseService.queryPatientCourseList(patientCourseQuery);
148 203 if (CollectionUtils.isNotEmpty(patientCourseModels))
149 204  
... ... @@ -310,8 +365,13 @@
310 365 query.setLimit(limit);
311 366 query.setNeed("true");
312 367 query.setHospitalIds(hospitalIdList);
  368 + query.setKeyword(keyword);
313 369 List<CourseModel> courseModels = courseService.queryCourseList(query);
314 370  
  371 +
  372 + PatientCourseQuery patientCourseQuery = new PatientCourseQuery();
  373 + patientCourseQuery.setYn(YnEnums.YES.getId());
  374 +
315 375 List<Map> results = new ArrayList<>();
316 376 CourseTypeQuery courseTypeQuery = new CourseTypeQuery();
317 377 query.setYn(YnEnums.YES.getId());
318 378  
319 379  
... ... @@ -357,11 +417,23 @@
357 417  
358 418  
359 419 //课程上限人数
360   - result.put("limitNum",model.getLimitNum() == null ? "0" : String.valueOf(model.getLimitNum()));
  420 + result.put("limitNum", model.getLimitNum() == null ? "0" : String.valueOf(model.getLimitNum()));
361 421  
362   - //孕妇与课程的状态
363   - result.put("status","");
364 422  
  423 + patientCourseQuery.setCourseId(model.getId());
  424 + patientCourseQuery.setPatientId(patientId);
  425 +
  426 +
  427 + Integer patientStatus = 0;
  428 + List<PatientCourseModel> patientCourseModels = patientCourseService.queryPatientCourseList(patientCourseQuery);
  429 + if (CollectionUtils.isNotEmpty(patientCourseModels))
  430 + {
  431 + patientStatus = patientCourseModels.get(0).getStatus();
  432 + }
  433 +
  434 + //孕妇与课程的状态 0未预约 1预约，2签到
  435 + result.put("patientCourseStatus",String.valueOf(patientStatus));
  436 +
365 437 results.add(result);
366 438 }
367 439 }
... ... @@ -369,6 +441,14 @@
369 441 BaseListResponse objectResponse = new BaseListResponse();
370 442 objectResponse.setData(results);
371 443 objectResponse.setPageInfo(query.getPageInfo());
  444 + objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
  445 + objectResponse.setErrormsg("成功");
  446 + return objectResponse;
  447 + }
  448 +
  449 + public BaseResponse cancelOrderCourse(String id) {
  450 + patientCourseService.deletePatientCourse(id);
  451 + BaseResponse objectResponse = new BaseResponse();
372 452 objectResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
373 453 objectResponse.setErrormsg("成功");
374 454 return objectResponse;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 8b2845b
1 1 package com.lyms.platform.operate.web.facade;
2 2  
3 3 import com.lyms.platform.biz.service.*;
4   -import com.lyms.platform.common.constants.ErrorCodeConstants;
5 4 import com.lyms.platform.common.enums.FmTypeEnums;
6 5 import com.lyms.platform.common.enums.TrackDownDateEnums;
7   -import com.lyms.platform.common.enums.TrackDownTransferEnums;
8 6 import com.lyms.platform.common.enums.YnEnums;
9   -import com.lyms.platform.common.result.BaseListResponse;
10 7 import com.lyms.platform.common.result.BaseObjectResponse;
11 8 import com.lyms.platform.common.result.PageResult;
12 9 import com.lyms.platform.common.result.RespBuilder;
13 10  
... ... @@ -112,12 +109,21 @@
112 109 downRecordQuery.setProvinceId(downQueryRequest.getProvinceId());
113 110 downRecordQuery.setCityId(downQueryRequest.getCityId());
114 111 downRecordQuery.setStreetId(downQueryRequest.getStreetId());
115   - downRecordQuery.setTrackType(downQueryRequest.getTrackType());
  112 +
116 113 //如果是产筛请求
117 114 if (null != downQueryRequest.getTrackType() && TrackDownDateEnums.D.getId() == downQueryRequest.getTrackType()) {
118 115 downRecordQuery.setLastMensesStart(DateUtil.addDay(DateUtil.formatDate(new Date()), -140));
119   - downRecordQuery.setTrackType(3);
120   - }/*else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.E.getId() == downQueryRequest.getTrackType()){
  116 + downRecordQuery.setTrackTypes(Arrays.asList(3,8));
  117 + }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.C.getId() == downQueryRequest.getTrackType()){
  118 + downRecordQuery.setTrackTypes(Arrays.asList(3,9));
  119 + }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.F.getId() == downQueryRequest.getTrackType()){
  120 + downRecordQuery.setTrackTypes(Arrays.asList(6,11));
  121 + }else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.G.getId() == downQueryRequest.getTrackType()){
  122 + downRecordQuery.setTrackTypes(Arrays.asList(7,10));
  123 + }else{
  124 + downRecordQuery.setTrackType(downQueryRequest.getTrackType());
  125 + }
  126 + /*else if(null != downQueryRequest.getTrackType() && TrackDownDateEnums.E.getId() == downQueryRequest.getTrackType()){
121 127 downRecordQuery.setLastMensesStart();
122 128 }*/
123 129 downRecordQuery.setPage(downQueryRequest.getPage());
... ... @@ -192,7 +198,6 @@
192 198 TrackDownRecordQuery downRecordQuery = convertNaviteQuery(downQueryRequest, userId);
193 199  
194 200 List<TrackDownRecord> downRecordList = trackDownRecordService.queryTrackDown(downRecordQuery);
195   -
196 201 List<Map> data = new ArrayList<>();
197 202 TrackDownTypeHandler downTypeHandler = trackDownTypeHandlerMap.get(downQueryRequest.getTrackType());
198 203 if (CollectionUtils.isNotEmpty(downRecordList) && null != downTypeHandler) {
... ... @@ -236,6 +241,7 @@
236 241 temp.put("parentId", downRecord.getParentId());
237 242 temp.put("username", downRecord.getUsername());
238 243 temp.put("cardNo", downRecord.getCardNo());
  244 + temp.put("trackDownDateType", downRecord.getTrackType());
239 245 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
240 246 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
241 247 TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
... ... @@ -280,6 +286,7 @@
280 286 temp.put("parentId", downRecord.getParentId());
281 287 temp.put("username", downRecord.getUsername());
282 288 temp.put("cardNo", downRecord.getCardNo());
  289 + temp.put("trackDownDateType", downRecord.getTrackType());
283 290 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
284 291 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
285 292 TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
... ... @@ -306,6 +313,7 @@
306 313 temp.put("id", downRecord.getId());
307 314 temp.put("pid", downRecord.getPid());
308 315 temp.put("parentId", downRecord.getParentId());
  316 + temp.put("trackDownDateType", downRecord.getTrackType());
309 317 temp.put("username", downRecord.getUsername());
310 318 temp.put("cardNo", downRecord.getCardNo());
311 319 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
... ... @@ -335,6 +343,8 @@
335 343 temp.put("parentId", downRecord.getResidentsArchiveId());
336 344 temp.put("username", downRecord.getUsername());
337 345 temp.put("cardNo", downRecord.getCardNo());
  346 + temp.put("trackDownDateType", downRecord.getTrackType());
  347 +
338 348 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
339 349 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
340 350 TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getResidentsArchiveId()).and("yn").is(1).and("trackType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
... ... @@ -361,6 +371,7 @@
361 371 temp.put("username", downRecord.getUsername());
362 372 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
363 373 temp.put("cardNo", StringUtils.encryCardNo(downRecord.getCardNo()));
  374 + temp.put("trackDownDateType", downRecord.getTrackType());
364 375 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
365 376 temp.put("phone", StringUtils.encryPhone(downRecord.getPhone()));
366 377 temp.put("id", downRecord.getId());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java View file @ 8b2845b
... ... @@ -65,13 +65,13 @@
65 65 private String isH = "0";
66 66 //<!---------基本信息----------->
67 67  
68   - private Map<String,String> measureData;
  68 + private Map<String,Object> measureData;
69 69  
70   - public Map<String, String> getMeasureData() {
  70 + public Map<String, Object> getMeasureData() {
71 71 return measureData;
72 72 }
73 73  
74   - public void setMeasureData(Map<String, String> measureData) {
  74 + public void setMeasureData(Map<String, Object> measureData) {
75 75 this.measureData = measureData;
76 76 }
77 77  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java View file @ 8b2845b
... ... @@ -41,12 +41,20 @@
41 41  
42 42 //课程类别
43 43 private String courseType;
  44 + private String courseTypeId;
44 45  
45 46 //创建人id
46 47 private String createUser;
47 48  
48 49 private String created;
49 50  
  51 + public String getCourseTypeId() {
  52 + return courseTypeId;
  53 + }
  54 +
  55 + public void setCourseTypeId(String courseTypeId) {
  56 + this.courseTypeId = courseTypeId;
  57 + }
50 58  
51 59 public String getId() {
52 60 return id;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MeasureInfoResult.java View file @ 8b2845b
... ... @@ -36,6 +36,15 @@
36 36 //医院名称
37 37 private String hospitalName;
38 38  
  39 + private String recordContent;
  40 +
  41 + public String getRecordContent() {
  42 + return recordContent;
  43 + }
  44 +
  45 + public void setRecordContent(String recordContent) {
  46 + this.recordContent = recordContent;
  47 + }
39 48  
40 49 public String getHospitalName() {
41 50 return hospitalName;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 8b2845b
... ... @@ -187,7 +187,7 @@
187 187 trackDown.setPid(mongoUtil.getPid(parentId));
188 188 trackDown.setParentId(parentId);
189 189 }
190   - //怀孕建档扭转直孕期检查的时候需要有孕妇的档案才可以扭转
  190 + //怀孕建档:怀孕建档流转至孕期检查的时候需要有孕妇的档案才可以扭转
191 191 if (TrackDownTransferEnums.B.getId() == trackDown.getTrackDownTransfer() &&
192 192 TrackDownDateEnums.B.getId() == trackDown.getTrackDownDateType()
193 193 &&StringUtils.isNotEmpty(trackDown.getParentId())) {
194 194  
195 195  
196 196  
... ... @@ -245,11 +245,12 @@
245 245 //如果需要进入的列表没有这个人的记录
246 246 if(0==trackDownRecordService.queryTrackDownCount(trackDownRecordQuery)){
247 247 trackDownRecord.setTrackType(nextId);
248   - trackDownRecordService.updateTrackDown(trackDownRecord, id);
249 248 }else {
  249 + //设置为不显示
250 250 trackDownRecord.setStatus(0);
251   - trackDownRecordService.updateTrackDown(trackDownRecord,id);
252 251 }
  252 + trackDownRecordService.updateTrackDown(trackDownRecord,id);
  253 +
253 254 } else if (TrackDownTransferEnums.C.getId() == trackDown.getTrackDownTransfer()) {
254 255 TrackDownRecord trackDownRecord = new TrackDownRecord();
255 256 trackDownRecord.setStatus(0);