Skip to content

A
Aidea
Commit a22c9354 authored by 谢希宇's avatar 谢希宇
Browse files
Options

update by strive

parent 72f5fc94
Show whitespace changes
Inline Side-by-side
Showing with 277 additions and 75 deletions
aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderlist.html
View file @ a22c9354
......@@ -181,7 +181,6 @@
<select id="isThree" name="isThree" class="form-control required">
<option value="">请选择患者类型</option>
<option value="3">三期患者</option>
<option value="4">四期患者</option>
</select>
</div>
<div class="col-xs-2">
......@@ -455,15 +454,15 @@
"mRender": function(a, b, c, d){
if ((c.status == 4 || c.status == 3 || c.status == 2) && c.confirm == null){
//是否超过7天 0标识超过7天
if( c.isExceedSevenDay == '0'){
//if( c.isExceedSevenDay == '0' && c.isThree != '1'){
if(isCheckedQyCode.indexOf(a+"")!=-1){
return '<input class="isExport" checked value="'+a+'" type="checkBox">';
}else{
return '<input class="isExport" value="'+a+'" type="checkBox">';
}
}else{
//}else{
return "";
}
//}
}else{
return "";
}
......
aidea-modules/order-module/src/main/java/com/cftech/order/web/OrderController.java
View file @ a22c9354
......@@ -277,23 +277,20 @@ public class OrderController {
if (StringUtils.isNoneBlank(order.getCourierNumber())) {
conds.like("o.courier_number", order.getCourierNumber());
}
//别名
if (StringUtils.isNoneBlank(order.getFansAlias())) {
conds.like("f.store", order.getFansAlias());
}
//订单状态
if (StringUtils.equals("", order.getStatus())) {
conds.in("o.status", new String[]{"0", "1"});
} else if (StringUtils.isNoneBlank(order.getStatus()) && !StringUtils.equals(order.getStatus(), "all")) {
conds.equal("o.status", order.getStatus());
}
//三期患者
if (StringUtils.equals("3", order.getIsThree())) {
conds.equal("au.status", "1");
conds.equal("m.status", "1");
}
//是否开票
if (StringUtils.isNoneBlank(order.getIsBill()) && StringUtils.equals(order.getIsBill(), "1")) {//未开票
conds.isNull("o.confirm");
......@@ -455,16 +452,11 @@ public class OrderController {
MpAccountsEntity mpAccountsEntity = accountsService.getDetail(accountsId);
boolean leader = roleService.selectRoleEntityByUserId(userid, Constants.SYSTEM_LEADER);
if (leader) {
userid = 1L;//药店主管
}
boolean manager = roleService.selectRoleEntityByUserId(userid, Constants.SYSTEM_STORAGEMANAGER);
if (manager) {
userid = 1L;//仓管员
if (leader || manager) {
userid = 1L;//药店主管
}
Sort sort = new Sort("o.create_time", OrderType.ASC);
Conds conds = new Conds();
conds.equal("o.del_flag", 0);
......@@ -485,23 +477,31 @@ public class OrderController {
if (StringUtils.isNoneBlank(order.getCourierNumber())) {
conds.like("o.courier_number", order.getCourierNumber());
}
//别名
if (StringUtils.isNoneBlank(order.getFansAlias())) {
conds.like("f.store", order.getFansAlias());
}
//订单状态
if (StringUtils.isNoneBlank(order.getStatus())) {
if (StringUtils.equals("", order.getStatus())) {
conds.in("o.status", new String[]{"0", "1"});
} else if (StringUtils.isNoneBlank(order.getStatus()) && !StringUtils.equals(order.getStatus(), "all")) {
conds.equal("o.status", order.getStatus());
}
//三期患者
if (StringUtils.equals("3", order.getIsThree())) {
conds.equal("m.status", "1");
}
//是否开票
if (StringUtils.isNoneBlank(order.getIsBill()) && StringUtils.equals(order.getIsBill(), "1")) {//未开票
conds.isNull("o.confirm");
} else if (StringUtils.isNoneBlank(order.getIsBill()) && StringUtils.equals(order.getIsBill(), "0")) {//已开票
conds.notNull("o.confirm");
}
//订单开始时间
//订单时间
if (StringUtils.isNoneBlank(order.getOrderStartTime())) {
conds.greatEqual("DATE_FORMAT(o.create_time, '%Y-%m-%d')", order.getOrderStartTime());
}
//订单结束时间
if (StringUtils.isNoneBlank(order.getOrderEndTime())) {
conds.lessEqual("DATE_FORMAT(o.create_time, '%Y-%m-%d')", order.getOrderEndTime());
String[] dateArr = order.getOrderStartTime().split(" - ");
conds.greatEqual("DATE_FORMAT(o.create_time, '%Y/%m/%d %H:%i')", dateArr[0]);
conds.lessEqual("DATE_FORMAT(o.create_time, '%Y/%m/%d %H:%i')", dateArr[1]);
}
List<Order> list = orderService.fetchSearchBy(conds, sort, 0, 0, userid, order.getStartOrderAmount(), order.getStartPayAmount());
......
aidea-modules/prescription-module/src/main/java/com/cftech/prescription/dao/PrescriptionMapper.xml
View file @ a22c9354
......@@ -32,6 +32,7 @@
<result column="description" property="description"/>
<result column="create_by" property="createBy"/>
<result column="update_by" property="updateBy"/>
<result column="openid" property="openid"/>
</resultMap>
<sql id="sqlWhere">
......@@ -62,8 +63,7 @@
</sql>
<sql id="sqlColumns">
id
,
id,
number,
min_program_no,
store_id,
......@@ -91,7 +91,41 @@
update_time,
description,
create_by,
update_by
update_by,
openid
</sql>
<sql id="listColumns">
t.id,
t.number,
t.min_program_no,
t.store_id,
t.hospital_name,
t.store_name,
t.cust_name,
t.weight,
t.cust_sex,
t.cust_phone,
t.symptom,
t.syptm_flag,
t.doctor_name,
t.doctor_dpmt_name,
t.doc_status,
t.doc_result,
t.pharm_name,
t.result,
t.guoms,
t.age,
t.pres_url,
t.accounts_id,
t.del_flag,
t.status,
t.create_time,
t.update_time,
t.description,
t.create_by,
t.update_by,
t.openid
</sql>
......@@ -131,7 +165,8 @@
now(),
#{description, jdbcType=VARCHAR},
#{createBy, jdbcType=BIGINT},
#{updateBy, jdbcType=BIGINT}
#{updateBy, jdbcType=BIGINT},
#{openid, jdbcType=VARCHAR}
)
</insert>
......@@ -143,15 +178,15 @@
</select>
<select id="count" parameterType="java.util.Map" resultType="java.lang.Integer">
SELECT COUNT(1) FROM t_aidea_prescription
SELECT COUNT(1) FROM t_aidea_prescription t
<include refid="sqlWhere"/>
</select>
<select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMap">
SELECT
<include refid="sqlColumns"/>
FROM t_aidea_prescription
<include refid="listColumns"/>
FROM t_aidea_prescription t
<include refid="sqlWhere"/>
<if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
<if test="limit>0">limit #{offset},#{limit}</if>
......@@ -244,6 +279,9 @@
<if test="updateBy != null">
update_by = #{updateBy, jdbcType=BIGINT},
</if>
<if test="openid != null">
openid = #{openid, jdbcType=BIGINT},
</if>
</set>
where id=#{id,jdbcType=BIGINT}
</update>
......
aidea-modules/prescription-module/src/main/java/com/cftech/prescription/model/Prescription.java
View file @ a22c9354
......@@ -20,6 +20,9 @@ public class Prescription implements Serializable {
/* 编码 */
@ExportConfig(value = "编码", width = 100, showLevel = 1)
private String number;
/* openid */
@ExportConfig(value = "人员openid", width = 100, showLevel = 1)
private String openid;
/* 小程序编码 */
@ExportConfig(value = "小程序编码", width = 100, showLevel = 1)
private String minProgramNo;
......
aidea-modules/prescription-module/src/main/java/com/cftech/prescription/service/PrescriptionService.java
View file @ a22c9354
package com.cftech.prescription.service;
import com.alibaba.fastjson.JSONObject;
import com.cftech.prescription.model.Prescription;
import com.cftech.core.generic.GenericService;
......@@ -11,5 +12,18 @@ import com.cftech.core.generic.GenericService;
*/
public interface PrescriptionService extends GenericService<Prescription> {
/**
* 创建处方单
* @param appId
* @param openId
* @return
*/
JSONObject generatePre(String appId, String openId);
/**
* 获取用户最新处方单
* @param openId
* @return
*/
JSONObject findLastPrescription(String appId, String openId);
}
aidea-modules/prescription-module/src/main/java/com/cftech/prescription/service/impl/PrescriptionServiceImpl.java
View file @ a22c9354
package com.cftech.prescription.service.impl;
import com.alibaba.fastjson.JSONObject;
import com.cftech.accounts.model.MpAccountsEntity;
import com.cftech.accounts.service.MpAccountsService;
import com.cftech.base.codingrule.utils.CodingruleUtils;
import com.cftech.core.scope.OrderType;
import com.cftech.core.sql.Sort;
import com.cftech.core.util.SystemConfig;
import com.cftech.prescription.model.Prescription;
import com.cftech.prescription.dao.PrescriptionMapper;
import com.cftech.prescription.service.PrescriptionService;
import com.cftech.core.generic.GenericDao;
import com.cftech.core.generic.GenericServiceImpl;
import com.cftech.core.sql.Conds;
import com.cftech.product.model.Product;
import com.cftech.product.service.ProductService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.connection.ConnectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import java.util.List;
/**
* 处方单列表ServiceImpl
......@@ -16,6 +30,7 @@ import org.springframework.stereotype.Service;
* @author Strive
* @date: 2021-08-18 19:32
*/
@Slf4j
@Service("prescriptionService")
public class PrescriptionServiceImpl extends GenericServiceImpl<Prescription> implements PrescriptionService {
......@@ -23,9 +38,73 @@ public class PrescriptionServiceImpl extends GenericServiceImpl<Prescription> im
@Qualifier("prescriptionMapper")
private PrescriptionMapper prescriptionMapper;
@Autowired
private CodingruleUtils codingruleUtils;
@Autowired
private MpAccountsService accountsService;
@Autowired
private ProductService productService;
@Override
public GenericDao<Prescription> getGenericMapper() {
return prescriptionMapper;
}
@Override
public JSONObject generatePre(String appId, String openId) {
JSONObject retObj = new JSONObject();
try {
MpAccountsEntity accountsEntity = accountsService.getMpAccountsAppid(appId);
//生成处方单编码
String number = codingruleUtils.getNumber(accountsEntity.getId(), Prescription.class.getName());
Product product = productService.fetchById(SystemConfig.p.getProperty("THREE_DRUGS_ID"));
Prescription prescription = new Prescription();
prescription.setNumber(number);
prescription.setOpenid(openId);
if (this.save(prescription)) {
JSONObject data = new JSONObject();
data.put("prescriptionNo", number);
data.put("productNo", product.getProductNumber());
data.put("unit", product.getUnit());
data.put("storeNo", SystemConfig.p.getProperty("cdfortis.store_no"));
retObj.put("errorNo", 0);
retObj.put("data", data);
} else {
retObj.put("errorNo", 1);
}
} catch (Exception e) {
retObj.put("errorNo", 1);
retObj.put("errorMsg", "生成处方单接口失败");
log.error("生成处方单接口失败：{}", e.getMessage());
e.printStackTrace();
}
return retObj;
}
@Override
public JSONObject findLastPrescription(String appId, String openId) {
JSONObject retObj = new JSONObject();
try {
//获取最新处方单数据
Conds conds = new Conds();
conds.equal("t.openid", openId);
Sort sort = new Sort("t.create_time", OrderType.DESC);
List<Prescription> list = this.fetchSearchByPage(conds, sort, 0, 0);
if (CollectionUtils.isEmpty(list)) {
retObj.put("errorNo", 1);
retObj.put("errorMsg", "暂无处方单信息，请稍后");
return retObj;
}
retObj.put("errorNo", 0);
retObj.put("data", list.get(0));
} catch (Exception e) {
e.printStackTrace();
}
return retObj;
}
}
\ No newline at end of file
aidea-modules/prescription-module/src/main/java/com/cftech/prescription/web/MobilePrecriptionController.java 0 → 100644
View file @ a22c9354
package com.cftech.prescription.web;
import com.alibaba.fastjson.JSONObject;
import com.cftech.prescription.service.PrescriptionService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
@RestController
@CrossOrigin
@RequestMapping(value = "mobile/auth/precription")
public class MobilePrecriptionController {
@Autowired
private PrescriptionService prescriptionService;
/**
* 生成处方单编码
* @param appId
* @param openId
* @return
*/
@RequestMapping(value = "generatePrescriptionNumber", method = { RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public JSONObject generatePrescriptionNumber(@RequestParam String appId,
@RequestParam String openId) {
return prescriptionService.generatePre(appId, openId);
}
/**
* 获取最新处方单
* @param appId
* @param openId
* @return
*/
@RequestMapping(value = "findLastPrescription", method = { RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public JSONObject findLastPrescription(@RequestParam String appId,
@RequestParam String openId) {
return prescriptionService.findLastPrescription(appId, openId);
}
}
aidea-modules/prescription-module/src/main/java/com/cftech/prescription/web/PrescriptionController.java
View file @ a22c9354
......@@ -156,7 +156,7 @@ public class PrescriptionController {
if (file == null) {
return list(request, model);
}
// 构造临时路径来存储上传的文件
// 构造临时路径来存储上传的文件
String uploadPath = System.getProperty("java.io.tmpdir");
File uploadDir = new File(uploadPath);
if (!uploadDir.exists()) {
......
aidea-modules/reportform-module/src/main/java/com/cftech/report/job/ReportJob.java
View file @ a22c9354
......@@ -62,7 +62,7 @@ public class ReportJob implements Job {
//获取报表用户信息
Conds condPeople = new Conds();
//condPeople.equal("DATE_FORMAT(detail.create_time ,'%Y-%m-%d')", format.format(today));
condPeople.equal("DATE_FORMAT(detail.create_time ,'%Y-%m-%d')", format.format(today));
condPeople.equal("detail.del_flag", Constants.DEL_FLAG_0);
Sort sortPeople = new Sort("detail.create_time", OrderType.DESC);
List<ReportPeopleInfo> listPeople = reportService.selectReportPeopleInfo(condPeople, sortPeople);
......
cftech-common-web/src/main/resources/common-test.properties
View file @ a22c9354
......@@ -144,21 +144,23 @@ map.key=OPIBZ-VYIW2-CK7UO-CM4WN-ELY2K-EUFYP
map.secret_key=W1je0RfMuDsfxCy73M0b3iEfZRF5cAcU
#\u5fae\u95ee\u8bca\u914d\u7f6e\u53c2\u6570
#\u83b7\u53d6\u0074\u006f\u006b\u0065\u006e\u5730\u5740
#\u5FAE\u95EE\u8BCA\u914D\u7F6E\u53C2\u6570
#\u83B7\u53D6token\u5730\u5740
#cdfortis.token_url=https://171.cdfortis.com/api/verify/token?appid={appid}&flag={flag}&timestamp={timestamp}&sign={sign}
cdfortis.token_url=https://api.cdfortis.com/api/verify/token?appid={appid}&flag={flag}&timestamp={timestamp}&sign={sign}
#\u5fae\u95ee\u8bca\u0061\u0070\u0070\u0069\u0064
#\u5FAE\u95EE\u8BCAappid
cdfortis.appid=74523ca670a6ceab8095a7476805c649
#\u5fae\u95ee\u8bca\u0073\u0065\u0063\u0072\u0065\u0074
#\u5FAE\u95EE\u8BCAsecret
cdfortis.secret=c2cf8d3e9a6c715a8046541bf397ccc6
#\u5fae\u95ee\u8bca\u0066\u006c\u0061\u0067
#\u5FAE\u95EE\u8BCAflag
cdfortis.flag=aidea888
#\u5fae\u95ee\u8bca\u836f\u54c1\u6e05\u5355\u4e0a\u4f20\u63a5\u53e3\u5730\u5740
#\u5FAE\u95EE\u8BCA\u836F\u54C1\u6E05\u5355\u4E0A\u4F20\u63A5\u53E3\u5730\u5740
cdfortis.drug_upload_url=https://api.cdfortis.com/api/drug/chain
#\u5fae\u95ee\u8bca\u83b7\u53d6\u56fe\u6587\u5904\u65b9\u5217\u8868\u63a5\u53e3
#\u5FAE\u95EE\u8BCA\u83B7\u53D6\u56FE\u6587\u5904\u65B9\u5217\u8868\u63A5\u53E3
cdfortis.get_fbusi_list_url=https://api.cdfortis.com/api/fbusi/getFbusiList
#\u5fae\u95ee\u8bca\u83b7\u53d6\u56fe\u6587\u5904\u65b9\u56fe\u7247\u63a5\u53e3
#\u5FAE\u95EE\u8BCA\u83B7\u53D6\u56FE\u6587\u5904\u65B9\u56FE\u7247\u63A5\u53E3
cdfortis.get_fbusi_pic_url=https://api.cdfortis.com/api/fbusi/getFbusiPicture
#\u5fae\u95ee\u8bca\u83b7\u53d6\u5355\u6761\u56fe\u6587\u5904\u65b9\u8be6\u60c5\u63a5\u53e3
#\u5FAE\u95EE\u8BCA\u83B7\u53D6\u5355\u6761\u56FE\u6587\u5904\u65B9\u8BE6\u60C5\u63A5\u53E3
cdfortis.get_fbusi_info_url=https://api.cdfortis.com/api/fbusi/getFbusiInfo
#\u5FAE\u95EE\u8BCA\u836F\u5E97\u7F16\u7801
cdfortis.store_no=aidea888
\ No newline at end of file
membercard-modules/shipping-address-web/src/main/webapp/WEB-INF/views/address/addresslist.html
View file @ a22c9354
......@@ -318,8 +318,12 @@
"aTargets": [8],
"mData": "address",
"mRender": function (a, b, c, d) {
if (a != null && a != '' && a.length >= 4) {
return '****' + a.slice(4, a.length);
if (a != null && a != '') {
let retObj = "";
for(let i=0; i<a.length; i++) {
retObj+="*";
}
return retObj;
}
return a;
}
......
mp-modules/mp-fanss-module/src/main/java/com/cftech/mp/fans/controller/MpFanssController.java
View file @ a22c9354
......@@ -158,7 +158,24 @@ public class MpFanssController {
mpFanssVO.setProvince(fanssEntity.getProvince());
mpFanssVO.setCity(fanssEntity.getCity());
mpFanssVO.setNickname(fanssEntity.getNickname());
mpFanssVO.setSource(fanssEntity.getSource().equals("1") ? "普通关注" : fanssEntity.getSource().equals("2") ? "医师二维码" : fanssEntity.getSource().equals("3") ? "客服二维码" :fanssEntity.getSource().equals("4") ? "医生二维码" :"组织二维码");
switch (fanssEntity.getSource()) {
case "0":
mpFanssVO.setSource("普通关注");
break;
case "1":
mpFanssVO.setSource("药师二维码");
break;
case "2":
mpFanssVO.setSource("客服二维码");
break;
case "3":
mpFanssVO.setSource("医生二维码");
break;
case "4":
mpFanssVO.setSource("组织二维码");
break;
}
mpFanssVO.setSubscribetime( simpleDateFormat.format(fanssEntity.getSubscribetime()));
list.add(mpFanssVO);
......
pom.xml
View file @ a22c9354
......@@ -968,7 +968,7 @@
<source>1.8</source>
<target>1.8</target>
<compilerArguments>
<bootclasspath>${java.home}/lib/rt.jar:${java.home}/lib/jce.jar</bootclasspath>
<bootclasspath>${java.home}/lib/rt.jar;${java.home}/lib/jce.jar</bootclasspath>
</compilerArguments>
</configuration>
</plugin>
......
portal-web/pom.xml
View file @ a22c9354
......@@ -346,6 +346,12 @@
<version>1.0-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>com.cftech</groupId>
<artifactId>prescription-module-web</artifactId>
<version>1.0-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
<build>
<finalName>portal-web</finalName>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment