Merge branch 'dev' of trick9191/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/hospital/prescription/service/PrescriptionService.java

@@ -2026,4 +2026,8 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
        List<WlyyDoctorWorkTimeVO> timeVOs = new ArrayList<>();
        return convertToModels(times,timeVOs,WlyyDoctorWorkTimeVO.class);
    }
//    public Map<String,Object> findPatientInfo(String patient){
//
//    }
}

common/common-request-mapping/src/main/java/com/yihu/jw/rm/hospital/BaseHospitalRequestMapping.java

@@ -197,6 +197,10 @@ public class BaseHospitalRequestMapping {
         */
        public static final String saveDoctorWorkTimeJson="/saveDoctorWorkTimeJson";
        /**
         * 获取居民基础信息
         */
        public static final String findPatientInfo ="/findPatientInfo";
        //=================end=======================================

server/svr-authentication/src/main/java/com/yihu/jw/security/core/userdetails/jdbc/WlyyUserDetailsService.java

@@ -6,6 +6,7 @@ import com.yihu.jw.security.model.WlyyUserDetails;
import com.yihu.jw.security.model.WlyyUserSimple;
import com.yihu.jw.security.utils.HttpClientUtil;
import com.yihu.utils.security.MD5;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateUtils;
import org.apache.http.NameValuePair;
@@ -181,11 +182,16 @@ public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetail
                    return users;
                }
                try {
                    String salt = randomString(5);
                    String idcard = patient.getString("idcard");
                    String pw = idcard.substring(idcard.length()-6);
                    this.getJdbcTemplate().update(DEFAULT_PATIENT_INSERT_STATEMENT,
                            new Object[]{patient.getString("code"),
                                    patient.getString("photo"),
                                    patient.getString("idcard"),
                                    patient.getString("password"),
                                    MD5.md5Hex(pw + "{" + salt + "}"),
                                    patient.getString("salt"),
                                    patient.getString("name"),
                                    patient.getDate("birthday"),
@@ -478,4 +484,17 @@ public class WlyyUserDetailsService extends JdbcDaoSupport implements UserDetail
    public void updateOpenId(String openid, String userId) {
        this.getJdbcTemplate().update("update base_patient p set p.openid = ? where p.id= ?", openid, userId);
    }
    public String randomString(int length) {
        String str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
        StringBuffer buffer = new StringBuffer();
        Random random = new Random();
        for(int i = 0; i < length; ++i) {
            int pos = random.nextInt(str.length());
            buffer.append(str.charAt(pos));
        }
        return buffer.toString();
    }
}

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/prescription/PrescriptionEndpoint.java

@@ -449,6 +449,14 @@ public class PrescriptionEndpoint extends EnvelopRestEndpoint {
                                             @RequestParam(value = "workTimeJson", required = true)String workTimeJson)throws Exception {
        return success(prescriptionService.saveDoctorWorkTimeJson(type,codes,workTimeJson));
    }
//    @PostMapping(value = BaseHospitalRequestMapping.Prescription.findPatientInfo)
//    @ApiOperation(value = "排班批量保存接口", notes = "排班批量保存接口")
//    public ObjEnvelop findPatientInfo(@ApiParam(name = "type", value = "1.全医院，2.科室，3.医生")
//                                      @RequestParam(value = "type", required = true)String patient){
//        return success(prescriptionService.findPatientInfo(type,codes,workTimeJson));
//
//    }
    //===========